- Added DBMail driver (#1488281)

git-svn-id: https://svn.roundcube.net/trunk@5976 208e9e7b-5314-0410-a742-e7e81cd9613c

5 files changed, 110 insertions, 0 deletions

diff --git a/plugins/password/README b/plugins/password/README
index ec9fba59c..4fcbc4b21 100644
--- a/plugins/password/README
+++ b/plugins/password/README
@@ -41,6 +41,7 @@
  2.13. XMail (xmail)
  2.14. Pw (pw_usermod)
  2.15. domainFACTORY (domainfactory)
+ 2.16. DBMail (dbmail)
  3.	Driver API
 
 
@@ -269,6 +270,18 @@
  No configuration options.
 
 
+ 2.16.  DBMail (dbmail)
+ -----------------------------------
+
+ Driver that adds functionality to change the users DBMail password.
+ It only works with dbmail-users on the same host where Roundcube runs
+ and requires shell access and gcc in order to compile the binary
+ (see instructions in chgdbmailusers.c file).
+ See config.inc.php.dist file for configuration description.
+
+ Note: DBMail users can also use sql driver.
+
+
  3. Driver API
  -------------
 
diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist
index 689c4de26..08a9f6061 100644
--- a/plugins/password/config.inc.php.dist
+++ b/plugins/password/config.inc.php.dist
@@ -317,3 +317,9 @@ $rcmail_config['password_virtualmin_format'] = 0;
 // Add the following line to visudo to tighten security:
 // www  ALL=NOPASSWORD: /usr/sbin/pw
 $rcmail_config['password_pw_usermod_cmd'] = 'sudo /usr/sbin/pw usermod -h 0 -n';
+
+
+// DBMail Driver options
+// -------------------
+// Additional arguments for the dbmail-users call
+$rcmail_config['password_dbmail_args'] = '-p sha512';
diff --git a/plugins/password/drivers/chgdbmailusers.c b/plugins/password/drivers/chgdbmailusers.c
new file mode 100644
index 000000000..28f79c100
--- /dev/null
+++ b/plugins/password/drivers/chgdbmailusers.c
@@ -0,0 +1,48 @@
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+// set the UID this script will run as (root user)
+#define UID 0
+#define CMD "/usr/sbin/dbmail-users"
+#define RCOK 0x100
+
+/* INSTALLING:
+  gcc -o chgdbmailusers chgdbmailusers.c
+  chown root.apache chgdbmailusers
+  strip chgdbmailusers
+  chmod 4550 chgdbmailusers
+*/
+
+main(int argc, char *argv[])
+{
+  int cnt,rc,cc;
+  char cmnd[255];
+
+  strcpy(cmnd, CMD);
+
+  if (argc > 1)
+  {
+    for (cnt = 1; cnt < argc; cnt++)
+    {
+      strcat(cmnd, " ");
+      strcat(cmnd, argv[cnt]);
+    }
+  }
+  else
+  {
+    fprintf(stderr, "__ %s:  failed %d  %d\n", argv[0], rc, cc);
+    return 255;
+  }
+
+  cc = setuid(UID);
+  rc = system(cmnd);
+
+  if ((rc != RCOK) || (cc != 0))
+  {
+    fprintf(stderr, "__ %s:  failed %d  %d\n", argv[0], rc, cc);
+    return 1;
+  }
+
+  return 0;
+}
diff --git a/plugins/password/drivers/dbmail.php b/plugins/password/drivers/dbmail.php
new file mode 100644
index 000000000..a457fc27b
--- /dev/null
+++ b/plugins/password/drivers/dbmail.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * DBMail Password Driver
+ *
+ * Driver that adds functionality to change the users DBMail password.
+ * The code is derrived from the Squirrelmail "Change SASL Password" Plugin
+ * by Galen Johnson.
+ *
+ * It only works with dbmail-users on the same host where Roundcube runs
+ * and requires shell access and gcc in order to compile the binary.
+ *
+ * For installation instructions please read the README file.
+ *
+ * @version 1.0
+ */
+
+class rcube_dbmail_password
+{
+    function password_save($currpass, $newpass)
+    {
+        $curdir = realpath(dirname(__FILE__));
+        $username = escapeshellcmd($_SESSION['username']);
+        $args = rcmail::get_instance()->config->get('password_dbmail_args', '');
+
+        exec("$curdir/chgdbmailusers -c $username -w $newpass $args", $output, $returnvalue);
+
+        if ($returnvalue == 0) {
+            return PASSWORD_SUCCESS;
+        }
+        else {
+            raise_error(array(
+                'code' => 600,
+                'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Password plugin: Unable to execute $curdir/chgdbmailusers"
+                ), true, false);
+        }
+
+        return PASSWORD_ERROR;
+    }
+}
diff --git a/plugins/password/package.xml b/plugins/password/package.xml
index a99d9c4d5..ddab35d7d 100644
--- a/plugins/password/package.xml
+++ b/plugins/password/package.xml
@@ -29,6 +29,7 @@
 - Added pw_usermod driver (#1487826)
 - Added option password_login_exceptions (#1487826)
 - Added domainfactory driver (#1487882)
+- Added DBMail driver (#1488281)
     </notes>
 	<contents>
 		<dir baseinstalldir="/" name="/">