Merge branch '6119-umask-in-updater-bad-etc-rspamd-local-d-maps-d-permission' into 'develop'

Marius Burkard · Marius Burkard · commit f5b71570e972 · 2021-03-25T16:20:29.000Z
Resolve "umask in updater (bad /etc/rspamd/local.d/maps.d/ permission)"

Closes #6119

See merge request ispconfig/ispconfig3!1458
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -1803,14 +1803,17 @@ public function configure_rspamd() {
 
 		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) == '/' ) {
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1803,14 +1803,17 @@ public function configure_rspamd() {`
`1803`	`1803`
`1804`	`1804`	`if(!is_dir('/etc/rspamd/local.d/')){`
`1805`	`1805`	`mkdir('/etc/rspamd/local.d/', 0755, true);`
	`1806`	`+ chmod('/etc/rspamd/local.d/', 0755);`
`1806`	`1807`	`}`
`1807`	`1808`
`1808`	`1809`	`if(!is_dir('/etc/rspamd/local.d/maps.d/')){`
`1809`	`1810`	`mkdir('/etc/rspamd/local.d/maps.d/', 0755, true);`
	`1811`	`+ chmod('/etc/rspamd/local.d/maps.d/', 0755);`
`1810`	`1812`	`}`
`1811`	`1813`
`1812`	`1814`	`if(!is_dir('/etc/rspamd/override.d/')){`
`1813`	`1815`	`mkdir('/etc/rspamd/override.d/', 0755, true);`
	`1816`	`+ chmod('/etc/rspamd/override.d/', 0755);`
`1814`	`1817`	`}`
`1815`	`1818`
`1816`	`1819`	`if ( substr($mail_config['dkim_path'], strlen($mail_config['dkim_path'])-1) == '/' ) {`