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 /modules/exampleauth | |
| 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 'modules/exampleauth')
| -rw-r--r-- | modules/exampleauth/lib/Auth/Source/External.php | 6 | ||||
| -rw-r--r-- | modules/exampleauth/www/authpage.php | 6 | ||||
| -rw-r--r-- | modules/exampleauth/www/redirecttest.php | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/modules/exampleauth/lib/Auth/Source/External.php b/modules/exampleauth/lib/Auth/Source/External.php index 53818e9..256a3de 100644 --- a/modules/exampleauth/lib/Auth/Source/External.php +++ b/modules/exampleauth/lib/Auth/Source/External.php @@ -187,9 +187,9 @@ class sspmod_exampleauth_Auth_Source_External extends SimpleSAML_Auth_Source { $stateId = (string)$_REQUEST['State']; // sanitize the input - $restartURL = SimpleSAML_Utilities::getURLFromStateID($stateId); - if (!is_null($restartURL)) { - SimpleSAML_Utilities::checkURLAllowed($restartURL); + $sid = SimpleSAML_Utilities::parseStateID($stateId); + if (!is_null($sid['url'])) { + SimpleSAML_Utilities::checkURLAllowed($sid['url']); } /* diff --git a/modules/exampleauth/www/authpage.php b/modules/exampleauth/www/authpage.php index bcd01b8..91ff791 100644 --- a/modules/exampleauth/www/authpage.php +++ b/modules/exampleauth/www/authpage.php @@ -33,9 +33,9 @@ if (!preg_match('@State=(.*)@', $returnTo, $matches)) { $stateId = urldecode($matches[1]); // sanitize the input -$restartURL = SimpleSAML_Utilities::getURLFromStateID($stateId); -if (!is_null($restartURL)) { - SimpleSAML_Utilities::checkURLAllowed($restartURL); +$sid = SimpleSAML_Utilities::parseStateID($stateId); +if (!is_null($sid['url'])) { + SimpleSAML_Utilities::checkURLAllowed($sid['url']); } SimpleSAML_Auth_State::loadState($stateId, 'exampleauth:External'); diff --git a/modules/exampleauth/www/redirecttest.php b/modules/exampleauth/www/redirecttest.php index c6d4fb8..8a38fc4 100644 --- a/modules/exampleauth/www/redirecttest.php +++ b/modules/exampleauth/www/redirecttest.php @@ -15,9 +15,9 @@ if (!array_key_exists('StateId', $_REQUEST)) { $id = $_REQUEST['StateId']; // sanitize the input -$restartURL = SimpleSAML_Utilities::getURLFromStateID($id); -if (!is_null($restartURL)) { - SimpleSAML_Utilities::checkURLAllowed($restartURL); +$sid = SimpleSAML_Utilities::parseStateID($id); +if (!is_null($sid['url'])) { + SimpleSAML_Utilities::checkURLAllowed($sid['url']); } $state = SimpleSAML_Auth_State::loadState($id, 'exampleauth:redirectfilter-test'); |