Skip to content
Snippets Groups Projects
Commit 1e5d2d04 authored by Andreas Åkre Solberg's avatar Andreas Åkre Solberg
Browse files

add isPassive to discovery request if about to send a passive request.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3319 44740490-163a-0410-bde0-09ae8108e29a
parent 03912728
No related branches found
No related tags found
No related merge requests found
...@@ -222,8 +222,8 @@ class sspmod_saml_Auth_Source_SP extends SimpleSAML_Auth_Source { ...@@ -222,8 +222,8 @@ class sspmod_saml_Auth_Source_SP extends SimpleSAML_Auth_Source {
if (isset($state['saml:IDPList'])) { if (isset($state['saml:IDPList'])) {
$IDPList = $state['saml:IDPList']; $IDPList = $state['saml:IDPList'];
} else { } else {
$IDPList = array(); $IDPList = array();
} }
$ar->setIDPList(array_unique(array_merge($this->metadata->getArray('IDPList', array()), $ar->setIDPList(array_unique(array_merge($this->metadata->getArray('IDPList', array()),
$idpMetadata->getArray('IDPList', array()), $idpMetadata->getArray('IDPList', array()),
...@@ -340,16 +340,20 @@ class sspmod_saml_Auth_Source_SP extends SimpleSAML_Auth_Source { ...@@ -340,16 +340,20 @@ class sspmod_saml_Auth_Source_SP extends SimpleSAML_Auth_Source {
} }
$returnTo = SimpleSAML_Module::getModuleURL('saml/sp/discoresp.php', array('AuthID' => $id)); $returnTo = SimpleSAML_Module::getModuleURL('saml/sp/discoresp.php', array('AuthID' => $id));
$params = array( $params = array(
'entityID' => $this->entityId, 'entityID' => $this->entityId,
'return' => $returnTo, 'return' => $returnTo,
'returnIDParam' => 'idpentityid' 'returnIDParam' => 'idpentityid'
); );
if(isset($state['saml:IDPList'])) { if(isset($state['saml:IDPList'])) {
$params['IDPList'] = $state['saml:IDPList']; $params['IDPList'] = $state['saml:IDPList'];
} }
if (isset($state['isPassive']) && $state['isPassive']) {
$params['isPassive'] = 'true';
}
SimpleSAML_Utilities::redirect($discoURL, $params); SimpleSAML_Utilities::redirect($discoURL, $params);
} }
......
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