Changeset 124 for trunk/lib/Auth_SQL.inc.php

Timestamp:

May 24, 2006 5:35:19 AM (18 years ago)

Author:

scdev

Message:

Q - Improved hashing algorithms in Auth_SQL, added more sc- css selectors, misc bug fixes

File:

• trunk/lib/Auth_SQL.inc.php (modified) (7 diffs)

trunk/lib/Auth_SQL.inc.php

@@ -4 +4 @@
  *
  * @author  Quinn Comendant <quinn@strangecode.com>
- * @version 2.0
+ * @version 2.1
  */
 
 // Available encryption types for class Auth_SQL.
-define('AUTH_ENCRYPT_MD5', 'md5');
-define('AUTH_ENCRYPT_CRYPT', 'crypt');
-define('AUTH_ENCRYPT_SHA1', 'sha1');
-define('AUTH_ENCRYPT_PLAINTEXT', 'plaintext');
+define('AUTH_ENCRYPT_MD5', 1);
+define('AUTH_ENCRYPT_CRYPT', 2);
+define('AUTH_ENCRYPT_SHA1', 3);
+define('AUTH_ENCRYPT_PLAINTEXT', 4);
 
 require_once dirname(__FILE__) . '/Email.inc.php';
@@ -41 +41 @@
 
         // The type of encryption to use for passwords stored in the db_table. Use one of the AUTH_ENCRYPT_* types specified above.
-        'encryption_type' => AUTH_ENCRYPT_MD5,
+        'encryption_type' => AUTH_ENCRYPT_SHA1,
 
         // The URL to the login script.
@@ -47 +47 @@
 
         // The maximum amount of time a user is allowed to be logged in. They will be forced to login again if they expire.
-        // This applies to admins and users. In seconds. 21600 seconds = 6 hours.
+        // In seconds. 21600 seconds = 6 hours.
         'login_timeout' => 21600,
 
         // The maximum amount of time a user is allowed to be idle before their session expires. They will be forced to login again if they expire.
-        // This applies to admins and users. In seconds. 3600 seconds = 1 hour.
+        // In seconds. 3600 seconds = 1 hour.
         'idle_timeout' => 3600,
 
@@ -300 +300 @@
         $this->initDB();
 
-        // Query DB for user matching credentials.
-        // FIXME: Cannot compare crypt style passwords this way.
-        $qid = DB::query("
-            SELECT *, " . $this->_params['db_primary_key'] . " AS user_id
-            FROM " . $this->_params['db_table'] . "
-            WHERE " . $this->_params['db_username_column'] . " = '" . DB::escapeString($username) . "'
-            AND BINARY userpass = '" . DB::escapeString($this->encryptPassword($password)) . "'
-        ");
+        switch ($this->_params['encryption_type']) {
+        case AUTH_ENCRYPT_CRYPT :
+            // Query DB for user matching credentials. Compare cyphertext with salted-encrypted password.
+            $qid = DB::query("
+                SELECT *, " . $this->_params['db_primary_key'] . " AS user_id
+                FROM " . $this->_params['db_table'] . "
+                WHERE " . $this->_params['db_username_column'] . " = '" . DB::escapeString($username) . "'
+                AND BINARY userpass = ENCRYPT('" . DB::escapeString($password) . "', LEFT(userpass, 2)))
+            ");
+            break;
+        case AUTH_ENCRYPT_PLAINTEXT :
+        case AUTH_ENCRYPT_MD5 :
+        case AUTH_ENCRYPT_SHA1 :
+        default :
+            // Query DB for user matching credentials. Directly compare cyphertext with result from encryptPassword().
+            $qid = DB::query("
+                SELECT *, " . $this->_params['db_primary_key'] . " AS user_id
+                FROM " . $this->_params['db_table'] . "
+                WHERE " . $this->_params['db_username_column'] . " = '" . DB::escapeString($username) . "'
+                AND BINARY userpass = '" . DB::escapeString($this->encryptPassword($password)) . "'
+            ");
+            break;
+        }
 
         // Return user data if found.
@@ -665 +680 @@
     function generatePassword($pattern='CvccvCdd')
     {
-        mt_srand((double) microtime() * 10000000);
         $str = '';
         for ($i=0; $i<strlen($pattern); $i++) {
@@ -682 +696 @@
      *
      */
-    function encryptPassword($password)
+    function encryptPassword($password, $salt=null)
     {
         switch ($this->_params['encryption_type']) {
@@ -690 +704 @@
 
         case AUTH_ENCRYPT_CRYPT :
-            return crypt($password);
+            // If comparing plaintext password with a hash, provide first two chars of the hash as the salt.
+            return isset($salt) ? crypt($password, substr($salt, 0, 2)) : crypt($password);
             break;
 
         case AUTH_ENCRYPT_SHA1 :
-            return sha1($password);
+            return sha1(App::getParam('signing_key') . sha1($password));
             break;
 
         case AUTH_ENCRYPT_MD5 :
         default :
-            return md5($password);
+            return md5(App::getParam('signing_key') . md5($password));
             break;
         }