- Password plugin: implemented drivers

- removed password_sasl plugin

1 files changed, 67 insertions, 124 deletions

diff --git a/plugins/password/password.php b/plugins/password/password.php
index 767ddab82..050053981 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -1,84 +1,37 @@
 <?php
 
-/**
- * Change Password
- *
- * Plugin that adds a possibility to change password using a database
- * (Settings -> Password tab)
- *
- * @version 1.1
- * @author Aleksander 'A.L.E.C' Machniak <alec@alec.pl>
- * @editor Daniel Black
- *
- * Configuration Items (config/main.inc.php):
- *   password_confirm_current - boolean to determine whether current password
- *     is required to change password. Defaults to FALSE.
- *   password_db_dsn - is the PEAR database DSN for performing the query. Defaults
- *     to the default databse setting in config/db.inc.php
- *   password_query - the SQL query used to change the password.
- *     If the SQL query is a SELECT it will return an error message in a row if unsuccessful
- *     If the SQL query is a UPDATE it will update a single row only. 
- *     An UPDATE where zero rows changed will be inteperated to be a wrong username/password
- *     More than one row changed will be inteperated as an internal error
- *     The query can contain the following macros that will be expanded as follows:
- *       %p is replaced with the plaintext new password
- *       %c is replaced with the crypt version of the new password, MD5 if available
- *         otherwise DES.
- *       %u is replaced with the username (from the session info)
- *       %o is replaced with the password before the change
- *       %h is replaced with the imap host (from the session info)
- *     Escaping of macros is handled by this module.
- *     Defaults to "SELECT update_passwd(%c, %u)" 
- *     To use this you need to define the update_passwd function in your
- *     database.
- *
- * Example SQL queries:
- * These will typically need to define a function to change the password:
- * 
- * Example implementations of an update_passwd function:
- *
- * This is for use with LMS (http://lms.org.pl) database and postgres:
- * CREATE OR REPLACE FUNCTION update_passwd(hash text, account text) RETURNS integer AS $$
- * DECLARE
- *         res integer;
- * BEGIN
- *      UPDATE passwd SET password = hash
- *	WHERE login = split_part(account, '@', 1)
- *		AND domainid = (SELECT id FROM domains WHERE name = split_part(account, '@', 2))
- *	RETURNING id INTO res;
- *	RETURN res;
- * END;
- * $$ LANGUAGE plpgsql SECURITY DEFINER;
- *
- * This is for use with a SELECT update_passwd(%o,%c,%u) query
- * Uupdates the password only when the old password matches the MD5 password in the database
- * CREATE FUNCTION update_password (oldpass text, cryptpass text, user text) RETURNS text
- *        MODIFIES SQL DATA
- * BEGIN
- *   DECLARE currentsalt varchar(20);
- *   DECLARE error text;
- *   SET error = 'incorrect current password';
- *   SELECT substring_index(substr(user.password,4),_latin1'$',1) INTO currentsalt FROM users WHERE username=user;
- *   SELECT '' INTO error FROM users WHERE username=user AND password=ENCRYPT(oldpass,currentsalt);
- *   UPDATE users SET password=cryptpass WHERE username=user AND password=ENCRYPT(oldpass,currentsalt);
- *   RETURN error;
- * END
- *
- * Example SQL UPDATEs:
- * 
- *   Plain text passwords:
- *   UPDATE users SET password=%p WHERE username=%u AND password=%o AND domain=%h LIMIT 1
- * 
- *   Crypt text passwords:
- *   UPDATE users SET password=%c WHERE username=%u LIMIT 1
- *
- *   Use a MYSQL crypt function (*nix only) with random 8 character salt
- *   UPDATE users SET password=ENCRYPT(%p,concat(_utf8'$1$',right(md5(rand()),8),_utf8'$')) WHERE username=%u LIMIT 1
- * 
- *   MD5 stored passwords:
- *   UPDATE users SET password=MD5(%p) WHERE username=%u AND password=MD5(%o) LIMIT 1
- * 
- */
+/*
+ +-------------------------------------------------------------------------+
+ | Password Plugin for Roundcube                                           |
+ | Version 1.2                                                             |
+ |                                                                         |
+ | Copyright (C) 2009, RoundCube Dev. - Switzerland                        |
+ |                                                                         |
+ | This program is free software; you can redistribute it and/or modify    |
+ | it under the terms of the GNU General Public License version 2          |
+ | as published by the Free Software Foundation.                           |
+ |                                                                         |
+ | This program is distributed in the hope that it will be useful,         |
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of          |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           |
+ | GNU General Public License for more details.                            |
+ |                                                                         |
+ | You should have received a copy of the GNU General Public License along |
+ | with this program; if not, write to the Free Software Foundation, Inc., |
+ | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.             |
+ |                                                                         |
+ +-------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <alec@alec.pl>                              |
+ +-------------------------------------------------------------------------+
+
+ $Id: index.php 2645 2009-06-15 07:01:36Z alec $
+
+*/
+
+define('PASSWORD_CRYPT_ERROR', 1);
+define('PASSWORD_ERROR', 2);
+define('PASSWORD_SUCCESS', 0);
+
 class password extends rcube_plugin
 {
   public $task = 'settings';
@@ -106,6 +59,7 @@ class password extends rcube_plugin
   function password_save()
   {
     $rcmail = rcmail::get_instance();
+    $this->load_config();
 
     $this->add_texts('localization/');
     $this->register_handler('plugin.body', array($this, 'password_form'));
@@ -135,8 +89,8 @@ class password extends rcube_plugin
   function password_form()
   {
     $rcmail = rcmail::get_instance();
+    $this->load_config();
 
-    $confirm = $rcmail->config->get('password_confirm_current');
     // add some labels to client
     $rcmail->output->add_label(
 	'password.nopassword',
@@ -152,7 +106,7 @@ class password extends rcube_plugin
     // return the complete edit form as table
     $out = '<table' . $attrib_str . ">\n\n";
 
-    if ($confirm) {
+    if ($rcmail->config->get('password_confirm_current')) {
       // show current password selection
       $field_id = 'curpasswd';
       $input_newpasswd = new html_passwordfield(array('name' => '_curpasswd', 'id' => $field_id,
@@ -205,55 +159,44 @@ class password extends rcube_plugin
 	), $out);
   }
 
-  private function _save($curpass,$passwd)
+  private function _save($curpass, $passwd)
   {
-    $cfg = rcmail::get_instance()->config;
-
-    if (!($sql = $cfg->get('password_query')))
-      $sql = "SELECT update_passwd(%c, %u)";
-
-    if ($dsn = $cfg->get('password_db_dsn')) {
-      $db = new rcube_mdb2($dsn, '', FALSE);
-      $db->set_debug((bool)$cfg->get('sql_debug'));
-      $db->db_connect('w');
-    } else {
-      $db = rcmail::get_instance()->get_dbh();
-    }
-
-    if ($err = $db->is_error())
-      return $err;
+    $config = rcmail::get_instance()->config;
+    $driver = $this->home.'/drivers/'.$config->get('password_driver', 'sql').'.php';
     
-    if (strpos($sql,'%c') !== FALSE) {
-      $salt = '';
-      if (CRYPT_MD5) { 
-        $len = rand(3,CRYPT_SALT_LENGTH);
-      } else if (CRYPT_STD_DES) {
-        $len = 2;
-      } else {
-        return $this->gettext('nocryptfunction');
-      }
-      for ($i = 0; $i < $len ; $i++) {
-        $salt .= chr(rand(ord('.'),ord('z')));
-      }
-      $sql = str_replace('%c',  $db->quote(crypt($passwd, CRYPT_MD5 ? '$1$'.$salt.'$' : $salt)), $sql);
+    if (!is_readable($driver)) {
+      raise_error(array(
+        'code' => 600,
+	'type' => 'php',
+	'file' => __FILE__,
+	'message' => "Password plugin: Unable to open driver file $driver"
+	), true, false);
+      return $this->gettext('internalerror');
     }
-    $sql = str_replace('%u', $db->quote($_SESSION['username'],'text'), $sql);
-    $sql = str_replace('%p', $db->quote($passwd,'text'), $sql);
-    $sql = str_replace('%o', $db->quote($curpass,'text'), $sql);
-    $sql = str_replace('%h', $db->quote($_SESSION['imap_host'],'text'), $sql);
-
-    $res = $db->query($sql);
-    if ($err = $db->is_error())
-      return $err;
-    if (strtolower(substr(trim($query),0,6))=='select') {
-      return $db->fetch_array($res);
-    } else { 
-      $res = $db->affected_rows($res);
-      if ($res == 0) return $this->gettext('errorsaving');
-      if ($res == 1) return FALSE; // THis is the good case - 1 row updated
+    
+    include($driver);
+
+    if (!function_exists('password_save')) {
+      raise_error(array(
+        'code' => 600,
+	'type' => 'php',
+	'file' => __FILE__,
+	'message' => "Password plugin: Broken driver: $driver"
+	), true, false);
       return $this->gettext('internalerror');
     }
 
+    $result = password_save($curpass, $passwd);
+
+    switch ($result) {
+      case PASSWORD_SUCCESS:
+        return;
+      case PASSWORD_CRYPT_ERROR;
+        return $this->gettext('nocryptfunction');
+      case PASSWORD_ERROR:
+      default:
+        return $this->gettext('internalerror');
+    }
   }
 
 }