Merge branch 'jammyjellyfish2204' of https://github.com/mail-in-a-box/mailinabox into jammyjellyfish2204

# Conflicts:
#	management/backup.py

CHANGELOG.md

@@ -25,6 +25,7 @@ No features of Mail-in-a-Box have changed in this release, but with the newer ve
 Also:
 
 * Roundcube's login session cookie was tightened. Existing sessions may require a manual logout.
+* Move Postgrey's database under $STORAGE_ROOT
 
 Version 57a (June 19, 2022)
 ---------------------------

management/backup.py

@@ -309,6 +309,7 @@ def perform_backup(full_backup):
 	service_command("dovecot", "stop", quit=True)
 	service_command("slapd", "stop", quit=True)
 	service_command("miabldap-capture", "stop", quit=True)
+	service_command("postgrey", "stop", quit=True)
 
 	# Execute a pre-backup script that copies files outside the homedir.
 	# Run as the STORAGE_USER user, not as root. Pass our settings in
@@ -340,6 +341,7 @@ def perform_backup(full_backup):
 		# Start services again.
 		service_command("miabldap-capture", "start", quit=False)
 		service_command("slapd", "start", quit=False)
+		service_command("postgrey", "start", quit=False)
 		service_command("dovecot", "start", quit=False)
 		service_command("postfix", "start", quit=False)
 		service_command("php8.0-fpm", "start", quit=False)

setup/mail-postfix.sh

@@ -254,11 +254,41 @@ tools/editconf.py /etc/postfix/main.cf \
 # As a matter of fact RFC is not strict about retry timer so postfix and
 # other MTA have their own intervals. To fix the problem of receiving
 # e-mails really latter, delay of greylisting has been set to
-# 180 seconds (default is 300 seconds).
+# 180 seconds (default is 300 seconds). We will move the postgrey database
+# under $STORAGE_ROOT. This prevents a "warming up" that would have occured
+# previously with a migrated or reinstalled OS.  We will specify this new path
+# with the --dbdir=... option. Arguments within POSTGREY_OPTS can not have spaces,
+# including dbdir. This is due to the way the init script sources the
+# /etc/default/postgrey file. --dbdir=... either needs to be a path without spaces
+# (luckily $STORAGE_ROOT does not currently work with spaces), or it needs to be a
+# symlink without spaces that can point to a folder with spaces).  We'll just assume
+# $STORAGE_ROOT won't have spaces to simplify things.
 tools/editconf.py /etc/default/postgrey \
