Fix generation of Blowfish-based password hashes (#1490184)

Aleksander Machniak

2014-12-09 753c8849accbbe0cb3ebef01e8b3e2ff3481a336

 plugins/password/drivers/sql.php

@@ -20,11 +20,11 @@
            $sql = 'SELECT update_passwd(%c, %u)';

        if ($dsn = $rcmail->config->get('password_db_dsn')) {
           // #1486067: enable new_link option
           if (is_array($dsn) && empty($dsn['new_link']))
               $dsn['new_link'] = true;
           else if (!is_array($dsn) && !preg_match('/\?new_link=true/', $dsn))
               $dsn .= '?new_link=true';
            // #1486067: enable new_link option
            if (is_array($dsn) && empty($dsn['new_link']))
                $dsn['new_link'] = true;
            else if (!is_array($dsn) && !preg_match('/\?new_link=true/', $dsn))
                $dsn .= '?new_link=true';

            $db = rcube_db::factory($dsn, '', false);
            $db->set_debug((bool)$rcmail->config->get('sql_debug'));
@@ -34,36 +34,44 @@
            $db = $rcmail->get_dbh();
        }

        if ($err = $db->is_error())
        if ($db->is_error()) {
            return PASSWORD_ERROR;
        }

        // crypted password
        if (strpos($sql, '%c') !== FALSE) {
            $salt = '';

            if (!($crypt_digest = $rcmail->config->get('password_crypt_digest')))
                $crypt_digest = CRYPT_MD5;
            
            switch ($crypt_digest)
            if (!($crypt_hash = $rcmail->config->get('password_crypt_hash')))
            {
            case CRYPT_MD5:
                if (CRYPT_MD5)
                    $crypt_hash = 'md5';
                else if (CRYPT_STD_DES)
                    $crypt_hash = 'des';
            }

            switch ($crypt_hash)
            {
            case 'md5':
                $len = 8;
                $salt_digest = '$1$';
                $salt_hashindicator = '$1$';
                break;
            case CRYPT_STD_DES:
            case 'des':
                $len = 2;
                break;
            case CRYPT_BLOWFISH:
                $len = 22;
                $salt_digest = '$2a$';
            case 'blowfish':
                $cost = (int) $rcmail->config->get('password_blowfish_cost');
                $cost = $cost < 4 || $cost > 31 ? 12 : $cost;
                $len  = 22;
                $salt_hashindicator = sprintf('$2a$%02d$', $cost);
                break;
            case CRYPT_SHA256:
            case 'sha256':
                $len = 16;
                $salt_digest = '$5$';
                $salt_hashindicator = '$5$';
                break;
            case CRYPT_SHA512:
            case 'sha512':
                $len = 16;
                $salt_digest = '$6$';
                $salt_hashindicator = '$6$';
                break;
            default:
                return PASSWORD_CRYPT_ERROR;
@@ -72,10 +80,10 @@
            //Restrict the character set used as salt (#1488136)
            $seedchars = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
            for ($i = 0; $i < $len ; $i++) {
               $salt .= $seedchars[rand(0, 63)];
                $salt .= $seedchars[rand(0, 63)];
            }

            $sql = str_replace('%c',  $db->quote(crypt($passwd, $salt_digest ? $salt_digest .$salt.'$' : $salt)), $sql);
            $sql = str_replace('%c',  $db->quote(crypt($passwd, $salt_hashindicator ? $salt_hashindicator .$salt.'$' : $salt)), $sql);
        }

        // dovecotpw
@@ -111,30 +119,30 @@

        // hashed passwords
        if (preg_match('/%[n|q]/', $sql)) {
           if (!extension_loaded('hash')) {
               raise_error(array(
                   'code' => 600,
                  'type' => 'php',
                  'file' => __FILE__, 'line' => __LINE__,
                  'message' => "Password plugin: 'hash' extension not loaded!"
              ), true, false);
            if (!extension_loaded('hash')) {
                rcube::raise_error(array(
                    'code' => 600,
                    'type' => 'php',
                    'file' => __FILE__, 'line' => __LINE__,
                    'message' => "Password plugin: 'hash' extension not loaded!"
                ), true, false);

               return PASSWORD_ERROR;
           }
                return PASSWORD_ERROR;
            }

           if (!($hash_algo = strtolower($rcmail->config->get('password_hash_algorithm'))))
            if (!($hash_algo = strtolower($rcmail->config->get('password_hash_algorithm'))))
                $hash_algo = 'sha1';

           $hash_passwd = hash($hash_algo, $passwd);
            $hash_passwd = hash($hash_algo, $passwd);
            $hash_curpass = hash($hash_algo, $curpass);

           if ($rcmail->config->get('password_hash_base64')) {
            if ($rcmail->config->get('password_hash_base64')) {
                $hash_passwd = base64_encode(pack('H*', $hash_passwd));
                $hash_curpass = base64_encode(pack('H*', $hash_curpass));
            }

           $sql = str_replace('%n', $db->quote($hash_passwd, 'text'), $sql);
           $sql = str_replace('%q', $db->quote($hash_curpass, 'text'), $sql);
            $sql = str_replace('%n', $db->quote($hash_passwd, 'text'), $sql);
            $sql = str_replace('%q', $db->quote($hash_curpass, 'text'), $sql);
        }

        // Handle clear text passwords securely (#1487034)
@@ -159,14 +167,14 @@

        // convert domains to/from punnycode
        if ($rcmail->config->get('password_idn_ascii')) {
            $domain_part = rcube_idn_to_ascii($domain_part);
            $username    = rcube_idn_to_ascii($username);
            $host        = rcube_idn_to_ascii($host);
            $domain_part = rcube_utils::idn_to_ascii($domain_part);
            $username    = rcube_utils::idn_to_ascii($username);
            $host        = rcube_utils::idn_to_ascii($host);
        }
        else {
            $domain_part = rcube_idn_to_utf8($domain_part);
            $username    = rcube_idn_to_utf8($username);
            $host        = rcube_idn_to_utf8($host);
            $domain_part = rcube_utils::idn_to_utf8($domain_part);
            $username    = rcube_utils::idn_to_utf8($username);
            $host        = rcube_utils::idn_to_utf8($host);
        }

        // at least we should always have the local part
@@ -178,16 +186,16 @@
        $res = $db->query($sql, $sql_vars);

        if (!$db->is_error()) {
           if (strtolower(substr(trim($query),0,6))=='select') {
               if ($result = $db->fetch_array($res))
                  return PASSWORD_SUCCESS;
           } else {
            if (strtolower(substr(trim($sql),0,6)) == 'select') {
                if ($db->fetch_array($res))
                    return PASSWORD_SUCCESS;
            } else {
                // This is the good case: 1 row updated
               if ($db->affected_rows($res) == 1)
                   return PASSWORD_SUCCESS;
                if ($db->affected_rows($res) == 1)
                    return PASSWORD_SUCCESS;
                // @TODO: Some queries don't affect any rows
                // Should we assume a success if there was no error?
           }
            }
        }

        return PASSWORD_ERROR;