projects
/
authserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
actually use the on-disk site-specific nonce to 'pepper' passwords before hashing...
[authserver.git]
/
authsystem.inc.php
diff --git
a/authsystem.inc.php
b/authsystem.inc.php
index a30e2abfbb23050137e307e64c698ee61b8fac7b..322e17faf74d615bed3c27f5d495b49fa6c58b9c 100644
(file)
--- a/
authsystem.inc.php
+++ b/
authsystem.inc.php
@@
-9,6
+9,8
@@
ini_set('display_errors', 1); error_reporting(E_ALL);
// Read DB settings
$dbdata = json_decode(file_get_contents('/etc/kairo/auth_db.json'), true);
if (!is_array($dbdata)) { trigger_error('DB configuration not found', E_USER_ERROR); }
// Read DB settings
$dbdata = json_decode(file_get_contents('/etc/kairo/auth_db.json'), true);
if (!is_array($dbdata)) { trigger_error('DB configuration not found', E_USER_ERROR); }
+$settings = json_decode(file_get_contents('/etc/kairo/auth_settings.json'), true);
+if (!is_array($settings)) { trigger_error('Auth settings not found', E_USER_ERROR); }
// Extended DOM document class
require_once('../kairo/include/cbsm/util/document.php-class');
// Extended DOM document class
require_once('../kairo/include/cbsm/util/document.php-class');
@@
-16,7
+18,7
@@
require_once('../kairo/include/cbsm/util/document.php-class');
require_once('../kairo/include/classes/email.php-class');
// Class for sending emails
require_once(__DIR__.'/authutils.php-class');
require_once('../kairo/include/classes/email.php-class');
// Class for sending emails
require_once(__DIR__.'/authutils.php-class');
-$utils = new AuthUtils(
array()
);
+$utils = new AuthUtils(
$settings
);
bindtextdomain('kairo_auth', 'en'); // XXX: Should negotiate locale.
bind_textdomain_codeset('kairo_auth', 'utf-8');
bindtextdomain('kairo_auth', 'en'); // XXX: Should negotiate locale.
bind_textdomain_codeset('kairo_auth', 'utf-8');