{tmpl_var name='overquota_notify_admin'}
diff --git a/interface/web/mail/mail_blacklist_del.php b/interface/web/mail/mail_blacklist_del.php
index d3bbc5d5d581991078d44997aa583d1550243181..aa671c488714f0f76af47e45aafad673ecb32eca 100644
--- a/interface/web/mail/mail_blacklist_del.php
+++ b/interface/web/mail/mail_blacklist_del.php
@@ -43,7 +43,7 @@ require_once '../../lib/config.inc.php';
require_once '../../lib/app.inc.php';
-if($_SESSION["s"]["user"]["typ"] != 'admin') $app->error('This function needs admin priveliges');
+if($_SESSION["s"]["user"]["typ"] != 'admin') $app->error('This function needs admin privileges');
//* Check permissions for module
$app->auth->check_module_permissions('mail');
diff --git a/interface/web/mail/mail_blacklist_edit.php b/interface/web/mail/mail_blacklist_edit.php
index e2f284a34ed84df3a0c397aee67107eeabb15468..b86729b919e9d08a8855d972d8c447e48a36bc3b 100644
--- a/interface/web/mail/mail_blacklist_edit.php
+++ b/interface/web/mail/mail_blacklist_edit.php
@@ -53,7 +53,7 @@ class page_action extends tform_actions {
function onShowNew() {
global $app, $conf;
- if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin priveliges');
+ if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin privileges');
parent::onShowNew();
}
@@ -61,7 +61,7 @@ class page_action extends tform_actions {
function onBeforeUpdate() {
global $app, $conf;
- if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin priveliges');
+ if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin privileges');
//* Check if the server has been changed
// We do this only for the admin or reseller users, as normal clients can not change the server ID anyway
@@ -79,7 +79,7 @@ class page_action extends tform_actions {
function onSubmit() {
global $app, $conf;
- if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin priveliges');
+ if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin privileges');
if(substr($this->dataRecord['source'], 0, 1) === '@') $this->dataRecord['source'] = substr($this->dataRecord['source'], 1);
diff --git a/interface/web/mail/mail_blacklist_list.php b/interface/web/mail/mail_blacklist_list.php
index 2bdc1e93b8270148285eb4d705dfa7b47cadcfce..ecb24d867c740f2f7853fd46d4d7f52ed1a5bf6b 100644
--- a/interface/web/mail/mail_blacklist_list.php
+++ b/interface/web/mail/mail_blacklist_list.php
@@ -12,7 +12,7 @@ $list_def_file = "list/mail_blacklist.list.php";
* End Form configuration
******************************************/
-if($_SESSION["s"]["user"]["typ"] != 'admin') $app->error('This function needs admin priveliges');
+if($_SESSION["s"]["user"]["typ"] != 'admin') $app->error('This function needs admin privileges');
//* Check permissions for module
$app->auth->check_module_permissions('mail');
diff --git a/interface/web/mail/mail_whitelist_del.php b/interface/web/mail/mail_whitelist_del.php
index 2294f4486806d41ffc7777d5bec207ae9c519c48..06ce88550bcef2a2e00d674759ddf310842bba3a 100644
--- a/interface/web/mail/mail_whitelist_del.php
+++ b/interface/web/mail/mail_whitelist_del.php
@@ -42,7 +42,7 @@ $tform_def_file = "form/mail_whitelist.tform.php";
require_once '../../lib/config.inc.php';
require_once '../../lib/app.inc.php';
-if($_SESSION["s"]["user"]["typ"] != 'admin') $app->error('This function needs admin priveliges');
+if($_SESSION["s"]["user"]["typ"] != 'admin') $app->error('This function needs admin privileges');
//* Check permissions for module
$app->auth->check_module_permissions('mail');
diff --git a/interface/web/mail/mail_whitelist_edit.php b/interface/web/mail/mail_whitelist_edit.php
index 2cf56b1ec451626491830f41acb54196341d6505..35fa825ec78cbdb8d237594cd276ae94ce9199b2 100644
--- a/interface/web/mail/mail_whitelist_edit.php
+++ b/interface/web/mail/mail_whitelist_edit.php
@@ -53,7 +53,7 @@ class page_action extends tform_actions {
function onShowNew() {
global $app, $conf;
- if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin priveliges');
+ if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin privileges');
parent::onShowNew();
}
@@ -61,7 +61,7 @@ class page_action extends tform_actions {
function onBeforeUpdate() {
global $app, $conf;
- if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin priveliges');
+ if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin privileges');
//* Check if the server has been changed
// We do this only for the admin or reseller users, as normal clients can not change the server ID anyway
@@ -77,7 +77,7 @@ class page_action extends tform_actions {
function onSubmit() {
global $app, $conf;
- if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin priveliges');
+ if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin privileges');
if(substr($this->dataRecord['source'], 0, 1) === '@') $this->dataRecord['source'] = substr($this->dataRecord['source'], 1);
diff --git a/interface/web/mail/mail_whitelist_list.php b/interface/web/mail/mail_whitelist_list.php
index 1a09b6b16578dd81455536a425d110597ed99168..73877797b4c97e40a333427c4e606793d70e2651 100644
--- a/interface/web/mail/mail_whitelist_list.php
+++ b/interface/web/mail/mail_whitelist_list.php
@@ -12,7 +12,7 @@ $list_def_file = "list/mail_whitelist.list.php";
* End Form configuration
******************************************/
-if($_SESSION["s"]["user"]["typ"] != 'admin') $app->error('This function needs admin priveliges');
+if($_SESSION["s"]["user"]["typ"] != 'admin') $app->error('This function needs admin privileges');
//* Check permissions for module
$app->auth->check_module_permissions('mail');
diff --git a/interface/web/mail/spamfilter_config_edit.php b/interface/web/mail/spamfilter_config_edit.php
index 5b3062ab771341d8214ca589d628621f55d53da8..9314feeccc95411b8e05b6eaaec7119af0d369a8 100644
--- a/interface/web/mail/spamfilter_config_edit.php
+++ b/interface/web/mail/spamfilter_config_edit.php
@@ -53,7 +53,7 @@ class page_action extends tform_actions {
function onShowEdit() {
global $app, $conf;
- if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin priveliges');
+ if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin privileges');
if($app->tform->errorMessage == '') {
$app->uses('ini_parser,getconf');
@@ -73,7 +73,7 @@ class page_action extends tform_actions {
function onUpdateSave($sql) {
global $app;
- if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin priveliges');
+ if($_SESSION["s"]["user"]["typ"] != 'admin') die('This function needs admin privileges');
$app->uses('ini_parser,getconf');
$section = $app->tform->getCurrentTab();
diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php
index 72f602f9dae2e7ac46da32d4aaf72803e9c979b6..e1fba6e18082c4fda64addbb5a293bc3b9940f95 100644
--- a/server/plugins-available/mysql_clientdb_plugin.inc.php
+++ b/server/plugins-available/mysql_clientdb_plugin.inc.php
@@ -529,7 +529,7 @@ class mysql_clientdb_plugin {
//* Remote access option has changed.
if($data['new']['remote_access'] != $data['old']['remote_access']) {
- //* set new priveliges
+ //* set new privileges
if($data['new']['remote_access'] == 'y') {
if($db_user) {
if($db_user['database_user'] == 'root'){
diff --git a/server/plugins-available/postfix_server_plugin.inc.php b/server/plugins-available/postfix_server_plugin.inc.php
index 5a0b222a2491bb62125adbaa096d887ed28aee85..2d6f063cd855752aa730a5bda6c34961949a00e2 100644
--- a/server/plugins-available/postfix_server_plugin.inc.php
+++ b/server/plugins-available/postfix_server_plugin.inc.php
@@ -70,6 +70,7 @@ class postfix_server_plugin {
// The purpose of this plugin is to rewrite the main.cf file
function update($event_name, $data) {
global $app, $conf;
+ $postfix_restart = false;
// get the config
$app->uses("getconf,system");
@@ -105,7 +106,7 @@ class postfix_server_plugin {
exec("postconf -e 'smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd'");
exec("postconf -e 'smtp_sasl_security_options ='");
exec('postmap /etc/postfix/sasl_passwd');
- exec($conf['init_scripts'] . '/' . 'postfix restart');
+ $postfix_restart=true;
}
if($mail_config['realtime_blackhole_list'] != $old_ini_data['mail']['realtime_blackhole_list']) {
@@ -139,27 +140,147 @@ class postfix_server_plugin {
}
}
$app->system->exec_safe("postconf -e ?", 'smtpd_recipient_restrictions = '.implode(", ", $new_options));
- exec('postfix reload');
}
-
- if($mail_config['reject_sender_login_mismatch'] != $old_ini_data['mail']['reject_sender_login_mismatch']) {
+
+ if ($mail_config['reject_sender_login_mismatch'] != $old_ini_data['mail']['reject_sender_login_mismatch']) {
$options = preg_split("/,\s*/", exec("postconf -h smtpd_sender_restrictions"));
$new_options = array();
foreach ($options as $key => $value) {
- if (!preg_match('/reject_authenticated_sender_login_mismatch/', $value)) {
- $new_options[] = $value;
+ $value = trim($value);
+ if ($value == '') continue;
+ if (preg_match('/reject_(authenticated_)?sender_login_mismatch/', $value)) {
+ continue;
}
+ $new_options[] = $value;
}
-
+
if ($mail_config['reject_sender_login_mismatch'] == 'y') {
- reset($new_options); $i = 0;
- // insert after check_sender_access but before permit_...
- while (isset($new_options[$i]) && substr($new_options[$i], 0, 19) == 'check_sender_access') ++$i;
- array_splice($new_options, $i, 0, array('reject_authenticated_sender_login_mismatch'));
+ array_splice($new_options, 0, 0, array('reject_authenticated_sender_login_mismatch'));
+
+ for ($i = 0; isset($new_options[$i]); $i++) {
+ if ($new_options[$i] == 'permit_mynetworks') {
+ array_splice($new_options, $i+1, 0, array('reject_sender_login_mismatch'));
+ break;
+ }
+ }
}
+
$app->system->exec_safe("postconf -e ?", 'smtpd_sender_restrictions = '.implode(", ", $new_options));
- exec('postfix reload');
- }
+ }
+
+ if ($mail_config['reject_unknown']) {
+ if (($mail_config['reject_unknown'] === 'client') || ($mail_config['reject_unknown'] === 'client_helo')) {
+ $options = preg_split("/,\s*/", exec("postconf -h smtpd_client_restrictions"));
+ $new_options = array();
+ foreach ($options as $key => $value) {
+ $value = trim($value);
+ if ($value == '') continue;
+ if (preg_match('/reject_unknown(_client)?_hostname/', $value)) {
+ continue;
+ }
+ $new_options[] = $value;
+ }
+
+ // insert before explicit permit, or append
+ for ($i = 0; isset($new_options[$i]); $i++) {
+ if ($new_options[$i] == 'permit') {
+ array_splice($new_options, $i, 0, array('reject_unknown_client_hostname'));
+ break;
+ }
+ }
+ if ($i == count($new_options)) {
+ $new_options[] = array('reject_unknown_client_hostname');
+ }
+
+ $app->system->exec_safe("postconf -e ?", 'smtpd_client_restrictions = '.implode(", ", $new_options));
+ } else {
+ $options = preg_split("/,\s*/", exec("postconf -h smtpd_client_restrictions"));
+ $new_options = array();
+ foreach ($options as $key => $value) {
+ $value = trim($value);
+ if ($value == '') continue;
+ if (preg_match('/reject_unknown(_client)?_hostname/', $value)) {
+ continue;
+ }
+ $new_options[] = $value;
+ }
+ $app->system->exec_safe("postconf -e ?", 'smtpd_client_restrictions = '.implode(", ", $new_options));
+ }
+
+ if (($mail_config['reject_unknown'] === 'helo') || ($mail_config['reject_unknown'] === 'client_helo')) {
+ $options = preg_split("/,\s*/", exec("postconf -h smtpd_helo_restrictions"));
+ $new_options = array();
+ foreach ($options as $key => $value) {
+ $value = trim($value);
+ if ($value == '') continue;
+ if (preg_match('/reject_unknown(_helo)?_hostname/', $value)) {
+ continue;
+ }
+ $new_options[] = $value;
+ }
+
+ // insert before explicit permit, or append
+ for ($i = 0; isset($new_options[$i]); $i++) {
+ if ($new_options[$i] == 'permit') {
+ array_splice($new_options, $i, 0, array('reject_unknown_helo_hostname'));
+ break;
+ }
+ }
+ if ($i == count($new_options)) {
+ $new_options[] = array('reject_unknown_helo_hostname');
+ }
+
+ $app->system->exec_safe("postconf -e ?", 'smtpd_helo_restrictions = '.implode(", ", $new_options));
+ } else {
+ $options = preg_split("/,\s*/", exec("postconf -h smtpd_helo_restrictions"));
+ $new_options = array();
+ foreach ($options as $key => $value) {
+ $value = trim($value);
+ if ($value == '') continue;
+ if (preg_match('/reject_unknown(_helo)?_hostname/', $value)) {
+ continue;
+ }
+ $new_options[] = $value;
+ }
+ $app->system->exec_safe("postconf -e ?", 'smtpd_helo_restrictions = '.implode(", ", $new_options));
+ }
+ }
+
+ if ($mail_config['stress_adaptive']) {
+ if ($mail_config['stress_adaptive'] == 'y') {
+ if (version_compare($postfix_version , '3.0', '>=')) {
+ $app->system->exec_safe("postconf -e ?", 'in_flow_delay = ${stress?{3}:{1}}s');
+ $app->system->exec_safe("postconf -e ?", 'smtp_connect_timeout = ${stress?{10}:{30}}s');
+ $app->system->exec_safe("postconf -e ?", 'smtp_helo_timeout = ${stress?{10}:{60}}s');
+ $app->system->exec_safe("postconf -e ?", 'smtp_mail_timeout = ${stress?{10}:{60}}s');
+ $app->system->exec_safe("postconf -e ?", 'smtpd_error_sleep_time = ${stress?{1}:{2}}s');
+ $app->system->exec_safe("postconf -e ?", 'smtpd_hard_error_limit = ${stress?{1}:{10}}');
+ $app->system->exec_safe("postconf -e ?", 'smtpd_recipient_overshoot_limit = ${stress?{60}:{600}}');
+ $app->system->exec_safe("postconf -e ?", 'smtpd_soft_error_limit = ${stress?{2}:{5}}');
+ $app->system->exec_safe("postconf -e ?", 'smtpd_timeout = ${stress?{10}:{60}}s');
+ } elseif (version_compare($postfix_version , '2.5', '>=')) {
+ $app->system->exec_safe("postconf -e ?", 'in_flow_delay = ${stress?3}${stress:1}s');
+ $app->system->exec_safe("postconf -e ?", 'smtp_connect_timeout = ${stress?10}${stress:30}s');
+ $app->system->exec_safe("postconf -e ?", 'smtp_helo_timeout = ${stress?10}${stress:60}s');
+ $app->system->exec_safe("postconf -e ?", 'smtp_mail_timeout = ${stress?10}${stress:60}s');
+ $app->system->exec_safe("postconf -e ?", 'smtpd_error_sleep_time = ${stress?1}${stress:2}s');
+ $app->system->exec_safe("postconf -e ?", 'smtpd_hard_error_limit = ${stress?1}${stress:10}');
+ $app->system->exec_safe("postconf -e ?", 'smtpd_recipient_overshoot_limit = ${stress?60}${stress:600}');
+ $app->system->exec_safe("postconf -e ?", 'smtpd_soft_error_limit = ${stress?2}${stress:5}');
+ $app->system->exec_safe("postconf -e ?", 'smtpd_timeout = ${stress?10}${stress:60}s');
+ }
+ } else { // mail_config['stress_adaptive'] == 'n'
+ exec("postconf -X 'in_flow_delay'");
+ exec("postconf -X 'smtp_connect_timeout'");
+ exec("postconf -X 'smtp_helo_timeout'");
+ exec("postconf -X 'smtp_mail_timeout'");
+ exec("postconf -X 'smtpd_error_sleep_time'");
+ exec("postconf -X 'smtpd_hard_error_limit'");
+ exec("postconf -X 'smtpd_recipient_overshoot_limit'");
+ exec("postconf -X 'smtpd_soft_error_limit'");
+ exec("postconf -X 'smtpd_timeout'");
+ }
+ }
if($app->system->is_installed('dovecot')) {
$virtual_transport = 'dovecot';
@@ -208,7 +329,7 @@ class postfix_server_plugin {
if (defined($configure_lmtp) && $configure_lmtp) {
for ($i = 0; isset($new_options[$i]); $i++) {
if ($new_options[$i] == 'reject_unlisted_recipient') {
- array_splice($new_options, $i+1, 0, array("check_recipient_access proxy:mysql:${postfix_config_dir}/mysql-verify_recipients.cf"));
+ array_splice($new_options, $i+1, 0, array("check_recipient_access proxy:mysql:${quoted_postfix_config_dir}/mysql-verify_recipients.cf"));
break;
}
}
@@ -220,6 +341,9 @@ class postfix_server_plugin {
exec("postconf -e 'smtpd_recipient_restrictions = ".implode(", ", $new_options)."'");
if($mail_config['content_filter'] != $old_ini_data['mail']['content_filter']) {
+ $rslm = ($mail_config['reject_sender_login_mismatch'] == 'y') ? "reject_sender_login_mismatch," : "";
+ $raslm = ($mail_config['reject_sender_login_mismatch'] == 'y') ? "reject_authenticated_sender_login_mismatch," : "";
+
if($mail_config['content_filter'] == 'rspamd'){
exec("postconf -X 'receive_override_options'");
exec("postconf -X 'content_filter'");
@@ -229,8 +353,8 @@ class postfix_server_plugin {
exec("postconf -e 'milter_protocol = 6'");
exec("postconf -e 'milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen}'");
exec("postconf -e 'milter_default_action = accept'");
-
- exec("postconf -e 'smtpd_sender_restrictions = check_sender_access mysql:/etc/postfix/mysql-virtual_sender.cf, permit_mynetworks, permit_sasl_authenticated'");
+
+ exec("postconf -e 'smtpd_sender_restrictions = ${raslm} permit_mynetworks, ${rslm} permit_sasl_authenticated, reject_non_fqdn_sender, check_sender_access proxy:mysql:/etc/postfix/mysql-virtual_sender.cf'");
$new_options = array();
$options = preg_split("/,\s*/", exec("postconf -h smtpd_recipient_restrictions"));
@@ -266,8 +390,9 @@ class postfix_server_plugin {
exec("postconf -e 'receive_override_options = no_address_mappings'");
exec("postconf -e 'content_filter = " . ($configure_lmtp ? "lmtp" : "amavis" ) . ":[127.0.0.1]:10024'");
-
- exec("postconf -e 'smtpd_sender_restrictions = check_sender_access mysql:/etc/postfix/mysql-virtual_sender.cf, check_sender_access regexp:/etc/postfix/tag_as_originating.re, permit_mynetworks, permit_sasl_authenticated, check_sender_access regexp:/etc/postfix/tag_as_foreign.re'");
+
+ // fixme: should read this from conf templates
+ exec("postconf -e 'smtpd_sender_restrictions = ${raslm} check_sender_access regexp:/etc/postfix/tag_as_originating.re, permit_mynetworks, ${rslm} permit_sasl_authenticated, reject_non_fqdn_sender, check_sender_access regexp:/etc/postfix/tag_as_foreign.re, check_sender_access proxy:mysql:/etc/postfix/mysql-virtual_sender.cf'");
}
}
@@ -290,6 +415,6 @@ class postfix_server_plugin {
exec("postconf -e 'mailbox_size_limit = ".intval($mail_config['mailbox_size_limit']*1024*1024)."'");
exec("postconf -e 'message_size_limit = ".intval($mail_config['message_size_limit']*1024*1024)."'");
- $app->services->restartServiceDelayed('postfix', 'reload');
+ $app->services->restartServiceDelayed('postfix', ($postfix_restart ? 'restart' : 'reload'));
}
} // end class