Revision: 3104
Author: olavmrk
Date: Wed May 23 23:08:13 2012
Log: saml:SP: Honor SessionNotOnOrAfter from IdP.
http://code.google.com/p/simplesamlphp/source/detail?r=3104
Modified:
/trunk/modules/saml/www/sp/saml2-acs.php
=======================================
--- /trunk/modules/saml/www/sp/saml2-acs.php Thu Mar 15 06:31:50 2012
+++ /trunk/modules/saml/www/sp/saml2-acs.php Wed May 23 23:08:13 2012
@@ -134,13 +134,15 @@
SimpleSAML_Auth_State::throwException($state, $e);
}
-if ($expire === NULL) {
+if ($expire !== NULL) {
+ $logoutExpire = $expire;
+} else {
/* Just expire the logout associtaion 24 hours into the future. */
- $expire = time() + 24*60*60;
+ $logoutExpire = time() + 24*60*60;
}
/* Register this session in the logout store. */
-sspmod_saml_SP_LogoutStore::addSession($sourceId, $nameId, $sessionIndex,
$expire);
+sspmod_saml_SP_LogoutStore::addSession($sourceId, $nameId, $sessionIndex,
$logoutExpire);
/* We need to save the NameID and SessionIndex for logout. */
$logoutState = array(
@@ -163,6 +165,9 @@
$state['saml:sp:AuthnContext'] = $assertion->getAuthnContext();
$state['PersistentAuthData'][] = 'saml:sp:AuthnContext';
+if ($expire !== NULL) {
+ $state['Expire'] = $expire;
+}
if (isset($state['SimpleSAML_Auth_Default.ReturnURL'])) {
/* Just note some information about the authentication, in case we
receive the
--
You received this message because you are subscribed to the Google Groups
"simpleSAMLphp commits" group.
To post to this group, send email to simplesamlphp-commits@googlegroups.com.
To unsubscribe from this group, send email to
simplesamlphp-commits+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/simplesamlphp-commits?hl=en.
