From a4bca9e43f8c77333b7c8b1b73179c6c51466d41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez=20Crespo?= <jaime.perez@uninett.no>
Date: Wed, 17 Oct 2018 15:41:25 +0200
Subject: [PATCH] Pass an instance of SimpleSAML\Configuration and
SimpleSAML\Session as optional parameters to SimpleSAML\Auth\Simple.
This allows us to inject both as dependencies of the class.
---
lib/SimpleSAML/Auth/Simple.php | 46 ++++++++++++++++++----------------
1 file changed, 25 insertions(+), 21 deletions(-)
diff --git a/lib/SimpleSAML/Auth/Simple.php b/lib/SimpleSAML/Auth/Simple.php
index f952ae2c3..711007405 100644
--- a/lib/SimpleSAML/Auth/Simple.php
+++ b/lib/SimpleSAML/Auth/Simple.php
@@ -23,22 +23,34 @@ class Simple
*/
protected $authSource;
- /**
- * @var Configuration|null
- */
+ /** @var \SimpleSAML\Configuration */
protected $app_config;
+ /** @var \SimpleSAML\Session */
+ protected $session;
+
+
/**
* Create an instance with the specified authsource.
*
* @param string $authSource The id of the authentication source.
+ * @param \SimpleSAML\Configuration|null $config Optional configuration to use.
+ * @param \SimpleSAML\Session|null $session Optional session to use.
*/
- public function __construct($authSource)
+ public function __construct($authSource, Configuration $config = null, Session $session = null)
{
assert(is_string($authSource));
+ if ($config === null) {
+ $config = Configuration::getInstance();
+ }
$this->authSource = $authSource;
- $this->app_config = Configuration::getInstance()->getConfigItem('application', null);
+ $this->app_config = $config->getConfigItem('application', null);
+
+ if ($session === null) {
+ $session = Session::getSessionFromRequest();
+ }
+ $this->session = $session;
}
@@ -69,9 +81,7 @@ class Simple
*/
public function isAuthenticated()
{
- $session = Session::getSessionFromRequest();
-
- return $session->isValid($this->authSource);
+ return $this->session->isValid($this->authSource);
}
@@ -90,9 +100,7 @@ class Simple
*/
public function requireAuth(array $params = array())
{
- $session = Session::getSessionFromRequest();
-
- if ($session->isValid($this->authSource)) {
+ if ($this->session->isValid($this->authSource)) {
// Already authenticated
return;
}
@@ -195,14 +203,13 @@ class Simple
assert(isset($params['ReturnStateParam'], $params['ReturnStateStage']));
}
- $session = Session::getSessionFromRequest();
- if ($session->isValid($this->authSource)) {
- $state = $session->getAuthData($this->authSource, 'LogoutState');
+ if ($this->session->isValid($this->authSource)) {
+ $state = $this->session->getAuthData($this->authSource, 'LogoutState');
if ($state !== null) {
$params = array_merge($state, $params);
}
- $session->doLogout($this->authSource);
+ $this->session->doLogout($this->authSource);
$params['LogoutCompletedHandler'] = array(get_class(), 'logoutCompleted');
@@ -259,8 +266,7 @@ class Simple
}
// Authenticated
- $session = Session::getSessionFromRequest();
- return $session->getAuthData($this->authSource, 'Attributes');
+ return $this->session->getAuthData($this->authSource, 'Attributes');
}
@@ -279,8 +285,7 @@ class Simple
return null;
}
- $session = Session::getSessionFromRequest();
- return $session->getAuthData($this->authSource, $name);
+ return $this->session->getAuthData($this->authSource, $name);
}
@@ -295,8 +300,7 @@ class Simple
return null;
}
- $session = Session::getSessionFromRequest();
- return $session->getAuthState($this->authSource);
+ return $this->session->getAuthState($this->authSource);
}
--
GitLab