From c1f441a41a0cc62c3b3d34b4db89567f44c367ff Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Mon, 25 Oct 2010 12:28:09 +0000
Subject: [PATCH] metaedit: Use SimpleSAML_Auth_Simple.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2601 44740490-163a-0410-bde0-09ae8108e29a
---
modules/metaedit/www/edit.php | 17 +++++++----------
modules/metaedit/www/index.php | 17 +++++++----------
2 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/modules/metaedit/www/edit.php b/modules/metaedit/www/edit.php
index 53023b114..ea110f57e 100644
--- a/modules/metaedit/www/edit.php
+++ b/modules/metaedit/www/edit.php
@@ -2,7 +2,6 @@
/* Load simpleSAMLphp, configuration and metadata */
$config = SimpleSAML_Configuration::getInstance();
-$session = SimpleSAML_Session::getInstance();
$metaconfig = SimpleSAML_Configuration::getConfig('module_metaedit.php');
$mdh = new SimpleSAML_Metadata_MetaDataStorageHandlerSerialize($metaconfig->getValue('metahandlerConfig', NULL));
@@ -10,15 +9,13 @@ $mdh = new SimpleSAML_Metadata_MetaDataStorageHandlerSerialize($metaconfig->getV
$authsource = $metaconfig->getValue('auth', 'login-admin');
$useridattr = $metaconfig->getValue('useridattr', 'eduPersonPrincipalName');
-if ($session->isValid($authsource)) {
- $attributes = $session->getAttributes();
- // Check if userid exists
- if (!isset($attributes[$useridattr]))
- throw new Exception('User ID is missing');
- $userid = $attributes[$useridattr][0];
-} else {
- SimpleSAML_Auth_Default::initLogin($authsource, SimpleSAML_Utilities::selfURL());
-}
+$as = new SimpleSAML_Auth_Simple($authsource);
+$as->requireAuth();
+$attributes = $as->getAttributes();
+// Check if userid exists
+if (!isset($attributes[$useridattr]))
+ throw new Exception('User ID is missing');
+$userid = $attributes[$useridattr][0];
function requireOwnership($metadata, $userid) {
if (!isset($metadata['owner']))
diff --git a/modules/metaedit/www/index.php b/modules/metaedit/www/index.php
index bd2fb2827..f2e8d765c 100644
--- a/modules/metaedit/www/index.php
+++ b/modules/metaedit/www/index.php
@@ -2,7 +2,6 @@
/* Load simpleSAMLphp, configuration and metadata */
$config = SimpleSAML_Configuration::getInstance();
-$session = SimpleSAML_Session::getInstance();
$metaconfig = SimpleSAML_Configuration::getConfig('module_metaedit.php');
$mdh = new SimpleSAML_Metadata_MetaDataStorageHandlerSerialize($metaconfig->getValue('metahandlerConfig', NULL));
@@ -10,15 +9,13 @@ $mdh = new SimpleSAML_Metadata_MetaDataStorageHandlerSerialize($metaconfig->getV
$authsource = $metaconfig->getValue('auth', 'login-admin');
$useridattr = $metaconfig->getValue('useridattr', 'eduPersonPrincipalName');
-if ($session->isValid($authsource)) {
- $attributes = $session->getAttributes();
- // Check if userid exists
- if (!isset($attributes[$useridattr]))
- throw new Exception('User ID is missing');
- $userid = $attributes[$useridattr][0];
-} else {
- SimpleSAML_Auth_Default::initLogin($authsource, SimpleSAML_Utilities::selfURL());
-}
+$as = new SimpleSAML_Auth_Simple($authsource);
+$as->requireAuth();
+$attributes = $as->getAttributes();
+// Check if userid exists
+if (!isset($attributes[$useridattr]))
+ throw new Exception('User ID is missing');
+$userid = $attributes[$useridattr][0];
function requireOwnership($metadata, $userid) {
if (!isset($metadata['owner']))
--
GitLab