From 0e2978ef48e7877ee46aa4a9e52e86b8f76c9733 Mon Sep 17 00:00:00 2001 From: Dominik Müller <info@profi-webdesign.net> Date: Sat, 18 Jan 2014 23:34:06 -0500 Subject: [PATCH] Mailbox quota can now be included into website quota (FS#3297) -------------------------------------------------------------- Feature can be activated over admin mailserver settings. when activated websites uid is used instead of standard vmail-uid. this only takes effect if web and mailserver are on the same server, otherwise it will be old behaviour. switching this setting when mailboxes exist doesn't matter. Mailboxfolder will be created with website uid for this. access of postfix and dovecot now works over mysql-table mail_user. virtual_uid_maps is changed from static to mysql-table. for dovecot<->postfix communication protocoll is changed vrom lda to lmtp. disablelmtp-column is added to mail_user-table. uid and gid can be overwritten by remoting. ONE OPEN ISSUE: since remoting has completly changed and mail_user_add function is missing at the moment, this function now was inclulded again. it is important to add the both new lines to the future function and then remove this new one. --- server/plugins-available/mysql_clientdb_plugin.inc.php | 784 +++++++++++++++++++++++++++++++++---------------------- 1 files changed, 473 insertions(+), 311 deletions(-) diff --git a/server/plugins-available/mysql_clientdb_plugin.inc.php b/server/plugins-available/mysql_clientdb_plugin.inc.php index e4825c8..cba977c 100644 --- a/server/plugins-available/mysql_clientdb_plugin.inc.php +++ b/server/plugins-available/mysql_clientdb_plugin.inc.php @@ -29,414 +29,576 @@ */ class mysql_clientdb_plugin { - + var $plugin_name = 'mysql_clientdb_plugin'; var $class_name = 'mysql_clientdb_plugin'; - + //* This function is called during ispconfig installation to determine // if a symlink shall be created for this plugin. function onInstall() { global $conf; - + if($conf['services']['db'] == true) { return true; } else { return false; } - + } - - + + /* This function is called when the plugin is loaded */ - + function onLoad() { global $app; - + /* Register for the events */ - + //* Databases - $app->plugins->registerEvent('database_insert',$this->plugin_name,'db_insert'); - $app->plugins->registerEvent('database_update',$this->plugin_name,'db_update'); - $app->plugins->registerEvent('database_delete',$this->plugin_name,'db_delete'); - + $app->plugins->registerEvent('database_insert', $this->plugin_name, 'db_insert'); + $app->plugins->registerEvent('database_update', $this->plugin_name, 'db_update'); + $app->plugins->registerEvent('database_delete', $this->plugin_name, 'db_delete'); + //* Database users - $app->plugins->registerEvent('database_user_insert',$this->plugin_name,'db_user_insert'); - $app->plugins->registerEvent('database_user_update',$this->plugin_name,'db_user_update'); - $app->plugins->registerEvent('database_user_delete',$this->plugin_name,'db_user_delete'); - - + $app->plugins->registerEvent('database_user_insert', $this->plugin_name, 'db_user_insert'); + $app->plugins->registerEvent('database_user_update', $this->plugin_name, 'db_user_update'); + $app->plugins->registerEvent('database_user_delete', $this->plugin_name, 'db_user_delete'); + + } - - function process_host_list($action, $database_name, $database_user, $database_password, $host_list, $link, $database_rename_user = '', $user_read_only = false) { - global $app; - - $action = strtoupper($action); - - // set to all hosts if none given - if(trim($host_list) == '') $host_list = '%'; - - // process arrays and comma separated strings - if(!is_array($host_list)) $host_list = explode(',', $host_list); - - $success = true; - - // loop through hostlist - foreach($host_list as $db_host) { - $db_host = trim($db_host); - - $app->log($action . ' for user ' . $database_user . ' at host ' . $db_host, LOGLEVEL_DEBUG); - - // check if entry is valid ip address - $valid = true; - if($db_host == '%' || $db_host == 'localhost') { - $valid = true; - } elseif(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $db_host)) { - $groups = explode('.', $db_host); - foreach($groups as $group){ - if($group<0 OR $group>255) - $valid=false; - } - } else { - $valid = false; - } - - if($valid == false) continue; - - if($action == 'GRANT') { - if(!$link->query("GRANT " . ($user_read_only ? "SELECT" : "ALL") . " ON ".$link->escape_string($database_name).".* TO '".$link->escape_string($database_user)."'@'$db_host' IDENTIFIED BY PASSWORD '".$link->escape_string($database_password)."';")) $success = false; - $app->log("GRANT " . ($user_read_only ? "SELECT" : "ALL") . " ON ".$link->escape_string($database_name).".* TO '".$link->escape_string($database_user)."'@'$db_host' IDENTIFIED BY PASSWORD '".$link->escape_string($database_password)."'; success? " . ($success ? 'yes' : 'no'), LOGLEVEL_DEBUG); - } elseif($action == 'REVOKE') { - if(!$link->query("REVOKE ALL PRIVILEGES ON ".$link->escape_string($database_name).".* FROM '".$link->escape_string($database_user)."'@'$db_host' IDENTIFIED BY PASSWORD '".$link->escape_string($database_password)."';")) $success = false; - } elseif($action == 'DROP') { - if(!$link->query("DROP USER '".$link->escape_string($database_user)."'@'$db_host';")) $success = false; - } elseif($action == 'RENAME') { - if(!$link->query("RENAME USER '".$link->escape_string($database_user)."'@'$db_host' TO '".$link->escape_string($database_rename_user)."'@'$db_host'")) $success = false; - } elseif($action == 'PASSWORD') { - if(!$link->query("SET PASSWORD FOR '".$link->escape_string($database_user)."'@'$db_host' = '".$link->escape_string($database_password)."';")) $success = false; - } - } - - return $success; - } - - function db_insert($event_name,$data) { + + function process_host_list($action, $database_name, $database_user, $database_password, $host_list, $link, $database_rename_user = '', $user_read_only = false) { + global $app; + + $action = strtoupper($action); + + // set to all hosts if none given + if(trim($host_list) == '') $host_list = '%'; + + // process arrays and comma separated strings + if(!is_array($host_list)) $host_list = explode(',', $host_list); + + $success = true; + + // loop through hostlist + foreach($host_list as $db_host) { + $db_host = trim($db_host); + + $app->log($action . ' for user ' . $database_user . ' at host ' . $db_host, LOGLEVEL_DEBUG); + + // check if entry is valid ip address + $valid = true; + if($db_host == '%' || $db_host == 'localhost') { + $valid = true; + } elseif(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $db_host)) { + $groups = explode('.', $db_host); + foreach($groups as $group){ + if($group<0 or $group>255) + $valid=false; + } + } else { + $valid = false; + } + + if($valid == false) continue; + + if($action == 'GRANT') { + if(!$link->query("GRANT " . ($user_read_only ? "SELECT" : "ALL") . " ON ".$link->escape_string($database_name).".* TO '".$link->escape_string($database_user)."'@'$db_host' IDENTIFIED BY PASSWORD '".$link->escape_string($database_password)."';")) $success = false; + $app->log("GRANT " . ($user_read_only ? "SELECT" : "ALL") . " ON ".$link->escape_string($database_name).".* TO '".$link->escape_string($database_user)."'@'$db_host' IDENTIFIED BY PASSWORD '".$link->escape_string($database_password)."'; success? " . ($success ? 'yes' : 'no'), LOGLEVEL_DEBUG); + } elseif($action == 'REVOKE') { + if(!$link->query("REVOKE ALL PRIVILEGES ON ".$link->escape_string($database_name).".* FROM '".$link->escape_string($database_user)."'@'$db_host' IDENTIFIED BY PASSWORD '".$link->escape_string($database_password)."';")) $success = false; + } elseif($action == 'DROP') { + if(!$link->query("DROP USER '".$link->escape_string($database_user)."'@'$db_host';")) $success = false; + } elseif($action == 'RENAME') { + if(!$link->query("RENAME USER '".$link->escape_string($database_user)."'@'$db_host' TO '".$link->escape_string($database_rename_user)."'@'$db_host'")) $success = false; + } elseif($action == 'PASSWORD') { + if(!$link->query("SET PASSWORD FOR '".$link->escape_string($database_user)."'@'$db_host' = '".$link->escape_string($database_password)."';")) $success = false; + } + } + + return $success; + } + + function drop_or_revoke_user($database_id, $user_id, $host_list){ + global $app; + + // set to all hosts if none given + if(trim($host_list) == '') $host_list = '%'; + + $db_user_databases = $app->db->queryAllRecords("SELECT * FROM web_database WHERE (database_user_id = ".$user_id." OR database_ro_user_id = ".$user_id.") AND active = 'y' AND database_id != ".$database_id); + $db_user_host_list = array(); + if(is_array($db_user_databases) && !empty($db_user_databases)){ + foreach($db_user_databases as $db_user_database){ + if($db_user_database['remote_access'] == 'y'){ + if($db_user_database['remote_ips'] == ''){ + $db_user_host_list[] = '%'; + } else { + $tmp_remote_ips = explode(',', $db_user_database['remote_ips']); + if(is_array($tmp_remote_ips) && !empty($tmp_remote_ips)){ + foreach($tmp_remote_ips as $tmp_remote_ip){ + $tmp_remote_ip = trim($tmp_remote_ip); + if($tmp_remote_ip != '') $db_user_host_list[] = $tmp_remote_ip; + } + } + unset($tmp_remote_ips); + } + } + $db_user_host_list[] = 'localhost'; + } + } + $host_list_arr = explode(',', $host_list); + //print_r($host_list_arr); + $drop_hosts = array_diff($host_list_arr, $db_user_host_list); + //print_r($drop_hosts); + $revoke_hosts = array_diff($host_list_arr, $drop_hosts); + //print_r($revoke_hosts); + + $drop_host_list = implode(',', $drop_hosts); + $revoke_host_list = implode(',', $revoke_hosts); + //echo $drop_host_list."\n"; + //echo $revoke_host_list."\n"; + return array('revoke_hosts' => $revoke_host_list, 'drop_hosts' => $drop_host_list); + } + + function db_insert($event_name, $data) { global $app, $conf; - + if($data['new']['type'] == 'mysql') { - if(!include(ISPC_LIB_PATH.'/mysql_clientdb.conf')) { - $app->log('Unable to open'.ISPC_LIB_PATH.'/mysql_clientdb.conf',LOGLEVEL_ERROR); + if(!include ISPC_LIB_PATH.'/mysql_clientdb.conf') { + $app->log('Unable to open'.ISPC_LIB_PATH.'/mysql_clientdb.conf', LOGLEVEL_ERROR); return; } - + //* Connect to the database $link = new mysqli($clientdb_host, $clientdb_user, $clientdb_password); if ($link->connect_error) { - $app->log('Unable to connect to mysql'.$link->connect_error,LOGLEVEL_ERROR); + $app->log('Unable to connect to mysql'.$link->connect_error, LOGLEVEL_ERROR); return; } // Charset for the new table if($data['new']['database_charset'] != '') { - $query_charset_table = ' DEFAULT CHARACTER SET '.$data['new']['database_charset']; + $query_charset_table = ' DEFAULT CHARACTER SET '.$data['new']['database_charset']; } else { - $query_charset_table = ''; + $query_charset_table = ''; } //* Create the new database if ($link->query('CREATE DATABASE '.$link->escape_string($data['new']['database_name']).$query_charset_table)) { - $app->log('Created MySQL database: '.$data['new']['database_name'],LOGLEVEL_DEBUG); + $app->log('Created MySQL database: '.$data['new']['database_name'], LOGLEVEL_DEBUG); } else { - $app->log('Unable to create the database: '.$link->error,LOGLEVEL_WARNING); + $app->log('Unable to create the database: '.$link->error, LOGLEVEL_WARNING); } - + // Create the database user if database is active if($data['new']['active'] == 'y') { - - // get the users for this database - $db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['new']['database_user_id']) . "'"); - - $db_ro_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['new']['database_ro_user_id']) . "'"); - - $host_list = ''; - if($data['new']['remote_access'] == 'y') { - $host_list = $data['new']['remote_ips']; - if($host_list == '') $host_list = '%'; - } - if($host_list != '') $host_list .= ','; - $host_list .= 'localhost'; - - if($db_user) { - if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $host_list, $link); - } - if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { - if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', true); - } - + + // get the users for this database + $db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['new']['database_user_id']) . "'"); + + $db_ro_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['new']['database_ro_user_id']) . "'"); + + $host_list = ''; + if($data['new']['remote_access'] == 'y') { + $host_list = $data['new']['remote_ips']; + if($host_list == '') $host_list = '%'; + } + if($host_list != '') $host_list .= ','; + $host_list .= 'localhost'; + + if($db_user) { + if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + else $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $host_list, $link); + } + if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { + if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', true); + } + } - + $link->query('FLUSH PRIVILEGES;'); $link->close(); } } - - function db_update($event_name,$data) { + + function db_update($event_name, $data) { global $app, $conf; - + + // skip processing if database was and is inactive + if($data['new']['active'] == 'n' && $data['old']['active'] == 'n') return; + if($data['new']['type'] == 'mysql') { - if(!include(ISPC_LIB_PATH.'/mysql_clientdb.conf')) { - $app->log('Unable to open'.ISPC_LIB_PATH.'/mysql_clientdb.conf',LOGLEVEL_ERROR); + if(!include ISPC_LIB_PATH.'/mysql_clientdb.conf') { + $app->log('Unable to open'.ISPC_LIB_PATH.'/mysql_clientdb.conf', LOGLEVEL_ERROR); return; } - + //* Connect to the database $link = new mysqli($clientdb_host, $clientdb_user, $clientdb_password); if ($link->connect_error) { - $app->log('Unable to connect to the database: '.$link->connect_error,LOGLEVEL_ERROR); + $app->log('Unable to connect to the database: '.$link->connect_error, LOGLEVEL_ERROR); return; } - - // get the users for this database - $db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['new']['database_user_id']) . "'"); - - $db_ro_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['new']['database_ro_user_id']) . "'"); - - $host_list = ''; - if($data['new']['remote_access'] == 'y') { - $host_list = $data['new']['remote_ips']; - if($host_list == '') $host_list = '%'; - } - if($host_list != '') $host_list .= ','; - $host_list .= 'localhost'; - - // Create the database user if database was disabled before - if($data['new']['active'] == 'y' && $data['old']['active'] == 'n') { - if($db_user) { - if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $host_list, $link); - } - if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { - if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', true); - } - } else if($data['new']['active'] == 'n' && $data['old']['active'] == 'y') { // revoke database user, if inactive - if($db_user) { - if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $host_list, $link); - } - if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { - if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link); - } + + // get the users for this database + $db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['new']['database_user_id']) . "'"); + $old_db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['old']['database_user_id']) . "'"); + + $db_ro_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['new']['database_ro_user_id']) . "'"); + $old_db_ro_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['old']['database_ro_user_id']) . "'"); + + $host_list = ''; + if($data['new']['remote_access'] == 'y') { + $host_list = $data['new']['remote_ips']; + if($host_list == '') $host_list = '%'; } - - //* selected Users have changed - if($data['new']['database_user_id'] != $data['old']['database_user_id']) { - if($data['old']['database_user_id'] && $data['old']['database_user_id'] != $data['new']['database_ro_user_id']) { - $old_db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['old']['database_user_id']) . "'"); - if($old_db_user) { - if($old_db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $host_list, $link); - } - } - if($db_user) { - if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $host_list, $link); - } - } - if($data['new']['database_ro_user_id'] != $data['old']['database_ro_user_id']) { - if($data['old']['database_ro_user_id'] && $data['old']['database_ro_user_id'] != $data['new']['database_user_id']) { - $old_db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['old']['database_ro_user_id']) . "'"); - if($old_db_user) { - if($old_db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $host_list, $link); - } - } - if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { - if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', true); - } - } - + if($host_list != '') $host_list .= ','; + $host_list .= 'localhost'; + + // REVOKES and DROPS have to be done on old host list, not new host list + $old_host_list = ''; + if($data['old']['remote_access'] == 'y') { + $old_host_list = $data['old']['remote_ips']; + if($old_host_list == '') $old_host_list = '%'; + } + if($old_host_list != '') $old_host_list .= ','; + $old_host_list .= 'localhost'; + + // Create the database user if database was disabled before + if($data['new']['active'] == 'y' && $data['old']['active'] == 'n') { + if($db_user) { + if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + else $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $host_list, $link); + } + if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { + if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', true); + } + } else if($data['new']['active'] == 'n' && $data['old']['active'] == 'y') { // revoke database user, if inactive + if($old_db_user) { + if($old_db_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + } else { + // Find out users to drop and users to revoke + $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $old_host_list); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + + + //$this->process_host_list('DROP', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $old_host_list, $link); + //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $old_host_list, $link); + } + } + if($old_db_ro_user && $data['old']['database_user_id'] != $data['old']['database_ro_user_id']) { + if($old_db_ro_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + } else { + // Find out users to drop and users to revoke + $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_ro_user_id'], $old_host_list); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + + //$this->process_host_list('DROP', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $old_host_list, $link); + //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $old_host_list, $link); + } + } + // Database is not active, so stop processing here + $link->query('FLUSH PRIVILEGES;'); + $link->close(); + return; + } + + //* selected Users have changed + if($data['new']['database_user_id'] != $data['old']['database_user_id']) { + if($data['old']['database_user_id'] && $data['old']['database_user_id'] != $data['new']['database_ro_user_id']) { + if($old_db_user) { + if($old_db_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + } else { + // Find out users to drop and users to revoke + $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $old_host_list); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + + //$this->process_host_list('DROP', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $old_host_list, $link); + //$this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $old_host_list, $link); + } + } + } + if($db_user) { + if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + else $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $host_list, $link); + } + } + if($data['new']['database_ro_user_id'] != $data['old']['database_ro_user_id']) { + if($data['old']['database_ro_user_id'] && $data['old']['database_ro_user_id'] != $data['new']['database_user_id']) { + if($old_db_ro_user) { + if($old_db_ro_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + } else { + // Find out users to drop and users to revoke + $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $old_host_list); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + + //$this->process_host_list('DROP', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $old_host_list, $link); + //$this->process_host_list('REVOKE', $data['new']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $old_host_list, $link); + } + } + } + if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { + if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $host_list, $link, '', true); + } + } + //* Remote access option has changed. if($data['new']['remote_access'] != $data['old']['remote_access']) { - + //* revoke old priveliges //mysql_query("REVOKE ALL PRIVILEGES ON ".mysql_real_escape_string($data["new"]["database_name"],$link).".* FROM '".mysql_real_escape_string($data["new"]["database_user"],$link)."';",$link); - + //* set new priveliges - if($data['new']['remote_access'] == 'y') { - if($db_user) { - if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link); - } - if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { - if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['new']['remote_ips'], $link, '', true); - } + if($data['new']['remote_access'] == 'y') { + if($db_user) { + if($db_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + } else { + $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link); + } + } + if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { + if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + else $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['new']['remote_ips'], $link, '', true); + } } else { - if($db_user) { - if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link); - } - if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { - if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else $this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['new']['remote_ips'], $link); - } + if($old_db_user) { + if($old_db_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + } else { + // Find out users to drop and users to revoke + $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $data['old']['remote_ips']); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + + //$this->process_host_list('DROP', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['old']['remote_ips'], $link); + //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['old']['remote_ips'], $link); + } + } + if($old_db_ro_user && $data['old']['database_user_id'] != $data['old']['database_ro_user_id']) { + if($old_db_ro_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + } else { + // Find out users to drop and users to revoke + $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_ro_user_id'], $data['old']['remote_ips']); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + + //$this->process_host_list('DROP', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['old']['remote_ips'], $link); + //$this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['old']['remote_ips'], $link); + } + } } - $app->log('Changing MySQL remote access privileges for database: '.$data['new']['database_name'],LOGLEVEL_DEBUG); + $app->log('Changing MySQL remote access privileges for database: '.$data['new']['database_name'], LOGLEVEL_DEBUG); } elseif($data['new']['remote_access'] == 'y' && $data['new']['remote_ips'] != $data['old']['remote_ips']) { - //* Change remote access list - if($db_user) { - if($db_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else { - $this->process_host_list('REVOKE', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['old']['remote_ips'], $link); - $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link); - } - } - if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { - if($db_ro_user['database_user'] == 'root') $app->log('User root not allowed for Client databases',LOGLEVEL_WARNING); - else { - $this->process_host_list('REVOKE', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['old']['remote_ips'], $link); - $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['new']['remote_ips'], $link, '', true); - } - } - } - - + //* Change remote access list + if($old_db_user) { + if($old_db_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + } else { + // Find out users to drop and users to revoke + $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $data['old']['remote_ips']); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + } + } + if($db_user) { + if($db_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + } else { + $this->process_host_list('GRANT', $data['new']['database_name'], $db_user['database_user'], $db_user['database_password'], $data['new']['remote_ips'], $link); + } + } + + if($old_db_ro_user && $data['old']['database_user_id'] != $data['old']['database_ro_user_id']) { + if($old_db_ro_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + } else { + // Find out users to drop and users to revoke + $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $data['old']['remote_ips']); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_ro_user['database_user'], $old_db_ro_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + } + } + + if($db_ro_user && $data['new']['database_user_id'] != $data['new']['database_ro_user_id']) { + if($db_ro_user['database_user'] == 'root'){ + $app->log('User root not allowed for Client databases', LOGLEVEL_WARNING); + } else { + $this->process_host_list('GRANT', $data['new']['database_name'], $db_ro_user['database_user'], $db_ro_user['database_password'], $data['new']['remote_ips'], $link, '', true); + } + } + } + + $link->query('FLUSH PRIVILEGES;'); $link->close(); } - + } - - function db_delete($event_name,$data) { + + function db_delete($event_name, $data) { global $app, $conf; - + if($data['old']['type'] == 'mysql') { - if(!include(ISPC_LIB_PATH.'/mysql_clientdb.conf')) { - $app->log('Unable to open'.ISPC_LIB_PATH.'/mysql_clientdb.conf',LOGLEVEL_ERROR); + if(!include ISPC_LIB_PATH.'/mysql_clientdb.conf') { + $app->log('Unable to open'.ISPC_LIB_PATH.'/mysql_clientdb.conf', LOGLEVEL_ERROR); return; } - + //* Connect to the database $link = new mysqli($clientdb_host, $clientdb_user, $clientdb_password); if ($link->connect_error) { - $app->log('Unable to connect to mysql: '.$link->connect_error,LOGLEVEL_ERROR); + $app->log('Unable to connect to mysql: '.$link->connect_error, LOGLEVEL_ERROR); return; } - - if($link->query('DROP DATABASE '.$link->escape_string($data['old']['database_name']))) { - $app->log('Dropping MySQL database: '.$data['old']['database_name'],LOGLEVEL_DEBUG); - } else { - $app->log('Error while dropping MySQL database: '.$data['old']['database_name'].' '.$link->error,LOGLEVEL_WARNING); + + $old_host_list = ''; + if($data['old']['remote_access'] == 'y') { + $old_host_list = $data['old']['remote_ips']; + if($old_host_list == '') $old_host_list = '%'; } - + if($old_host_list != '') $old_host_list .= ','; + $old_host_list .= 'localhost'; + + if($data['old']['database_user_id']) { + $old_db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['old']['database_user_id']) . "'"); + $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_user_id'], $old_host_list); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + } + if($data['old']['database_ro_user_id']) { + $old_db_user = $app->db->queryOneRecord("SELECT `database_user`, `database_password` FROM `web_database_user` WHERE `database_user_id` = '" . intval($data['old']['database_ro_user_id']) . "'"); + $drop_or_revoke_user = $this->drop_or_revoke_user($data['old']['database_id'], $data['old']['database_ro_user_id'], $old_host_list); + if($drop_or_revoke_user['drop_hosts'] != '') $this->process_host_list('DROP', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['drop_hosts'], $link); + if($drop_or_revoke_user['revoke_hosts'] != '') $this->process_host_list('REVOKE', $data['old']['database_name'], $old_db_user['database_user'], $old_db_user['database_password'], $drop_or_revoke_user['revoke_hosts'], $link); + } + + + if($link->query('DROP DATABASE '.$link->escape_string($data['old']['database_name']))) { + $app->log('Dropping MySQL database: '.$data['old']['database_name'], LOGLEVEL_DEBUG); + } else { + $app->log('Error while dropping MySQL database: '.$data['old']['database_name'].' '.$link->error, LOGLEVEL_WARNING); + } + $link->query('FLUSH PRIVILEGES;'); $link->close(); } - - + + } - - - function db_user_insert($event_name,$data) { + + + function db_user_insert($event_name, $data) { global $app, $conf; // we have nothing to do here, stale user accounts are useless ;) } - - function db_user_update($event_name,$data) { + + function db_user_update($event_name, $data) { global $app, $conf; - - if(!include(ISPC_LIB_PATH.'/mysql_clientdb.conf')) { - $app->log('Unable to open'.ISPC_LIB_PATH.'/mysql_clientdb.conf',LOGLEVEL_ERROR); - return; - } - - //* Connect to the database - $link = new mysqli($clientdb_host, $clientdb_user, $clientdb_password); - if ($link->connect_error) { - $app->log('Unable to connect to mysql'.$link->connect_error,LOGLEVEL_ERROR); - return; - } - - - if($data['old']['database_user'] == $data['new']['database_user'] && ($data['old']['database_password'] == $data['new']['database_password'] || $data['new']['database_password'] == '')) { - return; - } - - - $host_list = array('localhost'); - // get all databases this user was active for - $db_list = $app->db->queryAllRecords("SELECT `remote_access`, `remote_ips` FROM `web_database` WHERE `database_user_id` = '" . intval($data['old']['database_user_id']) . "'"); - foreach($db_list as $database) { - if($database['remote_access'] != 'y') continue; - - if($database['remote_ips'] != '') $ips = explode(',', $database['remote_ips']); - else $ips = array('%'); - - foreach($ips as $ip) { - $ip = trim($ip); - if(!in_array($ip, $host_list)) $host_list[] = $ip; - } - } - - foreach($host_list as $db_host) { - if($data['new']['database_user'] != $data['old']['database_user']) { + + if(!include ISPC_LIB_PATH.'/mysql_clientdb.conf') { + $app->log('Unable to open'.ISPC_LIB_PATH.'/mysql_clientdb.conf', LOGLEVEL_ERROR); + return; + } + + //* Connect to the database + $link = new mysqli($clientdb_host, $clientdb_user, $clientdb_password); + if ($link->connect_error) { + $app->log('Unable to connect to mysql'.$link->connect_error, LOGLEVEL_ERROR); + return; + } + + + if($data['old']['database_user'] == $data['new']['database_user'] && ($data['old']['database_password'] == $data['new']['database_password'] || $data['new']['database_password'] == '')) { + return; + } + + + $host_list = array('localhost'); + // get all databases this user was active for + $db_list = $app->db->queryAllRecords("SELECT `remote_access`, `remote_ips` FROM `web_database` WHERE `database_user_id` = '" . intval($data['old']['database_user_id']) . "'"); + if(count($db_list) < 1) return; // nothing to do on this server for this db user + + foreach($db_list as $database) { + if($database['remote_access'] != 'y') continue; + + if($database['remote_ips'] != '') $ips = explode(',', $database['remote_ips']); + else $ips = array('%'); + + foreach($ips as $ip) { + $ip = trim($ip); + if(!in_array($ip, $host_list)) $host_list[] = $ip; + } + } + + foreach($host_list as $db_host) { + if($data['new']['database_user'] != $data['old']['database_user']) { $link->query("RENAME USER '".$link->escape_string($data['old']['database_user'])."'@'$db_host' TO '".$link->escape_string($data['new']['database_user'])."'@'$db_host'"); - $app->log('Renaming MySQL user: '.$data['old']['database_user'].' to '.$data['new']['database_user'],LOGLEVEL_DEBUG); + $app->log('Renaming MySQL user: '.$data['old']['database_user'].' to '.$data['new']['database_user'], LOGLEVEL_DEBUG); } if($data['new']['database_password'] != $data['old']['database_password'] && $data['new']['database_password'] != '') { - $link->query("SET PASSWORD FOR '".$link->escape_string($data['new']['database_user'])."'@'$db_host' = PASSWORD('".$link->escape_string($data['new']['database_password'])."');"); // is contained in clear text so PASSWORD() func is needed - $app->log('Changing MySQL user password for: '.$data['new']['database_user'].'@'.$db_host,LOGLEVEL_DEBUG); + $link->query("SET PASSWORD FOR '".$link->escape_string($data['new']['database_user'])."'@'$db_host' = '".$link->escape_string($data['new']['database_password'])."';"); + $app->log('Changing MySQL user password for: '.$data['new']['database_user'].'@'.$db_host, LOGLEVEL_DEBUG); } - } - - $link->query('FLUSH PRIVILEGES;'); - $link->close(); - + } + + $link->query('FLUSH PRIVILEGES;'); + $link->close(); + } - - function db_user_delete($event_name,$data) { + + function db_user_delete($event_name, $data) { global $app, $conf; - - if(!include(ISPC_LIB_PATH.'/mysql_clientdb.conf')) { - $app->log('Unable to open'.ISPC_LIB_PATH.'/mysql_clientdb.conf',LOGLEVEL_ERROR); - return; - } - - //* Connect to the database - $link = new mysqli($clientdb_host, $clientdb_user, $clientdb_password); - if ($link->connect_error) { - $app->log('Unable to connect to mysql'.$link->connect_error,LOGLEVEL_ERROR); - return; - } - - $host_list = array(); - // read all mysql users with this username - $result = $link->query("SELECT `User`, `Host` FROM `mysql`.`user` WHERE `User` = '" . $link->escape_string($data['old']['database_user']) . "' AND `Create_user_priv` = 'N'"); // basic protection against accidently deleting system users like debian-sys-maint - if($result) { - while($row = $result->fetch_assoc()) { - $host_list[] = $row['Host']; - } - $result->free(); - } - - foreach($host_list as $db_host) { - if($link->query("DROP USER '".$link->escape_string($data['old']['database_user'])."'@'$db_host';")) { - $app->log('Dropping MySQL user: '.$data['old']['database_user'],LOGLEVEL_DEBUG); - } - } - - $link->query('FLUSH PRIVILEGES;'); - $link->close(); + + if(!include ISPC_LIB_PATH.'/mysql_clientdb.conf') { + $app->log('Unable to open'.ISPC_LIB_PATH.'/mysql_clientdb.conf', LOGLEVEL_ERROR); + return; + } + + //* Connect to the database + $link = new mysqli($clientdb_host, $clientdb_user, $clientdb_password); + if ($link->connect_error) { + $app->log('Unable to connect to mysql'.$link->connect_error, LOGLEVEL_ERROR); + return; + } + + $host_list = array(); + // read all mysql users with this username + $result = $link->query("SELECT `User`, `Host` FROM `mysql`.`user` WHERE `User` = '" . $link->escape_string($data['old']['database_user']) . "' AND `Create_user_priv` = 'N'"); // basic protection against accidently deleting system users like debian-sys-maint + if($result) { + while($row = $result->fetch_assoc()) { + $host_list[] = $row['Host']; + } + $result->free(); + } + + foreach($host_list as $db_host) { + if($link->query("DROP USER '".$link->escape_string($data['old']['database_user'])."'@'$db_host';")) { + $app->log('Dropping MySQL user: '.$data['old']['database_user'], LOGLEVEL_DEBUG); + } + } + + $link->query('FLUSH PRIVILEGES;'); + $link->close(); } + } // end class ?> -- Gitblit v1.9.1