diff --git a/html/includes/PasswordHash.php b/html/includes/PasswordHash.php
new file mode 100644
index 000000000..757d47d55
--- /dev/null
+++ b/html/includes/PasswordHash.php
@@ -0,0 +1,260 @@
+ in 2004-2006 and placed in
+# the public domain. Revised in subsequent years, still public domain.
+#
+# There's absolutely no warranty.
+#
+# The homepage URL for this framework is:
+#
+# http://www.openwall.com/phpass/
+#
+# Please be sure to update the Version line if you edit this file in any way.
+# It is suggested that you leave the main version number intact, but indicate
+# your project name (after the slash) and add your own revision information.
+#
+# Please do not change the "private" password hashing method implemented in
+# here, thereby making your hashes incompatible. However, if you must, please
+# change the hash type identifier (the "$P$") to something different.
+#
+# Obviously, since this code is in the public domain, the above are not
+# requirements (there can be none), but merely suggestions.
+#
+class PasswordHash {
+ var $itoa64;
+ var $iteration_count_log2;
+ var $portable_hashes;
+ var $random_state;
+
+ function PasswordHash($iteration_count_log2, $portable_hashes)
+ {
+ $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+
+ if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)
+ $iteration_count_log2 = 8;
+ $this->iteration_count_log2 = $iteration_count_log2;
+
+ $this->portable_hashes = $portable_hashes;
+
+ $this->random_state = microtime();
+ if (function_exists('getmypid'))
+ $this->random_state .= getmypid();
+ }
+
+ function get_random_bytes($count)
+ {
+ $output = '';
+
+ $output = openssl_random_pseudo_bytes($count,$strong);
+
+ if(empty($output))
+ {
+ if (is_readable('/dev/urandom') &&
+ ($fh = @fopen('/dev/urandom', 'rb')))
+ {
+ $output = fread($fh, $count);
+ fclose($fh);
+ }
+ }
+
+ if (strlen($output) < $count) {
+ $output = '';
+ for ($i = 0; $i < $count; $i += 16) {
+ $this->random_state =
+ md5(microtime() . $this->random_state);
+ $output .=
+ pack('H*', md5($this->random_state));
+ }
+ $output = substr($output, 0, $count);
+ }
+
+ return $output;
+ }
+
+ function encode64($input, $count)
+ {
+ $output = '';
+ $i = 0;
+ do {
+ $value = ord($input[$i++]);
+ $output .= $this->itoa64[$value & 0x3f];
+ if ($i < $count)
+ $value |= ord($input[$i]) << 8;
+ $output .= $this->itoa64[($value >> 6) & 0x3f];
+ if ($i++ >= $count)
+ break;
+ if ($i < $count)
+ $value |= ord($input[$i]) << 16;
+ $output .= $this->itoa64[($value >> 12) & 0x3f];
+ if ($i++ >= $count)
+ break;
+ $output .= $this->itoa64[($value >> 18) & 0x3f];
+ } while ($i < $count);
+
+ return $output;
+ }
+
+ function gensalt_private($input)
+ {
+ $output = '$P$';
+ $output .= $this->itoa64[min($this->iteration_count_log2 +
+ ((PHP_VERSION >= '5') ? 5 : 3), 30)];
+ $output .= $this->encode64($input, 6);
+
+ return $output;
+ }
+
+ function crypt_private($password, $setting)
+ {
+ $output = '*0';
+ if (substr($setting, 0, 2) == $output)
+ $output = '*1';
+
+ $id = substr($setting, 0, 3);
+ # We use "$P$", phpBB3 uses "$H$" for the same thing
+ if ($id != '$P$' && $id != '$H$')
+ return $output;
+
+ $count_log2 = strpos($this->itoa64, $setting[3]);
+ if ($count_log2 < 7 || $count_log2 > 30)
+ return $output;
+
+ $count = 1 << $count_log2;
+
+ $salt = substr($setting, 4, 8);
+ if (strlen($salt) != 8)
+ return $output;
+
+ # We're kind of forced to use MD5 here since it's the only
+ # cryptographic primitive available in all versions of PHP
+ # currently in use. To implement our own low-level crypto
+ # in PHP would result in much worse performance and
+ # consequently in lower iteration counts and hashes that are
+ # quicker to crack (by non-PHP code).
+ if (PHP_VERSION >= '5') {
+ $hash = md5($salt . $password, TRUE);
+ do {
+ $hash = md5($hash . $password, TRUE);
+ } while (--$count);
+ } else {
+ $hash = pack('H*', md5($salt . $password));
+ do {
+ $hash = pack('H*', md5($hash . $password));
+ } while (--$count);
+ }
+
+ $output = substr($setting, 0, 12);
+ $output .= $this->encode64($hash, 16);
+
+ return $output;
+ }
+
+ function gensalt_extended($input)
+ {
+ $count_log2 = min($this->iteration_count_log2 + 8, 24);
+ # This should be odd to not reveal weak DES keys, and the
+ # maximum valid value is (2**24 - 1) which is odd anyway.
+ $count = (1 << $count_log2) - 1;
+
+ $output = '_';
+ $output .= $this->itoa64[$count & 0x3f];
+ $output .= $this->itoa64[($count >> 6) & 0x3f];
+ $output .= $this->itoa64[($count >> 12) & 0x3f];
+ $output .= $this->itoa64[($count >> 18) & 0x3f];
+
+ $output .= $this->encode64($input, 3);
+
+ return $output;
+ }
+
+ function gensalt_blowfish($input)
+ {
+ # This one needs to use a different order of characters and a
+ # different encoding scheme from the one in encode64() above.
+ # We care because the last character in our encoded string will
+ # only represent 2 bits. While two known implementations of
+ # bcrypt will happily accept and correct a salt string which
+ # has the 4 unused bits set to non-zero, we do not want to take
+ # chances and we also do not want to waste an additional byte
+ # of entropy.
+ $itoa64 = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+
+ $output = '$2a$';
+ $output .= chr(ord('0') + $this->iteration_count_log2 / 10);
+ $output .= chr(ord('0') + $this->iteration_count_log2 % 10);
+ $output .= '$';
+
+ $i = 0;
+ do {
+ $c1 = ord($input[$i++]);
+ $output .= $itoa64[$c1 >> 2];
+ $c1 = ($c1 & 0x03) << 4;
+ if ($i >= 16) {
+ $output .= $itoa64[$c1];
+ break;
+ }
+
+ $c2 = ord($input[$i++]);
+ $c1 |= $c2 >> 4;
+ $output .= $itoa64[$c1];
+ $c1 = ($c2 & 0x0f) << 2;
+
+ $c2 = ord($input[$i++]);
+ $c1 |= $c2 >> 6;
+ $output .= $itoa64[$c1];
+ $output .= $itoa64[$c2 & 0x3f];
+ } while (1);
+
+ return $output;
+ }
+
+ function HashPassword($password)
+ {
+ $random = '';
+
+ if (CRYPT_BLOWFISH == 1 && !$this->portable_hashes) {
+ $random = $this->get_random_bytes(16);
+ $hash =
+ crypt($password, $this->gensalt_blowfish($random));
+ if (strlen($hash) == 60)
+ return $hash;
+ }
+
+ if (CRYPT_EXT_DES == 1 && !$this->portable_hashes) {
+ if (strlen($random) < 3)
+ $random = $this->get_random_bytes(3);
+ $hash =
+ crypt($password, $this->gensalt_extended($random));
+ if (strlen($hash) == 20)
+ return $hash;
+ }
+
+ if (strlen($random) < 6)
+ $random = $this->get_random_bytes(6);
+ $hash =
+ $this->crypt_private($password,
+ $this->gensalt_private($random));
+ if (strlen($hash) == 34)
+ return $hash;
+
+ # Returning '*' on error is safe here, but would _not_ be safe
+ # in a crypt(3)-like function used _both_ for generating new
+ # hashes and for validating passwords against existing hashes.
+ return '*';
+ }
+
+ function CheckPassword($password, $stored_hash)
+ {
+ $hash = $this->crypt_private($password, $stored_hash);
+ if ($hash[0] == '*')
+ $hash = crypt($password, $stored_hash);
+
+ return $hash == $stored_hash;
+ }
+}
+
+?>
diff --git a/html/includes/authenticate.inc.php b/html/includes/authenticate.inc.php
index 543e6416b..e8e15900b 100644
--- a/html/includes/authenticate.inc.php
+++ b/html/includes/authenticate.inc.php
@@ -1,6 +1,9 @@
Temp Directory is not writable ({$config['tmp_dir']}). Graphing may fail.");
}
+// Clear up any old sessions
+dbDelete('session', "`session_expiry` < ?", array(time()));
+
if ($vars['page'] == "logout" && $_SESSION['authenticated'])
{
dbInsert(array('user' => $_SESSION['username'], 'address' => $_SERVER["REMOTE_ADDR"], 'result' => 'Logged Out'), 'authlog');
+ dbDelete('session', "`session_username` = ? AND session_value = ?", array($_SESSION['username'],$_COOKIE['sess_id']));
unset($_SESSION);
+ unset($_COOKIE);
+ setcookie ("sess_id", "", time() - 60*60*24*$config['auth_remember'], "/");
+ setcookie ("token", "", time() - 60*60*24*$config['auth_remember'], "/");
+ setcookie ("auth", "", time() - 60*60*24*$config['auth_remember'], "/");
session_destroy();
- setcookie ("username", "", time() - 60*60*24*100, "/");
- setcookie ("password", "", time() - 60*60*24*100, "/");
$auth_message = "Logged Out";
header('Location: /');
exit;
}
-if (isset($_GET['username']) && isset($_GET['password']))
-{
- $_SESSION['username'] = mres($_GET['username']);
- $_SESSION['password'] = $_GET['password'];
-} elseif (isset($_POST['username']) && isset($_POST['password'])) {
+// We are only interested in login details passed via POST.
+if (isset($_POST['username']) && isset($_POST['password'])) {
$_SESSION['username'] = mres($_POST['username']);
$_SESSION['password'] = $_POST['password'];
-} elseif (isset($_COOKIE['username']) && isset($_COOKIE['password'])) {
- $_SESSION['username'] = mres($_COOKIE['username']);
- $_SESSION['password'] = $_COOKIE['password'];
}
if (!isset($config['auth_mechanism']))
@@ -61,10 +64,12 @@ else
$auth_success = 0;
-if (isset($_SESSION['username']))
+if ((isset($_SESSION['username'])) || (isset($_COOKIE['sess_id'],$_COOKIE['token'])))
{
- if (authenticate($_SESSION['username'],$_SESSION['password']))
+ if ((authenticate($_SESSION['username'],$_SESSION['password'])) || (reauthenticate($_COOKIE['sess_id'],$_COOKIE['token'])))
{
+ // Regenerate session id for additional security.
+ session_regenerate_id();
$_SESSION['userlevel'] = get_userlevel($_SESSION['username']);
$_SESSION['user_id'] = get_userid($_SESSION['username']);
if (!$_SESSION['authenticated'])
@@ -75,8 +80,26 @@ if (isset($_SESSION['username']))
}
if (isset($_POST['remember']))
{
- setcookie("username", $_SESSION['username'], time()+60*60*24*100, "/");
- setcookie("password", $_SESSION['password'], time()+60*60*24*100, "/");
+ $sess_id = session_id();
+ $hasher = new PasswordHash(8, FALSE);
+ $token = strgen();
+ $auth = strgen();
+ $hasher = new PasswordHash(8, FALSE);
+ $token_id = $_SESSION['username'].'|'.$hasher->HashPassword($_SESSION['username'].$token);
+ // If we have been asked to remember the user then set the relevant cookies and create a session in the DB.
+ setcookie("sess_id", $sess_id, time()+60*60*24*$config['auth_remember'], "/", null, null, true);
+ setcookie("token", $token_id, time()+60*60*24*$config['auth_remember'], "/", null, null, true);
+ setcookie("auth", $auth, time()+60*60*24*$config['auth_remember'], "/", null, null, true);
+ dbInsert(array('session_username' => $_SESSION['username'], 'session_value' => $sess_id, 'session_token' => $token, 'session_auth' => $auth, 'session_expiry' => time()+60*60*24*$config['auth_remember']), 'session');
+ }
+ if (isset($_COOKIE['sess_id'],$_COOKIE['token'],$_COOKIE['auth']))
+ {
+ // If we have the remember me cookies set then update session expiry times to keep us logged in.
+ $sess_id = session_id();
+ dbUpdate(array('session_value' => $sess_id, 'session_expiry' => time()+60*60*24*$config['auth_remember']), 'session', 'session_auth=?', array($_COOKIE['auth']));
+ setcookie("sess_id", $sess_id, time()+60*60*24*$config['auth_remember'], "/", null, null, true);
+ setcookie("token", $_COOKIE['token'], time()+60*60*24*$config['auth_remember'], "/", null, null, true);
+ setcookie("auth", $_COOKIE['auth'], time()+60*60*24*$config['auth_remember'], "/", null, null, true);
}
$permissions = permissions_cache($_SESSION['user_id']);
}
diff --git a/html/includes/authentication/http-auth.inc.php b/html/includes/authentication/http-auth.inc.php
index e34a0dde2..9b0f51107 100644
--- a/html/includes/authentication/http-auth.inc.php
+++ b/html/includes/authentication/http-auth.inc.php
@@ -27,6 +27,11 @@ function authenticate($username,$password)
return 0;
}
+function reauthenticate($sess_id = "",$token = "")
+{
+ return 0;
+}
+
function passwordscanchange($username = "")
{
return 0;
diff --git a/html/includes/authentication/ldap.inc.php b/html/includes/authentication/ldap.inc.php
index 1d4e7cc20..d640097d7 100644
--- a/html/includes/authentication/ldap.inc.php
+++ b/html/includes/authentication/ldap.inc.php
@@ -49,6 +49,11 @@ function authenticate($username,$password)
return 0;
}
+function reauthenticate($sess_id,$token)
+{
+ return 0;
+}
+
function passwordscanchange($username = "")
{
return 0;
diff --git a/html/includes/authentication/mysql.inc.php b/html/includes/authentication/mysql.inc.php
index 14df72852..67b2c5990 100644
--- a/html/includes/authentication/mysql.inc.php
+++ b/html/includes/authentication/mysql.inc.php
@@ -9,14 +9,26 @@ function authenticate($username,$password)
// Migrate from old, unhashed password
if ($row['password'] == $encrypted_old)
{
- $row = dbFetchRow("DESCRIBE users password");
- if ($row['Type'] == 'varchar(34)')
+ $row_type = dbFetchRow("DESCRIBE users password");
+ if ($row_type['Type'] == 'varchar(34)')
{
changepassword($username,$password);
}
return 1;
}
- if ($row['password'] == crypt($password,$row['password']))
+ elseif(substr($row['password'],0,3) == '$1$')
+ {
+ $row_type = dbFetchRow("DESCRIBE users password");
+ if ($row_type['Type'] == 'varchar(60)')
+ {
+ if ($row['password'] == crypt($password,$row['password']))
+ {
+ changepassword($username,$password);
+ }
+ }
+ }
+ $hasher = new PasswordHash(8, FALSE);
+ if($hasher->CheckPassword($password, $row['password']))
{
return 1;
}
@@ -24,6 +36,22 @@ function authenticate($username,$password)
return 0;
}
+function reauthenticate($sess_id,$token)
+{
+ list($uname,$hash) = explode("|",$token);
+ $session = dbFetchRow("SELECT * FROM `session` WHERE `session_username` = '$uname' AND session_value='$sess_id'");
+ $hasher = new PasswordHash(8, FALSE);
+ if($hasher->CheckPassword($uname.$session['session_token'],$hash))
+ {
+ $_SESSION['username'] = $uname;
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+}
+
function passwordscanchange($username = "")
{
/*
@@ -62,7 +90,8 @@ function generateSalt($max = 15)
function changepassword($username,$password)
{
- $encrypted = crypt($password,'$1$' . generateSalt(8).'$');
+ $hasher = new PasswordHash(8, FALSE);
+ $encrypted = $hasher->HashPassword($password);
return dbUpdate(array('password' => $encrypted), 'users', '`username` = ?', array($username));
}
@@ -75,7 +104,8 @@ function adduser($username, $password, $level, $email = "", $realname = "", $can
{
if (!user_exists($username))
{
- $encrypted = crypt($password,'$1$' . generateSalt(8).'$');
+ $hasher = new PasswordHash(8, FALSE);
+ $encrypted = $hasher->HashPassword($password);
return dbInsert(array('username' => $username, 'password' => $encrypted, 'level' => $level, 'email' => $email, 'realname' => $realname, 'can_modify_passwd' => $can_modify_passwd), 'users');
} else {
return FALSE;
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index d1333e572..1f095dd10 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -388,6 +388,7 @@ $config['irc_chan'][] = "##" . $config['project_id'];
$config['allow_unauth_graphs'] = 0; # Allow graphs to be viewed by anyone
$config['allow_unauth_graphs_cidr'] = array(); # Allow graphs to be viewed without authorisation from certain IP ranges
$config['auth_mechanism'] = "mysql"; # Available mechanisms: mysql (default), ldap, http-auth
+$config['auth_remember'] = '30'; # This is how long in days to remember users who select remember me
// LDAP Authentication
diff --git a/sql-schema/028.sql b/sql-schema/028.sql
new file mode 100644
index 000000000..d076e410b
--- /dev/null
+++ b/sql-schema/028.sql
@@ -0,0 +1 @@
+ALTER TABLE `users` CHANGE `password` `password` VARCHAR( 60 );
diff --git a/sql-schema/029.sql b/sql-schema/029.sql
new file mode 100644
index 000000000..d6e8a5714
--- /dev/null
+++ b/sql-schema/029.sql
@@ -0,0 +1,2 @@
+CREATE TABLE IF NOT EXISTS `session` ( `session_id` int(11) NOT NULL AUTO_INCREMENT, `session_username` varchar(30) NOT NULL, `session_value` varchar(60) NOT NULL, `session_token` varchar(60) NOT NULL, `session_auth` varchar(16) NOT NULL, `session_expiry` int(11) NOT NULL, PRIMARY KEY (`session_id`)) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+