Revision: 3336
Author: jaim...@gmail.com
Date: Tue Jan 28 00:24:41 2014 UTC
Log: Fix for bug introduced in r3332.
http://code.google.com/p/simplesamlphp/source/detail?r=3336
Modified:
/trunk/lib/SimpleSAML/Auth/ProcessingChain.php
/trunk/lib/SimpleSAML/Auth/State.php
/trunk/lib/SimpleSAML/IdP/LogoutTraditional.php
/trunk/lib/SimpleSAML/Utilities.php
/trunk/modules/InfoCard/lib/Auth/Source/ICAuth.php
/trunk/modules/aselect/www/credentials.php
/trunk/modules/authYubiKey/lib/Auth/Source/YubiKey.php
/trunk/modules/authfacebook/www/linkback.php
/trunk/modules/authlinkedin/www/linkback.php
/trunk/modules/authmyspace/www/linkback.php
/trunk/modules/authorize/www/authorize_403.php
/trunk/modules/authtwitter/www/linkback.php
/trunk/modules/authwindowslive/www/linkback.php
/trunk/modules/cas/www/linkback.php
/trunk/modules/cdc/www/resume.php
/trunk/modules/consent/www/getconsent.php
/trunk/modules/consent/www/logout.php
/trunk/modules/consent/www/noconsent.php
/trunk/modules/core/lib/Auth/UserPassBase.php
/trunk/modules/core/lib/Auth/UserPassOrgBase.php
/trunk/modules/core/www/idp/logout-iframe-done.php
/trunk/modules/core/www/idp/logout-iframe.php
/trunk/modules/core/www/idp/resumelogout.php
/trunk/modules/core/www/loginuserpass.php
/trunk/modules/core/www/loginuserpassorg.php
/trunk/modules/core/www/short_sso_interval.php
/trunk/modules/exampleauth/lib/Auth/Source/External.php
/trunk/modules/exampleauth/www/authpage.php
/trunk/modules/exampleauth/www/redirecttest.php
/trunk/modules/expirycheck/www/about2expire.php
/trunk/modules/expirycheck/www/expired.php
/trunk/modules/multiauth/www/selectsource.php
/trunk/modules/negotiate/www/backend.php
/trunk/modules/negotiate/www/retry.php
/trunk/modules/openid/www/consumer.php
/trunk/modules/openid/www/linkback.php
/trunk/modules/openidProvider/lib/Server.php
/trunk/modules/papi/lib/Auth/Source/PAPI.php
/trunk/modules/preprodwarning/www/showwarning.php
/trunk/modules/saml/www/sp/discoresp.php
/trunk/modules/saml/www/sp/saml1-acs.php
/trunk/modules/saml/www/sp/saml2-acs.php
/trunk/modules/saml/www/sp/saml2-logout.php
/trunk/www/saml2/sp/AssertionConsumerService.php
/trunk/www/shib13/sp/AssertionConsumerService.php
=======================================
--- /trunk/lib/SimpleSAML/Auth/ProcessingChain.php Mon Jan 27 09:28:12 2014
UTC
+++ /trunk/lib/SimpleSAML/Auth/ProcessingChain.php Tue Jan 28 00:24:41 2014
UTC
@@ -306,7 +306,7 @@
* 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)');
=======================================
--- /trunk/lib/SimpleSAML/Auth/State.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/lib/SimpleSAML/Auth/State.php Tue Jan 28 00:24:41 2014 UTC
@@ -211,10 +211,10 @@
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 @@
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 @@
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;
=======================================
--- /trunk/lib/SimpleSAML/IdP/LogoutTraditional.php Fri Jan 24 16:36:54
2014 UTC
+++ /trunk/lib/SimpleSAML/IdP/LogoutTraditional.php Tue Jan 28 00:24:41
2014 UTC
@@ -77,9 +77,9 @@
}
// sanitize the input
- $restartURL =
SimpleSAML_Utilities::getURLFromStateID($relayState);
- if (!is_null($restartURL)) {
- SimpleSAML_Utilities::checkURLAllowed($restartURL);
+ $sid = SimpleSAML_Utilities::parseStateID($relayState);
+ if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
$state =
SimpleSAML_Auth_State::loadState($relayState, 'core:LogoutTraditional');
=======================================
--- /trunk/lib/SimpleSAML/Utilities.php Mon Jan 27 19:08:09 2014 UTC
+++ /trunk/lib/SimpleSAML/Utilities.php Tue Jan 28 00:24:41 2014 UTC
@@ -345,19 +345,23 @@
/**
- * Get a URL embedded in a StateID, in the form 'id:url'.
+ * Get the ID and (optionally) a URL embedded in a StateID,
+ * in the form 'id:url'.
*
* @param string $stateId The state ID to use.
- * @return string The embedded URL if found, NULL otherwise.
+ * @return array A hashed array with the ID and the URL (if any),
+ * in the 'id' and 'url' keys, respectively. If there's no URL
+ * in the input parameter, NULL will be returned as the value for
+ * the 'url' key.
*/
- public static function getURLFromStateID($stateId) {
+ public static function parseStateID($stateId) {
$tmp = explode(':', $stateId, 2);
$id = $tmp[0];
$url = NULL;
if (count($tmp) === 2) {
$url = $tmp[1];
}
- return $url;
+ return array('id' => $id, 'url' => $url);
}
=======================================
--- /trunk/modules/InfoCard/lib/Auth/Source/ICAuth.php Fri Jan 24 16:36:54
2014 UTC
+++ /trunk/modules/InfoCard/lib/Auth/Source/ICAuth.php Tue Jan 28 00:24:41
2014 UTC
@@ -69,9 +69,9 @@
}
// sanitize the input
- $restartURL =
SimpleSAML_Utilities::getURLFromStateID($authStateId);
- if (!is_null($restartURL)) {
-
SimpleSAML_Utilities::checkURLAllowed($restartURL);
+ $sid = SimpleSAML_Utilities::parseStateID($authStateId);
+ if (!is_null($sid['url'])) {
+
SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
/* Retrieve the authentication state. */
=======================================
--- /trunk/modules/aselect/www/credentials.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/aselect/www/credentials.php Tue Jan 28 00:24:41 2014 UTC
@@ -13,9 +13,9 @@
$id = $_REQUEST['ssp_state'];
// 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, 'aselect:login');
=======================================
--- /trunk/modules/authYubiKey/lib/Auth/Source/YubiKey.php Fri Jan 24
16:36:54 2014 UTC
+++ /trunk/modules/authYubiKey/lib/Auth/Source/YubiKey.php Tue Jan 28
00:24:41 2014 UTC
@@ -125,9 +125,9 @@
assert('is_string($otp)');
// sanitize the input
- $restartURL =
SimpleSAML_Utilities::getURLFromStateID($authStateId);
- if (!is_null($restartURL)) {
- SimpleSAML_Utilities::checkURLAllowed($restartURL);
+ $sid = SimpleSAML_Utilities::parseStateID($authStateId);
+ if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
/* Retrieve the authentication state. */
=======================================
--- /trunk/modules/authfacebook/www/linkback.php Fri Jan 24 16:36:54 2014
UTC
+++ /trunk/modules/authfacebook/www/linkback.php Tue Jan 28 00:24:41 2014
UTC
@@ -11,9 +11,9 @@
$stateID = $_REQUEST['AuthState'];
// 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']);
}
$state = SimpleSAML_Auth_State::loadState($stateID,
sspmod_authfacebook_Auth_Source_Facebook::STAGE_INIT);
=======================================
--- /trunk/modules/authlinkedin/www/linkback.php Fri Jan 24 16:36:54 2014
UTC
+++ /trunk/modules/authlinkedin/www/linkback.php Tue Jan 28 00:24:41 2014
UTC
@@ -11,9 +11,9 @@
}
// 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']);
}
$state = SimpleSAML_Auth_State::loadState($stateId,
sspmod_authlinkedin_Auth_Source_LinkedIn::STAGE_INIT);
=======================================
--- /trunk/modules/authmyspace/www/linkback.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/authmyspace/www/linkback.php Tue Jan 28 00:24:41 2014 UTC
@@ -11,9 +11,9 @@
}
// 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']);
}
$state = SimpleSAML_Auth_State::loadState($stateId,
sspmod_authmyspace_Auth_Source_MySpace::STAGE_INIT);
=======================================
--- /trunk/modules/authorize/www/authorize_403.php Fri Jan 24 16:36:54 2014
UTC
+++ /trunk/modules/authorize/www/authorize_403.php Tue Jan 28 00:24:41 2014
UTC
@@ -13,9 +13,9 @@
$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, 'authorize:Authorize');
=======================================
--- /trunk/modules/authtwitter/www/linkback.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/authtwitter/www/linkback.php Tue Jan 28 00:24:41 2014 UTC
@@ -10,9 +10,9 @@
$stateID = $_REQUEST['AuthState'];
// 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']);
}
$state = SimpleSAML_Auth_State::loadState($stateID,
sspmod_authtwitter_Auth_Source_Twitter::STAGE_INIT);
=======================================
--- /trunk/modules/authwindowslive/www/linkback.php Fri Jan 24 16:36:54
2014 UTC
+++ /trunk/modules/authwindowslive/www/linkback.php Tue Jan 28 00:24:41
2014 UTC
@@ -8,9 +8,9 @@
$stateId = $_REQUEST['wrap_client_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']);
}
$state = SimpleSAML_Auth_State::loadState($stateId,
sspmod_authwindowslive_Auth_Source_LiveID::STAGE_INIT);
=======================================
--- /trunk/modules/cas/www/linkback.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/cas/www/linkback.php Tue Jan 28 00:24:41 2014 UTC
@@ -14,9 +14,9 @@
}
// 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']);
}
$state = SimpleSAML_Auth_State::loadState($stateId,
sspmod_cas_Auth_Source_CAS::STAGE_INIT);
=======================================
--- /trunk/modules/cdc/www/resume.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/cdc/www/resume.php Tue Jan 28 00:24:41 2014 UTC
@@ -18,9 +18,9 @@
}
// sanitize the input
-$restartURL = SimpleSAML_Utilities::getURLFromStateID($response['id']);
-if (!is_null($restartURL)) {
- SimpleSAML_Utilities::checkURLAllowed($restartURL);
+$sid = SimpleSAML_Utilities::parseStateID($response['id']);
+if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
$state = SimpleSAML_Auth_State::loadState($response['id'], 'cdc:resume');
=======================================
--- /trunk/modules/consent/www/getconsent.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/consent/www/getconsent.php Tue Jan 28 00:24:41 2014 UTC
@@ -33,9 +33,9 @@
$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, 'consent:request');
=======================================
--- /trunk/modules/consent/www/logout.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/consent/www/logout.php Tue Jan 28 00:24:41 2014 UTC
@@ -12,9 +12,9 @@
$id = (string)$_GET['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, 'consent:request');
=======================================
--- /trunk/modules/consent/www/noconsent.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/consent/www/noconsent.php Tue Jan 28 00:24:41 2014 UTC
@@ -14,9 +14,9 @@
$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, 'consent:request');
=======================================
--- /trunk/modules/core/lib/Auth/UserPassBase.php Fri Jan 24 16:36:54 2014
UTC
+++ /trunk/modules/core/lib/Auth/UserPassBase.php Tue Jan 28 00:24:41 2014
UTC
@@ -198,9 +198,9 @@
assert('is_string($password)');
// sanitize the input
- $restartURL =
SimpleSAML_Utilities::getURLFromStateID($authStateId);
- if (!is_null($restartURL)) {
- SimpleSAML_Utilities::checkURLAllowed($restartURL);
+ $sid = SimpleSAML_Utilities::parseStateID($authStateId);
+ if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
/* Here we retrieve the state array we saved in the
authenticate-function. */
=======================================
--- /trunk/modules/core/lib/Auth/UserPassOrgBase.php Fri Jan 24 16:36:54
2014 UTC
+++ /trunk/modules/core/lib/Auth/UserPassOrgBase.php Tue Jan 28 00:24:41
2014 UTC
@@ -210,9 +210,9 @@
assert('is_string($organization)');
// sanitize the input
- $restartURL =
SimpleSAML_Utilities::getURLFromStateID($authStateId);
- if (!is_null($restartURL)) {
- SimpleSAML_Utilities::checkURLAllowed($restartURL);
+ $sid = SimpleSAML_Utilities::parseStateID($authStateId);
+ if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
/* Retrieve the authentication state. */
@@ -264,9 +264,9 @@
assert('is_string($authStateId)');
// sanitize the input
- $restartURL =
SimpleSAML_Utilities::getURLFromStateID($authStateId);
- if (!is_null($restartURL)) {
- SimpleSAML_Utilities::checkURLAllowed($restartURL);
+ $sid = SimpleSAML_Utilities::parseStateID($authStateId);
+ if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
/* Retrieve the authentication state. */
=======================================
--- /trunk/modules/core/www/idp/logout-iframe-done.php Fri Jan 24 16:36:54
2014 UTC
+++ /trunk/modules/core/www/idp/logout-iframe-done.php Tue Jan 28 00:24:41
2014 UTC
@@ -6,9 +6,9 @@
$id = (string)$_REQUEST['id'];
// 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, 'core:Logout-IFrame');
=======================================
--- /trunk/modules/core/www/idp/logout-iframe.php Fri Jan 24 16:36:54 2014
UTC
+++ /trunk/modules/core/www/idp/logout-iframe.php Tue Jan 28 00:24:41 2014
UTC
@@ -20,9 +20,9 @@
}
// 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, 'core:Logout-IFrame');
=======================================
--- /trunk/modules/core/www/idp/resumelogout.php Fri Jan 24 16:36:54 2014
UTC
+++ /trunk/modules/core/www/idp/resumelogout.php Tue Jan 28 00:24:41 2014
UTC
@@ -6,9 +6,9 @@
$id = (string)$_REQUEST['id'];
// 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, 'core:Logout:afterbridge');
=======================================
--- /trunk/modules/core/www/loginuserpass.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/core/www/loginuserpass.php Tue Jan 28 00:24:41 2014 UTC
@@ -16,9 +16,9 @@
$authStateId = $_REQUEST['AuthState'];
// sanitize the input
-$restartURL = SimpleSAML_Utilities::getURLFromStateID($authStateId);
-if (!is_null($restartURL)) {
- SimpleSAML_Utilities::checkURLAllowed($restartURL);
+$sid = SimpleSAML_Utilities::parseStateID($authStateId);
+if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
/* Retrieve the authentication state. */
=======================================
--- /trunk/modules/core/www/loginuserpassorg.php Fri Jan 24 16:36:54 2014
UTC
+++ /trunk/modules/core/www/loginuserpassorg.php Tue Jan 28 00:24:41 2014
UTC
@@ -16,9 +16,9 @@
$authStateId = $_REQUEST['AuthState'];
// sanitize the input
-$restartURL = SimpleSAML_Utilities::getURLFromStateID($authStateId);
-if (!is_null($restartURL)) {
- SimpleSAML_Utilities::checkURLAllowed($restartURL);
+$sid = SimpleSAML_Utilities::parseStateID($authStateId);
+if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
/* Retrieve the authentication state. */
=======================================
--- /trunk/modules/core/www/short_sso_interval.php Fri Jan 24 16:36:54 2014
UTC
+++ /trunk/modules/core/www/short_sso_interval.php Tue Jan 28 00:24:41 2014
UTC
@@ -14,9 +14,9 @@
$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, 'core:short_sso_interval');
=======================================
--- /trunk/modules/exampleauth/lib/Auth/Source/External.php Mon Jan 27
09:28:12 2014 UTC
+++ /trunk/modules/exampleauth/lib/Auth/Source/External.php Tue Jan 28
00:24:41 2014 UTC
@@ -187,9 +187,9 @@
$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']);
}
/*
=======================================
--- /trunk/modules/exampleauth/www/authpage.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/exampleauth/www/authpage.php Tue Jan 28 00:24:41 2014 UTC
@@ -33,9 +33,9 @@
$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');
=======================================
--- /trunk/modules/exampleauth/www/redirecttest.php Fri Jan 24 16:36:54
2014 UTC
+++ /trunk/modules/exampleauth/www/redirecttest.php Tue Jan 28 00:24:41
2014 UTC
@@ -15,9 +15,9 @@
$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');
=======================================
--- /trunk/modules/expirycheck/www/about2expire.php Fri Jan 24 16:36:54
2014 UTC
+++ /trunk/modules/expirycheck/www/about2expire.php Tue Jan 28 00:24:41
2014 UTC
@@ -16,9 +16,9 @@
$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, 'expirywarning:about2expire');
=======================================
--- /trunk/modules/expirycheck/www/expired.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/expirycheck/www/expired.php Tue Jan 28 00:24:41 2014 UTC
@@ -16,9 +16,9 @@
$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, 'expirywarning:expired');
=======================================
--- /trunk/modules/multiauth/www/selectsource.php Fri Jan 24 16:36:54 2014
UTC
+++ /trunk/modules/multiauth/www/selectsource.php Tue Jan 28 00:24:41 2014
UTC
@@ -17,9 +17,9 @@
$authStateId = $_REQUEST['AuthState'];
// sanitize the input
-$restartURL = SimpleSAML_Utilities::getURLFromStateID($authStateId);
-if (!is_null($restartURL)) {
- SimpleSAML_Utilities::checkURLAllowed($restartURL);
+$sid = SimpleSAML_Utilities::parseStateID($authStateId);
+if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
/* Retrieve the authentication state. */
=======================================
--- /trunk/modules/negotiate/www/backend.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/negotiate/www/backend.php Tue Jan 28 00:24:41 2014 UTC
@@ -12,9 +12,9 @@
$authStateId = $_REQUEST['AuthState'];
// sanitize the input
-$restartURL = SimpleSAML_Utilities::getURLFromStateID($authStateId);
-if (!is_null($restartURL)) {
- SimpleSAML_Utilities::checkURLAllowed($restartURL);
+$sid = SimpleSAML_Utilities::parseStateID($authStateId);
+if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
$state = SimpleSAML_Auth_State::loadState($authStateId,
sspmod_negotiate_Auth_Source_Negotiate::STAGEID);
=======================================
--- /trunk/modules/negotiate/www/retry.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/negotiate/www/retry.php Tue Jan 28 00:24:41 2014 UTC
@@ -12,9 +12,9 @@
$authStateId = $_REQUEST['AuthState'];
// sanitize the input
-$restartURL = SimpleSAML_Utilities::getURLFromStateID($authStateId);
-if (!is_null($restartURL)) {
- SimpleSAML_Utilities::checkURLAllowed($restartURL);
+$sid = SimpleSAML_Utilities::parseStateID($authStateId);
+if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
$state = SimpleSAML_Auth_State::loadState($authStateId,
sspmod_negotiate_Auth_Source_Negotiate::STAGEID);
=======================================
--- /trunk/modules/openid/www/consumer.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/openid/www/consumer.php Tue Jan 28 00:24:41 2014 UTC
@@ -8,9 +8,9 @@
$authState = $_REQUEST['AuthState'];
// sanitize the input
-$restartURL = SimpleSAML_Utilities::getURLFromStateID($authState);
-if (!is_null($restartURL)) {
- SimpleSAML_Utilities::checkURLAllowed($restartURL);
+$sid = SimpleSAML_Utilities::parseStateID($authState);
+if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
$state = SimpleSAML_Auth_State::loadState($authState, 'openid:init');
=======================================
--- /trunk/modules/openid/www/linkback.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/openid/www/linkback.php Tue Jan 28 00:24:41 2014 UTC
@@ -8,9 +8,9 @@
$authState = $_REQUEST['AuthState'];
// sanitize the input
-$restartURL = SimpleSAML_Utilities::getURLFromStateID($authState);
-if (!is_null($restartURL)) {
- SimpleSAML_Utilities::checkURLAllowed($restartURL);
+$sid = SimpleSAML_Utilities::parseStateID($authState);
+if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
$state = SimpleSAML_Auth_State::loadState($authState, 'openid:auth');
=======================================
--- /trunk/modules/openidProvider/lib/Server.php Mon Jan 27 09:28:12 2014
UTC
+++ /trunk/modules/openidProvider/lib/Server.php Tue Jan 28 00:24:41 2014
UTC
@@ -330,9 +330,9 @@
assert('is_string($stateId)');
// 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']);
}
return
SimpleSAML_Auth_State::loadState($stateId, 'openidProvider:resumeState');
=======================================
--- /trunk/modules/papi/lib/Auth/Source/PAPI.php Fri Jan 24 16:36:54 2014
UTC
+++ /trunk/modules/papi/lib/Auth/Source/PAPI.php Tue Jan 28 00:24:41 2014
UTC
@@ -117,9 +117,9 @@
$this->_stateId = (string)$_REQUEST['SSPStateID'];
// sanitize the input
- $restartURL =
SimpleSAML_Utilities::getURLFromStateID($this->_stateId);
- if (!is_null($restartURL)) {
-
SimpleSAML_Utilities::checkURLAllowed($restartURL);
+ $sid =
SimpleSAML_Utilities::parseStateID($this->_stateId);
+ if (!is_null($sid['url'])) {
+
SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
$state = SimpleSAML_Auth_State::loadState($this->_stateId,
self::STAGE_INIT);
@@ -170,9 +170,9 @@
$this->_stateId = (string)$_REQUEST['SSPStateID'];
// sanitize the input
- $restartURL =
SimpleSAML_Utilities::getURLFromStateID($this->_stateId);
- if (!is_null($restartURL)) {
-
SimpleSAML_Utilities::checkURLAllowed($restartURL);
+ $sid =
SimpleSAML_Utilities::parseStateID($this->_stateId);
+ if (!is_null($sid['url'])) {
+
SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
$state = SimpleSAML_Auth_State::loadState($this->_stateId,
self::STAGE_INIT);
=======================================
--- /trunk/modules/preprodwarning/www/showwarning.php Fri Jan 24 16:36:54
2014 UTC
+++ /trunk/modules/preprodwarning/www/showwarning.php Tue Jan 28 00:24:41
2014 UTC
@@ -17,9 +17,9 @@
$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, 'warning:request');
=======================================
--- /trunk/modules/saml/www/sp/discoresp.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/saml/www/sp/discoresp.php Tue Jan 28 00:24:41 2014 UTC
@@ -15,9 +15,9 @@
$stateID = $_REQUEST['AuthID'];
// 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']);
}
$state = SimpleSAML_Auth_State::loadState($stateID, 'saml:sp:sso');
=======================================
--- /trunk/modules/saml/www/sp/saml1-acs.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/saml/www/sp/saml1-acs.php Tue Jan 28 00:24:41 2014 UTC
@@ -32,9 +32,9 @@
$stateID = $_REQUEST['TARGET'];
// 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']);
}
$state = SimpleSAML_Auth_State::loadState($stateID, 'saml:sp:sso');
=======================================
--- /trunk/modules/saml/www/sp/saml2-acs.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/saml/www/sp/saml2-acs.php Tue Jan 28 00:24:41 2014 UTC
@@ -54,9 +54,9 @@
if (!empty($stateId)) {
// 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']);
}
/* This is a response to a request we sent earlier. */
=======================================
--- /trunk/modules/saml/www/sp/saml2-logout.php Fri Jan 24 16:36:54 2014 UTC
+++ /trunk/modules/saml/www/sp/saml2-logout.php Tue Jan 28 00:24:41 2014 UTC
@@ -55,9 +55,9 @@
}
// sanitize the input
- $restartURL = SimpleSAML_Utilities::getURLFromStateID($relayState);
- if (!is_null($restartURL)) {
- SimpleSAML_Utilities::checkURLAllowed($restartURL);
+ $sid = SimpleSAML_Utilities::parseStateID($relayState);
+ if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
$state = SimpleSAML_Auth_State::loadState($relayState, 'saml:slosent');
=======================================
--- /trunk/www/saml2/sp/AssertionConsumerService.php Fri Jan 24 16:36:54
2014 UTC
+++ /trunk/www/saml2/sp/AssertionConsumerService.php Tue Jan 28 00:24:41
2014 UTC
@@ -61,9 +61,9 @@
$authProcId = $_REQUEST[SimpleSAML_Auth_ProcessingChain::AUTHPARAM];
// sanitize the input
- $restartURL = SimpleSAML_Utilities::getURLFromStateID($authProcId);
- if (!is_null($restartURL)) {
- SimpleSAML_Utilities::checkURLAllowed($restartURL);
+ $sid = SimpleSAML_Utilities::parseStateID($authProcId);
+ if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
$authProcState =
SimpleSAML_Auth_ProcessingChain::fetchProcessedState($authProcId);
=======================================
--- /trunk/www/shib13/sp/AssertionConsumerService.php Fri Jan 24 16:36:54
2014 UTC
+++ /trunk/www/shib13/sp/AssertionConsumerService.php Tue Jan 28 00:24:41
2014 UTC
@@ -49,9 +49,9 @@
$authProcId = $_REQUEST[SimpleSAML_Auth_ProcessingChain::AUTHPARAM];
// sanitize the input
- $restartURL = SimpleSAML_Utilities::getURLFromStateID($authProcId);
- if (!is_null($restartURL)) {
- SimpleSAML_Utilities::checkURLAllowed($restartURL);
+ $sid = SimpleSAML_Utilities::parseStateID($authProcId);
+ if (!is_null($sid['url'])) {
+ SimpleSAML_Utilities::checkURLAllowed($sid['url']);
}
$authProcState =
SimpleSAML_Auth_ProcessingChain::fetchProcessedState($authProcId);
--
You received this message because you are subscribed to the Google Groups
"simpleSAMLphp commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to simplesamlphp-commits+unsubscr...@googlegroups.com.
To post to this group, send email to simplesamlphp-commits@googlegroups.com.
Visit this group at http://groups.google.com/group/simplesamlphp-commits.
For more options, visit https://groups.google.com/groups/opt_out.
