Skip to content

Commit 5538547

Browse files
author
Till Brehm
committed
Set stronger permission settings on amavis configuration files.
1 parent 68af0bb commit 5538547

File tree

7 files changed

+32
-4
lines changed

7 files changed

+32
-4
lines changed

‎install/dist/lib/centos52.lib.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ public function configure_amavis() {
123123
$content = str_replace('{hostname}', $conf['hostname'], $content);
124124
$content = str_replace('/var/spool/amavisd/clamd.sock', '/tmp/clamd.socket', $content);
125125
wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
126+
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
126127

127128

128129
// Adding the amavisd commands to the postfix configuration

‎install/dist/lib/centos53.lib.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ public function configure_amavis() {
124124
$content = str_replace('{hostname}', $conf['hostname'], $content);
125125
$content = str_replace('/var/spool/amavisd/clamd.sock', '/var/run/clamav/clamd.sock', $content);
126126
wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
127+
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
127128

128129

129130
// Adding the amavisd commands to the postfix configuration

‎install/dist/lib/centos70.lib.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ public function configure_amavis() {
124124
$content = str_replace('{hostname}', $conf['hostname'], $content);
125125
$content = str_replace('/var/spool/amavisd/clamd.sock', '/var/run/clamav/clamd.sock', $content);
126126
wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
127+
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
127128

128129

129130
// Adding the amavisd commands to the postfix configuration

‎install/dist/lib/fedora.lib.php‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,7 @@ public function configure_amavis() {
477477
$content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
478478
$content = str_replace('{hostname}', $conf['hostname'], $content);
479479
wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
480+
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
480481

481482

482483
// Adding the amavisd commands to the postfix configuration
@@ -1271,7 +1272,13 @@ public function install_ispconfig()
12711272

12721273
// Add symlink for patch tool
12731274
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
1274-
1275+
1276+
// Change mode of a few files from amavisd
1277+
if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) chmod($conf['amavis']['config_dir'].'/conf.d/50-user', 0640);
1278+
if(is_file($conf['amavis']['config_dir'].'/50-user~')) chmod($conf['amavis']['config_dir'].'/50-user~', 0400);
1279+
if(is_file($conf['amavis']['config_dir'].'/amavisd.conf')) chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
1280+
if(is_file($conf['amavis']['config_dir'].'/amavisd.conf~')) chmod($conf['amavis']['config_dir'].'/amavisd.conf~', 0400);
1281+
12751282
}
12761283

12771284
public function configure_dbserver()

‎install/dist/lib/gentoo.lib.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1140,7 +1140,13 @@ public function install_ispconfig()
11401140

11411141
// Add symlink for patch tool
11421142
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
1143-
1143+
1144+
// Change mode of a few files from amavisd
1145+
if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) chmod($conf['amavis']['config_dir'].'/conf.d/50-user', 0640);
1146+
if(is_file($conf['amavis']['config_dir'].'/50-user~')) chmod($conf['amavis']['config_dir'].'/50-user~', 0400);
1147+
if(is_file($conf['amavis']['config_dir'].'/amavisd.conf')) chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
1148+
if(is_file($conf['amavis']['config_dir'].'/amavisd.conf~')) chmod($conf['amavis']['config_dir'].'/amavisd.conf~', 0400);
1149+
11441150
}
11451151

11461152
}

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,7 @@ public function configure_amavis() {
525525
$content = str_replace('{mysql_server_port}', $conf["mysql"]["port"], $content);
526526
$content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
527527
wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
528+
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
528529

529530

530531
// Adding the amavisd commands to the postfix configuration
@@ -1345,7 +1346,12 @@ public function install_ispconfig()
13451346
// Add symlink for patch tool
13461347
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
13471348

1348-
1349+
// Change mode of a few files from amavisd
1350+
if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) chmod($conf['amavis']['config_dir'].'/conf.d/50-user', 0640);
1351+
if(is_file($conf['amavis']['config_dir'].'/50-user~')) chmod($conf['amavis']['config_dir'].'/50-user~', 0400);
1352+
if(is_file($conf['amavis']['config_dir'].'/amavisd.conf')) chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
1353+
if(is_file($conf['amavis']['config_dir'].'/amavisd.conf~')) chmod($conf['amavis']['config_dir'].'/amavisd.conf~', 0400);
1354+
13491355
}
13501356

13511357
public function configure_dbserver()

‎install/lib/installer_base.lib.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1034,14 +1034,15 @@ public function configure_amavis() {
10341034
// amavisd user config file
10351035
$configfile = 'amavisd_user_config';
10361036
if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) copy($conf['amavis']['config_dir'].'/conf.d/50-user', $conf['amavis']['config_dir'].'/50-user~');
1037-
if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user~')) chmod($conf['amavis']['config_dir'].'/conf.d/50-user~', 0400);
1037+
if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user~')) chmod($conf['amavis']['config_dir'].'/50-user~', 0400);
10381038
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master');
10391039
$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
10401040
$content = str_replace('{mysql_server_ispconfig_password}', $conf['mysql']['ispconfig_password'], $content);
10411041
$content = str_replace('{mysql_server_database}', $conf['mysql']['database'], $content);
10421042
$content = str_replace('{mysql_server_port}', $conf['mysql']['port'], $content);
10431043
$content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
10441044
wf($conf['amavis']['config_dir'].'/conf.d/50-user', $content);
1045+
chmod($conf['amavis']['config_dir'].'/conf.d/50-user', 0640);
10451046

10461047
// TODO: chmod and chown on the config file
10471048

@@ -2200,6 +2201,11 @@ public function install_ispconfig() {
22002201
// Add symlink for patch tool
22012202
if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
22022203

2204+
// Change mode of a few files from amavisd
2205+
if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) chmod($conf['amavis']['config_dir'].'/conf.d/50-user', 0640);
2206+
if(is_file($conf['amavis']['config_dir'].'/50-user~')) chmod($conf['amavis']['config_dir'].'/50-user~', 0400);
2207+
if(is_file($conf['amavis']['config_dir'].'/amavisd.conf')) chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
2208+
if(is_file($conf['amavis']['config_dir'].'/amavisd.conf~')) chmod($conf['amavis']['config_dir'].'/amavisd.conf~', 0400);
22032209
}
22042210

22052211
public function configure_dbserver() {

0 commit comments

Comments
 (0)