Skip to content
Snippets Groups Projects
Commit 4c0bcdec authored by Jaime Perez Crespo's avatar Jaime Perez Crespo
Browse files

Move SimpleSAML_Utilities::isAdmin() to SimpleSAML_Utils_Auth::isAdmin()....

Move SimpleSAML_Utilities::isAdmin() to SimpleSAML_Utils_Auth::isAdmin(). Deprecate the former and stop using it.
parent 07c6d834
No related branches found
No related tags found
No related merge requests found
...@@ -1335,15 +1335,10 @@ class SimpleSAML_Utilities { ...@@ -1335,15 +1335,10 @@ class SimpleSAML_Utilities {
/** /**
* Check whether the current user is a admin user. * @deprecated This function will be removed in SSP 2.0. Please use SimpleSAML_Utils_Auth::isAdmin() instead.
*
* @return bool TRUE if the current user is a admin user, FALSE if not.
*/ */
public static function isAdmin() { public static function isAdmin() {
return SimpleSAML_Utils_Auth::isAdmin();
$session = SimpleSAML_Session::getSessionFromRequest();
return $session->isValid('admin') || $session->isValid('login-admin');
} }
...@@ -1372,7 +1367,7 @@ class SimpleSAML_Utilities { ...@@ -1372,7 +1367,7 @@ class SimpleSAML_Utilities {
*/ */
public static function requireAdmin() { public static function requireAdmin() {
if (self::isAdmin()) { if (SimpleSAML_Utils_Auth::isAdmin()) {
return; return;
} }
......
<?php
/**
* Auth-related utility methods.
*
* @package SimpleSAMLphp
*/
class SimpleSAML_Utils_Auth
{
/**
* Check whether the current user is admin.
*
* @return boolean True if the current user is an admin user, false otherwise.
*
* @author Olav Morken, UNINETT AS <olav.morken@uninett.no>
*/
public static function isAdmin()
{
$session = SimpleSAML_Session::getSessionFromRequest();
return $session->isValid('admin') || $session->isValid('login-admin');
}
}
\ No newline at end of file
...@@ -10,7 +10,7 @@ if ($config->getBoolean('admin.protectindexpage', false)) { ...@@ -10,7 +10,7 @@ if ($config->getBoolean('admin.protectindexpage', false)) {
SimpleSAML_Utilities::requireAdmin(); SimpleSAML_Utilities::requireAdmin();
} }
$loginurl = SimpleSAML_Utilities::getAdminLoginURL(); $loginurl = SimpleSAML_Utilities::getAdminLoginURL();
$isadmin = SimpleSAML_Utilities::isAdmin(); $isadmin = SimpleSAML_Utils_Auth::isAdmin();
......
...@@ -11,7 +11,7 @@ if ($config->getBoolean('admin.protectindexpage', false)) { ...@@ -11,7 +11,7 @@ if ($config->getBoolean('admin.protectindexpage', false)) {
SimpleSAML_Utilities::requireAdmin(); SimpleSAML_Utilities::requireAdmin();
} }
$loginurl = SimpleSAML_Utilities::getAdminLoginURL(); $loginurl = SimpleSAML_Utilities::getAdminLoginURL();
$isadmin = SimpleSAML_Utilities::isAdmin(); $isadmin = SimpleSAML_Utils_Auth::isAdmin();
$warnings = array(); $warnings = array();
......
...@@ -11,7 +11,7 @@ if ($config->getBoolean('admin.protectindexpage', false)) { ...@@ -11,7 +11,7 @@ if ($config->getBoolean('admin.protectindexpage', false)) {
SimpleSAML_Utilities::requireAdmin(); SimpleSAML_Utilities::requireAdmin();
} }
$loginurl = SimpleSAML_Utilities::getAdminLoginURL(); $loginurl = SimpleSAML_Utilities::getAdminLoginURL();
$isadmin = SimpleSAML_Utilities::isAdmin(); $isadmin = SimpleSAML_Utils_Auth::isAdmin();
......
...@@ -10,7 +10,7 @@ if ($config->getBoolean('admin.protectindexpage', false)) { ...@@ -10,7 +10,7 @@ if ($config->getBoolean('admin.protectindexpage', false)) {
SimpleSAML_Utilities::requireAdmin(); SimpleSAML_Utilities::requireAdmin();
} }
$loginurl = SimpleSAML_Utilities::getAdminLoginURL(); $loginurl = SimpleSAML_Utilities::getAdminLoginURL();
$isadmin = SimpleSAML_Utilities::isAdmin(); $isadmin = SimpleSAML_Utils_Auth::isAdmin();
......
...@@ -28,7 +28,7 @@ class sspmod_statistics_AccessCheck { ...@@ -28,7 +28,7 @@ class sspmod_statistics_AccessCheck {
return; return;
} }
if (SimpleSAML_Utilities::isAdmin()) { if (SimpleSAML_Utils_Auth::isAdmin()) {
// User logged in as admin. OK. // User logged in as admin. OK.
SimpleSAML_Logger::debug('Statistics auth - logged in as admin, access granted'); SimpleSAML_Logger::debug('Statistics auth - logged in as admin, access granted');
return; return;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment