From 32048facf803dcdd08ea6bcca295158633b57762 Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Tue, 23 Mar 2021 15:36:35 -0600
Subject: [PATCH 1/2] updater: reset umask after creating tmpdir

---
 server/scripts/update_runner.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/scripts/update_runner.sh b/server/scripts/update_runner.sh
index 5647272f3a..8c885f7299 100644
--- a/server/scripts/update_runner.sh
+++ b/server/scripts/update_runner.sh
@@ -40,10 +40,12 @@ cd /tmp
 if [ -n "${_UPD}" ]
 then
     {
+        save_umask=`umask`
         umask 0077 \
         && tmpdir=`mktemp -dt "$(basename $0).XXXXXXXXXX"` \
         && test -d "${tmpdir}" \
         && cd "${tmpdir}"
+        umask $save_umask
     } || {
         echo 'mktemp failed'
         exit 1
-- 
GitLab


From b801952990365ed0c74d30d089ecec981d157375 Mon Sep 17 00:00:00 2001
From: Jesse Norell <jesse@kci.net>
Date: Tue, 23 Mar 2021 15:41:08 -0600
Subject: [PATCH 2/2] ensure created rspamd directories have correct permission

---
 install/lib/installer_base.lib.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 6de768f7e5..9c7e139c37 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1800,14 +1800,17 @@ class installer_base {
 
 		if(!is_dir('/etc/rspamd/local.d/')){
 			mkdir('/etc/rspamd/local.d/', 0755, true);
+			chmod('/etc/rspamd/local.d/', 0755);
 		}
 
 		if(!is_dir('/etc/rspamd/local.d/maps.d/')){
 			mkdir('/etc/rspamd/local.d/maps.d/', 0755, true);
+			chmod('/etc/rspamd/local.d/maps.d/', 0755);
 		}
 
 		if(!is_dir('/etc/rspamd/override.d/')){
 			mkdir('/etc/rspamd/override.d/', 0755, true);
+			chmod('/etc/rspamd/override.d/', 0755);
 		}
 
 		if ( substr($mail_config['dkim_path'], strlen($mail_config['dkim_path'])-1) == '/' ) {
-- 
GitLab