From 4de6890754c2fe73056ea517eedd6dc2844068bd Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Mon, 20 Apr 2015 16:38:30 +0200
Subject: [PATCH] Move SimpleSAML_Utils_Auth to SimpleSAML\Utils\Auth.
---
lib/SimpleSAML/Utilities.php | 12 ++++++------
lib/SimpleSAML/Utils/Auth.php | 18 +++++++++---------
modules/adfs/www/idp/metadata.php | 2 +-
modules/core/www/frontpage_auth.php | 6 +++---
modules/core/www/frontpage_config.php | 6 +++---
modules/core/www/frontpage_federation.php | 6 +++---
modules/core/www/frontpage_welcome.php | 6 +++---
modules/core/www/login-admin.php | 2 +-
modules/core/www/show_metadata.php | 2 +-
modules/cron/www/croninfo.php | 2 +-
modules/logpeek/www/index.php | 2 +-
modules/memcacheMonitor/www/memcachestat.php | 2 +-
modules/metarefresh/www/fetch.php | 2 +-
modules/saml/www/idp/certs.php | 2 +-
modules/saml/www/sp/metadata.php | 2 +-
modules/statistics/lib/AccessCheck.php | 4 ++--
www/admin/hostnames.php | 2 +-
www/admin/metadata-converter.php | 2 +-
www/admin/phpinfo.php | 2 +-
www/saml2/idp/metadata.php | 2 +-
www/shib13/idp/metadata.php | 2 +-
21 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index 247019e4b..e6a33a4e9 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 e8d299993..48dd8ffe0 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 34c6ad8c7..345dbb5bf 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 a471be784..2622b1d83 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 4ec7585af..7e4cc4fe9 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 34d610a31..5e32a10bd 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 ca39d038c..4fb5227fa 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 bab9b0c55..9376d71f0 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 9edfa4e31..5e90a8b6a 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 192576772..204f60767 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 6336e6cb1..a0d8152cc 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 76a059027..d925e2cca 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 70fc6657c..322c34408 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 77a5074e4..48be5f09e 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 e7267bbef..851ec9ccd 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 794bc0191..4d393b896 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 cc6a4511f..93b6180b8 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 5b2e2acca..2a6f075c8 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 8688389bc..945172895 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 d7411d959..e8015ea44 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 8b2c94bac..e65642dfc 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();
}
--
GitLab