From dee987b263b021b990ea4c62cb15be47c6d61fb5 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 05 Jan 2015 08:30:12 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
server/plugins-available/mail_plugin.inc.php | 166 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 139 insertions(+), 27 deletions(-)
diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php
index 6d109c5..06b3017 100644
--- a/server/plugins-available/mail_plugin.inc.php
+++ b/server/plugins-available/mail_plugin.inc.php
@@ -92,17 +92,48 @@
unset($tmp_basepath_parts[count($tmp_basepath_parts)-1]);
$base_path = implode('/', $tmp_basepath_parts);
+ //* Set the email-uid and gid if not given
+ if (($data['new']['uid'] == -1) || ($data['new']['gid'] == -1)) {
+ $app->log('Setting uid and gid automatically',LOGLEVEL_DEBUG);
+ if ($mail_config["mailbox_virtual_uidgid_maps"] == 'y') {
+ $app->log('Map uid to linux-user',LOGLEVEL_DEBUG);
+ $email_parts = explode('@',$data['new']['email']);
+ $webdomain = $app->db->queryOneRecord("SELECT domain_id, server_id, system_user, parent_domain_id FROM web_domain WHERE domain = '".$app->db->quote($email_parts[1])."'");
+ if ($webdomain) {
+ while (($webdomain['system_user'] == null) && ($webdomain['parent_domain_id'] != 0)) {
+ $webdomain = $app->db->queryOneRecord("SELECT domain_id, server_id, system_user, parent_domain_id FROM web_domain WHERE domain_id = '".$webdomain['parent_domain_id']."'");
+ }
+ $app->log($data['new']['server_id'].' == '.$webdomain['server_id'],LOGLEVEL_DEBUG);
+
+ // only if web and mailserver are identical
+ if ($data['new']['server_id'] == $webdomain['server_id']) {
+ $data['new']['uid'] = $app->system->getuid($webdomain['system_user']);
+ }
+ }
+ }
+ }
+ // if nothing set before -> use standard mailuser uid and gid vmail
+ if ($data['new']['uid'] == -1) $data['new']['uid'] = $mail_config["mailuser_uid"];
+ if ($data['new']['gid'] == -1) $data['new']['gid'] = $mail_config["mailuser_gid"];
+ $app->log('Mailuser uid: '.$data['new']['uid'].', gid: '.$data['new']['gid'],LOGLEVEL_DEBUG);
+
+ // update DB if values changed
+ $app->db->query("UPDATE mail_user SET uid = ".$data['new']['uid'].", gid = ".$data['new']['gid']." WHERE mailuser_id = ".$data['new']['mailuser_id']);
+
+ // now get names of uid and gid
+ $user = $app->system->getuser($data['new']['uid']);
+ $group = $app->system->getgroup($data['new']['gid']);
//* Create the mail domain directory, if it does not exist
if(!empty($base_path) && !is_dir($base_path)) {
//exec("su -c 'mkdir -p ".escapeshellcmd($base_path)."' ".$mail_config['mailuser_name']);
- $app->system->mkdirpath($base_path, 0700, $mail_config['mailuser_name'], $mail_config['mailuser_group']);
+ $app->system->mkdirpath($base_path, 0770, $mail_config['mailuser_name'], $mail_config['mailuser_group']); // needs group-access because users of subfolders may differ from vmail
$app->log('Created Directory: '.$base_path, LOGLEVEL_DEBUG);
}
// Dovecot uses a different mail layout with a separate 'Maildir' subdirectory.
if($mail_config['pop3_imap_daemon'] == 'dovecot') {
//exec("su -c 'mkdir -p ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
- $app->system->mkdirpath($maildomain_path, 0700, $mail_config['mailuser_name'], $mail_config['mailuser_group']);
+ $app->system->mkdirpath($maildomain_path, 0700, $user, $group);
$app->log('Created Directory: '.$maildomain_path, LOGLEVEL_DEBUG);
$maildomain_path .= '/Maildir';
}
@@ -118,46 +149,48 @@
if(!empty($maildomain_path) && !is_dir($maildomain_path)) {
//exec("su -c 'maildirmake ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
- $app->system->maildirmake($maildomain_path, $mail_config['mailuser_name']);
-
- exec('chown -R '.$mail_config['mailuser_name'].':'.$mail_config['mailuser_group'].' '.escapeshellcmd($data['new']['maildir']));
- $app->log('Set ownership on '.escapeshellcmd($data['new']['maildir']), LOGLEVEL_DEBUG);
+ $app->system->maildirmake($maildomain_path, $user, '', $group);
//* This is to fix the maildrop quota not being rebuilt after the quota is changed.
if($mail_config['pop3_imap_daemon'] != 'dovecot') {
- if(is_dir($maildomain_path)) exec("su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']); // Avoid maildirmake quota bug, see debian bug #214911
- $app->log('Created Maildir: '."su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'], LOGLEVEL_DEBUG);
+ if(is_dir($maildomain_path)) exec("su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($maildomain_path)."' ".$user); // Avoid maildirmake quota bug, see debian bug #214911
+ $app->log('Created Maildir: '."su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($maildomain_path)."' ".$user, LOGLEVEL_DEBUG);
}
}
if(!is_dir($data['new']['maildir'].'/.Sent')) {
//exec("su -c 'maildirmake -f Sent ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
//$app->log('Created submaildir Sent: '."su -c 'maildirmake -f Sent ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
- $app->system->maildirmake($maildomain_path, $mail_config['mailuser_name'], 'Sent');
+ $app->system->maildirmake($maildomain_path, $user, 'Sent', $group);
}
if(!is_dir($data['new']['maildir'].'/.Drafts')) {
//exec("su -c 'maildirmake -f Drafts ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
//$app->log('Created submaildir Drafts: '."su -c 'maildirmake -f Drafts ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
- $app->system->maildirmake($maildomain_path, $mail_config['mailuser_name'], 'Drafts');
+ $app->system->maildirmake($maildomain_path, $user, 'Drafts', $group);
}
if(!is_dir($data['new']['maildir'].'/.Trash')) {
//exec("su -c 'maildirmake -f Trash ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
//$app->log('Created submaildir Trash: '."su -c 'maildirmake -f Trash ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
- $app->system->maildirmake($maildomain_path, $mail_config['mailuser_name'], 'Trash');
+ $app->system->maildirmake($maildomain_path, $user, 'Trash', $group);
}
if(!is_dir($data['new']['maildir'].'/.Junk')) {
//exec("su -c 'maildirmake -f Junk ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
//$app->log('Created submaildir Junk: '."su -c 'maildirmake -f Junk ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
- $app->system->maildirmake($maildomain_path, $mail_config['mailuser_name'], 'Junk');
+ $app->system->maildirmake($maildomain_path, $user, 'Junk', $group);
}
+
+ // Set permissions now recursive
+ exec('chown -R '.$user.':'.$group.' '.escapeshellcmd($data['new']['maildir']));
+ $app->log('Set ownership on '.escapeshellcmd($data['new']['maildir']), LOGLEVEL_DEBUG);
//* Set the maildir quota
if(is_dir($data['new']['maildir'].'/new') && $mail_config['pop3_imap_daemon'] != 'dovecot') {
if($data['new']['quota'] > 0) {
- if(is_dir($data['new']['maildir'])) exec("su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name']);
- $app->log('Set Maildir quota: '."su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name'], LOGLEVEL_DEBUG);
+ if(is_dir($data['new']['maildir'])) exec("su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."' ".$user);
+ $app->log('Set Maildir quota: '."su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."' ".$user, LOGLEVEL_DEBUG);
}
}
+
//* Send the welcome email message
if(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$conf['language'].'.txt')) {
@@ -225,16 +258,47 @@
unset($tmp_basepath_parts[count($tmp_basepath_parts)-1]);
$base_path = implode('/', $tmp_basepath_parts);
+ //* Set the email-uid and gid if not given -> in case of changed settings again setting here
+ if (($data['new']['uid'] == -1) || ($data['new']['gid'] == -1)) {
+ $app->log('Setting uid and gid automatically',LOGLEVEL_DEBUG);
+ if ($mail_config["mailbox_virtual_uidgid_maps"] == 'y') {
+ $app->log('Map uid to linux-user',LOGLEVEL_DEBUG);
+ $email_parts = explode('@',$data['new']['email']);
+ $webdomain = $app->db->queryOneRecord("SELECT domain_id, server_id, system_user, parent_domain_id FROM web_domain WHERE domain = '".$app->db->quote($email_parts[1])."'");
+ if ($webdomain) {
+ while ($webdomain['parent_domain_id'] != 0) {
+ $webdomain = $app->db->queryOneRecord("SELECT domain_id, server_id, system_user, parent_domain_id FROM web_domain WHERE domain_id = '".$webdomain['parent_domain_id']."'");
+ }
+ $app->log($data['new']['server_id'].' == '.$webdomain['server_id'],LOGLEVEL_DEBUG);
+
+ // only if web and mailserver are identical
+ if ($data['new']['server_id'] == $webdomain['server_id']) {
+ $data['new']['uid'] = $app->system->getuid($webdomain['system_user']);
+ }
+ }
+ }
+ }
+ // if nothing set before -> use standard mailuser uid and gid vmail
+ if ($data['new']['uid'] == -1) $data['new']['uid'] = $mail_config["mailuser_uid"];
+ if ($data['new']['gid'] == -1) $data['new']['gid'] = $mail_config["mailuser_gid"];
+ $app->log('Mailuser uid: '.$data['new']['uid'].', gid: '.$data['new']['gid'],LOGLEVEL_DEBUG);
+
+ // update DB if values changed
+ $app->db->query("UPDATE mail_user SET uid = ".$data['new']['uid'].", gid = ".$data['new']['gid']." WHERE mailuser_id = ".$data['new']['mailuser_id']);
+
+ $user = $app->system->getuser($data['new']['uid']);
+ $group = $app->system->getgroup($data['new']['gid']);
+
//* Create the mail domain directory, if it does not exist
if(!empty($base_path) && !is_dir($base_path)) {
//exec("su -c 'mkdir -p ".escapeshellcmd($base_path)."' ".$mail_config['mailuser_name']);
- $app->system->mkdirpath($base_path, 0700, $mail_config['mailuser_name'], $mail_config['mailuser_group']);
+ $app->system->mkdirpath($base_path, 0770, $mail_config['mailuser_name'], $mail_config['mailuser_group']); // needs group-access because users of subfolders may differ from vmail
$app->log('Created Directory: '.$base_path, LOGLEVEL_DEBUG);
}
// Dovecot uses a different mail layout with a separate 'Maildir' subdirectory.
if($mail_config['pop3_imap_daemon'] == 'dovecot') {
- $app->system->mkdirpath($maildomain_path, 0700, $mail_config['mailuser_name'], $mail_config['mailuser_group']);
+ $app->system->mkdirpath($maildomain_path, 0700, $user, $group);
$app->log('Created Directory: '.$base_path, LOGLEVEL_DEBUG);
$maildomain_path .= '/Maildir';
}
@@ -250,15 +314,13 @@
if(!empty($maildomain_path) && !is_dir($maildomain_path.'/new')) {
//exec("su -c 'maildirmake ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
//$app->log("Created Maildir "."su -c 'maildirmake ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
- $app->system->maildirmake($maildomain_path, $mail_config['mailuser_name']);
+ $app->system->maildirmake($maildomain_path, $user, '', $group);
- exec('chown -R '.$mail_config['mailuser_name'].':'.$mail_config['mailuser_group'].' '.escapeshellcmd($data['new']['maildir']));
- $app->log('Set ownership on '.escapeshellcmd($data['new']['maildir']), LOGLEVEL_DEBUG);
//* This is to fix the maildrop quota not being rebuilt after the quota is changed.
if($mail_config['pop3_imap_daemon'] != 'dovecot') {
if($data['new']['quota'] > 0) {
- if(is_dir($maildomain_path)) exec("su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']); // Avoid maildirmake quota bug, see debian bug #214911
- $app->log('Updated Maildir quota: '."su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'], LOGLEVEL_DEBUG);
+ if(is_dir($maildomain_path)) exec("su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($maildomain_path)."' ".$user); // Avoid maildirmake quota bug, see debian bug #214911
+ $app->log('Updated Maildir quota: '."su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($maildomain_path)."' ".$user, LOGLEVEL_DEBUG);
} else {
if(file_exists($data['new']['maildir'].'/maildirsize')) unlink($data['new']['maildir'].'/maildirsize');
$app->log('Set Maildir quota to unlimited.', LOGLEVEL_DEBUG);
@@ -269,23 +331,27 @@
if(!is_dir($data['new']['maildir'].'/.Sent')) {
//exec("su -c 'maildirmake -f Sent ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
//$app->log('Created submaildir Sent: '."su -c 'maildirmake -f Sent ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
- $app->system->maildirmake($maildomain_path, $mail_config['mailuser_name'], 'Sent');
+ $app->system->maildirmake($maildomain_path, $user, 'Sent', $group);
}
if(!is_dir($data['new']['maildir'].'/.Drafts')) {
//exec("su -c 'maildirmake -f Drafts ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
//$app->log('Created submaildir Drafts: '."su -c 'maildirmake -f Drafts ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
- $app->system->maildirmake($maildomain_path, $mail_config['mailuser_name'], 'Drafts');
+ $app->system->maildirmake($maildomain_path, $user, 'Drafts', $group);
}
if(!is_dir($data['new']['maildir'].'/.Trash')) {
//exec("su -c 'maildirmake -f Trash ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
//$app->log('Created submaildir Trash: '."su -c 'maildirmake -f Trash ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
- $app->system->maildirmake($maildomain_path, $mail_config['mailuser_name'], 'Trash');
+ $app->system->maildirmake($maildomain_path, $user, 'Trash', $group);
}
if(!is_dir($data['new']['maildir'].'/.Junk')) {
//exec("su -c 'maildirmake -f Junk ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']);
//$app->log('Created submaildir Junk: '."su -c 'maildirmake -f Junk ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
- $app->system->maildirmake($maildomain_path, $mail_config['mailuser_name'], 'Junk');
+ $app->system->maildirmake($maildomain_path, $user, 'Junk', $group);
}
+
+ // Set permissions now recursive
+ exec('chown -R '.$user.':'.$group.' '.escapeshellcmd($data['new']['maildir']));
+ $app->log('Set ownership on '.escapeshellcmd($data['new']['maildir']), LOGLEVEL_DEBUG);
// Move mailbox, if domain has changed and delete old mailbox
if($data['new']['maildir'] != $data['old']['maildir'] && is_dir($data['old']['maildir'])) {
@@ -303,8 +369,8 @@
// Courier Layout
if(is_dir($data['new']['maildir'].'/new') && $mail_config['pop3_imap_daemon'] != 'dovecot') {
if($data['new']['quota'] > 0) {
- if(is_dir($data['new']['maildir'])) exec("su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name']);
- $app->log('Updated Maildir quota: '."su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name'], LOGLEVEL_DEBUG);
+ if(is_dir($data['new']['maildir'])) exec("su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."' ".$user);
+ $app->log('Updated Maildir quota: '."su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."' ".$user, LOGLEVEL_DEBUG);
} else {
if(file_exists($data['new']['maildir'].'/maildirsize')) unlink($data['new']['maildir'].'/maildirsize');
$app->log('Set Maildir quota to unlimited.', LOGLEVEL_DEBUG);
@@ -319,12 +385,36 @@
$app->uses("getconf");
$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
+ $maildir_path_deleted = false;
$old_maildir_path = escapeshellcmd($data['old']['maildir']);
if($old_maildir_path != $mail_config['homedir_path'] && strlen($old_maildir_path) > strlen($mail_config['homedir_path']) && !stristr($old_maildir_path, '//') && !stristr($old_maildir_path, '..') && !stristr($old_maildir_path, '*') && strlen($old_maildir_path) >= 10) {
exec('rm -rf '.escapeshellcmd($old_maildir_path));
$app->log('Deleted the Maildir: '.$data['old']['maildir'], LOGLEVEL_DEBUG);
+ $maildir_path_deleted = true;
} else {
$app->log('Possible security violation when deleting the maildir: '.$data['old']['maildir'], LOGLEVEL_ERROR);
+ }
+
+ //* Delete the mail-backups
+ $server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
+ $backup_dir = $server_config['backup_dir'];
+ $mount_backup = true;
+ if($server_config['backup_dir'] != '' && $maildir_path_deleted && $server_config['backup_delete'] == 'y') {
+ //* mount backup directory, if necessary
+ if( $server_config['backup_dir_is_mount'] == 'y' && !$app->system->mount_backup_dir($backup_dir) ) $mount_backup = false;
+ if($mount_backup){
+ $sql = "SELECT * FROM mail_domain WHERE domain = '".explode("@",$data['old']['email'])[1]."'";
+ $domain_rec = $app->db->queryOneRecord($sql);
+ $mail_backup_dir = $backup_dir.'/mail'.$domain_rec['domain_id'];
+ $mail_backup_files = 'mail'.$data['old']['mailuser_id'];
+ exec(escapeshellcmd('rm -f '.$mail_backup_dir.'/'.$mail_backup_files).'*');
+ //* cleanup database
+ $sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND mailuser_id = ?";
+ $app->db->query($sql, $conf['server_id'], $domain_rec['domain_id'], $data['old']['mailuser_id']);
+ if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $domain_rec['domain_id'], $data['old']['mailuser_id']);
+
+ $app->log('Deleted the mail backups for: '.$data['old']['email'], LOGLEVEL_DEBUG);
+ }
}
}
@@ -335,11 +425,13 @@
$app->uses("getconf");
$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
+ $maildomain_path_deleted = false;
//* Delete maildomain path
$old_maildomain_path = escapeshellcmd($mail_config['homedir_path'].'/'.$data['old']['domain']);
if($old_maildomain_path != $mail_config['homedir_path'] && !stristr($old_maildomain_path, '//') && !stristr($old_maildomain_path, '..') && !stristr($old_maildomain_path, '*') && !stristr($old_maildomain_path, '&') && strlen($old_maildomain_path) >= 10 && !empty($data['old']['domain'])) {
exec('rm -rf '.escapeshellcmd($old_maildomain_path));
$app->log('Deleted the mail domain directory: '.$old_maildomain_path, LOGLEVEL_DEBUG);
+ $maildomain_path_deleted = true;
} else {
$app->log('Possible security violation when deleting the mail domain directory: '.$old_maildomain_path, LOGLEVEL_ERROR);
}
@@ -352,6 +444,26 @@
} else {
$app->log('Possible security violation when deleting the mail domain mailfilter directory: '.$old_maildomain_path, LOGLEVEL_ERROR);
}
+
+ //* Delete the mail-backups
+ $server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
+ $backup_dir = $server_config['backup_dir'];
+ $mount_backup = true;
+ if($server_config['backup_dir'] != '' && $maildomain_path_deleted && $server_config['backup_delete'] == 'y'){
+ //* mount backup directory, if necessary
+ if( $server_config['backup_dir_is_mount'] == 'y' && !$app->system->mount_backup_dir($backup_dir) ) $mount_backup = false;
+ if($mount_backup){
+ $mail_backup_dir = $backup_dir.'/mail'.$data['old']['domain_id'];
+ exec(escapeshellcmd('rm -rf '.$mail_backup_dir));
+ //* cleanup database
+ $sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND mailuser_id = ?";
+ $app->db->query($sql, $conf['server_id'], $domain_rec['domain_id'], $data['old']['mailuser_id']);
+ if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $domain_rec['domain_id'], $data['old']['mailuser_id']);
+
+ $app->log('Deleted the mail backup directory: '.$mail_backup_dir, LOGLEVEL_DEBUG);
+ }
+ }
+
}
function transport_update($event_name, $data) {
--
Gitblit v1.9.1