From edc761827d4248d78169d35a38fd54e028a7370a Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Thu, 15 May 2008 14:12:44 +0000
Subject: [PATCH] Remove all uses of SimpleSAML_Session::getInstance(TRUE) and
replace them with getInstance().
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@569 44740490-163a-0410-bde0-09ae8108e29a
---
docs/source/simplesamlphp-sp.xml | 2 +-
lib/SimpleSAML/Consent/ConsentStorage.php | 2 +-
lib/SimpleSAML/Logger.php | 2 +-
www/admin/memcachestat.php | 2 +-
www/admin/metadata.php | 2 +-
www/admin/phpinfo.php | 2 +-
www/admin/test.php | 2 +-
www/aselect/handler.php | 2 +-
www/auth/login-auto.php | 2 +-
www/auth/login-cas-ldap.php | 2 +-
www/auth/login-feide.php | 2 +-
www/auth/login-tlsclient.php | 2 +-
www/auth/login-wayf-ldap.php | 2 +-
www/auth/login.php | 2 +-
www/authmemcookie.php | 2 +-
www/example-simple/hostnames.php | 2 +-
www/example-simple/saml2-example.php | 2 +-
www/example-simple/shib13-example.php | 2 +-
www/index.php | 2 +-
www/noconsent.php | 2 +-
www/openid/provider/server.php | 4 ++--
www/saml2/idp/SSOService.php | 2 +-
www/saml2/idp/metadata.php | 2 +-
www/saml2/sp/AssertionConsumerService.php | 2 +-
www/saml2/sp/SingleLogoutService.php | 2 +-
www/saml2/sp/initSSO.php | 2 +-
www/saml2/sp/metadata.php | 2 +-
www/shib13/idp/SSOService.php | 2 +-
www/shib13/idp/metadata.php | 2 +-
www/shib13/sp/AssertionConsumerService.php | 2 +-
www/shib13/sp/metadata.php | 2 +-
31 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/docs/source/simplesamlphp-sp.xml b/docs/source/simplesamlphp-sp.xml
index 6c6df9fe3..f21449f92 100644
--- a/docs/source/simplesamlphp-sp.xml
+++ b/docs/source/simplesamlphp-sp.xml
@@ -877,7 +877,7 @@ require_once('SimpleSAML/XHTML/Template.php');
<programlisting>/* Load simpleSAMLphp, configuration and metadata */
$config = SimpleSAML_Configuration::getInstance();
-$session = SimpleSAML_Session::getInstance(true);</programlisting>
+$session = SimpleSAML_Session::getInstance();</programlisting>
<para>Then check whether the session is valid. If not, redirect the user
to the IdP, specifying the <filename>initSSO.php</filename> script (for
diff --git a/lib/SimpleSAML/Consent/ConsentStorage.php b/lib/SimpleSAML/Consent/ConsentStorage.php
index fedc765ad..74ed7e592 100644
--- a/lib/SimpleSAML/Consent/ConsentStorage.php
+++ b/lib/SimpleSAML/Consent/ConsentStorage.php
@@ -41,7 +41,7 @@ class SimpleSAML_Consent_Storage {
$this->dbh = new PDO($pdo_connect, $pdo_user, $pdo_passwd,
array( PDO::ATTR_PERSISTENT => false));
} catch(Exception $exception) {
- $session = SimpleSAML_Session::getInstance(TRUE);
+ $session = SimpleSAML_Session::getInstance();
SimpleSAML_Utilities::fatalError($session->getTrackID(), 'PROCESSASSERTION', $exception);
}
//$this->dbh->setAttribute('PDO::ATTR_TIMEOUT', 5);
diff --git a/lib/SimpleSAML/Logger.php b/lib/SimpleSAML/Logger.php
index dac2109d0..b5c20d7df 100644
--- a/lib/SimpleSAML/Logger.php
+++ b/lib/SimpleSAML/Logger.php
@@ -174,7 +174,7 @@ class SimpleSAML_Logger {
self::$trackid = self::$TRACKID_FETCHING;
/* Get the current session. This could cause recursion back to the logger class. */
- $session = SimpleSAML_Session::getInstance(TRUE);
+ $session = SimpleSAML_Session::getInstance();
/* Update the trackid. */
self::$trackid = $session->getTrackId();
diff --git a/www/admin/memcachestat.php b/www/admin/memcachestat.php
index 0260049cb..aa346e1fb 100644
--- a/www/admin/memcachestat.php
+++ b/www/admin/memcachestat.php
@@ -11,7 +11,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
try {
$config = SimpleSAML_Configuration::getInstance();
- $session = SimpleSAML_Session::getInstance(true);
+ $session = SimpleSAML_Session::getInstance();
/* Make sure that the user has admin access rights. */
if (!isset($session) || !$session->isValid('login-admin') ) {
diff --git a/www/admin/metadata.php b/www/admin/metadata.php
index 0c7f982f9..d4177f772 100644
--- a/www/admin/metadata.php
+++ b/www/admin/metadata.php
@@ -9,7 +9,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
/* Load simpleSAMLphp, configuration and metadata */
$config = SimpleSAML_Configuration::getInstance();
-$session = SimpleSAML_Session::getInstance(true);
+$session = SimpleSAML_Session::getInstance();
/* Check if valid local session exists.. */
diff --git a/www/admin/phpinfo.php b/www/admin/phpinfo.php
index c62d8a617..134fe0b50 100644
--- a/www/admin/phpinfo.php
+++ b/www/admin/phpinfo.php
@@ -8,7 +8,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
try {
$config = SimpleSAML_Configuration::getInstance();
- $session = SimpleSAML_Session::getInstance(true);
+ $session = SimpleSAML_Session::getInstance();
/* Make sure that the user has admin access rights. */
if (!isset($session) || !$session->isValid('login-admin') ) {
diff --git a/www/admin/test.php b/www/admin/test.php
index 18eee7719..7f255bb1e 100644
--- a/www/admin/test.php
+++ b/www/admin/test.php
@@ -83,7 +83,7 @@ foreach ($_GET as $k => $v) {
if ($op === 'login') {
- $session = SimpleSAML_Session::getInstance(TRUE);
+ $session = SimpleSAML_Session::getInstance();
/* Initialize SSO if we aren't authenticated. */
if (!$session->isValid($protocol) ) {
diff --git a/www/aselect/handler.php b/www/aselect/handler.php
index 1e3330234..db27749c1 100644
--- a/www/aselect/handler.php
+++ b/www/aselect/handler.php
@@ -415,7 +415,7 @@ function as_request_bridge_return() {
}
$parms = as_call($url);
- $session = SimpleSAML_Session::getInstance(true);
+ $session = SimpleSAML_Session::getInstance();
$session->doLogin('aselect');
if (array_key_exists('attributes', $parms)) {
diff --git a/www/auth/login-auto.php b/www/auth/login-auto.php
index 037ca237b..c1dbebce5 100644
--- a/www/auth/login-auto.php
+++ b/www/auth/login-auto.php
@@ -66,7 +66,7 @@ usleep($delay_login * 1000);
/* Load the session of the current user. */
-$session = SimpleSAML_Session::getInstance(true);
+$session = SimpleSAML_Session::getInstance();
if($session == NULL) {
SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOSESSION');
}
diff --git a/www/auth/login-cas-ldap.php b/www/auth/login-cas-ldap.php
index 28362d40f..7afd978ea 100755
--- a/www/auth/login-cas-ldap.php
+++ b/www/auth/login-cas-ldap.php
@@ -18,7 +18,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Metadata/MetaDataStorageHandler.php');
$config = SimpleSAML_Configuration::getInstance();
-$session = SimpleSAML_Session::getInstance(TRUE);
+$session = SimpleSAML_Session::getInstance();
try {
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
diff --git a/www/auth/login-feide.php b/www/auth/login-feide.php
index 7c488582f..303b82df6 100644
--- a/www/auth/login-feide.php
+++ b/www/auth/login-feide.php
@@ -31,7 +31,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
$config = SimpleSAML_Configuration::getInstance();
$ldapconfig = $config->copyFromBase('loginfeide', 'config-login-feide.php');
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
-$session = SimpleSAML_Session::getInstance(TRUE);
+$session = SimpleSAML_Session::getInstance();
SimpleSAML_Logger::info('AUTH - ldap-feide: Accessing auth endpoint login-feide');
diff --git a/www/auth/login-tlsclient.php b/www/auth/login-tlsclient.php
index a1b6e4c64..cf3f01df0 100644
--- a/www/auth/login-tlsclient.php
+++ b/www/auth/login-tlsclient.php
@@ -12,7 +12,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
$config = SimpleSAML_Configuration::getInstance();
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
-$session = SimpleSAML_Session::getInstance(true);
+$session = SimpleSAML_Session::getInstance();
SimpleSAML_Logger::info('AUTH - ldap: Accessing auth endpoint login');
diff --git a/www/auth/login-wayf-ldap.php b/www/auth/login-wayf-ldap.php
index ac29fa665..56d51cb0e 100755
--- a/www/auth/login-wayf-ldap.php
+++ b/www/auth/login-wayf-ldap.php
@@ -19,7 +19,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
$config = SimpleSAML_Configuration::getInstance();
-$session = SimpleSAML_Session::getInstance(TRUE);
+$session = SimpleSAML_Session::getInstance();
try {
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
diff --git a/www/auth/login.php b/www/auth/login.php
index 57cea79e3..dcefc9130 100644
--- a/www/auth/login.php
+++ b/www/auth/login.php
@@ -12,7 +12,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
$config = SimpleSAML_Configuration::getInstance();
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
-$session = SimpleSAML_Session::getInstance(TRUE);
+$session = SimpleSAML_Session::getInstance();
SimpleSAML_Logger::info('AUTH - ldap: Accessing auth endpoint login');
diff --git a/www/authmemcookie.php b/www/authmemcookie.php
index d76274b57..7fdc7a5e1 100644
--- a/www/authmemcookie.php
+++ b/www/authmemcookie.php
@@ -19,7 +19,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
try {
/* Load simpleSAMLphp configuration. */
$globalConfig = SimpleSAML_Configuration::getInstance();
- $session = SimpleSAML_Session::getInstance(TRUE);
+ $session = SimpleSAML_Session::getInstance();
/* Check if this module is enabled. */
if(!$globalConfig->getValue('enable.authmemcookie', FALSE)) {
diff --git a/www/example-simple/hostnames.php b/www/example-simple/hostnames.php
index 8df549f76..ef8e248f2 100644
--- a/www/example-simple/hostnames.php
+++ b/www/example-simple/hostnames.php
@@ -13,7 +13,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
/* Load simpleSAMLphp, configuration */
$config = SimpleSAML_Configuration::getInstance();
-$session = SimpleSAML_Session::getInstance(true);
+$session = SimpleSAML_Session::getInstance();
/* Check if valid local session exists.. */
if (!isset($session) || !$session->isValid('login-admin') ) {
diff --git a/www/example-simple/saml2-example.php b/www/example-simple/saml2-example.php
index 05dab6f76..332c72b97 100644
--- a/www/example-simple/saml2-example.php
+++ b/www/example-simple/saml2-example.php
@@ -17,7 +17,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
/* Load simpleSAMLphp, configuration and metadata */
$config = SimpleSAML_Configuration::getInstance();
-$session = SimpleSAML_Session::getInstance(TRUE);
+$session = SimpleSAML_Session::getInstance();
/**
* Check if valid local session exists, and the authority is the SAML 2.0 SP
diff --git a/www/example-simple/shib13-example.php b/www/example-simple/shib13-example.php
index dbbf689c1..b11f529d1 100644
--- a/www/example-simple/shib13-example.php
+++ b/www/example-simple/shib13-example.php
@@ -17,7 +17,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
/* Load simpleSAMLphp, configuration and metadata */
$config = SimpleSAML_Configuration::getInstance();
-$session = SimpleSAML_Session::getInstance(TRUE);
+$session = SimpleSAML_Session::getInstance();
/**
* Check if valid local session exists, and the authority is the Shib 1.3 SP
diff --git a/www/index.php b/www/index.php
index 1da305b07..c611b88aa 100644
--- a/www/index.php
+++ b/www/index.php
@@ -10,7 +10,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
/* Load simpleSAMLphp, configuration */
$config = SimpleSAML_Configuration::getInstance();
-$session = SimpleSAML_Session::getInstance(true);
+$session = SimpleSAML_Session::getInstance();
/* Check if valid local session exists.. */
if ($config->getValue('admin.protectindexpage', false)) {
diff --git a/www/noconsent.php b/www/noconsent.php
index a2337dbc9..352063dc3 100644
--- a/www/noconsent.php
+++ b/www/noconsent.php
@@ -6,7 +6,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
/* Load simpleSAMLphp, configuration */
$config = SimpleSAML_Configuration::getInstance();
-$session = SimpleSAML_Session::getInstance(true);
+$session = SimpleSAML_Session::getInstance();
$t = new SimpleSAML_XHTML_Template($config, 'noconsent.php');
$t->show();
diff --git a/www/openid/provider/server.php b/www/openid/provider/server.php
index b3c563c71..0901f87ac 100644
--- a/www/openid/provider/server.php
+++ b/www/openid/provider/server.php
@@ -97,7 +97,7 @@ function action_default()
$t->data['openidserver'] = $metadata->getGenerated('server', 'openid-provider');
- $session = SimpleSAML_Session::getInstance(true);
+ $session = SimpleSAML_Session::getInstance();
$useridfield = $config->getValue('openid.userid_attributename');
$delegationprefix = $config->getValue('openid.delegation_prefix');
@@ -218,7 +218,7 @@ function check_authenticated_user() {
$config = SimpleSAML_Configuration::getInstance();
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
- $session = SimpleSAML_Session::getInstance(true);
+ $session = SimpleSAML_Session::getInstance();
$idpentityid = $metadata->getMetaDataCurrentEntityID('openid-provider');
$idpmeta = $metadata->getMetaDataCurrent('openid-provider');
diff --git a/www/saml2/idp/SSOService.php b/www/saml2/idp/SSOService.php
index 0ba29fca8..da0ab98e2 100644
--- a/www/saml2/idp/SSOService.php
+++ b/www/saml2/idp/SSOService.php
@@ -26,7 +26,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
$config = SimpleSAML_Configuration::getInstance();
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
-$session = SimpleSAML_Session::getInstance(TRUE);
+$session = SimpleSAML_Session::getInstance();
try {
$idpentityid = $metadata->getMetaDataCurrentEntityID('saml20-idp-hosted');
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index 52aecdd84..1ffa8d010 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -12,7 +12,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'xmlsecli
/* Load simpleSAMLphp, configuration and metadata */
$config = SimpleSAML_Configuration::getInstance();
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
-$session = SimpleSAML_Session::getInstance(true);
+$session = SimpleSAML_Session::getInstance();
if (!$config->getValue('enable.saml20-idp', false))
SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOACCESS');
diff --git a/www/saml2/sp/AssertionConsumerService.php b/www/saml2/sp/AssertionConsumerService.php
index e1445896d..1078fdadc 100644
--- a/www/saml2/sp/AssertionConsumerService.php
+++ b/www/saml2/sp/AssertionConsumerService.php
@@ -27,7 +27,7 @@ $config = SimpleSAML_Configuration::getInstance();
/* Get the session object for the user. Create a new session if no session
* exists for this user.
*/
-$session = SimpleSAML_Session::getInstance(TRUE);
+$session = SimpleSAML_Session::getInstance();
SimpleSAML_Logger::info('SAML2.0 - SP.AssertionConsumerService: Accessing SAML 2.0 SP endpoint AssertionConsumerService');
diff --git a/www/saml2/sp/SingleLogoutService.php b/www/saml2/sp/SingleLogoutService.php
index b42dfb21c..a56371c44 100644
--- a/www/saml2/sp/SingleLogoutService.php
+++ b/www/saml2/sp/SingleLogoutService.php
@@ -17,7 +17,7 @@ $config = SimpleSAML_Configuration::getInstance();
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
// Get the local session
-$session = SimpleSAML_Session::getInstance(true);
+$session = SimpleSAML_Session::getInstance();
SimpleSAML_Logger::info('SAML2.0 - SP.SingleLogoutService: Accessing SAML 2.0 SP endpoint SingleLogoutService');
diff --git a/www/saml2/sp/initSSO.php b/www/saml2/sp/initSSO.php
index 3d50b4dcc..cd1dae9ca 100644
--- a/www/saml2/sp/initSSO.php
+++ b/www/saml2/sp/initSSO.php
@@ -12,7 +12,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
$config = SimpleSAML_Configuration::getInstance();
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
-$session = SimpleSAML_Session::getInstance(TRUE);
+$session = SimpleSAML_Session::getInstance();
SimpleSAML_Logger::info('SAML2.0 - SP.initSSO: Accessing SAML 2.0 SP initSSO script');
diff --git a/www/saml2/sp/metadata.php b/www/saml2/sp/metadata.php
index 4348c023c..6f8458d69 100644
--- a/www/saml2/sp/metadata.php
+++ b/www/saml2/sp/metadata.php
@@ -10,7 +10,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
/* Load simpleSAMLphp, configuration and metadata */
$config = SimpleSAML_Configuration::getInstance();
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
-$session = SimpleSAML_Session::getInstance(TRUE);
+$session = SimpleSAML_Session::getInstance();
if (!$config->getValue('enable.saml20-sp', false))
diff --git a/www/shib13/idp/SSOService.php b/www/shib13/idp/SSOService.php
index 05e729559..d4f84ebf2 100644
--- a/www/shib13/idp/SSOService.php
+++ b/www/shib13/idp/SSOService.php
@@ -25,7 +25,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
$config = SimpleSAML_Configuration::getInstance();
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
-$session = SimpleSAML_Session::getInstance(true);
+$session = SimpleSAML_Session::getInstance();
SimpleSAML_Logger::info('Shib1.3 - IdP.SSOService: Accessing Shibboleth 1.3 IdP endpoint SSOService');
diff --git a/www/shib13/idp/metadata.php b/www/shib13/idp/metadata.php
index 137b1afa1..a58f17a3c 100644
--- a/www/shib13/idp/metadata.php
+++ b/www/shib13/idp/metadata.php
@@ -12,7 +12,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'xmlsecli
/* Load simpleSAMLphp, configuration and metadata */
$config = SimpleSAML_Configuration::getInstance();
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
-$session = SimpleSAML_Session::getInstance(true);
+$session = SimpleSAML_Session::getInstance();
if (!$config->getValue('enable.shib13-idp', false))
SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOACCESS');
diff --git a/www/shib13/sp/AssertionConsumerService.php b/www/shib13/sp/AssertionConsumerService.php
index c789efd18..c2318e685 100644
--- a/www/shib13/sp/AssertionConsumerService.php
+++ b/www/shib13/sp/AssertionConsumerService.php
@@ -13,7 +13,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
$config = SimpleSAML_Configuration::getInstance();
-$session = SimpleSAML_Session::getInstance(TRUE);
+$session = SimpleSAML_Session::getInstance();
SimpleSAML_Logger::info('Shib1.3 - SP.AssertionConsumerService: Accessing Shibboleth 1.3 SP endpoint AssertionConsumerService');
diff --git a/www/shib13/sp/metadata.php b/www/shib13/sp/metadata.php
index ecdcde4cb..58e509321 100644
--- a/www/shib13/sp/metadata.php
+++ b/www/shib13/sp/metadata.php
@@ -10,7 +10,7 @@ require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSA
/* Load simpleSAMLphp, configuration and metadata */
$config = SimpleSAML_Configuration::getInstance();
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
-$session = SimpleSAML_Session::getInstance(TRUE);
+$session = SimpleSAML_Session::getInstance();
if (!$config->getValue('enable.shib13-sp', false))
--
GitLab