X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=plugins%2Fpassword%2Fdrivers%2Fsql.php;h=06a6b75ffac4f0ad10ade9cb9da36c7d7f3a5485;hb=76507f7c63a660742e76889ad6e3919f3dde3bb0;hp=9afaa65d87d295233ab17996bd99c2d6193b4087;hpb=b68022ca3782d5eb5a1a7ef6f8cf7abe1dc15bd6;p=roundcube.git

diff --git a/plugins/password/drivers/sql.php b/plugins/password/drivers/sql.php
index 9afaa65..06a6b75 100644
--- a/plugins/password/drivers/sql.php
+++ b/plugins/password/drivers/sql.php
@@ -5,7 +5,7 @@
  *
  * Driver for passwords stored in SQL database
  *
- * @version 1.2
+ * @version 1.4
  * @author Aleksander 'A.L.E.C' Machniak <alec@alec.pl>
  *
  */
@@ -18,11 +18,11 @@ function password_save($curpass, $passwd)
         $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 = new rcube_mdb2($dsn, '', FALSE);
         $db->set_debug((bool)$rcmail->config->get('sql_debug'));
@@ -33,72 +33,139 @@ function password_save($curpass, $passwd)
 
     if ($err = $db->is_error())
         return PASSWORD_ERROR;
-    
+
     // crypted password
     if (strpos($sql, '%c') !== FALSE) {
         $salt = '';
-        if (CRYPT_MD5) { 
-    	    $len = rand(3, CRYPT_SALT_LENGTH);
+        if (CRYPT_MD5) {
+            // Always use eight salt characters for MD5 (#1488136)
+    	    $len = 8;
         } else if (CRYPT_STD_DES) {
     	    $len = 2;
         } else {
     	    return PASSWORD_CRYPT_ERROR;
         }
+
+        //Restrict the character set used as salt (#1488136)
+        $seedchars = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
         for ($i = 0; $i < $len ; $i++) {
-    	    $salt .= chr(rand(ord('.'), ord('z')));
+    	    $salt .= $seedchars[rand(0, 63)];
         }
+
         $sql = str_replace('%c',  $db->quote(crypt($passwd, CRYPT_MD5 ? '$1$'.$salt.'$' : $salt)), $sql);
     }
-    
+
+    // dovecotpw
+    if (strpos($sql, '%D') !== FALSE) {
+        if (!($dovecotpw = $rcmail->config->get('password_dovecotpw')))
+            $dovecotpw = 'dovecotpw';
+        if (!($method = $rcmail->config->get('password_dovecotpw_method')))
+            $method = 'CRAM-MD5';
+
+        // use common temp dir
+        $tmp_dir = $rcmail->config->get('temp_dir');
+        $tmpfile = tempnam($tmp_dir, 'roundcube-');
+
+        $pipe = popen("$dovecotpw -s '$method' > '$tmpfile'", "w");
+        if (!$pipe) {
+            unlink($tmpfile);
+            return PASSWORD_CRYPT_ERROR;
+        }
+        else {
+            fwrite($pipe, $passwd . "\n", 1+strlen($passwd)); usleep(1000);
+            fwrite($pipe, $passwd . "\n", 1+strlen($passwd));
+            pclose($pipe);
+            $newpass = trim(file_get_contents($tmpfile), "\n");
+            if (!preg_match('/^\{' . $method . '\}/', $newpass)) {
+                return PASSWORD_CRYPT_ERROR;
+            }
+            if (!$rcmail->config->get('password_dovecotpw_with_method'))
+                $newpass = trim(str_replace('{' . $method . '}', '', $newpass));
+            unlink($tmpfile);
+        }
+        $sql = str_replace('%D', $db->quote($newpass), $sql);
+    }
+
     // hashed passwords
     if (preg_match('/%[n|q]/', $sql)) {
 
-	if (!extension_loaded('hash')) {
-	    raise_error(array(
-	        'code' => 600,
-		'type' => 'php',
-		'file' => __FILE__,
-		'message' => "Password plugin: 'hash' extension not loaded!"
-		), true, false);
-	    return PASSWORD_ERROR;			    
-	}
-
-	if (!($hash_algo = strtolower($rcmail->config->get('password_hash_algorithm'))))
+	    if (!extension_loaded('hash')) {
+	        raise_error(array(
+	            'code' => 600,
+		        'type' => 'php',
+		        'file' => __FILE__, 'line' => __LINE__,
+		        'message' => "Password plugin: 'hash' extension not loaded!"
+		    ), true, false);
+
+	        return PASSWORD_ERROR;
+	    }
+
+	    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)
+    $sql_vars = array();
+    if (preg_match_all('/%[p|o]/', $sql, $m)) {
+        foreach ($m[0] as $var) {
+            if ($var == '%p') {
+                $sql = preg_replace('/%p/', '?', $sql, 1);
+                $sql_vars[] = (string) $passwd;
+            }
+            else { // %o
+                $sql = preg_replace('/%o/', '?', $sql, 1);
+                $sql_vars[] = (string) $curpass;
+            }
+        }
     }
 
-    $user_info = explode('@', $_SESSION['username']);
-    if (count($user_info) >= 2) {
-	$sql = str_replace('%l', $db->quote($user_info[0], 'text'), $sql);
-	$sql = str_replace('%d', $db->quote($user_info[0], 'text'), $sql);
+    $local_part  = $rcmail->user->get_username('local');
+    $domain_part = $rcmail->user->get_username('domain');
+    $username    = $_SESSION['username'];
+    $host        = $_SESSION['imap_host'];
+
+    // 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);
     }
-    
-    $sql = str_replace('%u', $db->quote($_SESSION['username'],'text'), $sql);
-    $sql = str_replace('%h', $db->quote($_SESSION['imap_host'],'text'), $sql);
-    $sql = str_replace('%p', $db->quote($passwd,'text'), $sql);
-    $sql = str_replace('%o', $db->quote($curpass,'text'), $sql);
+    else {
+        $domain_part = rcube_idn_to_utf8($domain_part);
+        $username    = rcube_idn_to_utf8($username);
+        $host        = rcube_idn_to_utf8($host);
+    }
+
+    // at least we should always have the local part
+    $sql = str_replace('%l', $db->quote($local_part, 'text'), $sql);
+    $sql = str_replace('%d', $db->quote($domain_part, 'text'), $sql);
+    $sql = str_replace('%u', $db->quote($username, 'text'), $sql);
+    $sql = str_replace('%h', $db->quote($host, 'text'), $sql);
 
-    $res = $db->query($sql);
+    $res = $db->query($sql, $sql_vars);
 
     if (!$db->is_error()) {
-	if (strtolower(substr(trim($query),0,6))=='select') {
+	    if (strtolower(substr(trim($query),0,6))=='select') {
     	    if ($result = $db->fetch_array($res))
-		return PASSWORD_SUCCESS;
-	} else { 
+		        return PASSWORD_SUCCESS;
+	    } else {
+            // This is the good case: 1 row updated
     	    if ($db->affected_rows($res) == 1)
-		return PASSWORD_SUCCESS; // This is the good case: 1 row updated
-	}
+	            return PASSWORD_SUCCESS;
+            // @TODO: Some queries don't affect any rows
+            // Should we assume a success if there was no error?
+	    }
     }
 
     return PASSWORD_ERROR;