entrouvert
/
simplesamlphp
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Configuration: replace in-tree uses of copyFromBase and init with getConfig and setConfigDir. 

git-svn-id: http://simplesamlphp.googlecode.com/svn/trunk@1329 44740490-163a-0410-bde0-09ae8108e29a
This commit is contained in:
olavmrk 2009-02-26 07:19:00 +00:00
parent 1658d5097b
commit c1dc249da5
41 changed files with 43 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/memcacheSync.php
View File

@ -25,7 +25,7 @@ require_once($baseDir . '/lib/_autoload.php');
/* Initialize the configuration. */
$configdir = $baseDir . '/config';
SimpleSAML_Configuration::init($configdir);
SimpleSAML_Configuration::setConfigDir($configdir);
/* Things we should warn the user about. */
$warnServerDown = 0;

3
lib/SimpleSAML/Auth/Source.php
View File

@ -163,8 +163,7 @@ abstract class SimpleSAML_Auth_Source {
assert('is_string($authId)');
/* For now - load and parse config file. */
$globalConfig = SimpleSAML_Configuration::getInstance();
$config = $globalConfig->copyFromBase('authsources', 'authsources.php');
$config = SimpleSAML_Configuration::getConfig('authsources.php');
$authConfig = $config->getValue($authId, NULL);
if ($authConfig === NULL) {

4
lib/SimpleSAML/AuthMemCookie.php
View File

@ -40,9 +40,7 @@ class SimpleSAML_AuthMemCookie {
*/
private function __construct() {
/* Load Auth MemCookie configuration. */
$globalConfig = SimpleSAML_Configuration::getInstance();
SimpleSAML_Configuration::init($GLOBALS['configdir'], 'authmemcookie', 'authmemcookie.php');
$this->amcConfig = SimpleSAML_Configuration::getInstance('authmemcookie');
$this->amcConfig = SimpleSAML_Configuration::getConfig('authmemcookie.php');
}

2
lib/SimpleSAML/MetaShare/Store.php
View File

@ -27,7 +27,7 @@ class SimpleSAML_MetaShare_Store {
* singleton accessor.
*/
private function __construct() {
$metaConfig = SimpleSAML_Configuration::getInstance()->copyFromBase('metashare', 'metashare.php');
$metaConfig = SimpleSAML_Configuration::getConfig('metashare.php');
$this->metadataPath = $metaConfig->getString('metashare.path');
$this->metadataPath = SimpleSAML_Utilities::resolvePath($this->metadataPath);

3
modules/InfoCard/lib/Auth/Source/ICAuth.php
View File

@ -45,8 +45,7 @@ class sspmod_InfoCard_Auth_Source_ICAuth extends SimpleSAML_Auth_Source {
SimpleSAML_Logger::debug('ENTRA en icauth');
assert('is_string($authStateId)');
$config = SimpleSAML_Configuration::getInstance();
$autoconfig = $config->copyFromBase('logininfocard', 'config-login-infocard.php');
$autoconfig = SimpleSAML_Configuration::getConfig('config-login-infocard.php');
$idp_key = $autoconfig->getValue('idp_key');
$sts_crt = $autoconfig->getValue('sts_crt');
$Infocard = $autoconfig->getValue('InfoCard');

2
modules/InfoCard/www/getcardform.php
View File

@ -13,7 +13,7 @@
/* Load the configuration. */
$config = SimpleSAML_Configuration::getInstance();
$autoconfig = $config->copyFromBase('logininfocard', 'config-login-infocard.php');
$autoconfig = SimpleSAML_Configuration::getConfig('config-login-infocard.php');
$Infocard = $autoconfig->getValue('InfoCard');

2
modules/InfoCard/www/login-infocard.php
View File

@ -13,7 +13,7 @@
/* Load the configuration. */
$config = SimpleSAML_Configuration::getInstance();
$autoconfig = $config->copyFromBase('logininfocard', 'config-login-infocard.php');
$autoconfig = SimpleSAML_Configuration::getConfig('config-login-infocard.php');
$server_key = $autoconfig->getValue('server_key');
$server_crt = $autoconfig->getValue('server_crt');

3
modules/InfoCard/www/mex.php
View File

@ -19,8 +19,7 @@ if ($method == "POST"){
}
$config = SimpleSAML_Configuration::getInstance();
$autoconfig = $config->copyFromBase('logininfocard', 'config-login-infocard.php');
$autoconfig = SimpleSAML_Configuration::getConfig('config-login-infocard.php');
$ICconfig['tokenserviceurl'] = $autoconfig->getValue('tokenserviceurl');
$ICconfig['certificates'] = $autoconfig->getValue('certificates');
$ICconfig['UserCredential'] = $autoconfig->getValue('UserCredential');

3
modules/InfoCard/www/tokenservice.php
View File

@ -45,7 +45,6 @@ function decryptMcrypt($data,$key) {
Header('Content-Type: application/soap+xml;charset=utf-8');
$config = SimpleSAML_Configuration::getInstance();
SimpleSAML_Logger::debug('Tokenservice');
$token = new DOMDocument();
@ -57,7 +56,7 @@ $cardId = $doc->getElementsByTagname('CardId')->item(0)->nodeValue;
$authenticated = false;
$autoconfig = $config->copyFromBase('logininfocard', 'config-login-infocard.php');
$autoconfig = SimpleSAML_Configuration::getConfig('config-login-infocard.php');
$ICconfig['UserCredential'] = $autoconfig->getValue('UserCredential');
$debugDir = $autoconfig->getValue('debugDir');

2
modules/aggregator/www/index.php
View File

@ -9,7 +9,7 @@ $metadataSets = array(
);
$globalConfig = SimpleSAML_Configuration::getInstance();
$aggregatorConfig = $globalConfig->copyFromBase('aggregator', 'aggregator.php');
$aggregatorConfig = SimpleSAML_Configuration::getConfig('aggregator.php');
$aggregators = $aggregatorConfig->getArray('aggragators');

2
modules/casserver/www/login.php
View File

@ -31,7 +31,7 @@ if (array_key_exists('gateway', $_GET)) {
/* Load simpleSAMLphp, configuration and metadata */
$config = SimpleSAML_Configuration::getInstance();
$casconfig = $config->copyFromBase('casconfig', 'module_casserver.php');
$casconfig = SimpleSAML_Configuration::getConfig('module_casserver.php');
$session = SimpleSAML_Session::getInstance();

3
modules/casserver/www/serviceValidate.php
View File

@ -29,8 +29,7 @@ if (array_key_exists('renew', $_GET)) {
try {
/* Load simpleSAMLphp, configuration and metadata */
$config = SimpleSAML_Configuration::getInstance();
$casconfig = $config->copyFromBase('casconfig', 'module_casserver.php');
$casconfig = SimpleSAML_Configuration::getConfig('module_casserver.php');
$path = $casconfig->resolvePath($casconfig->getValue('ticketcache', 'ticketcache'));

3
modules/casserver/www/validate.php
View File

@ -29,8 +29,7 @@ if (array_key_exists('renew', $_GET)) {
try {
/* Load simpleSAMLphp, configuration and metadata */
$config = SimpleSAML_Configuration::getInstance();
$casconfig = $config->copyFromBase('casconfig', 'module_casserver.php');
$casconfig = SimpleSAML_Configuration::getConfig('module_casserver.php');
$path = $casconfig->resolvePath($casconfig->getValue('ticketcache', 'ticketcache'));

4
modules/certcheck/www/index.php
View File

@ -24,8 +24,8 @@ function phpping($host, $port) {
}
$ldapconfig = $config->copyFromBase('loginfeide', 'config-login-feide.php');
$ldapStatusConfig = $config->copyFromBase('ldapstatus', 'module_ldapstatus.php');
$ldapconfig = SimpleSAML_Configuration::getConfig('config-login-feide.php');
$ldapStatusConfig = SimpleSAML_Configuration::getConfig('module_ldapstatus.php');
$pingcommand = $ldapStatusConfig->getValue('ping');

3
modules/consentSimpleAdmin/hooks/hook_sanitycheck.php
View File

@ -9,8 +9,7 @@ function consentSimpleAdmin_hook_sanitycheck(&$hookinfo) {
assert('array_key_exists("info", $hookinfo)');
try {
$config = SimpleSAML_Configuration::getInstance();
$consentconfig = $config->copyFromBase('consentSimpleAdminConfig', 'module_consentSimpleAdmin.php');
$consentconfig = SimpleSAML_Configuration::getConfig('module_consentSimpleAdmin.php');
// Parse consent config
$consent_storage = sspmod_consent_Store::parseStoreConfig($consentconfig->getValue('store'));

2
modules/consentSimpleAdmin/www/consentAdmin.php
View File

@ -14,7 +14,7 @@
// Get config object
$config = SimpleSAML_Configuration::getInstance();
$consentconfig = $config->copyFromBase('consentSimpleAdminConfig', 'module_consentSimpleAdmin.php');
$consentconfig = SimpleSAML_Configuration::getConfig('module_consentSimpleAdmin.php');
// Get session object
$session = SimpleSAML_Session::getInstance();

2
modules/consentSimpleAdmin/www/consentStats.php
View File

@ -12,7 +12,7 @@
// Get config object
$config = SimpleSAML_Configuration::getInstance();
$consentconfig = $config->copyFromBase('consentSimpleAdminConfig', 'module_consentSimpleAdmin.php');
$consentconfig = SimpleSAML_Configuration::getConfig('module_consentSimpleAdmin.php');
// Parse consent config

3
modules/cron/hooks/hook_cron.php
View File

@ -9,8 +9,7 @@ function cron_hook_cron(&$croninfo) {
assert('array_key_exists("summary", $croninfo)');
assert('array_key_exists("tag", $croninfo)');
$config = SimpleSAML_Configuration::getInstance();
$cronconfig = $config->copyFromBase('cron', 'module_cron.php');
$cronconfig = SimpleSAML_Configuration::getConfig('module_cron.php');
if ($cronconfig->getValue('debug_message', TRUE)) {

2
modules/cron/www/cron.php
View File

@ -1,7 +1,7 @@
<?php
$config = SimpleSAML_Configuration::getInstance();
$cronconfig = $config->copyFromBase('cron', 'module_cron.php');
$cronconfig = SimpleSAML_Configuration::getConfig('module_cron.php');
if (!is_null($cronconfig->getValue('key'))) {
if ($_REQUEST['key'] !== $cronconfig->getValue('key')) {

2
modules/cron/www/croninfo.php
View File

@ -17,7 +17,7 @@ if (!isset($session) || !$session->isValid('login-admin') ) {
);
}
$cronconfig = $config->copyFromBase('cron', 'module_cron.php');
$cronconfig = SimpleSAML_Configuration::getConfig('module_cron.php');
$key = $cronconfig->getValue('key', '');
$tags = $cronconfig->getValue('allowed_tags');

2
modules/discopower/lib/PowerIdPDisco.php
View File

@ -27,7 +27,7 @@ class sspmod_discopower_PowerIdPDisco extends SimpleSAML_XHTML_IdPDisco {
parent::__construct($discoType);
$this->discoconfig = $this->config->copyFromBase('discopower', 'module_discopower.php');
$this->discoconfig = SimpleSAML_Configuration::getConfig('module_discopower.php');
}

4
modules/ldapstatus/www/index.php
View File

@ -81,8 +81,8 @@ function myErrorHandler($errno, $errstr, $errfile, $errline) {
$ldapconfig = $config->copyFromBase('loginfeide', 'config-login-feide.php');
$ldapStatusConfig = $config->copyFromBase('ldapstatus', 'module_ldapstatus.php');
$ldapconfig = SimpleSAML_Configuration::getConfig('config-login-feide.php');
$ldapStatusConfig = SimpleSAML_Configuration::getConfig('module_ldapstatus.php');
$debug = $ldapconfig->getValue('ldapDebug', FALSE);
$orgs = $ldapconfig->getValue('orgldapconfig');

2
modules/logpeek/www/index.php
View File

@ -11,7 +11,7 @@ if (!$session->isValid('login-admin') ) {
}
$logpeekconfig = $config->copyFromBase('logpeek', 'module_logpeek.php');
$logpeekconfig = SimpleSAML_Configuration::getConfig('module_logpeek.php');
$logfile = $logpeekconfig->getValue('logfile', '/var/simplesamlphp.log');

2
modules/metarefresh/bin/metarefresh.php
View File

@ -14,7 +14,7 @@ $baseDir = dirname(dirname(dirname(dirname(__FILE__))));
require_once($baseDir . '/lib/_autoload.php');
/* Initialize the configuration. */
SimpleSAML_Configuration::init($baseDir . '/config');
SimpleSAML_Configuration::setConfigDir($baseDir . '/config');
/* $outputDir contains the directory we will store the generated metadata in. */
$outputDir = $baseDir . '/metadata-generated';

2
modules/metarefresh/hooks/hook_cron.php
View File

@ -13,7 +13,7 @@ function metarefresh_hook_cron(&$croninfo) {
try {
$config = SimpleSAML_Configuration::getInstance();
$mconfig = $config->copyFromBase('mconfig', 'config-metarefresh.php');
$mconfig = SimpleSAML_Configuration::getConfig('config-metarefresh.php');
$sets = $mconfig->getValue('sets');
if (count($sets) < 1) return;

3
modules/sanitycheck/hooks/hook_cron.php
View File

@ -13,8 +13,7 @@ function sanitycheck_hook_cron(&$croninfo) {
try {
$config = SimpleSAML_Configuration::getInstance();
$sconfig = $config->copyFromBase('sconfig', 'config-sanitycheck.php');
$sconfig = SimpleSAML_Configuration::getConfig('config-sanitycheck.php');
if (is_null($sconfig->getValue('cron_tag', NULL))) return;
if ($sconfig->getValue('cron_tag', NULL) !== $croninfo['tag']) return;

2
modules/sanitycheck/www/index.php
View File

@ -2,7 +2,7 @@
$config = SimpleSAML_Configuration::getInstance();
$sconfig = $config->copyFromBase('sconfig', 'config-sanitycheck.php');
$sconfig = SimpleSAML_Configuration::getConfig('config-sanitycheck.php');
$info = array();
$errors = array();

2
modules/statistics/bin/loganalyzer.php
View File

@ -9,7 +9,7 @@ $baseDir = dirname(dirname(dirname(dirname(__FILE__))));
require_once($baseDir . '/lib/_autoload.php');
/* Initialize the configuration. */
SimpleSAML_Configuration::init($baseDir . '/config');
SimpleSAML_Configuration::setConfigDir($baseDir . '/config');

3
modules/statistics/hooks/hook_cron.php
View File

@ -9,8 +9,7 @@ function statistics_hook_cron(&$croninfo) {
assert('array_key_exists("summary", $croninfo)');
assert('array_key_exists("tag", $croninfo)');
$config = SimpleSAML_Configuration::getInstance();
$statconfig = $config->copyFromBase('statconfig', 'module_statistics.php');
$statconfig = SimpleSAML_Configuration::getConfig('module_statistics.php');
if (is_null($statconfig->getValue('cron_tag', NULL))) return;
if ($statconfig->getValue('cron_tag', NULL) !== $croninfo['tag']) return;

3
modules/statistics/hooks/hook_sanitycheck.php
View File

@ -10,8 +10,7 @@ function statistics_hook_sanitycheck(&$hookinfo) {
assert('array_key_exists("info", $hookinfo)');
try {
$config = SimpleSAML_Configuration::getInstance();
$statconfig = $config->copyFromBase('statconfig', 'module_statistics.php');
$statconfig = SimpleSAML_Configuration::getConfig('module_statistics.php');
} catch(Exception $e) {
$hookinfo['errors'][] = '[statistics] Could not get configuration: ' . $e->getMessage(); return;
}

4
modules/statistics/lib/Aggregator.php
View File

@ -6,7 +6,6 @@
*/
class sspmod_statistics_Aggregator {
private $config;
private $statconfig;
private $statdir;
private $inputfile;
@ -18,8 +17,7 @@ class sspmod_statistics_Aggregator {
*/
public function __construct() {
$this->config = SimpleSAML_Configuration::getInstance();
$this->statconfig = $this->config->copyFromBase('statconfig', 'module_statistics.php');
$this->statconfig = SimpleSAML_Configuration::getConfig('module_statistics.php');
$this->statdir = $this->statconfig->getValue('statdir');
$this->inputfile = $this->statconfig->getValue('inputfile');

2
modules/statistics/www/showstats.php
View File

@ -1,7 +1,7 @@
<?php
$config = SimpleSAML_Configuration::getInstance();
$statconfig = $config->copyFromBase('statconfig', 'module_statistics.php');
$statconfig = SimpleSAML_Configuration::getConfig('module_statistics.php');
$statdir = $statconfig->getValue('statdir');
$inputfile = $statconfig->getValue('inputfile');

3
www/_include.php
View File

@ -62,8 +62,7 @@ if (!file_exists($configdir . '/config.php')) {
exit(1);
}
SimpleSAML_Configuration::init($configdir);
SimpleSAML_Configuration::setConfigDir($configdir, 'simplesaml');
SimpleSAML_Configuration::setConfigDir($configdir);

2
www/auth/login-auto.php
View File

@ -21,7 +21,7 @@ require_once('../../www/_include.php');
/* Load the configuration. */
$config = SimpleSAML_Configuration::getInstance();
$autoconfig = $config->copyFromBase('loginauto', 'config-login-auto.php');
$autoconfig = SimpleSAML_Configuration::getConfig('config-login-auto.php');
$enable = (bool)$autoconfig->getValue('auth.auto.enable');

2
www/auth/login-feide.php
View File

@ -21,7 +21,7 @@
require_once('../../www/_include.php');
$config = SimpleSAML_Configuration::getInstance();
$ldapconfig = $config->copyFromBase('loginfeide', 'config-login-feide.php');
$ldapconfig = SimpleSAML_Configuration::getConfig('config-login-feide.php');
$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
$session = SimpleSAML_Session::getInstance();

3
www/auth/login-tlsclient.php
View File

@ -9,8 +9,7 @@ $session = SimpleSAML_Session::getInstance();
SimpleSAML_Logger::info('AUTH - ldap: Accessing auth endpoint login');
SimpleSAML_Configuration::init($configdir, 'ldapconfig', 'ldap.php');
$ldapconfig = SimpleSAML_Configuration::getInstance('ldapconfig');
$ldapconfig = SimpleSAML_Configuration::getConfig('ldap.php');
$error = null;

3
www/auth/login.php
View File

@ -9,8 +9,7 @@ $session = SimpleSAML_Session::getInstance();
SimpleSAML_Logger::info('AUTH - ldap: Accessing auth endpoint login');
SimpleSAML_Configuration::init($configdir, 'ldapconfig', 'ldap.php');
$ldapconfig = SimpleSAML_Configuration::getInstance('ldapconfig');
$ldapconfig = SimpleSAML_Configuration::getConfig('ldap.php');
$error = null;

2
www/metashare/add.php
View File

@ -7,7 +7,7 @@ require_once('../_include.php');
*/
$config = SimpleSAML_Configuration::getInstance();
$metaConfig = $config->copyFromBase('metashare', 'metashare.php');
$metaConfig = SimpleSAML_Configuration::getConfig('metashare.php');
if(!$metaConfig->getBoolean('metashare.enable', FALSE)) {
header('HTTP/1.0 401 Forbidden');

2
www/metashare/download.php
View File

@ -6,7 +6,7 @@ require_once('../_include.php');
* This page handles downloading of single metadata entries from the MetaShare.
*/
$metaConfig = SimpleSAML_Configuration::getInstance()->copyFromBase('metashare', 'metashare.php');
$metaConfig = SimpleSAML_Configuration::getConfig('metashare.php');
if(!$metaConfig->getBoolean('metashare.enable', FALSE)) {
header('HTTP/1.0 401 Forbidden');

2
www/metashare/downloadall.php
View File

@ -6,7 +6,7 @@ require_once('../_include.php');
* This page handles downloading of all metadata entries from the MetaShare.
*/
$metaConfig = SimpleSAML_Configuration::getInstance()->copyFromBase('metashare', 'metashare.php');
$metaConfig = SimpleSAML_Configuration::getConfig('metashare.php');
if(!$metaConfig->getBoolean('metashare.enable', FALSE)) {
header('HTTP/1.0 401 Forbidden');

2
www/metashare/index.php
View File

@ -7,7 +7,7 @@ require_once('../_include.php');
*/
$config = SimpleSAML_Configuration::getInstance();
$metaConfig = $config->copyFromBase('metashare', 'metashare.php');
$metaConfig = SimpleSAML_Configuration::getConfig('metashare.php');
if(!$metaConfig->getBoolean('metashare.enable', FALSE)) {
header('HTTP/1.0 401 Forbidden');