From b1a6a5a3991cec5cd08873b01376e45d0b247f18 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 09:05:33 -0500
Subject: [PATCH] Cleaning up code to match coding guidelines
---
server/plugins-available/mail_plugin_dkim.inc.php | 318 ++++++++++++++++++++++++++++------------------------
1 files changed, 169 insertions(+), 149 deletions(-)
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index 72a1d03..322ccd8 100644
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/server/plugins-available/mail_plugin_dkim.inc.php
@@ -1,36 +1,37 @@
<?php
/**
-Copyright (c) 2007 - 2013, Till Brehm, projektfarm Gmbh
-Copyright (c) 2013, Florian Schaal, info@schaal-24.de
-All rights reserved.
+ Copyright (c) 2007 - 2013, Till Brehm, projektfarm Gmbh
+ Copyright (c) 2013, Florian Schaal, info@schaal-24.de
+ All rights reserved.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of ISPConfig nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of ISPConfig nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-@author Florian Schaal, info@schaal-24.de
-@copyrighth Florian Schaal, info@schaal-24.de
-*/
+ @author Florian Schaal, info@schaal-24.de
+ @copyrighth Florian Schaal, info@schaal-24.de
+ */
+
class mail_plugin_dkim {
@@ -40,10 +41,11 @@
// private variables
var $action = '';
- /**
- * This function is called during ispconfig installation to determine
- * if a symlink shall be created for this plugin.
- */
+
+ /**
+ * This function is called during ispconfig installation to determine
+ * if a symlink shall be created for this plugin.
+ */
function onInstall() {
global $conf;
@@ -55,23 +57,25 @@
}
+
/**
- * This function is called when the plugin is loaded
- */
+ * This function is called when the plugin is loaded
+ */
function onLoad() {
- global $app,$conf;
+ global $app, $conf;
/*
Register for the events
*/
- $app->plugins->registerEvent('mail_domain_delete',$this->plugin_name,'domain_dkim_delete');
- $app->plugins->registerEvent('mail_domain_insert',$this->plugin_name,'domain_dkim_insert');
- $app->plugins->registerEvent('mail_domain_update',$this->plugin_name,'domain_dkim_update');
+ $app->plugins->registerEvent('mail_domain_delete', $this->plugin_name, 'domain_dkim_delete');
+ $app->plugins->registerEvent('mail_domain_insert', $this->plugin_name, 'domain_dkim_insert');
+ $app->plugins->registerEvent('mail_domain_update', $this->plugin_name, 'domain_dkim_update');
}
- /**
- * This function gets the amavisd-config file
- * @return string path to the amavisd-config for dkim-keys
- */
+
+ /**
+ * This function gets the amavisd-config file
+ * @return string path to the amavisd-config for dkim-keys
+ */
function get_amavis_config() {
$pos_config=array(
'/etc/amavisd.conf',
@@ -79,122 +83,131 @@
'/etc/amavis/conf.d/50-user'
);
$amavis_configfile='';
- foreach($pos_config as $conf) {
+ foreach($pos_config as $conf) {
if (is_file($conf)) {
$amavis_configfile=$conf;
break;
}
- }
+ }
return $amavis_configfile;
}
+
/**
- * This function checks the relevant configs and disables dkim for the domain
- * if the directory for dkim is not writeable or does not exist
- * @param array $data mail-settings
- * @return boolean - true when the amavis-config and the dkim-dir are writeable
- */
+ * This function checks the relevant configs and disables dkim for the domain
+ * if the directory for dkim is not writeable or does not exist
+ * @param array $data mail-settings
+ * @return boolean - true when the amavis-config and the dkim-dir are writeable
+ */
function check_system($data) {
- global $app,$mail_config;
- $app->uses('getconf');
+ global $app, $mail_config;
+ $app->uses('getconf');
$check=true;
/* check for amavis-config */
if ( $this->get_amavis_config() == '' || !is_writeable($this->get_amavis_config()) ) {
- $app->log('Amavis-config not found or not writeable.',LOGLEVEL_ERROR);
+ $app->log('Amavis-config not found or not writeable.', LOGLEVEL_ERROR);
$check=false;
}
/* 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']) && isset($data['new']['dkim_private']) && !empty($data['new']['dkim_private'])) {
if (!is_writeable($mail_config['dkim_path'])) {
- $app->log('DKIM Path '.$mail_config['dkim_path'].' not found or not writeable.',LOGLEVEL_ERROR);
+ $app->log('DKIM Path '.$mail_config['dkim_path'].' not found or not writeable.', LOGLEVEL_ERROR);
$check=false;
- }
+ }
} else {
- $app->log('Unable to write DKIM settings; Check your config!',LOGLEVEL_ERROR);
+ $app->log('Unable to write DKIM settings; Check your config!', LOGLEVEL_ERROR);
$check=false;
}
return $check;
}
-
- /**
- * This function restarts amavis
- */
- function restart_amavis() {
- global $app,$conf;
- $initfile=$conf['init_scripts'].'/amavis';
- $app->log('Restarting amavis.',LOGLEVEL_DEBUG);
- exec(escapeshellarg($conf['init_scripts']).escapeshellarg('/amavis').' restart',$output);
- foreach($output as $logline) $app->log($logline,LOGLEVEL_DEBUG);
- }
+
+
+
+
/**
- * This function writes the keyfiles (public and private)
- * @param string $key_file full path to the key-file
- * @param string $key_value private-key
- * @param string $key_domain mail-domain
- * @return bool - true when the key is written to disk
- */
- function write_dkim_key($key_file,$key_value,$key_domain) {
- global $app,$mailconfig;
+ * This function restarts amavis
+ */
+ function restart_amavis() {
+ global $app, $conf;
+ $initfile=$conf['init_scripts'].'/amavis';
+ $app->log('Restarting amavis.', LOGLEVEL_DEBUG);
+ exec(escapeshellarg($conf['init_scripts']).escapeshellarg('/amavis').' restart', $output);
+ foreach($output as $logline) $app->log($logline, LOGLEVEL_DEBUG);
+ }
+
+
+ /**
+ * This function writes the keyfiles (public and private)
+ * @param string $key_file full path to the key-file
+ * @param string $key_value private-key
+ * @param string $key_domain mail-domain
+ * @return bool - true when the key is written to disk
+ */
+ function write_dkim_key($key_file, $key_value, $key_domain) {
+ global $app, $mailconfig;
$success=false;
- if (!file_put_contents($key_file.'.private',$key_value) === false) {
- $app->log('Saved DKIM Private-key to '.$key_file.'.private',LOGLEVEL_DEBUG);
+ if (!file_put_contents($key_file.'.private', $key_value) === false) {
+ $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', $pubkey, $result);
$public_key='';
foreach($pubkey as $values) $public_key=$public_key.$values."\n";
/* save the DKIM Public-key in dkim-dir */
- if (!file_put_contents($key_file.'.public',$public_key) === false)
- $app->log('Saved DKIM Public to '.$key_domain.'.',LOGLEVEL_DEBUG);
- else $app->log('Unable to save DKIM Public to '.$key_domain.'.',LOGLEVEL_WARNING);
- }
+ if (!file_put_contents($key_file.'.public', $public_key) === false)
+ $app->log('Saved DKIM Public to '.$key_domain.'.', LOGLEVEL_DEBUG);
+ else $app->log('Unable to save DKIM Public to '.$key_domain.'.', LOGLEVEL_WARNING);
+ }
return $success;
}
+
/**
- * This function removes the keyfiles
- * @param string $key_file full path to the key-file
- * @param string $key_domain mail-domain
- */
- function remove_dkim_key($key_file,$key_domain) {
+ * This function removes the keyfiles
+ * @param string $key_file full path to the key-file
+ * @param string $key_domain mail-domain
+ */
+ function remove_dkim_key($key_file, $key_domain) {
global $app;
if (file_exists($key_file.'.private')) {
exec('rm -f '.escapeshellarg($key_file.'.private'));
- $app->log('Deleted the DKIM Private-key for '.$key_domain.'.',LOGLEVEL_DEBUG);
- } else $app->log('Unable to delete the DKIM Private-key for '.$key_domain.' (not found).',LOGLEVEL_DEBUG);
+ $app->log('Deleted the DKIM Private-key for '.$key_domain.'.', LOGLEVEL_DEBUG);
+ } else $app->log('Unable to delete the DKIM Private-key for '.$key_domain.' (not found).', LOGLEVEL_DEBUG);
if (file_exists($key_file.'.public')) {
exec('rm -f '.escapeshellarg($key_file.'.public'));
- $app->log('Deleted the DKIM Public-key for '.$key_domain.'.',LOGLEVEL_DEBUG);
- } else $app->log('Unable to delete the DKIM Public-key for '.$key_domain.' (not found).',LOGLEVEL_DEBUG);
+ $app->log('Deleted the DKIM Public-key for '.$key_domain.'.', LOGLEVEL_DEBUG);
+ } else $app->log('Unable to delete the DKIM Public-key for '.$key_domain.' (not found).', LOGLEVEL_DEBUG);
}
+
/**
- * This function adds the entry to the amavisd-config
- * @param string $key_domain mail-domain
- */
+ * This function adds the entry to the amavisd-config
+ * @param string $key_domain mail-domain
+ */
function add_to_amavis($key_domain) {
- global $app,$mail_config;
+ global $app, $mail_config;
$amavis_config = file_get_contents($this->get_amavis_config());
- $key_value="dkim_key('".$key_domain."', 'default', '".$mail_config['dkim_path']."/".$key_domain.".private');\n";
- if(strpos($amavis_config, $key_value) !== false) $amavis_config = str_replace($key_value, '', $amavis_config);
- if (!file_put_contents($this->get_amavis_config(),$key_value,FILE_APPEND) === false) {
- $app->log('Adding DKIM Private-key to amavis-config.',LOGLEVEL_DEBUG);
+ $key_value="dkim_key('".$key_domain."', 'default', '".$mail_config['dkim_path']."/".$key_domain.".private');\n";
+ if(strpos($amavis_config, $key_value) !== false) $amavis_config = str_replace($key_value, '', $amavis_config);
+ if (!file_put_contents($this->get_amavis_config(), $key_value, FILE_APPEND) === false) {
+ $app->log('Adding DKIM Private-key to amavis-config.', LOGLEVEL_DEBUG);
$this->restart_amavis();
}
}
+
/**
- * This function removes the entry from the amavisd-config
- * @param string $key_domain mail-domain
- */
+ * This function removes the entry from the amavisd-config
+ * @param string $key_domain mail-domain
+ */
function remove_from_amavis($key_domain) {
global $app;
$amavis_config = file($this->get_amavis_config());
$i=0;$found=false;
foreach($amavis_config as $line) {
- if (preg_match("/^\bdkim_key\b.*\b".$key_domain."\b/",$line)) {
+ if (preg_match("/^\bdkim_key\b.*\b".$key_domain."\b/", $line)) {
unset($amavis_config[$i]);
$found=true;
}
@@ -202,95 +215,102 @@
}
if ($found) {
file_put_contents($this->get_amavis_config(), $amavis_config);
- $app->log('Deleted the DKIM settings from amavis-config for '.$key_domain.'.',LOGLEVEL_DEBUG);
+ $app->log('Deleted the DKIM settings from amavis-config for '.$key_domain.'.', LOGLEVEL_DEBUG);
$this->restart_amavis();
- } else $app->log('Unable to delete the DKIM settings from amavis-config for '.$key_domain.'.',LOGLEVEL_ERROR);
+ } else $app->log('Unable to delete the DKIM settings from amavis-config for '.$key_domain.'.', LOGLEVEL_ERROR);
}
+
/**
- * This function controlls new key-files and amavisd-entries
- * @param array $data mail-settings
- */
+ * This function controlls new key-files and amavisd-entries
+ * @param array $data mail-settings
+ */
function add_dkim($data) {
global $app;
if ($data['new']['active'] == 'y') {
- $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
- 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'])) {
- $this->add_to_amavis($data['new']['domain']);
+ $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
+ 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'])) {
+ $this->add_to_amavis($data['new']['domain']);
} else {
- $app->log('Error saving the DKIM Private-key for '.$data['new']['domain'].' - DKIM is not enabled for the domain.',LOGLEVEL_ERROR);
+ $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);
+ $app->log('DKIM for '.$data['new']['domain'].' not written to disk - domain is inactive', LOGLEVEL_DEBUG);
}
}
- /**
- * This function controlls the removement of keyfiles (public and private)
- * and the entry in the amavisd-config
- * @param array $data mail-settings
- */
- function remove_dkim($_data) {
- global $app;
- $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
- 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);
- $this->remove_dkim_key($mail_config['dkim_path']."/".$_data['domain'],$_data['domain']);
- $this->remove_from_amavis($_data['domain']);
- }
/**
- * Function called by onLoad
- * deletes dkim-keys
- */
- function domain_dkim_delete($event_name,$data) {
+ * This function controlls the removement of keyfiles (public and private)
+ * and the entry in the amavisd-config
+ * @param array $data mail-settings
+ */
+ function remove_dkim($_data) {
+ global $app;
+ $mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
+ 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);
+ $this->remove_dkim_key($mail_config['dkim_path']."/".$_data['domain'], $_data['domain']);
+ $this->remove_from_amavis($_data['domain']);
+ }
+
+
+ /**
+ * Function called by onLoad
+ * deletes dkim-keys
+ */
+ function domain_dkim_delete($event_name, $data) {
if (isset($data['old']['dkim']) && $data['old']['dkim'] == 'y') $this->remove_dkim($data['old']);
}
+
/**
- * Function called by onLoad
- * insert dkim-keys
- */
- function domain_dkim_insert($event_name,$data) {
+ * Function called by onLoad
+ * insert dkim-keys
+ */
+ function domain_dkim_insert($event_name, $data) {
if (isset($data['new']['dkim']) && $data['new']['dkim']=='y' && $this->check_system($data)) {
$this->add_dkim($data);
}
}
+
/**
- * Function called by onLoad
- * chang dkim-settings
- */
- function domain_dkim_update($event_name,$data) {
+ * Function called by onLoad
+ * chang dkim-settings
+ */
+ function domain_dkim_update($event_name, $data) {
global $app;
- /* get the config */
+ /* get the config */
if (isset($data['new']['dkim']) && $data['new']['dkim']=='y') { /* DKIM enabled */
if ($this->check_system($data)) {
/* new domain-name */
- if ($data['old']['domain'] != $data['new']['domain']) {
+ if ($data['old']['domain'] != $data['new']['domain']) {
$this->remove_dkim($data['old']);
$this->add_dkim($data);
}
/* new key */
- if (($data['old']['dkim_private'] != $data['new']['dkim_private']) || ($data['old']['dkim'] != $data['new']['dkim'])) {
- if ($data['new']['dkim_private'] != $data['old']['dkim_private']) $this->remove_dkim($data['new']);
+ if (($data['old']['dkim_private'] != $data['new']['dkim_private']) || ($data['old']['dkim'] != $data['new']['dkim'])) {
+ if ($data['new']['dkim_private'] != $data['old']['dkim_private']) $this->remove_dkim($data['new']);
$this->add_dkim($data);
}
/* change active (on / off) */
- if ($data['old']['active'] != $data['new']['active']) {
- if ($data['new']['active'] == 'y') {
- $this->add_dkim($data);
+ if ($data['old']['active'] != $data['new']['active']) {
+ if ($data['new']['active'] == 'y') {
+ $this->add_dkim($data);
} else {
- $this->remove_dkim($data['new']);
- }
- }
- }
+ $this->remove_dkim($data['new']);
+ }
+ }
+ }
}
if (isset($data['new']['dkim']) && $data['old']['dkim'] != $data['new']['dkim'])
if ($this->check_system($data) && $data['new']['dkim'] == 'n') $this->remove_dkim($data['new']);
}
+
}
+
?>
--
Gitblit v1.9.1