From 29099adcedcf53fbb6ccff9b7d59b3b9a53410b0 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Tue, 21 Apr 2009 07:42:38 +0000
Subject: [PATCH] Change all code in the repository to use the new admin helper
functions.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1467 44740490-163a-0410-bde0-09ae8108e29a
---
modules/cron/www/croninfo.php | 6 +-----
modules/ldapstatus/www/index.php | 18 ++++------------
modules/logpeek/www/index.php | 6 +-----
modules/memcacheMonitor/www/memcachestat.php | 6 +-----
modules/statistics/www/showstats.php | 6 ++----
www/admin/config.php | 6 +-----
www/admin/metadata.php | 6 +-----
www/admin/phpinfo.php | 6 +-----
www/example-simple/hostnames.php | 6 +-----
www/index.php | 10 +++------
www/saml2/idp/metadata.php | 6 +-----
www/saml2/sp/metadata.php | 22 +++++++-------------
www/shib13/idp/metadata.php | 6 +-----
www/shib13/sp/metadata.php | 6 +-----
14 files changed, 26 insertions(+), 90 deletions(-)
diff --git a/modules/cron/www/croninfo.php b/modules/cron/www/croninfo.php
index 12e066792..44a3a1ab9 100644
--- a/modules/cron/www/croninfo.php
+++ b/modules/cron/www/croninfo.php
@@ -11,11 +11,7 @@ require_once('_include.php');
$config = SimpleSAML_Configuration::getInstance();
$session = SimpleSAML_Session::getInstance();
-if (!isset($session) || !$session->isValid('login-admin') ) {
- SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' => SimpleSAML_Utilities::selfURL())
- );
-}
+SimpleSAML_Utilities::requireAdmin();
$cronconfig = SimpleSAML_Configuration::getConfig('module_cron.php');
diff --git a/modules/ldapstatus/www/index.php b/modules/ldapstatus/www/index.php
index 26a37a272..d83d71c7d 100644
--- a/modules/ldapstatus/www/index.php
+++ b/modules/ldapstatus/www/index.php
@@ -34,7 +34,7 @@ if (array_key_exists('orgtest', $_REQUEST)) {
if (isset($orgs[$_REQUEST['orgtest']]) && array_key_exists('adminAccess', $orgs[$_REQUEST['orgtest']]))
$allowedusers = array_merge($allowedusers, $orgs[$_REQUEST['orgtest']]['adminAccess']);
- if ($session->isValid('login-admin') ) {
+ if (SimpleSAML_Utilities::isAdmin()) {
// User logged in as admin. OK.
SimpleSAML_Logger::debug('LDAPStatus auth - logged in as admin, access granted');
@@ -64,9 +64,7 @@ if (array_key_exists('orgtest', $_REQUEST)) {
} else {
// If authsource is not defined, init admin login.
- SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' => SimpleSAML_Utilities::selfURL())
- );
+ SimpleSAML_Utilities::requireAdmin();
}
@@ -86,22 +84,14 @@ if (array_key_exists('orgtest', $_REQUEST)) {
-// if (!$session->isValid('login-admin') ) {
-// SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
-// array('RelayState' => SimpleSAML_Utilities::selfURL())
-// );
-// }
+// SimpleSAML_Utilities::requireAdmin();
$isAdmin = TRUE;
}
} else {
// Require admin access to overview page...
- if (!$session->isValid('login-admin') ) {
- SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' => SimpleSAML_Utilities::selfURL())
- );
- }
+ SimpleSAML_Utilities::requireAdmin();
$isAdmin = TRUE;
}
diff --git a/modules/logpeek/www/index.php b/modules/logpeek/www/index.php
index 691ff1628..dc9a5728e 100644
--- a/modules/logpeek/www/index.php
+++ b/modules/logpeek/www/index.php
@@ -4,11 +4,7 @@
$config = SimpleSAML_Configuration::getInstance();
$session = SimpleSAML_Session::getInstance();
-if (!$session->isValid('login-admin') ) {
- SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' => SimpleSAML_Utilities::selfURL())
- );
-}
+SimpleSAML_Utilities::requireAdmin();
$logpeekconfig = SimpleSAML_Configuration::getConfig('module_logpeek.php');
diff --git a/modules/memcacheMonitor/www/memcachestat.php b/modules/memcacheMonitor/www/memcachestat.php
index 6cd5d9e6a..744db824e 100644
--- a/modules/memcacheMonitor/www/memcachestat.php
+++ b/modules/memcacheMonitor/www/memcachestat.php
@@ -78,11 +78,7 @@ try {
$session = SimpleSAML_Session::getInstance();
/* Make sure that the user has admin access rights. */
- if (!isset($session) || !$session->isValid('login-admin') ) {
- SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' => SimpleSAML_Utilities::selfURL())
- );
- }
+ SimpleSAML_Utilities::requireAdmin();
$formats = array(
diff --git a/modules/statistics/www/showstats.php b/modules/statistics/www/showstats.php
index b1f05db4f..1f6f79b5f 100644
--- a/modules/statistics/www/showstats.php
+++ b/modules/statistics/www/showstats.php
@@ -12,7 +12,7 @@ $useridattr = $statconfig->getString('useridattr', 'eduPersonPrincipalName');
if ($protected) {
- if ($session->isValid('login-admin') ) {
+ if (SimpleSAML_Utilities::isAdmin()) {
// User logged in as admin. OK.
SimpleSAML_Logger::debug('Statistics auth - logged in as admin, access granted');
@@ -41,9 +41,7 @@ if ($protected) {
} else {
// If authsource is not defined, init admin login.
- SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' => SimpleSAML_Utilities::selfURL())
- );
+ SimpleSAML_Utilities::requireAdmin();
}
}
diff --git a/www/admin/config.php b/www/admin/config.php
index 6242d77da..63a703105 100644
--- a/www/admin/config.php
+++ b/www/admin/config.php
@@ -152,11 +152,7 @@ $config = SimpleSAML_Configuration::getInstance();
$session = SimpleSAML_Session::getInstance();
/* Check if the user is logged in with admin access. */
-if (!$session->isValid('login-admin') ) {
- SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' => SimpleSAML_Utilities::selfURL())
- );
-}
+SimpleSAML_Utilities::requireAdmin();
/* Find config directories. */
$configDir = $config->getBaseDir() . 'config/';
diff --git a/www/admin/metadata.php b/www/admin/metadata.php
index 7524cd687..41b0fde47 100644
--- a/www/admin/metadata.php
+++ b/www/admin/metadata.php
@@ -8,11 +8,7 @@ $session = SimpleSAML_Session::getInstance();
/* Check if valid local session exists.. */
-if (!isset($session) || !$session->isValid('login-admin') ) {
- SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' => SimpleSAML_Utilities::selfURL())
- );
-}
+SimpleSAML_Utilities::requireAdmin();
try {
diff --git a/www/admin/phpinfo.php b/www/admin/phpinfo.php
index c70db06af..cecb51d29 100644
--- a/www/admin/phpinfo.php
+++ b/www/admin/phpinfo.php
@@ -8,11 +8,7 @@ try {
$session = SimpleSAML_Session::getInstance();
/* Make sure that the user has admin access rights. */
- if (!isset($session) || !$session->isValid('login-admin') ) {
- SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' => SimpleSAML_Utilities::selfURL())
- );
- }
+ SimpleSAML_Utilities::requireAdmin();
phpinfo();
} catch(Exception $e) {
diff --git a/www/example-simple/hostnames.php b/www/example-simple/hostnames.php
index 008d3188b..690bf62e3 100644
--- a/www/example-simple/hostnames.php
+++ b/www/example-simple/hostnames.php
@@ -7,11 +7,7 @@ $config = SimpleSAML_Configuration::getInstance();
$session = SimpleSAML_Session::getInstance();
/* Check if valid local session exists.. */
-if (!isset($session) || !$session->isValid('login-admin') ) {
- SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' => SimpleSAML_Utilities::selfURL())
- );
-}
+SimpleSAML_Utilities::requireAdmin();
diff --git a/www/index.php b/www/index.php
index beb073bdc..fd5a8010e 100644
--- a/www/index.php
+++ b/www/index.php
@@ -8,14 +8,10 @@ $session = SimpleSAML_Session::getInstance();
/* Check if valid local session exists.. */
if ($config->getValue('admin.protectindexpage', false)) {
- if (!isset($session) || !$session->isValid('login-admin') ) {
- SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' => SimpleSAML_Utilities::selfURL())
- );
- }
+ SimpleSAML_Utilities::requireAdmin();
}
-$loginurl = '/' . $config->getBaseURL() . 'auth/login-admin.php?RelayState=' . SimpleSAML_Utilities::selfURL();
-$isadmin = $session->isValid('login-admin');
+$loginurl = SimpleSAML_Utilities::getAdminLoginURL();
+$isadmin = SimpleSAML_Utilities::isAdmin();
$warnings = array();
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index 77355811b..1faf98643 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -12,11 +12,7 @@ if (!$config->getValue('enable.saml20-idp', false))
/* Check if valid local session exists.. */
if ($config->getValue('admin.protectmetadata', false)) {
- if (!isset($session) || !$session->isValid('login-admin') ) {
- SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' => SimpleSAML_Utilities::selfURL())
- );
- }
+ SimpleSAML_Utilities::requireAdmin();
}
diff --git a/www/saml2/sp/metadata.php b/www/saml2/sp/metadata.php
index ed84a00a3..8c73dd208 100644
--- a/www/saml2/sp/metadata.php
+++ b/www/saml2/sp/metadata.php
@@ -13,11 +13,7 @@ if (!$config->getValue('enable.saml20-sp', false))
/* Check if valid local session exists.. */
if ($config->getValue('admin.protectmetadata', false)) {
- if (!isset($session) || !$session->isValid('login-admin') ) {
- SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' => SimpleSAML_Utilities::selfURL())
- );
- }
+ SimpleSAML_Utilities::requireAdmin();
}
try {
@@ -79,16 +75,12 @@ try {
}
- $adminok = (isset($session) && $session->isValid('login-admin') );
- $adminlogin = SimpleSAML_Utilities::addURLparameter(
- '/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' =>
- SimpleSAML_Utilities::addURLParameter(
- SimpleSAML_Utilities::selfURLNoQuery(),
- array('output' => 'xhtml')
- )
- )
- );
+ $adminok = SimpleSAML_Utilities::isAdmin();
+ $adminlogin = SimpleSAML_Utilities::getAdminLoginURL(
+ SimpleSAML_Utilities::addURLParameter(
+ SimpleSAML_Utilities::selfURLNoQuery(),
+ array('output' => 'xhtml')
+ ));
$sentok = FALSE;
diff --git a/www/shib13/idp/metadata.php b/www/shib13/idp/metadata.php
index 99bfd3647..071ac2413 100644
--- a/www/shib13/idp/metadata.php
+++ b/www/shib13/idp/metadata.php
@@ -12,11 +12,7 @@ if (!$config->getValue('enable.shib13-idp', false))
/* Check if valid local session exists.. */
if ($config->getValue('admin.protectmetadata', false)) {
- if (!isset($session) || !$session->isValid('login-admin') ) {
- SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' => SimpleSAML_Utilities::selfURL())
- );
- }
+ SimpleSAML_Utilities::requireAdmin();
}
diff --git a/www/shib13/sp/metadata.php b/www/shib13/sp/metadata.php
index d9cda1877..39c92d540 100644
--- a/www/shib13/sp/metadata.php
+++ b/www/shib13/sp/metadata.php
@@ -13,11 +13,7 @@ if (!$config->getValue('enable.shib13-sp', false))
/* Check if valid local session exists.. */
if ($config->getValue('admin.protectmetadata', false)) {
- if (!isset($session) || !$session->isValid('login-admin') ) {
- SimpleSAML_Utilities::redirect('/' . $config->getBaseURL() . 'auth/login-admin.php',
- array('RelayState' => SimpleSAML_Utilities::selfURL())
- );
- }
+ SimpleSAML_Utilities::requireAdmin();
}
--
GitLab