From 1e5d2d04808cf183def7fc3df4675b8ce5226ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Thu, 9 Jan 2014 12:35:52 +0000
Subject: [PATCH] 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
---
modules/saml/lib/Auth/Source/SP.php | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/modules/saml/lib/Auth/Source/SP.php b/modules/saml/lib/Auth/Source/SP.php
index 4246ab104..9bc623468 100644
--- a/modules/saml/lib/Auth/Source/SP.php
+++ b/modules/saml/lib/Auth/Source/SP.php
@@ -222,8 +222,8 @@ class sspmod_saml_Auth_Source_SP extends SimpleSAML_Auth_Source {
if (isset($state['saml:IDPList'])) {
$IDPList = $state['saml:IDPList'];
} else {
- $IDPList = array();
- }
+ $IDPList = array();
+ }
$ar->setIDPList(array_unique(array_merge($this->metadata->getArray('IDPList', array()),
$idpMetadata->getArray('IDPList', array()),
@@ -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));
-
- $params = array(
- 'entityID' => $this->entityId,
- 'return' => $returnTo,
- 'returnIDParam' => 'idpentityid'
- );
-
- if(isset($state['saml:IDPList'])) {
- $params['IDPList'] = $state['saml:IDPList'];
- }
+
+ $params = array(
+ 'entityID' => $this->entityId,
+ 'return' => $returnTo,
+ 'returnIDParam' => 'idpentityid'
+ );
+
+ if(isset($state['saml:IDPList'])) {
+ $params['IDPList'] = $state['saml:IDPList'];
+ }
+
+ if (isset($state['isPassive']) && $state['isPassive']) {
+ $params['isPassive'] = 'true';
+ }
SimpleSAML_Utilities::redirect($discoURL, $params);
}
--
GitLab