From eb8fafbc89b58be3e61eff22da0a38662b514fe7 Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Sun, 10 Apr 2011 14:27:48 +0000
Subject: [PATCH] functions.inc.php: - generate_password(): generate more
 secure random password

Based on a patch from Pierre Fagrell (mrfrenzy@SF),
https://sourceforge.net/tracker/?func=detail&aid=2958698&group_id=191583&atid=937964
(with some modifications)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/branches/postfixadmin-2.3@1027 a1433add-5e2c-0410-b055-b7f2511e0802
---
 CHANGELOG.TXT     |  3 ++-
 functions.inc.php | 27 ++++++++++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index edfbe778..6a3e7b76 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -13,7 +13,8 @@
 Changes after 2.3.3 release (postfixadmin-2.3 branch)
 ---------------------------------------------------------------
 
-  - fix typo in variable name in squirrelmail plugin
+  - generate more secure random passwords
+  - squirrelmail plugin: fix typo in variable name
 
 Version 2.3.3 - 2011/03/14 - SVN r1010 (postfixadmin-2.3 branch)
 ---------------------------------------------------------------
diff --git a/functions.inc.php b/functions.inc.php
index 2683f413..70792d35 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -1107,9 +1107,30 @@ function encode_header ($string, $default_charset = "utf-8")
 // Action: Generates a random password
 // Call: generate_password ()
 //
-function generate_password ()
-{
-    $password = substr (md5 (mt_rand ()), 0, 8);
+function generate_password () {
+    global $CONF;
+
+    //check that password length is sensible
+    $length = (int) $CONF['min_password_length'];
+    if ($length < 5 || $length > 32) {
+  	    $length = 8;
+    }
+
+    // define possible characters
+    $possible = "2345678923456789abcdefghijkmnpqrstuvwxyzABCDEFGHIJKLMNPQRSTUVWXYZ"; # skip 0 and 1 to avoid confusion with O and l
+
+    // add random characters to $password until $length is reached
+    $password = "";
+    while (strlen($password) < $length) {
+        // pick a random character from the possible ones
+        $char = substr($possible, mt_rand(0, strlen($possible)-1), 1);
+
+        // we don't want this character if it's already in the password
+        if (!strstr($password, $char)) {
+            $password .= $char;
+        }
+    }
+
     return $password;
 }