-	POSTGREY_OPTS=\"'--inet=127.0.0.1:10023 --delay=180'\"
+	POSTGREY_OPTS=\""--inet=127.0.0.1:10023 --delay=180 --dbdir=$STORAGE_ROOT/mail/postgrey/db"\"
 
 
+# If the $STORAGE_ROOT/mail/postgrey is empty, copy the postgrey database over from the old location
+if [ ! -d $STORAGE_ROOT/mail/postgrey/db ]; then
+	# Stop the service
+	service postgrey stop
+	# Ensure the new paths for postgrey db exists
+	mkdir -p $STORAGE_ROOT/mail/postgrey/db
+	# Move over database files
+	mv /var/lib/postgrey/* $STORAGE_ROOT/mail/postgrey/db/ || true
+fi
+# keep the postgrey local client whitelist file in STORAGE_ROOT so it
+# gets backed up
+if [ ! -L "/etc/postgrey/whitelist_clients.local" ] && [ -f "/etc/postgrey/whitelist_clients.local" ]; then
+    # regular file (non-link) exists - move it to user-data
+    cp -p "/etc/postgrey/whitelist_clients.local" \
+          "$STORAGE_ROOT/mail/postgrey/whitelist_clients.local"
+fi
+ln -sf "$STORAGE_ROOT/mail/postgrey/whitelist_clients.local" \
+       "/etc/postgrey/whitelist_clients.local"
+# Ensure permissions are set
+chown -R postgrey:postgrey $STORAGE_ROOT/mail/postgrey/
+chmod 700 $STORAGE_ROOT/mail/postgrey/{,db}
+
 # We are going to setup a newer whitelist for postgrey, the version included in the distribution is old
 cat > /etc/cron.daily/mailinabox-postgrey-whitelist << EOF;
 #!/bin/bash
@@ -285,17 +315,6 @@ EOF
 chmod +x /etc/cron.daily/mailinabox-postgrey-whitelist
 /etc/cron.daily/mailinabox-postgrey-whitelist
 
-# keep the postgrey local client whitelist file in STORAGE_ROOT so it
-# gets backed up
-mkdir -p "$STORAGE_ROOT/mail/postgrey"
-if [ ! -L "/etc/postgrey/whitelist_clients.local" ] && [ -f "/etc/postgrey/whitelist_clients.local" ]; then
-    # regular file (non-link) exists - move it to user-data
-    cp -p "/etc/postgrey/whitelist_clients.local" \
-          "$STORAGE_ROOT/mail/postgrey/whitelist_clients.local"
-fi
-ln -sf "$STORAGE_ROOT/mail/postgrey/whitelist_clients.local" \
-       "/etc/postgrey/whitelist_clients.local"
-
 
 # Increase the message size limit from 10MB to 128MB.
 # The same limit is specified in nginx.conf for mail submitted via webmail and Z-Push.

setup/system.sh

@@ -148,7 +148,7 @@ fi
 
 echo Installing system packages...
 apt_install python3 python3-dev python3-pip python3-setuptools \
-	netcat-openbsd wget curl git sudo coreutils bc \
+	netcat-openbsd wget curl git sudo coreutils bc file \
 	pollinate openssh-client unzip \
 	unattended-upgrades cron ntp fail2ban rsyslog
 

tests/bin/restore_backup.sh

@@ -85,6 +85,7 @@ if [ -e "setup/ldap.sh" ]; then
         "opendkim:opendkim::/run/opendkim:/usr/sbin/nologin"
         "spampd:spampd::/nonexistent:/usr/sbin/nologin"
         "www-data:www-data:www-data:/var/www:/usr/sbin/nologin"
+        "postgrey:postgrey::/var/lib/postgrey:/usr/sbin/nologin"
     )
 else
     # Cloud-In-A-Box

tests/suites/mail-access.sh

@@ -42,7 +42,7 @@ _test_greylisting_x() {
 
 postgrey_whitelist_recipents() {
 	local wl="/etc/postgrey/whitelist_recipients.local"
-	rm -f "$wl"
+	truncate --size=0 "$wl" || die "Could not truncate $wl"
 	local recipient
 	for recipient; do
 		echo "$recipient" >> "$wl" || \
@@ -56,7 +56,7 @@ postgrey_whitelist_recipents() {
 
 postgrey_reset_whitelists() {
 	local wl="/etc/postgrey/whitelist_recipients.local"
-	rm -f "$wl"
+	truncate --size=0 --no-create "$wl" || die "Could not truncate $wl"
 	if ! systemctl reload postgrey >/dev/null 2>&1; then
 		systemctl restart postgrey >>$TEST_OF 2>&1
 	fi
@@ -76,13 +76,15 @@ postgrey_reset_state() {
 	# testing scenario
 	#
 	record "[Reset postgrey]"
-	if [ ! -d "/var/lib/postgrey" ]; then
-		die "Postgrey database directory /var/lib/postgrey does not exist!"
+	#local db="/var/lib/postgrey"
+	local db="$STORAGE_ROOT/mail/postgrey/db"
+	if [ ! -d "$db" ]; then
+		die "Postgrey database directory $db does not exist!"
 	fi
 	systemctl stop postgrey >>$TEST_OF 2>&1 || die "unble to stop postgrey"
-	if ! rm -f /var/lib/postgrey/* >>$TEST_OF 2>&1; then
+	if ! rm -f "$db/*" >>$TEST_OF 2>&1; then
 		systemctl start postgrey >>$TEST_OF 2>&1
-		die "unable to remove the postgrey database files"
+		die "unable to remove the postgrey database files in $db"
 	fi
 
 	systemctl start postgrey >>$TEST_OF 2>&1 || die "unble to start postgrey"