summaryrefslogtreecommitdiffstats
path: root/lib/SimpleSAML/Auth
diff options
context:
space:
mode:
Diffstat (limited to 'lib/SimpleSAML/Auth')
-rw-r--r--lib/SimpleSAML/Auth/BWC.php4
-rw-r--r--lib/SimpleSAML/Auth/Default.php8
-rw-r--r--lib/SimpleSAML/Auth/Simple.php12
-rw-r--r--lib/SimpleSAML/Auth/Source.php6
-rw-r--r--lib/SimpleSAML/Auth/State.php6
5 files changed, 18 insertions, 18 deletions
diff --git a/lib/SimpleSAML/Auth/BWC.php b/lib/SimpleSAML/Auth/BWC.php
index 3cdddf5..f66203f 100644
--- a/lib/SimpleSAML/Auth/BWC.php
+++ b/lib/SimpleSAML/Auth/BWC.php
@@ -101,7 +101,7 @@ class SimpleSAML_Auth_BWC extends SimpleSAML_Auth_Simple {
$params['ReturnTo'] = SimpleSAML_Utilities::createPostRedirectLink($params['ReturnTo'], $_POST);
}
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
$authnRequest = array(
'IsPassive' => isset($params['isPassive']) ? $params['isPassive'] : FALSE,
@@ -152,7 +152,7 @@ class SimpleSAML_Auth_BWC extends SimpleSAML_Auth_Simple {
$url = SimpleSAML_Utilities::selfURL();
}
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
if (!$session->isValid($this->authority)) {
/* Not authenticated to this authentication source. */
SimpleSAML_Utilities::redirectTrustedURL($url);
diff --git a/lib/SimpleSAML/Auth/Default.php b/lib/SimpleSAML/Auth/Default.php
index ca02e74..90d3d08 100644
--- a/lib/SimpleSAML/Auth/Default.php
+++ b/lib/SimpleSAML/Auth/Default.php
@@ -124,7 +124,7 @@ class SimpleSAML_Auth_Default {
$return = $state['SimpleSAML_Auth_Default.Return'];
/* Save session state. */
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
$session->doLogin($state['SimpleSAML_Auth_Default.id'], self::extractPersistentAuthState($state));
if (is_string($return)) {
@@ -155,7 +155,7 @@ class SimpleSAML_Auth_Default {
assert('is_string($returnURL)');
assert('is_string($authority) || is_null($authority)');
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
if ($authority === NULL) {
$authority = $session->getAuthority();
@@ -235,7 +235,7 @@ class SimpleSAML_Auth_Default {
$source = $state['SimpleSAML_Auth_Default.logoutSource'];
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
$authId = $session->getAuthority();
if ($authId !== $source) {
@@ -270,7 +270,7 @@ class SimpleSAML_Auth_Default {
assert('is_string($authId)');
assert('is_string($redirectTo)');
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
$session->doLogin($authId, self::extractPersistentAuthState($state));
SimpleSAML_Utilities::redirectUntrustedURL($redirectTo);
diff --git a/lib/SimpleSAML/Auth/Simple.php b/lib/SimpleSAML/Auth/Simple.php
index 8043830..db14112 100644
--- a/lib/SimpleSAML/Auth/Simple.php
+++ b/lib/SimpleSAML/Auth/Simple.php
@@ -48,7 +48,7 @@ class SimpleSAML_Auth_Simple {
* @return bool TRUE if the user is authenticated, FALSE if not.
*/
public function isAuthenticated() {
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
return $session->isValid($this->authSource);
}
@@ -70,7 +70,7 @@ class SimpleSAML_Auth_Simple {
*/
public function requireAuth(array $params = array()) {
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
if ($session->isValid($this->authSource)) {
/* Already authenticated. */
@@ -176,7 +176,7 @@ class SimpleSAML_Auth_Simple {
assert('isset($params["ReturnStateParam"]) && isset($params["ReturnStateStage"])');
}
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
if ($session->isValid($this->authSource)) {
$state = $session->getAuthData($this->authSource, 'LogoutState');
if ($state !== NULL) {
@@ -241,7 +241,7 @@ class SimpleSAML_Auth_Simple {
}
/* Authenticated. */
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
return $session->getAuthData($this->authSource, 'Attributes');
}
@@ -259,7 +259,7 @@ class SimpleSAML_Auth_Simple {
return NULL;
}
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
return $session->getAuthData($this->authSource, $name);
}
@@ -275,7 +275,7 @@ class SimpleSAML_Auth_Simple {
return NULL;
}
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
return $session->getAuthState($this->authSource);
}
diff --git a/lib/SimpleSAML/Auth/Source.php b/lib/SimpleSAML/Auth/Source.php
index 802035e..29effde 100644
--- a/lib/SimpleSAML/Auth/Source.php
+++ b/lib/SimpleSAML/Auth/Source.php
@@ -111,7 +111,7 @@ abstract class SimpleSAML_Auth_Source {
assert('isset($state["ReturnCallback"])');
/* The default implementation just copies over the previous authentication data. */
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
$data = $session->getAuthState($this->authId);
foreach ($data as $k => $v) {
$state[$k] = $v;
@@ -294,7 +294,7 @@ abstract class SimpleSAML_Auth_Source {
);
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
$session->setData('SimpleSAML_Auth_Source.LogoutCallbacks', $id, $data,
SimpleSAML_Session::DATA_TIMEOUT_LOGOUT);
}
@@ -315,7 +315,7 @@ abstract class SimpleSAML_Auth_Source {
$id = strlen($this->authId) . ':' . $this->authId . $assoc;
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
$data = $session->getData('SimpleSAML_Auth_Source.LogoutCallbacks', $id);
if ($data === NULL) {
diff --git a/lib/SimpleSAML/Auth/State.php b/lib/SimpleSAML/Auth/State.php
index ccea15f..a8600b1 100644
--- a/lib/SimpleSAML/Auth/State.php
+++ b/lib/SimpleSAML/Auth/State.php
@@ -160,7 +160,7 @@ class SimpleSAML_Auth_State {
/* Save state. */
$serializedState = serialize($state);
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
$session->setData('SimpleSAML_Auth_State', $id, $serializedState, self::getStateTimeout());
SimpleSAML_Logger::debug('Saved state: ' . var_export($return, TRUE));
@@ -213,7 +213,7 @@ class SimpleSAML_Auth_State {
$sid = SimpleSAML_Utilities::parseStateID($id);
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
$state = $session->getData('SimpleSAML_Auth_State', $sid['id']);
if ($state === NULL) {
@@ -274,7 +274,7 @@ class SimpleSAML_Auth_State {
SimpleSAML_Logger::debug('Deleting state: ' . var_export($state[self::ID], TRUE));
- $session = SimpleSAML_Session::getInstance();
+ $session = SimpleSAML_Session::getSessionFromRequest();
$session->deleteData('SimpleSAML_Auth_State', $state[self::ID]);
}
generated by cgit v1.1 at 2025-06-06 20:59:06 +0000