webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-09 05:02:44 +03:00
Code Activity

functions.inc.php:

Browse Source 
- pacrypt(): some small changes after Szilagyi Jozsef's patch:
  - comment out unused $crypt_method
  - change $dovecotpw default to "doveadm pw" (unrelated to the patch)
  - set $dovepasstest to "-t $pw_db" instead of having two similar
    command lines, and also shellescapearg() $pw_db
  - use "if (empty($dovepasstest))" instead of "if (empty($pw_db))"



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1524 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
Christian Boltz
2013-10-03 20:01:31 +00:00
parent 161d387485
commit 0d6f9ff99f
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
functions.inc.php
View File

@@ -912,9 +912,9 @@ function pacrypt ($pw, $pw_db="") {
$method = strtoupper($split_method[1]);
if (! preg_match("/^[A-Z0-9-]+$/", $method)) { die("invalid dovecot encryption method"); } # TODO: check against a fixed list?
# if (strtolower($method) == 'md5-crypt') die("\$CONF['encrypt'] = 'dovecot:md5-crypt' will not work because dovecotpw generates a random salt each time. Please use \$CONF['encrypt'] = 'md5crypt' instead.");
$crypt_method = preg_match ("/.*-CRYPT$/", $method);
# $crypt_method = preg_match ("/.*-CRYPT$/", $method);
$dovecotpw = "dovecotpw";
$dovecotpw = "doveadm pw";
if (!empty($CONF['dovecotpw'])) $dovecotpw = $CONF['dovecotpw'];
# Use proc_open call to avoid safe_mode problems and to prevent showing plain password in process table
@@ -924,18 +924,19 @@ function pacrypt ($pw, $pw_db="") {
2 => array("pipe", "w"), // stderr
);
if (empty($pw_db)) {
$pipe = proc_open("$dovecotpw '-s' $method", $spec, $pipes);
} else {
$pipe = proc_open("$dovecotpw '-s' $method -t '$pw_db'", $spec, $pipes);
$dovepasstest = '';
if (!empty($pw_db)) {
# TODO: only use -t for salted passwords to be backward compatible with dovecot < 2.1 again
$dovepasstest = " -t " . escapeshellarg($pw_db);
}
$pipe = proc_open("$dovecotpw '-s' $method$dovepasstest", $spec, $pipes);
if (!$pipe) {
die("can't proc_open $dovecotpw");
} else {
// use dovecot's stdin, it uses getpass() twice
// use dovecot's stdin, it uses getpass() twice (except when using -t)
// Write pass in pipe stdin
if (empty($pw_db)) {
if (empty($dovepasstest)) {
fwrite($pipes[0], $pw . "\n", 1+strlen($pw)); usleep(1000);
}
fwrite($pipes[0], $pw . "\n", 1+strlen($pw));
@@ -944,7 +945,7 @@ function pacrypt ($pw, $pw_db="") {
// Read hash from pipe stdout
$password = fread($pipes[1], "200");
if (empty($pw_db)) {
if (empty($dovepasstest)) {
if ( !preg_match('/^\{' . $method . '\}/', $password)) {
$stderr_output = stream_get_contents($pipes[2]);
error_log('dovecotpw password encryption failed.');