From 651edcb5b62a5f8f435a15ee066d1054f08baaac Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Tue, 13 May 2008 11:30:48 +0000
Subject: [PATCH] Change SAML2 LogoutRequest and LogoutResponse to use
generateID and generateTimestamp from Utilities.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@540 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/XML/SAML20/LogoutRequest.php | 21 +++----------------
lib/SimpleSAML/XML/SAML20/LogoutResponse.php | 22 ++------------------
2 files changed, 5 insertions(+), 38 deletions(-)
diff --git a/lib/SimpleSAML/XML/SAML20/LogoutRequest.php b/lib/SimpleSAML/XML/SAML20/LogoutRequest.php
index 7c1e6e10d..e3ba33104 100644
--- a/lib/SimpleSAML/XML/SAML20/LogoutRequest.php
+++ b/lib/SimpleSAML/XML/SAML20/LogoutRequest.php
@@ -1,6 +1,7 @@
<?php
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
+require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Metadata/MetaDataStorageHandler.php');
/**
@@ -127,8 +128,8 @@ class SimpleSAML_XML_SAML20_LogoutRequest {
$spnamequalifier = isset($issuermd['SPNameQualifier']) ? $issuermd['SPNameQualifier'] : $issuermd['entityid'];
}
- $id = self::generateID();
- $issueInstant = self::generateIssueInstant();
+ $id = SimpleSAML_Utilities::generateID();
+ $issueInstant = SimpleSAML_Utilities::generateTimestamp();
$destination = $receivermd['SingleLogoutService'];
@@ -146,22 +147,6 @@ class SimpleSAML_XML_SAML20_LogoutRequest {
return $logoutRequest;
}
-
- public static function generateID() {
-
- $length = 42;
- $key = "_";
- for ( $i=0; $i < $length; $i++ )
- {
- $key .= dechex( rand(0,15) );
- }
- return $key;
- }
-
- public static function generateIssueInstant() {
- return gmdate("Y-m-d\TH:i:s\Z");
- }
-
}
?>
\ No newline at end of file
diff --git a/lib/SimpleSAML/XML/SAML20/LogoutResponse.php b/lib/SimpleSAML/XML/SAML20/LogoutResponse.php
index 83436c9c7..95d68862e 100644
--- a/lib/SimpleSAML/XML/SAML20/LogoutResponse.php
+++ b/lib/SimpleSAML/XML/SAML20/LogoutResponse.php
@@ -100,8 +100,8 @@ class SimpleSAML_XML_SAML20_LogoutResponse {
$issuermd = $this->metadata->getMetaData($issuer, $issuerset);
$receivermd = $this->metadata->getMetaData($receiver, $receiverset);
- $id = self::generateID();
- $issueInstant = self::generateIssueInstant();
+ $id = SimpleSAML_Utilities::generateID();
+ $issueInstant = SimpleSAML_Utilities::generateTimestamp();
$destination = $receivermd['SingleLogoutService'];
@@ -123,24 +123,6 @@ class SimpleSAML_XML_SAML20_LogoutResponse {
return $samlResponse;
}
-
-
-
- public static function generateID() {
-
- $length = 42;
- $key = "_";
- for ( $i=0; $i < $length; $i++ )
- {
- $key .= dechex( rand(0,15) );
- }
- return $key;
- }
-
- public static function generateIssueInstant($offset = 0) {
- return gmdate("Y-m-d\TH:i:s\Z", time() + $offset);
- }
-
}
?>
\ No newline at end of file
--
GitLab