diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index 247019e4bf5aeb7e1644edb385feee3ad250e509..e6a33a4e9231cf45cfd56e90ee7db57f21b54ab9 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -1059,26 +1059,26 @@ class SimpleSAML_Utilities {
/**
- * @deprecated This function will be removed in SSP 2.0. Please use SimpleSAML_Utils_Auth::isAdmin() instead.
+ * @deprecated This function will be removed in SSP 2.0. Please use SimpleSAML\Utils\Auth::isAdmin() instead.
*/
public static function isAdmin() {
- return SimpleSAML_Utils_Auth::isAdmin();
+ return SimpleSAML\Utils\Auth::isAdmin();
}
/**
- * @deprecated This function will be removed in SSP 2.0. Please use SimpleSAML_Utils_Auth::getAdminLoginURL instead();
+ * @deprecated This function will be removed in SSP 2.0. Please use SimpleSAML\Utils\Auth::getAdminLoginURL instead();
*/
public static function getAdminLoginURL($returnTo = NULL) {
- return SimpleSAML_Utils_Auth::getAdminLoginURL($returnTo);
+ return SimpleSAML\Utils\Auth::getAdminLoginURL($returnTo);
}
/**
- * @deprecated This function will be removed in SSP 2.0. Please use SimpleSAML_Utils_Auth::requireAdmin() instead.
+ * @deprecated This function will be removed in SSP 2.0. Please use SimpleSAML\Utils\Auth::requireAdmin() instead.
*/
public static function requireAdmin() {
- return SimpleSAML_Utils_Auth::requireAdmin();
+ return SimpleSAML\Utils\Auth::requireAdmin();
}
diff --git a/lib/SimpleSAML/Utils/Auth.php b/lib/SimpleSAML/Utils/Auth.php
index e8d29999310d6d87c9bfbff6206ec4cad6c0c42d..48dd8ffe0b0ec5928d9079b573e619779a862732 100644
--- a/lib/SimpleSAML/Utils/Auth.php
+++ b/lib/SimpleSAML/Utils/Auth.php
@@ -1,12 +1,12 @@
<?php
-
+namespace SimpleSAML\Utils;
/**
* Auth-related utility methods.
*
* @package SimpleSAMLphp
*/
-class SimpleSAML_Utils_Auth
+class Auth
{
/**
@@ -21,10 +21,10 @@ class SimpleSAML_Utils_Auth
assert('is_string($returnTo) || is_null($returnTo)');
if ($returnTo === null) {
- $returnTo = SimpleSAML_Utilities::selfURL();
+ $returnTo = \SimpleSAML_Utilities::selfURL();
}
- return SimpleSAML_Module::getModuleURL('core/login-admin.php', array('ReturnTo' => $returnTo));
+ return \SimpleSAML_Module::getModuleURL('core/login-admin.php', array('ReturnTo' => $returnTo));
}
/**
@@ -36,7 +36,7 @@ class SimpleSAML_Utils_Auth
*/
public static function isAdmin()
{
- $session = SimpleSAML_Session::getSessionFromRequest();
+ $session = \SimpleSAML_Session::getSessionFromRequest();
return $session->isValid('admin') || $session->isValid('login-admin');
}
@@ -54,16 +54,16 @@ class SimpleSAML_Utils_Auth
*/
public static function requireAdmin()
{
- if (SimpleSAML_Utils_Auth::isAdmin()) {
+ if (self::isAdmin()) {
return;
}
// not authenticated as admin user, start authentication
- if (SimpleSAML_Auth_Source::getById('admin') !== null) {
- $as = new SimpleSAML_Auth_Simple('admin');
+ if (\SimpleSAML_Auth_Source::getById('admin') !== null) {
+ $as = new \SimpleSAML_Auth_Simple('admin');
$as->login();
} else {
- throw new SimpleSAML_Error_Exception('Cannot find "admin" auth source, and admin privileges are required.');
+ throw new \SimpleSAML_Error_Exception('Cannot find "admin" auth source, and admin privileges are required.');
}
}
}
\ No newline at end of file
diff --git a/modules/adfs/www/idp/metadata.php b/modules/adfs/www/idp/metadata.php
index 34c6ad8c76d296731b748b309ae94fa1ad93c104..345dbb5bf8d146d16c2b9b592b09db29793ed4a7 100644
--- a/modules/adfs/www/idp/metadata.php
+++ b/modules/adfs/www/idp/metadata.php
@@ -9,7 +9,7 @@ if (!$config->getBoolean('enable.adfs-idp', false))
/* Check if valid local session exists.. */
if ($config->getBoolean('admin.protectmetadata', false)) {
- SimpleSAML_Utils_Auth::requireAdmin();
+ SimpleSAML\Utils\Auth::requireAdmin();
}
diff --git a/modules/core/www/frontpage_auth.php b/modules/core/www/frontpage_auth.php
index a471be7840bf6a6918d9c7912d5b737a32114e0f..2622b1d83b8a1992f04fe2e2414c5389891ea009 100644
--- a/modules/core/www/frontpage_auth.php
+++ b/modules/core/www/frontpage_auth.php
@@ -7,10 +7,10 @@ $session = SimpleSAML_Session::getSessionFromRequest();
/* Check if valid local session exists.. */
if ($config->getBoolean('admin.protectindexpage', false)) {
- SimpleSAML_Utils_Auth::requireAdmin();
+ SimpleSAML\Utils\Auth::requireAdmin();
}
-$loginurl = SimpleSAML_Utils_Auth::getAdminLoginURL();
-$isadmin = SimpleSAML_Utils_Auth::isAdmin();
+$loginurl = SimpleSAML\Utils\Auth::getAdminLoginURL();
+$isadmin = SimpleSAML\Utils\Auth::isAdmin();
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index 4ec7585af1a3a2ebd41f00d6d22fc5281a6b1f8f..7e4cc4fe953d9839ff7494b7112733746bdf6646 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -8,10 +8,10 @@ $session = SimpleSAML_Session::getSessionFromRequest();
/* Check if valid local session exists.. */
if ($config->getBoolean('admin.protectindexpage', false)) {
- SimpleSAML_Utils_Auth::requireAdmin();
+ SimpleSAML\Utils\Auth::requireAdmin();
}
-$loginurl = SimpleSAML_Utils_Auth::getAdminLoginURL();
-$isadmin = SimpleSAML_Utils_Auth::isAdmin();
+$loginurl = SimpleSAML\Utils\Auth::getAdminLoginURL();
+$isadmin = SimpleSAML\Utils\Auth::isAdmin();
$warnings = array();
diff --git a/modules/core/www/frontpage_federation.php b/modules/core/www/frontpage_federation.php
index 34d610a31d1d951737def9f1ceb03158cbc05aed..5e32a10bd13e8f44bc2733a9addc1816ad4fd06c 100644
--- a/modules/core/www/frontpage_federation.php
+++ b/modules/core/www/frontpage_federation.php
@@ -8,10 +8,10 @@ $session = SimpleSAML_Session::getSessionFromRequest();
/* Check if valid local session exists.. */
if ($config->getBoolean('admin.protectindexpage', false)) {
- SimpleSAML_Utils_Auth::requireAdmin();
+ SimpleSAML\Utils\Auth::requireAdmin();
}
-$loginurl = SimpleSAML_Utils_Auth::getAdminLoginURL();
-$isadmin = SimpleSAML_Utils_Auth::isAdmin();
+$loginurl = SimpleSAML\Utils\Auth::getAdminLoginURL();
+$isadmin = SimpleSAML\Utils\Auth::isAdmin();
diff --git a/modules/core/www/frontpage_welcome.php b/modules/core/www/frontpage_welcome.php
index ca39d038cd56031f3d3cdef320d76477a1cfb09d..4fb5227fa1105c2a1a9fe18d5f2ea14c6a93b4bc 100644
--- a/modules/core/www/frontpage_welcome.php
+++ b/modules/core/www/frontpage_welcome.php
@@ -7,10 +7,10 @@ $session = SimpleSAML_Session::getSessionFromRequest();
/* Check if valid local session exists.. */
if ($config->getBoolean('admin.protectindexpage', false)) {
- SimpleSAML_Utils_Auth::requireAdmin();
+ SimpleSAML\Utils\Auth::requireAdmin();
}
-$loginurl = SimpleSAML_Utils_Auth::getAdminLoginURL();
-$isadmin = SimpleSAML_Utils_Auth::isAdmin();
+$loginurl = SimpleSAML\Utils\Auth::getAdminLoginURL();
+$isadmin = SimpleSAML\Utils\Auth::isAdmin();
diff --git a/modules/core/www/login-admin.php b/modules/core/www/login-admin.php
index bab9b0c5571f72497b09bff5b7e511f5afd92486..9376d71f0847cd076b95410292dea8e8ab7cad6a 100644
--- a/modules/core/www/login-admin.php
+++ b/modules/core/www/login-admin.php
@@ -7,7 +7,7 @@ if (!array_key_exists('ReturnTo', $_REQUEST)) {
throw new SimpleSAML_Error_BadRequest('Missing ReturnTo parameter.');
}
-SimpleSAML_Utils_Auth::requireAdmin();
+SimpleSAML\Utils\Auth::requireAdmin();
SimpleSAML_Utilities::redirectUntrustedURL($_REQUEST['ReturnTo']);
diff --git a/modules/core/www/show_metadata.php b/modules/core/www/show_metadata.php
index 9edfa4e3120e89e06724158fbda575c31b2abfef..5e90a8b6a00deb10b30f52591256d0b9b7d9b7c0 100644
--- a/modules/core/www/show_metadata.php
+++ b/modules/core/www/show_metadata.php
@@ -6,7 +6,7 @@
$config = SimpleSAML_Configuration::getInstance();
$session = SimpleSAML_Session::getSessionFromRequest();
-SimpleSAML_Utils_Auth::requireAdmin();
+SimpleSAML\Utils\Auth::requireAdmin();
if (!array_key_exists('entityid', $_REQUEST))
diff --git a/modules/cron/www/croninfo.php b/modules/cron/www/croninfo.php
index 192576772879931fb9867d86f3a917da8aab2ca2..204f607670b5795b398707a176255a2fc3d896c1 100644
--- a/modules/cron/www/croninfo.php
+++ b/modules/cron/www/croninfo.php
@@ -11,7 +11,7 @@ require_once('_include.php');
$config = SimpleSAML_Configuration::getInstance();
$session = SimpleSAML_Session::getSessionFromRequest();
-SimpleSAML_Utils_Auth::requireAdmin();
+SimpleSAML\Utils\Auth::requireAdmin();
$cronconfig = SimpleSAML_Configuration::getConfig('module_cron.php');
diff --git a/modules/logpeek/www/index.php b/modules/logpeek/www/index.php
index 6336e6cb172f1e2366dc2bbf7104a28be7344234..a0d8152cc89199f66fc547e5dfbe07d36eae5f4a 100644
--- a/modules/logpeek/www/index.php
+++ b/modules/logpeek/www/index.php
@@ -21,7 +21,7 @@ function logFilter($objFile, $tag, $cut){
$config = SimpleSAML_Configuration::getInstance();
$session = SimpleSAML_Session::getSessionFromRequest();
-SimpleSAML_Utils_Auth::requireAdmin();
+SimpleSAML\Utils\Auth::requireAdmin();
$logpeekconfig = SimpleSAML_Configuration::getConfig('module_logpeek.php');
$logfile = $logpeekconfig->getValue('logfile', '/var/simplesamlphp.log');
diff --git a/modules/memcacheMonitor/www/memcachestat.php b/modules/memcacheMonitor/www/memcachestat.php
index 76a0590278c7ba0dfbfcc09bc7c8152c034cd757..d925e2cca53efc8dd7164c8ad46915e0408660de 100644
--- a/modules/memcacheMonitor/www/memcachestat.php
+++ b/modules/memcacheMonitor/www/memcachestat.php
@@ -75,7 +75,7 @@ function humanreadable($input) {
$config = SimpleSAML_Configuration::getInstance();
/* Make sure that the user has admin access rights. */
-SimpleSAML_Utils_Auth::requireAdmin();
+SimpleSAML\Utils\Auth::requireAdmin();
$formats = array(
diff --git a/modules/metarefresh/www/fetch.php b/modules/metarefresh/www/fetch.php
index 70fc6657c3dd6af36910de2175cbdbbc8f215f82..322c34408aa2e0b2b2bd7132e113afd45ec67a87 100644
--- a/modules/metarefresh/www/fetch.php
+++ b/modules/metarefresh/www/fetch.php
@@ -3,7 +3,7 @@
$config = SimpleSAML_Configuration::getInstance();
$mconfig = SimpleSAML_Configuration::getOptionalConfig('config-metarefresh.php');
-SimpleSAML_Utils_Auth::requireAdmin();
+SimpleSAML\Utils\Auth::requireAdmin();
SimpleSAML_Logger::setCaptureLog(TRUE);
diff --git a/modules/saml/www/idp/certs.php b/modules/saml/www/idp/certs.php
index 77a5074e4f8bb00974d0c355ce93104d3d186bdb..48be5f09ebd7cafff0c79223536250337003f409 100644
--- a/modules/saml/www/idp/certs.php
+++ b/modules/saml/www/idp/certs.php
@@ -9,7 +9,7 @@ if (!$config->getBoolean('enable.saml20-idp', false))
/* Check if valid local session exists.. */
if ($config->getBoolean('admin.protectmetadata', false)) {
- SimpleSAML_Utils_Auth::requireAdmin();
+ SimpleSAML\Utils\Auth::requireAdmin();
}
$idpentityid = $metadata->getMetaDataCurrentEntityID('saml20-idp-hosted');
diff --git a/modules/saml/www/sp/metadata.php b/modules/saml/www/sp/metadata.php
index e7267bbefa72d2016a993f3a84434bc1413ba3b9..851ec9ccd43738fb447754ee57c9e1ac70ab2b46 100644
--- a/modules/saml/www/sp/metadata.php
+++ b/modules/saml/www/sp/metadata.php
@@ -6,7 +6,7 @@ if (!array_key_exists('PATH_INFO', $_SERVER)) {
$config = SimpleSAML_Configuration::getInstance();
if ($config->getBoolean('admin.protectmetadata', false)) {
- SimpleSAML_Utils_Auth::requireAdmin();
+ SimpleSAML\Utils\Auth::requireAdmin();
}
$sourceId = substr($_SERVER['PATH_INFO'], 1);
$source = SimpleSAML_Auth_Source::getById($sourceId);
diff --git a/modules/statistics/lib/AccessCheck.php b/modules/statistics/lib/AccessCheck.php
index 794bc01918e5d80b09548d51810aef55fb36a9d9..4d393b8961c1369d230e70a0425a2637eb08ed7b 100644
--- a/modules/statistics/lib/AccessCheck.php
+++ b/modules/statistics/lib/AccessCheck.php
@@ -28,7 +28,7 @@ class sspmod_statistics_AccessCheck {
return;
}
- if (SimpleSAML_Utils_Auth::isAdmin()) {
+ if (SimpleSAML\Utils\Auth::isAdmin()) {
// User logged in as admin. OK.
SimpleSAML_Logger::debug('Statistics auth - logged in as admin, access granted');
return;
@@ -36,7 +36,7 @@ class sspmod_statistics_AccessCheck {
if (!isset($authsource)) {
// If authsource is not defined, init admin login.
- SimpleSAML_Utils_Auth::requireAdmin();
+ SimpleSAML\Utils\Auth::requireAdmin();
}
/* We are using an authsource for login. */
diff --git a/www/admin/hostnames.php b/www/admin/hostnames.php
index cc6a4511f840876366fc312743c5c001662d8de1..93b6180b8e7f074f6f23129d8ef7c25a301c5bf3 100644
--- a/www/admin/hostnames.php
+++ b/www/admin/hostnames.php
@@ -7,7 +7,7 @@ $config = SimpleSAML_Configuration::getInstance();
$session = SimpleSAML_Session::getSessionFromRequest();
/* Check if valid local session exists.. */
-SimpleSAML_Utils_Auth::requireAdmin();
+SimpleSAML\Utils\Auth::requireAdmin();
$attributes = array();
diff --git a/www/admin/metadata-converter.php b/www/admin/metadata-converter.php
index 5b2e2acca457fd722a86dae09675252f0699f53a..2a6f075c88a23543f9fb5ba1c42053062c26889d 100644
--- a/www/admin/metadata-converter.php
+++ b/www/admin/metadata-converter.php
@@ -3,7 +3,7 @@
require_once('../_include.php');
/* Make sure that the user has admin access rights. */
-SimpleSAML_Utils_Auth::requireAdmin();
+SimpleSAML\Utils\Auth::requireAdmin();
$config = SimpleSAML_Configuration::getInstance();
diff --git a/www/admin/phpinfo.php b/www/admin/phpinfo.php
index 8688389bc0d566bb611ba222b623fc99f704a14f..945172895844f2e666edbe27371218e82794f068 100644
--- a/www/admin/phpinfo.php
+++ b/www/admin/phpinfo.php
@@ -3,6 +3,6 @@
require_once('../_include.php');
/* Make sure that the user has admin access rights. */
-SimpleSAML_Utils_Auth::requireAdmin();
+SimpleSAML\Utils\Auth::requireAdmin();
phpinfo();
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index d7411d9590ef95b700b164111200ccbc4d0c0e4d..e8015ea440946866cac4dca8bd78dc9e8b2a00c8 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -11,7 +11,7 @@ if (!$config->getBoolean('enable.saml20-idp', false))
/* Check if valid local session exists.. */
if ($config->getBoolean('admin.protectmetadata', false)) {
- SimpleSAML_Utils_Auth::requireAdmin();
+ SimpleSAML\Utils\Auth::requireAdmin();
}
diff --git a/www/shib13/idp/metadata.php b/www/shib13/idp/metadata.php
index 8b2c94bac40a6983d2efa186466df227e3a2b300..e65642dfc087719c006f15e93d4c7655bf1e574f 100644
--- a/www/shib13/idp/metadata.php
+++ b/www/shib13/idp/metadata.php
@@ -11,7 +11,7 @@ if (!$config->getBoolean('enable.shib13-idp', false))
/* Check if valid local session exists.. */
if ($config->getBoolean('admin.protectmetadata', false)) {
- SimpleSAML_Utils_Auth::requireAdmin();
+ SimpleSAML\Utils\Auth::requireAdmin();
}