Fixing PFA bugs / MAIL-5 Adding configuration

technicalguru · technicalguru · commit 86d0f81ef400 · 2020-04-16T20:20:47.000+02:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,15 @@
 FROM eu.gcr.io/long-grin-186810/rs-php:7.4.4-apache-2.4.38.0
 LABEL maintainer="Ralph Schuster <github@ralph-schuster.eu>"
 
+# PFA has a bug in 3.2 release (see below)
+RUN apt-get update &&  apt-get update && apt-get install -y --no-install-recommends \
+    patch \
+    && rm -rf /var/lib/apt/lists/*
+
 #ADD etc/php/ /usr/local/etc/php/conf.d/
 #ADD etc/conf/ /etc/apache2/conf-enabled/
 #ADD etc/mods/ /etc/apache2/mods-enabled/
 #ADD etc/sites/ /etc/apache2/sites-enabled/
-ADD src/    /var/www/html/
 RUN chown -R www-data:www-data /var/www/html
 
 RUN cd /var/www/html \
@@ -15,4 +19,7 @@ RUN cd /var/www/html \
     && mkdir templates_c \
     && chown -R www-data:www-data .
 
+ADD src/    /var/www/html/
 
+# Fix the crucial bug
+RUN patch /var/www/html/model/MailboxHandler.php < /var/www/html/MailboxHandler.patch
diff --git a/src/MailboxHandler.patch b/src/MailboxHandler.patch
@@ -0,0 +1,15 @@
+--- /var/www/html/model/MailboxHandler.php.orig  2020-04-16 17:56:52.043852299 +0000
++++ /var/www/html/model/MailboxHandler.php       2020-04-16 17:58:55.600195117 +0000
+@@ -216,7 +216,10 @@
+
+
+     protected function beforestore() {
+-        if (isset($this->values['quota']) && $this->values['quota'] != -1) {
++        if (!isset($this->values['quota']) || (trim($this->values['quota']) == '')) {
++            $this->values['quota'] = -1;
++        }
++        if ($this->values['quota'] != -1) {
+             $this->values['quota'] = $this->values['quota'] * Config::read('quota_multiplier'); # convert quota from MB to bytes
+         }
+
+
diff --git a/src/config.local.php b/src/config.local.php
@@ -61,7 +61,8 @@
 // In order to setup Postfixadmin, you MUST specify a hashed password here.
 // To create the hash, visit setup.php in a browser and type a password into the field,
 // on submission it will be echoed out to you as a hashed value.
-$CONF['setup_password'] = password_hash($_ENV['PFA_SETUP_PASS'] ? $_ENV['PFA_SETUP_PASS'] : $_ENV['PFA_DB_PASS'], PASSWORD_DEFAULT);
+$PFA_SALT = md5(time() . '*' . $_SERVER['REMOTE_ADDR'] . '*' . mt_rand(0, 60000));
+$CONF['setup_password'] = $PFA_SALT.':'.sha1($PFA_SALT.':'.($_ENV['PFA_SETUP_PASS'] ? $_ENV['PFA_SETUP_PASS'] : $_ENV['PFA_DB_PASS']));
 
 // Language config
 // Language files are located in './languages', change as required..
diff --git a/src/index.php b/src/index.php
@@ -0,0 +1,11 @@
+<html>
+<head>
+    <title>Postfix Admin</title>
+    <meta http-equiv="refresh" content= "0; url=public/index.php" />
+</head>
+<body>
+    <p>The Postfix Admin directory layout changed.</p>
+    <p>Please update your webserver config so that the DocumentRoot or Alias points to the directory "public".</p>
+</body>
+</html>
+
