From 29b321d9110665dee72f845c21016c5830fa48ca Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Mon, 6 Dec 2010 07:23:52 +0000
Subject: [PATCH] saml:SP: Save NameID, IdP & SessionIndex in persistent auth
 data.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2677 44740490-163a-0410-bde0-09ae8108e29a
---
 modules/saml/lib/Auth/Source/SP.php | 1 -
 modules/saml/www/sp/saml2-acs.php   | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/saml/lib/Auth/Source/SP.php b/modules/saml/lib/Auth/Source/SP.php
index 9d9aeb402..bd56b465d 100644
--- a/modules/saml/lib/Auth/Source/SP.php
+++ b/modules/saml/lib/Auth/Source/SP.php
@@ -471,7 +471,6 @@ class sspmod_saml_Auth_Source_SP extends SimpleSAML_Auth_Source {
 		$source->addLogoutCallback($idp, $state);
 
 		$state['Attributes'] = $authProcState['Attributes'];
-		$state['IdP'] = $idp;
 
 		if (isset($state['saml:sp:isUnsoliced']) && (bool)$state['saml:sp:isUnsoliced']) {
 			if (isset($state['saml:sp:RelayState'])) {
diff --git a/modules/saml/www/sp/saml2-acs.php b/modules/saml/www/sp/saml2-acs.php
index 7fa449357..19c1ed59c 100644
--- a/modules/saml/www/sp/saml2-acs.php
+++ b/modules/saml/www/sp/saml2-acs.php
@@ -118,5 +118,13 @@ $state['saml:AuthenticatingAuthority'] = $authenticatingAuthority;
 $state['saml:AuthenticatingAuthority'][] = $idp;
 $state['PersistentAuthData'][] = 'saml:AuthenticatingAuthority';
 
+$state['saml:sp:IdP'] = $idp;
+$state['PersistentAuthData'][] = 'saml:sp:IdP';
+$state['saml:sp:NameID'] = $nameId;
+$state['PersistentAuthData'][] = 'saml:sp:NameID';
+$state['saml:sp:SessionIndex'] = $sessionIndex;
+$state['PersistentAuthData'][] = 'saml:sp:SessionIndex';
+
+
 $source->handleResponse($state, $idp, $attributes);
 assert('FALSE');
-- 
GitLab