Commit 16539954 authored by Florian Schaal's avatar Florian Schaal

fixed (re)creation of DKIM Path and add some warn-logs

parent a5ce4329
...@@ -119,8 +119,12 @@ class mail_plugin_dkim { ...@@ -119,8 +119,12 @@ class mail_plugin_dkim {
} }
/* dir for dkim-keys writeable? */ /* dir for dkim-keys writeable? */
$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail'); $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
if (isset($mail_config['dkim_path']) && (!empty($mail_config['dkim_path'])) && isset($data['new']['dkim_private']) && !empty($data['new']['dkim_private'])) { if ( isset($mail_config['dkim_path']) &&
!empty($mail_config['dkim_path']) &&
isset($data['new']['dkim_private']) &&
!empty($data['new']['dkim_private']) &&
$mail_config['dkim_path'] != '/'
) {
if (!is_dir($mail_config['dkim_path'])) { if (!is_dir($mail_config['dkim_path'])) {
$app->log('DKIM Path '.$mail_config['dkim_path'].' not found - (re)created.', LOGLEVEL_DEBUG); $app->log('DKIM Path '.$mail_config['dkim_path'].' not found - (re)created.', LOGLEVEL_DEBUG);
if($app->system->is_user('amavis')) { if($app->system->is_user('amavis')) {
...@@ -133,10 +137,12 @@ class mail_plugin_dkim { ...@@ -133,10 +137,12 @@ class mail_plugin_dkim {
} }
if(!empty($amavis_user)) { if(!empty($amavis_user)) {
mkdir($mail_config['dkim_path'], 0750, true); mkdir($mail_config['dkim_path'], 0750, true);
exec('chown '.$amavis_user.' /var/lib/amavis/dkim'); exec('chown '.$amavis_user.' '.escapeshellarg($mail_config['dkim_path']));
unset($amavis_user); unset($amavis_user);
} else { } else {
mkdir($mail_config['dkim_path'], 0755, true); mkdir($mail_config['dkim_path'], 0755, true);
$app->log('No user amavis or vscan found - using root for '.$mail_config['dkim_path']
, LOGLEVEL_WARNING);
} }
} }
...@@ -194,6 +200,8 @@ class mail_plugin_dkim { ...@@ -194,6 +200,8 @@ class mail_plugin_dkim {
if (!file_put_contents($key_file.'.public', $public_key) === false) if (!file_put_contents($key_file.'.public', $public_key) === false)
$app->log('Saved DKIM Public to '.$key_domain.'.', LOGLEVEL_DEBUG); $app->log('Saved DKIM Public to '.$key_domain.'.', LOGLEVEL_DEBUG);
else $app->log('Unable to save DKIM Public to '.$key_domain.'.', LOGLEVEL_DEBUG); else $app->log('Unable to save DKIM Public to '.$key_domain.'.', LOGLEVEL_DEBUG);
} else {
$app->log('Unable to save DKIM Privte-key to '.$key_file.'.private', LOGLEVEL_ERROR);
} }
return $success; return $success;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment