Imported Upstream version 0.5

[roundcube.git] / plugins / password / drivers / sql.php

diff --git a/plugins/password/drivers/sql.php b/plugins/password/drivers/sql.php
index 1e737f2333accaf1750e28bfaeac474e70868856..33469ec622790cc2142a0f3b7f9c4874591a4fa6 100644 (file)
--- a/plugins/password/drivers/sql.php
+++ b/plugins/password/drivers/sql.php
@@ -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,7 +33,7 @@ function password_save($curpass, $passwd)
 
     if ($err = $db->is_error())
         return PASSWORD_ERROR;
-    
+
     // crypted password
     if (strpos($sql, '%c') !== FALSE) {
         $salt = '';
@@ -49,56 +49,98 @@ function password_save($curpass, $passwd)
         }
         $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);
     }
 
-    $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[1], '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;
+            }
+        }
     }
-    
+
+    // at least we should always have the local part
+    $sql = str_replace('%l', $db->quote($rcmail->user->get_username('local'), 'text'), $sql);
+    $sql = str_replace('%d', $db->quote($rcmail->user->get_username('domain'), 'text'), $sql);
     $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);
 
-    $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 { 
            if ($db->affected_rows($res) == 1)
-               return PASSWORD_SUCCESS; // This is the good case: 1 row updated
-       }
+                       return PASSWORD_SUCCESS; // This is the good case: 1 row updated
+           }
     }
 
     return PASSWORD_ERROR;