From 97cbe2de01a1d33f3e38e3cb5dcf4f657f119fd4 Mon Sep 17 00:00:00 2001
From: Jaime Perez <jaime.perez@uninett.no>
Date: Wed, 5 Mar 2014 11:31:53 +0100
Subject: [PATCH] Prepare to remove www/auth.
---
lib/SimpleSAML/Utilities.php | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index af36ed752..8cbdbfbd4 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -1650,20 +1650,13 @@ class SimpleSAML_Utilities {
return;
}
- $returnTo = self::selfURL();
-
/* Not authenticated as admin user. Start authentication. */
if (SimpleSAML_Auth_Source::getById('admin') !== NULL) {
$as = new SimpleSAML_Auth_Simple('admin');
$as->login();
} else {
- /* For backwards-compatibility. */
-
- $config = SimpleSAML_Configuration::getInstance();
- self::redirectTrustedURL('/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' => $returnTo)
- );
+ throw new Exception('Cannot find "admin" auth source, and admin privileges are required.');
}
}
--
GitLab