4775: add salt to the cookie password value. Use the last-login value so then cookie...

diff --git a/docs/login.php b/docs/login.php
index 937926d..8f637a8 100644 (file)
--- a/docs/login.php
+++ b/docs/login.php
@@ -109,7 +109,12 @@ if (isset($this_login, $this_password)) {
        } 
        
        if ($used_cookie) {
-               $sql = "SELECT member_id, login, first_name, second_name, last_name, preferences,password AS pass, language, status, last_login FROM ".TABLE_PREFIX."members WHERE login='$this_login' AND password='$this_password'";
+           #4775: password now store with salt
+           $sql = "SELECT password, last_login FROM " . TABLE_PREFIX . "members WHERE login='$this_login'";
+           $result = mysql_query($sql, $db);
+           $cookieRow = mysql_fetch_assoc($result);
+           $saltedPassword = hash('sha512', $cookieRow['password'] . hash('sha512', $cookieRow['last_login']));
+               $sql = "SELECT member_id, login, first_name, second_name, last_name, preferences,password AS pass, language, status, last_login FROM ".TABLE_PREFIX."members WHERE login='$this_login' AND '$saltedPassword'='$this_password'";
        } else {
                $sql = "SELECT member_id, login, first_name, second_name, last_name, preferences, language, status, password AS pass, last_login FROM ".TABLE_PREFIX."members WHERE (login='$this_login' OR email='$this_login') AND SHA1(CONCAT(password, '$_SESSION[token]'))='$this_password'";
        }
@@ -132,13 +137,16 @@ if (isset($this_login, $this_password)) {
                $_SESSION['is_guest']   = 0;
                $_SESSION['lang']               = $row['language'];
                $_SESSION['course_id']  = 0;
+               $now = date('Y-m-d H:i:s');
 
                if ($auto_login == 1) {
                        $parts = parse_url($_base_href);
                        // update the cookie.. increment to another 2 days
                        $cookie_expire = time()+172800;
+                       // #4775, also look at pref_tab_functions.inc.php setAutoLoginCookie(). Same technique.
+                       $saltedPassword = hash('sha512', $row['pass'] . hash('sha512', $now));
                        ATutor.setcookie('ATLogin', $this_login, $cookie_expire, $parts['path']);
-                       ATutor.setcookie('ATPass',  $row['pass'],  $cookie_expire, $parts['path']);
+                       ATutor.setcookie('ATPass',  $saltedPassword,  $cookie_expire, $parts['path']);
                }
                
                $_SESSION['first_login'] = false;
@@ -147,7 +155,7 @@ if (isset($this_login, $this_password)) {
                    $_SESSION['first_login'] = true;
                }
 
-               $sql = "UPDATE ".TABLE_PREFIX."members SET creation_date=creation_date, last_login=NOW() WHERE member_id=$_SESSION[member_id]";
+               $sql = "UPDATE ".TABLE_PREFIX."members SET creation_date=creation_date, last_login='$now' WHERE member_id=$_SESSION[member_id]";
                mysql_query($sql, $db);
 
                //clear login attempt on successful login

diff --git a/docs/mods/_core/users/lib/pref_tab_functions.inc.php b/docs/mods/_core/users/lib/pref_tab_functions.inc.php
index 1ba2061..5175d2e 100644 (file)
--- a/docs/mods/_core/users/lib/pref_tab_functions.inc.php
+++ b/docs/mods/_core/users/lib/pref_tab_functions.inc.php
@@ -221,7 +221,7 @@ global $db, $_config_defaults;;
  * @return string - either 'enable' if the cookies were set, or 'disable' otherwise.
  */
 function setAutoLoginCookie($toDo) {
-global $db;
+    global $db;
 
     //set default values for disabled auto login cookies
     $parts = parse_url(AT_BASE_HREF);
@@ -234,16 +234,18 @@ global $db;
        //if enable auto login, set actual cookie values
        if ($toDo == 'enable') {
                $time = time() + 172800;
-               $sql    = "SELECT password FROM ".TABLE_PREFIX."members WHERE member_id=$_SESSION[member_id]";
+               $sql    = "SELECT password, last_login FROM ".TABLE_PREFIX."members WHERE member_id=$_SESSION[member_id]";
                $result = mysql_query($sql, $db);
                $row    = mysql_fetch_assoc($result);
                $password = $row["password"];
+               $last_login = $row["last_login"];
                $login = $_SESSION['login'];    
        }
-       
-       //set cookies and boolean value indicating cookies have been set.ies
+       #4775: password now store with salt
+       $saltedPassword = hash('sha512', $password . hash('sha512', $last_login));
+       //set cookies and boolean value indicating cookies have been set.iesf
        $is_cookie_login_set = ATutor.setcookie('ATLogin', $login, $time, $path);
-       $is_cookie_pass_set = ATutor.setcookie('ATPass',  $password, $time, $path);
+       $is_cookie_pass_set = ATutor.setcookie('ATPass',  $saltedPassword, $time, $path);
        if ($is_cookie_login_set && $is_cookie_pass_set) $is_auto_login = $toDo;
        return $is_auto_login;
 }
@@ -262,4 +264,4 @@ function checkAutoLoginCookie() {
     return $is_auto_login;
 }
 
-?>
\ No newline at end of file
+?>