diff options
| author | Jaime Pérez Crespo <jaime.perez@uninett.no> | 2014-01-28 00:24:41 +0000 |
|---|---|---|
| committer | Jaime Pérez Crespo <jaime.perez@uninett.no> | 2014-01-28 00:24:41 +0000 |
| commit | 26ecd93413b6c8fb8a2642f882ad91d83b77c8f0 (patch) | |
| tree | 7f143c64e4b49f310e770527b57ee0ea2c69ca59 /lib/SimpleSAML/Auth | |
| parent | df62f4656f4b8da04ede0b1486716f23236168ff (diff) | |
| download | simplesamlphp-26ecd93413b6c8fb8a2642f882ad91d83b77c8f0.zip simplesamlphp-26ecd93413b6c8fb8a2642f882ad91d83b77c8f0.tar.gz simplesamlphp-26ecd93413b6c8fb8a2642f882ad91d83b77c8f0.tar.bz2 | |
Fix for bug introduced in r3332.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3336 44740490-163a-0410-bde0-09ae8108e29a
Diffstat (limited to 'lib/SimpleSAML/Auth')
| -rw-r--r-- | lib/SimpleSAML/Auth/ProcessingChain.php | 2 | ||||
| -rw-r--r-- | lib/SimpleSAML/Auth/State.php | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/SimpleSAML/Auth/ProcessingChain.php b/lib/SimpleSAML/Auth/ProcessingChain.php index 2bc624d..3380840 100644 --- a/lib/SimpleSAML/Auth/ProcessingChain.php +++ b/lib/SimpleSAML/Auth/ProcessingChain.php @@ -306,7 +306,7 @@ class SimpleSAML_Auth_ProcessingChain { * SimpleSAML_Auth_ProcessingChain::AUTHPARAM request parameter. Please * make sure to sanitize it properly by calling the * SimpleSAML_Utilities::checkURLAllowed() function with the embedded - * restart URL, if any. See also SimpleSAML_Utilities::getURLFromStateID(). + * restart URL, if any. See also SimpleSAML_Utilities::parseStateID(). */ public static function fetchProcessedState($id) { assert('is_string($id)'); diff --git a/lib/SimpleSAML/Auth/State.php b/lib/SimpleSAML/Auth/State.php index 0b74da2..ccea15f 100644 --- a/lib/SimpleSAML/Auth/State.php +++ b/lib/SimpleSAML/Auth/State.php @@ -211,10 +211,10 @@ class SimpleSAML_Auth_State { assert('is_bool($allowMissing)'); SimpleSAML_Logger::debug('Loading state: ' . var_export($id, TRUE)); - $restartURL = SimpleSAML_Utilities::getURLFromStateID($id); + $sid = SimpleSAML_Utilities::parseStateID($id); $session = SimpleSAML_Session::getInstance(); - $state = $session->getData('SimpleSAML_Auth_State', $id); + $state = $session->getData('SimpleSAML_Auth_State', $sid['id']); if ($state === NULL) { /* Could not find saved data. */ @@ -222,11 +222,11 @@ class SimpleSAML_Auth_State { return NULL; } - if ($restartURL === NULL) { + if ($sid['url'] === NULL) { throw new SimpleSAML_Error_NoState(); } - SimpleSAML_Utilities::redirectTrustedURL($restartURL); + SimpleSAML_Utilities::redirectTrustedURL($sid['url']); } $state = unserialize($state); @@ -246,11 +246,11 @@ class SimpleSAML_Auth_State { SimpleSAML_Logger::warning($msg); - if ($restartURL === NULL) { + if ($sid['url'] === NULL) { throw new Exception($msg); } - SimpleSAML_Utilities::redirectTrustedURL($restartURL); + SimpleSAML_Utilities::redirectTrustedURL($sid['url']); } return $state; |