From 4f096edc1a10e9fb5be9379927a92ede27f3055e Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Tue, 12 Apr 2011 13:44:09 +0000
Subject: [PATCH] saml: Fix warning about unset element when doing SAML 1.1
authentication.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2811 44740490-163a-0410-bde0-09ae8108e29a
---
modules/saml/lib/Auth/Source/SP.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/modules/saml/lib/Auth/Source/SP.php b/modules/saml/lib/Auth/Source/SP.php
index 5155d4844..eaf676534 100644
--- a/modules/saml/lib/Auth/Source/SP.php
+++ b/modules/saml/lib/Auth/Source/SP.php
@@ -439,8 +439,6 @@ class sspmod_saml_Auth_Source_SP extends SimpleSAML_Auth_Source {
$authProcState = array(
'saml:sp:IdP' => $idp,
- 'saml:sp:NameID' => $state['saml:sp:NameID'],
- 'saml:sp:SessionIndex' => $state['saml:sp:SessionIndex'],
'saml:sp:State' => $state,
'ReturnCall' => array('sspmod_saml_Auth_Source_SP', 'onProcessingCompleted'),
@@ -449,6 +447,13 @@ class sspmod_saml_Auth_Source_SP extends SimpleSAML_Auth_Source {
'Source' => $idpMetadataArray,
);
+ if (isset($state['saml:sp:NameID'])) {
+ $authProcState['saml:sp:NameID'] = $state['saml:sp:NameID'];
+ }
+ if (isset($state['saml:sp:SessionIndex'])) {
+ $authProcState['saml:sp:SessionIndex'] = $state['saml:sp:SessionIndex'];
+ }
+
$pc = new SimpleSAML_Auth_ProcessingChain($idpMetadataArray, $spMetadataArray, 'sp');
$pc->processState($authProcState);
--
GitLab