Skip to content
Snippets Groups Projects
Commit dabcc26b authored by Olav Morken's avatar Olav Morken
Browse files

Fix misspelling "unsoliced" => "unsolicited".

Thanks to Thijs Kinkhorst for fixing this!

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3005 44740490-163a-0410-bde0-09ae8108e29a
parent a923d004
No related branches found
No related tags found
No related merge requests found
...@@ -232,7 +232,7 @@ class SimpleSAML_Auth_Default { ...@@ -232,7 +232,7 @@ class SimpleSAML_Auth_Default {
/** /**
* Handle a unsoliced login operations. * Handle a unsolicited login operations.
* *
* This function creates a session from the received information. It * This function creates a session from the received information. It
* will then redirect to the given URL. * will then redirect to the given URL.
...@@ -244,7 +244,7 @@ class SimpleSAML_Auth_Default { ...@@ -244,7 +244,7 @@ class SimpleSAML_Auth_Default {
* @param string $redirectTo The URL we should redirect the user to after * @param string $redirectTo The URL we should redirect the user to after
* updating the session. * updating the session.
*/ */
public static function handleUnsolicedAuth($authId, array $state, $redirectTo) { public static function handleUnsolicitedAuth($authId, array $state, $redirectTo) {
assert('is_string($authId)'); assert('is_string($authId)');
assert('is_string($redirectTo)'); assert('is_string($redirectTo)');
......
...@@ -502,13 +502,13 @@ class sspmod_saml_Auth_Source_SP extends SimpleSAML_Auth_Source { ...@@ -502,13 +502,13 @@ class sspmod_saml_Auth_Source_SP extends SimpleSAML_Auth_Source {
$state['Attributes'] = $authProcState['Attributes']; $state['Attributes'] = $authProcState['Attributes'];
if (isset($state['saml:sp:isUnsoliced']) && (bool)$state['saml:sp:isUnsoliced']) { if (isset($state['saml:sp:isUnsolicited']) && (bool)$state['saml:sp:isUnsolicited']) {
if (!empty($state['saml:sp:RelayState'])) { if (!empty($state['saml:sp:RelayState'])) {
$redirectTo = $state['saml:sp:RelayState']; $redirectTo = $state['saml:sp:RelayState'];
} else { } else {
$redirectTo = $source->getMetadata()->getString('RelayState', '/'); $redirectTo = $source->getMetadata()->getString('RelayState', '/');
} }
SimpleSAML_Auth_Default::handleUnsolicedAuth($sourceId, $state, $redirectTo); SimpleSAML_Auth_Default::handleUnsolicitedAuth($sourceId, $state, $redirectTo);
} }
SimpleSAML_Auth_Source::completeAuth($state); SimpleSAML_Auth_Source::completeAuth($state);
......
...@@ -24,7 +24,7 @@ $target = (string)$_REQUEST['TARGET']; ...@@ -24,7 +24,7 @@ $target = (string)$_REQUEST['TARGET'];
if (preg_match('@^https?://@i', $target)) { if (preg_match('@^https?://@i', $target)) {
/* Unsolicited response. */ /* Unsolicited response. */
$state = array( $state = array(
'saml:sp:isUnsoliced' => TRUE, 'saml:sp:isUnsolicited' => TRUE,
'saml:sp:AuthId' => $sourceId, 'saml:sp:AuthId' => $sourceId,
'saml:sp:RelayState' => $target, 'saml:sp:RelayState' => $target,
); );
......
...@@ -43,9 +43,9 @@ if (!empty($stateId)) { ...@@ -43,9 +43,9 @@ if (!empty($stateId)) {
throw new SimpleSAML_Error_Exception('The authentication source id in the URL does not match the authentication source which sent the request.'); throw new SimpleSAML_Error_Exception('The authentication source id in the URL does not match the authentication source which sent the request.');
} }
} else { } else {
/* This is an unsoliced response. */ /* This is an unsolicited response. */
$state = array( $state = array(
'saml:sp:isUnsoliced' => TRUE, 'saml:sp:isUnsolicited' => TRUE,
'saml:sp:AuthId' => $sourceId, 'saml:sp:AuthId' => $sourceId,
'saml:sp:RelayState' => $response->getRelayState(), 'saml:sp:RelayState' => $response->getRelayState(),
); );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment