password handling refactoring and added conversion of passwords to unicode

diff --git a/admin/uploaduser.php b/admin/uploaduser.php
index 63714f773672d57fd10c595131da59df9d17eb25..a20becf4bfdd0cda31f12d5b453d1bce8b3ea4bc 100755 (executable)
--- a/admin/uploaduser.php
+++ b/admin/uploaduser.php
@@ -174,7 +174,7 @@
                     }
                     // password needs to be encrypted
                     else if ($name == "password" && !empty($value)) {
-                        $user->password = md5($value);
+                        $user->password = hash_internal_user_password($value);
                     }
                     else if ($name == "username") {
                         $user->username = addslashes(moodle_strtolower($value));

diff --git a/admin/user.php b/admin/user.php
index 6d969893d573fdf7bc18c9027d52367281ce0a55..749d2358e0b374824450f1b39370f3278b639568 100644 (file)
--- a/admin/user.php
+++ b/admin/user.php
@@ -25,7 +25,7 @@
         $user->firstname    = get_string("admin");
         $user->lastname     = get_string("user");
         $user->username     = "admin";
-        $user->password     = md5("admin");
+        $user->password     = hash_internal_user_password("admin");
         $user->email        = "root@localhost";
         $user->confirmed    = 1;
         $user->lang         = $CFG->lang;

diff --git a/auth/db/lib.php b/auth/db/lib.php
index 48a5ea9af629c631bf496cc508b9c3535b5d971b..7ca12c83cd106fa20a9c49c4175d168b2cd28edf 100644 (file)
--- a/auth/db/lib.php
+++ b/auth/db/lib.php
@@ -42,7 +42,7 @@ function auth_user_login ($username, $password) {
             // user exists exterally
             // check username/password internally
             if ($user = get_record('user', 'username', $username)) {
-                return ($user->password == md5($password));
+                return validate_internal_user_password($user, $password);
             }
         } else {
             // user does not exist externally

diff --git a/auth/email/lib.php b/auth/email/lib.php
index 6807f268d26e99bc53a5cd29f9d88bd458e0e4e8..d16b8e284eeaf408043428f60e34fd748712775c 100644 (file)
--- a/auth/email/lib.php
+++ b/auth/email/lib.php
@@ -7,11 +7,11 @@ function auth_user_login ($username, $password) {
 
     global $CFG;
 
-    if (! $user = get_record('user', 'username', $username)) {
-        return false;
+    if ($user = get_record('user', 'username', $username)) {
+        return validate_internal_user_password($user, $password);
     }
-    
-    return ($user->password == md5($password));
+
+    return false;
 }
 
 

diff --git a/auth/manual/lib.php b/auth/manual/lib.php
index 301d17f0428a722710b6fcfa3c94bee736a10b68..a398cb4e846fd9f0e1bacbe8826a6833f78ba8d5 100644 (file)
--- a/auth/manual/lib.php
+++ b/auth/manual/lib.php
@@ -6,7 +6,7 @@ function auth_user_login ($username, $password) {
 // Returns true if the username and password work
 
     if ($user = get_record('user', 'username', $username)) {
-        return ($user->password == md5($password));
+        return validate_internal_user_password($user, $password);
     }
 
     return false;

diff --git a/auth/none/lib.php b/auth/none/lib.php
index 483db5a9548261ec31a795c58dd6fc379fc8f424..f3734dce1817d008182ebda67e51b8c8128fc061 100644 (file)
--- a/auth/none/lib.php
+++ b/auth/none/lib.php
@@ -6,7 +6,7 @@ function auth_user_login ($username, $password) {
 // Returns true if the username and password work
 
     if ($user = get_record('user', 'username', $username)) {
-        return ($user->password == md5($password));
+        return validate_internal_user_password($user, $password);
     }
 
     return true;

diff --git a/lib/datalib.php b/lib/datalib.php
index d6b24bbb91f4e073d79cbaa34d28b1de4fd8ac6f..f265cb090500f4a4997967972aa8b5db3297cabc 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -1280,26 +1280,6 @@ function update_record($table, $dataobject) {
 
 /// USER DATABASE ////////////////////////////////////////////////
 
-/**
- * Does this username and password specify a valid admin user?
- *
- * @uses $CFG
- * @param string $username The name of the user to be tested for admin rights
- * @param string $md5password The password supplied by the user in md5 encrypted format.
- * @return bool
- */
-function adminlogin($username, $md5password) {
-
-    global $CFG;
-
-    return record_exists_sql("SELECT u.id
-                                FROM {$CFG->prefix}user u,
-                                     {$CFG->prefix}user_admins a
-                              WHERE u.id = a.userid
-                                AND u.username = '$username'
-                                AND u.password = '$md5password'");
-}
-
 /**
  * Get the guest user information from the database
  *

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index df5f02b746dc7b42c3578c5ebdf0e4a98a4ba740..487e81f45573d912b01936346ba20a408d10860f 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2409,11 +2409,7 @@ function create_user_record($username, $password, $auth='') {
 
     $newuser->auth = (empty($auth)) ? $CFG->auth : $auth;
     $newuser->username = $username;
-    if(empty($CFG->{$newuser->auth.'_preventpassindb'})){  //Prevent passwords in Moodle's DB
-        $newuser->password = md5($password);
-    } else {
-        $newuser->password = 'not cached';  //Unusable password
-    }
+    update_internal_user_password($newuser, $password, false);
     $newuser->lang = $CFG->lang;
     $newuser->confirmed = 1;
     $newuser->lastIP = getremoteaddr();
@@ -2529,8 +2525,6 @@ function authenticate_user_login($username, $password) {
 
     global $CFG;
 
-    $md5password = md5($password);
-
     // First try to find the user in the database
 
     if (!$user = get_complete_user_data('username', $username)) {
@@ -2573,14 +2567,7 @@ function authenticate_user_login($username, $password) {
             if (empty($user->auth)) {             // For some reason auth isn't set yet
                 set_field('user', 'auth', $auth, 'username', $username);
             }
-            if (empty($CFG->{$user->auth.'_preventpassindb'})){   //Calculate the password to update
-                $passfield = $md5password;
-            } else {
-                 $passfield = 'not cached';
-            }
-            if ($passfield <> $user->password) {   // Update local copy of password for reference
-                set_field('user', 'password',  $passfield, 'username', $username); //Update password
-            }
+            update_internal_user_password($user, $password);
             if (!is_internal_auth()) {            // update user record from external DB
                 $user = update_user_record($username);
             }
@@ -2627,6 +2614,78 @@ function authenticate_user_login($username, $password) {
     }
 }
 
+/**
+ * Compare password against hash stored in local user table.
+ * If necessary it also updates the stored hash to new format.
+ * 
+ * @param object user
+ * @param string plain text password
+ * @return bool is password valid?
+ */
+function validate_internal_user_password(&$user, $password) {
+    global $CFG;
+
+    $validated = false;
+
+    if (!empty($CFG->unicodedb)) {
+        $textlib = textlib_get_instance();
+        $convpassword = $textlib->convert($password, 'UTF-8', get_string('oldcharset'));
+    } else {
+        $convpassword = false;
+    }
+
+    if ($user->password == md5($password)) {
+        $validated = true;
+    } elseif ($convpassword !== false && $user->password == md5($convpassword)) {
+        $validated = true;
+    }
+
+    if ($validated) {
+        update_internal_user_password($user, $password);
+    }
+
+    return $validated;
+}
+
+/**
+ * Calculate hashed value from password using current hash mechanism.
+ * This mechanism might change in future, older methodes are handled in validate_internal_user_password()
+ * 
+ * @param string password
+ * @return string password hash
+ */
+function hash_internal_user_password($password) {
+    return md5($password);
+}
+
+/**
+ * Update pssword hash in user object.
+ * 
+ * @param object user
+ * @param string plain text password
+ * @param bool store changes also in db, default true
+ * @return true if hash changed
+ */
+function update_internal_user_password(&$user, $password, $storeindb=true) {
+    global $CFG;
+
+    if (!empty($CFG->{$user->auth.'_preventpassindb'})) {
+        $hashedpassword = 'not cached';
+    } else {
+        $hashedpassword = hash_internal_user_password($password);
+    }
+
+    if ($user->password != $hashedpassword) {
+        if ($storeindb) {
+            if (!set_field('user', 'password',  $hashedpassword, 'username', $user->username)) {
+                return false;
+            }
+        }
+        $user->password = $hashedpassword;
+    }
+    return true;
+}
+
 /**
  * Get a complete user record, which includes all the info
  * in the user record, as well as membership information

diff --git a/login/change_password.php b/login/change_password.php
index b241549b0753eca40d8e049bfcc8778adc3ca628..16008043007c92a658e75ed777133d4d0e7d820d 100644 (file)
--- a/login/change_password.php
+++ b/login/change_password.php
@@ -2,7 +2,7 @@
 
     require_once('../config.php');
 
-    $id = optional_param('id', SITEID);
+    $id = optional_param('id', SITEID, PARAM_INT);
 
     //HTTPS is potentially required in this page
     httpsrequired();
@@ -26,19 +26,14 @@
         update_login_count();
 
         if (!count((array)$err)) {
-            $username = $frm->username;
-            $password = md5($frm->newpassword1);
-
-            $user = get_complete_user_data('username', $username);
+            $user = get_complete_user_data('username', $frm->username);
 
             if (isguest($user->id)) {
                 error('Can\'t change guest password!');
             }
             
             if (is_internal_auth($user->auth)){
-                if (set_field('user', 'password', $password, 'username', $username)) {
-                    $user->password = $password;
-                } else {
+                if (!update_internal_user_password($user, $frm->newpassword1)) {
                     error('Could not set the new password');
                 }
             } else { // external users
@@ -49,7 +44,7 @@
                     if (function_exists('auth_user_update_password')){
                         // note that we pass cleartext password 
                         if (auth_user_update_password($user->username, $frm->newpassword1)){
-                            $user->password = $password;
+                            update_internal_user_password($user, $frm->newpassword1, false);
                         } else {
                             error('Could not set the new password');
                         }

diff --git a/login/index.php b/login/index.php
index 55cffbe481dc0db3cb24495e99c1473c253ed8c6..61fafb54081d993afb1efc7fdd07a0b115869603 100644 (file)
--- a/login/index.php
+++ b/login/index.php
@@ -2,7 +2,7 @@
 
     require_once("../config.php");
 
-    $loginguest = optional_param('loginguest', false); // determines whether visitors are logged in as guest automatically
+    $loginguest = optional_param('loginguest', 0, PARAM_BOOL); // determines whether visitors are logged in as guest automatically
 
 /// Check for timed out sessions
     if (!empty($SESSION->has_timed_out)) {
@@ -19,7 +19,7 @@
     if (! record_exists("user", "username", "guest")) {
         $guest->auth        = "manual"; 
         $guest->username    = "guest"; 
-        $guest->password    = md5("guest");
+        $guest->password    = hash_internal_user_password("guest");
         $guest->firstname   = addslashes(get_string("guestuser"));
         $guest->lastname    = " ";
         $guest->email       = "root@localhost";

diff --git a/login/signup.php b/login/signup.php
index 0ff9d324fd2c449d780dd370ad85387fbc6a41e0..de6eacb805dd3ef16579c2e4f531a0012a963dee 100644 (file)
--- a/login/signup.php
+++ b/login/signup.php
@@ -21,7 +21,7 @@
 
         if (count((array)$err) == 0) {
             $plainpass = $user->password;
-            $user->password = md5($user->password);
+            $user->password = hash_internal_user_password($plainpass);
             $user->confirmed = 0;
             $user->lang = current_language();
             $user->firstaccess = time();

diff --git a/user/edit.php b/user/edit.php
index 41b0ce59715179ada30d05145e4d18b82c1e30c2..7d06b3cbc32ce1971667860211015bb239480750 100644 (file)
--- a/user/edit.php
+++ b/user/edit.php
@@ -186,7 +186,7 @@
 
             if (isadmin()) {
                 if (!empty($usernew->newpassword)) {
-                    $usernew->password = md5($usernew->newpassword);
+                    $usernew->password = hash_internal_user_password($usernew->newpassword);
                     // update external passwords
                     if (!empty($CFG->{'auth_'. $user->auth.'_stdchangepassword'})) {
                         if (function_exists('auth_user_update_password')){