From 043073bc58b0fee5efd023aae1c342087317ad40 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Thu, 3 Dec 2009 13:46:28 +0000
Subject: [PATCH] saml2/idp: Remove some code that should have been removed as
part of r2020.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2021 44740490-163a-0410-bde0-09ae8108e29a
---
www/saml2/idp/SingleLogoutService.php | 40 ---------------------------
1 file changed, 40 deletions(-)
diff --git a/www/saml2/idp/SingleLogoutService.php b/www/saml2/idp/SingleLogoutService.php
index e34a3f8ef..acec6b53f 100644
--- a/www/saml2/idp/SingleLogoutService.php
+++ b/www/saml2/idp/SingleLogoutService.php
@@ -276,46 +276,6 @@ if ($config->getBoolean('debug', false))
-/* Check whether we should authenticate with an AuthSource. Any time the auth-option matches a
- * valid AuthSource, we assume that this is the case.
- */
-$auth = $idpMetadata->getString('auth');
-if(SimpleSAML_Auth_Source::getById($idpMetadata->getString('auth')) !== NULL) {
- /* Authenticate with an AuthSource. */
- $authSource = TRUE;
- $authority = $idpmetadata['auth'];
-} else {
- $authSource = FALSE;
- $authority = SimpleSAML_Utilities::getAuthority($idpmetadata);
-}
-
-/**
- * If there exists a local valid session with the SAML 2.0 module as an authority,
- * initiate SAML 2.0 SP Single LogOut, with the RelayState equal this URL.
- */
-if ($session->getAuthority() == 'saml2') {
-
- $bridgedId = SimpleSAML_Utilities::generateID();
- $returnTo = SimpleSAML_Utilities::selfURLNoQuery() . '?LogoutID=' . $bridgedId;
-
- /* Save the $logoutInfo until we return from the SP. */
- saveLogoutInfo($bridgedId);
-
- SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'saml2/sp/initSLO.php',
- array('RelayState' => $returnTo)
- );
-}
-
-if ($session->getAuthority() == 'shib13') {
- /**
- * TODO: Show warning to inform the user that he is logged on through an Shibboleth 1.3 IdP that
- * do not support logout.
- */
-}
-
-
-
-
/*
* Logout procedure is done and we send a Logout Response back to the SP
*/
--
GitLab