From bc095b85a66cfa9639b80bfb4705c721f5df3712 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Mon, 5 Oct 2009 11:51:43 +0000
Subject: [PATCH] AuthMemCookie: Support for authentication sources.
Update issue 215
This change sort of fixes the use of initSSO.php for
www/authmemcookie.php by making it possible to use authsources with
AuthMemCookie.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1817 44740490-163a-0410-bde0-09ae8108e29a
---
config-templates/authmemcookie.php | 16 +++++++++++++---
lib/SimpleSAML/AuthMemCookie.php | 12 ++++++++++++
www/authmemcookie.php | 6 ++++++
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/config-templates/authmemcookie.php b/config-templates/authmemcookie.php
index 967151248..036e8c2e6 100644
--- a/config-templates/authmemcookie.php
+++ b/config-templates/authmemcookie.php
@@ -7,10 +7,20 @@
$config = array(
/*
- * What type of login Auth MemCookie will use. Can be either 'saml2' or 'shib13'.
- * The default value is 'saml2'.
+ * What type of login Auth MemCookie will use.
+ * Can be either 'authsource', 'saml2' or 'shib13'.
+ *
+ * For backwards compatibility, the default value if unset is 'saml2'.
+ * New installations should use 'authsource'.
+ */
+ 'loginmethod' => 'authsource',
+
+ /*
+ * The authentication source that should be used.
+ *
+ * This must be one of the authentication sources configured in config/authsources.php.
*/
- 'loginmethod' => 'saml2',
+ 'authsource' => 'default-sp',
/*
* This is the name of the cookie we should save the session id in. The value of this option must match the
diff --git a/lib/SimpleSAML/AuthMemCookie.php b/lib/SimpleSAML/AuthMemCookie.php
index 79824d1f3..61adacbcc 100644
--- a/lib/SimpleSAML/AuthMemCookie.php
+++ b/lib/SimpleSAML/AuthMemCookie.php
@@ -52,6 +52,7 @@ class SimpleSAML_AuthMemCookie {
public function getLoginMethod() {
$loginMethod = $this->amcConfig->getString('loginmethod', 'saml2');
$supportedLogins = array(
+ 'authsource',
'saml2',
'shib13',
);
@@ -63,6 +64,17 @@ class SimpleSAML_AuthMemCookie {
}
+ /**
+ * Retrieve the authentication source that should be used to authenticate the user.
+ *
+ * @return string The login type which should be used for Auth MemCookie.
+ */
+ public function getAuthSource() {
+
+ return $this->amcConfig->getString('authsource');
+ }
+
+
/**
* This function retrieves the name of the cookie from the configuration.
*
diff --git a/www/authmemcookie.php b/www/authmemcookie.php
index fde955233..dac9a362c 100644
--- a/www/authmemcookie.php
+++ b/www/authmemcookie.php
@@ -28,6 +28,12 @@ try {
/* Check if the user is authorized. We attempt to authenticate the user if not. */
$loginMethod = $amc->getLoginMethod();
switch($loginMethod) {
+ case 'authsource':
+ /* The default now. */
+ $sourceId = $amc->getAuthSource();
+ $s = new SimpleSAML_Auth_Simple($sourceId);
+ $s->requireAuth();
+ break;
case 'saml2':
if (!$session->isValid('saml2') ) {
SimpleSAML_Utilities::redirect(
--
GitLab