From 958e6b99b5c0a10345f2e8f96f96c1b745b676ca Mon Sep 17 00:00:00 2001
From: Jaime Perez <jaime.perez@uninett.no>
Date: Wed, 5 Mar 2014 15:59:11 +0100
Subject: [PATCH] Stop using SimpleSAML_Session::getAuthority() in
SimpleSAML_Auth_Default.
---
lib/SimpleSAML/Auth/Default.php | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/lib/SimpleSAML/Auth/Default.php b/lib/SimpleSAML/Auth/Default.php
index 442c2ac31..2f0b9934c 100644
--- a/lib/SimpleSAML/Auth/Default.php
+++ b/lib/SimpleSAML/Auth/Default.php
@@ -226,17 +226,18 @@ class SimpleSAML_Auth_Default {
$source = $state['SimpleSAML_Auth_Default.logoutSource'];
+
$session = SimpleSAML_Session::getSessionFromRequest();
- $authId = $session->getAuthority();
+ if (!$session->isValid($source)) {
+ SimpleSAML_Logger::warning(
+ 'Received logout from an invalid authentication source '.
+ var_export($source, TRUE)
+ );
- if ($authId !== $source) {
- SimpleSAML_Logger::warning('Received logout from different authentication source ' .
- 'than the current. Current is ' . var_export($authId, TRUE) .
- '. Logout source is ' . var_export($source, TRUE) . '.');
return;
}
- $session->doLogout();
+ $session->doLogout($source);
}
--
GitLab