From 8abd175abb8a5abfd25bc9172554bc05c8ce40c3 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 13 Aug 2014 07:06:55 -0400
Subject: [PATCH] Merge branch 'domain_module_fixes' into 'master'
---
server/plugins-available/mail_plugin_dkim.inc.php | 95 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 77 insertions(+), 18 deletions(-)
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index 2ed935f..a74c4b8 100644
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/server/plugins-available/mail_plugin_dkim.inc.php
@@ -87,6 +87,10 @@
break;
}
}
+ //* If we can use seperate config-files with amavis use 60-dkim
+ if (substr_compare($amavis_configfile, '50-user', -7) === 0)
+ $amavis_configfile = str_replace('50-user', '60-dkim', $amavis_configfile);
+
return $amavis_configfile;
}
@@ -98,10 +102,18 @@
*/
function check_system($data) {
global $app, $mail_config;
+
$app->uses('getconf');
$check=true;
+
/* check for amavis-config */
- if ( $this->get_amavis_config() == '' || !is_writeable($this->get_amavis_config()) ) {
+ $amavis_configfile = $this->get_amavis_config();
+
+ //* When we can use 60-dkim for the dkim-keys create the file if it does not exists.
+ if (substr_compare($amavis_configfile, '60-dkim', -7) === 0 && !file_exists($amavis_configfile))
+ file_put_contents($amavis_configfile, '');
+
+ if ( $amavis_configfile == '' || !is_writeable($amavis_configfile) ) {
$app->log('Amavis-config not found or not writeable.', LOGLEVEL_ERROR);
$check=false;
}
@@ -111,7 +123,21 @@
if (!is_dir($mail_config['dkim_path'])) {
$app->log('DKIM Path '.$mail_config['dkim_path'].' not found - (re)created.', LOGLEVEL_DEBUG);
- mkdir($mail_config['dkim_path'], 0750, true);
+ if($app->system->is_user('amavis')) {
+ $amavis_user='amavis';
+ } elseif ($app->system->is_user('vscan')) {
+ $amavis_user='vscan';
+ }
+ else {
+ $amavis_user='';
+ }
+ if(!empty($amavis_user)) {
+ mkdir($mail_config['dkim_path'], 0750, true);
+ exec('chown '.$amavis_user.' /var/lib/amavis/dkim');
+ unset($amavis_user);
+ } else {
+ mkdir($mail_config['dkim_path'], 0755, true);
+ }
}
if (!is_writeable($mail_config['dkim_path'])) {
@@ -120,7 +146,7 @@
}
} else {
- $app->log('Unable to write DKIM settings; Check your config!', LOGLEVEL_ERROR);
+ $app->log('Unable to write DKIM settings - no DKIM-Path defined', LOGLEVEL_ERROR);
$check=false;
}
return $check;
@@ -161,7 +187,7 @@
$app->log('Saved DKIM Private-key to '.$key_file.'.private', LOGLEVEL_DEBUG);
$success=true;
/* now we get the DKIM Public-key */
- exec('cat '.escapeshellarg($key_file.'.private').'|openssl rsa -pubout', $pubkey, $result);
+ exec('cat '.escapeshellarg($key_file.'.private').'|openssl rsa -pubout 2> /dev/null', $pubkey, $result);
$public_key='';
foreach($pubkey as $values) $public_key=$public_key.$values."\n";
/* save the DKIM Public-key in dkim-dir */
@@ -193,16 +219,32 @@
* This function adds the entry to the amavisd-config
* @param string $key_domain mail-domain
*/
- function add_to_amavis($key_domain) {
+ function add_to_amavis($key_domain, $selector, $old_selector) {
global $app, $mail_config;
+ if (empty($selector)) $selector = 'default';
$restart = false;
- $selector = 'default';
- $amavis_config = file_get_contents($this->get_amavis_config());
- $key_value="dkim_key('".$key_domain."', '".$selector."', '".$mail_config['dkim_path']."/".$key_domain.".private');\n";
- $amavis_config = preg_replace("/(\n|\r)?dkim_key.*".$key_domain.".*/", '', $amavis_config).$key_value;
+ $amavis_configfile = $this->get_amavis_config();
- if (file_put_contents($this->get_amavis_config(), $amavis_config)) {
+ $search_regex = "/(\n|\r)?dkim_key\(\'".$key_domain."\',\ \'(".$selector."|".$old_selector."){1}?\'.*/";
+
+ //* If we are using seperate config-files with amavis remove existing keys from 50-user to avoid duplicate keys
+ if (substr_compare($amavis_configfile, '60-dkim', -7) === 0) {
+ $temp_configfile = str_replace('60-dkim', '50-user', $amavis_configfile);
+ $temp_config = file_get_contents($temp_configfile);
+ if (preg_match($search_regex, $temp_config)) {
+ $temp_config = preg_replace($search_regex, '', $temp_config)."\n";
+ file_put_contents($temp_configfile, $temp_config);
+ }
+ unset($temp_configfile);
+ unset($temp_config);
+ }
+
+ $key_value="dkim_key('".$key_domain."', '".$selector."', '".$mail_config['dkim_path']."/".$key_domain.".private');\n";
+ $amavis_config = file_get_contents($amavis_configfile);
+ $amavis_config = preg_replace($search_regex, '', $amavis_config).$key_value;
+
+ if (file_put_contents($amavis_configfile, $amavis_config)) {
$app->log('Adding DKIM Private-key to amavis-config.', LOGLEVEL_DEBUG);
$restart = true;
} else {
@@ -220,13 +262,29 @@
global $app;
$restart = false;
- $amavis_config = file_get_contents($this->get_amavis_config());
+ $amavis_configfile = $this->get_amavis_config();
+ $amavis_config = file_get_contents($amavis_configfile);
- if (preg_match("/(\n|\r)?dkim_key.*".$key_domain.".*/", $amavis_config)) {
- $amavis_config = preg_replace("/(\n|\r)?dkim_key.*".$key_domain.".*(\n|\r)?/", '', $amavis_config);
- file_put_contents($this->get_amavis_config(), $amavis_config);
+ $search_regex = "/(\n|\r)?dkim_key.*".$key_domain.".*(\n|\r)?/";
+
+ if (preg_match($search_regex, $amavis_config)) {
+ $amavis_config = preg_replace($search_regex, '', $amavis_config);
+ file_put_contents($amavis_configfile, $amavis_config);
$app->log('Deleted the DKIM settings from amavis-config for '.$key_domain.'.', LOGLEVEL_DEBUG);
$restart = true;
+ }
+
+ //* If we are using seperate config-files with amavis remove existing keys from 50-user, too
+ if (substr_compare($amavis_configfile, '60-dkim', -7) === 0) {
+ $temp_configfile = str_replace('60-dkim', '50-user', $amavis_configfile);
+ $temp_config = file_get_contents($temp_configfile);
+ if (preg_match($search_regex, $temp_config)) {
+ $temp_config = preg_replace($search_regex, '', $temp_config);
+ file_put_contents($temp_configfile, $temp_config);
+ $restart = true;
+ }
+ unset($temp_configfile);
+ unset($temp_config);
}
return $restart;
@@ -243,7 +301,7 @@
if ( substr($mail_config['dkim_path'], strlen($mail_config['dkim_path'])-1) == '/' )
$mail_config['dkim_path'] = substr($mail_config['dkim_path'], 0, strlen($mail_config['dkim_path'])-1);
if ($this->write_dkim_key($mail_config['dkim_path']."/".$data['new']['domain'], $data['new']['dkim_private'], $data['new']['domain'])) {
- if ($this->add_to_amavis($data['new']['domain'])) {
+ if ($this->add_to_amavis($data['new']['domain'], $data['new']['dkim_selector'], $data['old']['dkim_selector'] )) {
$this->restart_amavis();
} else {
$this->remove_dkim_key($mail_config['dkim_path']."/".$data['new']['domain'], $data['new']['domain']);
@@ -251,9 +309,6 @@
} else {
$app->log('Error saving the DKIM Private-key for '.$data['new']['domain'].' - DKIM is not enabled for the domain.', LOGLEVEL_ERROR);
}
- }
- else {
- $app->log('DKIM for '.$data['new']['domain'].' not written to disk - domain is inactive', LOGLEVEL_DEBUG);
}
}
@@ -320,6 +375,10 @@
if ($data['new']['dkim_private'] != $data['old']['dkim_private'] && $data['new']['dkim'] == 'y') {
$this->add_dkim($data);
}
+ /* new selector */
+ if ($data['new']['dkim_selector'] != $data['old']['dkim_selector'] && $data['new']['dkim'] == 'y') {
+ $this->add_dkim($data);
+ }
/* new domain-name */
if ($data['new']['domain'] != $data['old']['domain']) {
$this->remove_dkim($data['old']);
--
Gitblit v1.9.1