dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix. Install with create new database for PgSQL/MySQL 

* MySQL/PgSQL ignore error while create new user because user may already exists.
* MySQL on database page use same checkbox like one for PgSQL
* MySQL/PgSQL if create user empty try use db user.(may be better use root/postgres without pass)
* PgSQL fix `GRANT ALL ON DATABASE dbname` instead of `GRANT ALL ON dbname`
* MySQL fix connect string build
* MySQL fix use correct password to connect
This commit is contained in:
Alexey Melnichuk 2016-03-30 15:05:25 +03:00
parent da0e54da44
commit b9f2e358af
2 changed files with 162 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

289
core/install/resources/classes/install_fusionpbx.php
View File

@ -332,12 +332,20 @@ include "root.php";
if ($this->global_settings->db_create()) { if ($this->global_settings->db_create()) {
//attempt to create new Postgres role and database //attempt to create new Postgres role and database
$this->write_progress("\tCreating database"); $this->write_progress("\tCreating database");
$db_create_username = $this->global_settings->db_create_username();
$db_create_password = $this->global_settings->db_create_password();
$db_host = $this->global_settings->db_host();
$db_port = $this->global_settings->db_port();
if(strlen($db_create_username) == 0){
$db_create_username = $this->global_settings->db_username();
$db_create_password = $this->global_settings->db_password();
}
if (strlen($db_host) == 0) {
$db_host = 'localhost';
}
try { try {
if (strlen($this->global_settings->db_host()) > 0) { $this->dbh = new PDO("pgsql:host=$db_host port=$db_port user=$db_create_username password=$db_create_password dbname=template1");
$this->dbh = new PDO("pgsql:host={$this->global_settings->db_host()} port={$this->global_settings->db_port()} user={$this->global_settings->db_create_username()} password={$this->global_settings->db_create_password()} dbname=template1");
} else {
$this->dbh = new PDO("pgsql:host=localhost port={$this->global_settings->db_port()} user={$this->global_settings->db_create_username()} password={$this->global_settings->db_create_password()} dbname=template1");
}
} catch (PDOException $error) { } catch (PDOException $error) {
throw new Exception("error connecting to database in order to create: " . $error->getMessage()); throw new Exception("error connecting to database in order to create: " . $error->getMessage());
} }
@ -346,11 +354,12 @@ include "root.php";
if($this->dbh->exec("CREATE DATABASE {$this->global_settings->db_name()}") === false) { if($this->dbh->exec("CREATE DATABASE {$this->global_settings->db_name()}") === false) {
throw new Exception("Failed to create database {$this->global_settings->db_name()}: " . join(":", $this->dbh->errorInfo())); throw new Exception("Failed to create database {$this->global_settings->db_name()}: " . join(":", $this->dbh->errorInfo()));
} }
if($this->global_settings->db_username() != $this->global_settings->db_create_username()){ if($this->global_settings->db_username() != $db_create_username){
if($this->dbh->exec("CREATE USER {$this->global_settings->db_username()} WITH PASSWORD '{$this->global_settings->db_password()}'") === false){ if($this->dbh->exec("CREATE USER {$this->global_settings->db_username()} WITH PASSWORD '{$this->global_settings->db_password()}'") === false){
throw new Exception("Failed to create user {$this->global_settings->db_name()}: " . join(":", $this->dbh->errorInfo())); // user may be already exists
// throw new Exception("Failed to create user {$this->global_settings->db_name()}: " . join(":", $this->dbh->errorInfo()));
} }
if($this->dbh->exec("GRANT ALL ON {$this->global_settings->db_name()} TO {$this->global_settings->db_username()}") === false){ if($this->dbh->exec("GRANT ALL ON DATABASE {$this->global_settings->db_name()} TO {$this->global_settings->db_username()}") === false){
throw new Exception("Failed to create user {$this->global_settings->db_name()}: " . join(":", $this->dbh->errorInfo())); throw new Exception("Failed to create user {$this->global_settings->db_name()}: " . join(":", $this->dbh->errorInfo()));
} }
} }
@ -410,128 +419,148 @@ include "root.php";
} }
protected function create_database_mysql() { protected function create_database_mysql() {
//database connection //database connection
$connect_string; $connect_string;
if (strlen($this->global_settings->db_host()) == 0 && strlen($this->global_settings->db_port()) == 0) { if (strlen($this->global_settings->db_host()) == 0 && strlen($this->global_settings->db_port()) == 0) {
//if both host and port are empty use the unix socket //if both host and port are empty use the unix socket
$connect_string = "mysql:host=$this->global_settings->db_host();unix_socket=/var/run/mysqld/mysqld.sock;"; $connect_string = "mysql:host={$this->global_settings->db_host()};unix_socket=/var/run/mysqld/mysqld.sock;";
} }
elseif (strlen($this->global_settings->db_port()) == 0) { elseif (strlen($this->global_settings->db_port()) == 0) {
//leave out port if it is empty //leave out port if it is empty
$connect_string = "mysql:host=$this->global_settings->db_host();"; $connect_string = "mysql:host={$this->global_settings->db_host()};";
} }
else { else {
$connect_string = "mysql:host=$this->global_settings->db_host();port=$this->global_settings->db_port();"; $connect_string = "mysql:host={$this->global_settings->db_host()};port={$this->global_settings->db_port()};";
} }
//create the table, user and set the permissions only if the db_create_username was provided //if we need create new database
if ($this->global_settings->db_create_username()) { if ($this->global_settings->db_create()) {
//attempt to create new user and database
$this->write_progress("\tCreating database"); $this->write_progress("\tCreating database");
$db_create_username = $this->global_settings->db_create_username();
$db_create_password = $this->global_settings->db_create_password();
if(strlen($db_create_username) == 0){
$db_create_username = $this->global_settings->db_username();
$db_create_password = $this->global_settings->db_password();
}
//connect to MySQL
try { try {
$this->dbh = new PDO($connect_string, $this->global_settings->db_create_username(), $this->global_settings->db_create_password(), array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8')); $this->dbh = new PDO($connect_string, $db_create_username, $db_create_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
$this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$this->dbh->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); $this->dbh->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
} }
catch (PDOException $error) { catch (PDOException $error) {
throw new Exception("error connecting to database for ccreate: " . $error->getMessage() . "\n" . $sql ); throw new Exception("error connecting to database for create: " . $error->getMessage() . "\n" . $sql );
} }
//select the mysql database
try {
$this->dbh->query("USE mysql;");
}
catch (PDOException $error) {
throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
}
//create user and set the permissions //select the mysql database
try { try {
$tmp_sql = "CREATE USER '".$this->global_settings->db_username()."'@'%' IDENTIFIED BY '".$this->global_settings->db_password()."'; "; $this->dbh->query("USE mysql;");
$this->dbh->query($tmp_sql); }
} catch (PDOException $error) {
catch (PDOException $error) { throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql ); }
}
//set account to unlimited use //create user if we use separeate user to access and create
try { if($this->global_settings->db_username() != $db_create_username) {
if ($this->global_settings->db_host() == "localhost" || $this->global_settings->db_host() == "127.0.0.1") { //create user and set the permissions
$tmp_sql = "GRANT USAGE ON * . * TO '".$this->global_settings->db_username()."'@'localhost' "; try {
$tmp_sql .= "IDENTIFIED BY '".$this->global_settings->db_password()."' "; $tmp_sql = "CREATE USER '".$this->global_settings->db_username()."'@'%' IDENTIFIED BY '".$this->global_settings->db_password()."'; ";
$tmp_sql .= "WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 MAX_USER_CONNECTIONS 0; ";
$this->dbh->query($tmp_sql);
$tmp_sql = "GRANT USAGE ON * . * TO '".$this->global_settings->db_username()."'@'127.0.0.1' ";
$tmp_sql .= "IDENTIFIED BY '".$this->global_settings->db_password()."' ";
$tmp_sql .= "WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 MAX_USER_CONNECTIONS 0; ";
$this->dbh->query($tmp_sql); $this->dbh->query($tmp_sql);
} }
else { catch (PDOException $error) {
$tmp_sql = "GRANT USAGE ON * . * TO '".$this->global_settings->db_username()."'@'".$this->global_settings->db_host()."' "; // ignore error here because user may already exists
$tmp_sql .= "IDENTIFIED BY '".$this->global_settings->db_password()."' "; // (e.g. reinstall can be done via remove db)
$tmp_sql .= "WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 MAX_USER_CONNECTIONS 0; "; // throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
$this->dbh->query($tmp_sql);
} }
}
catch (PDOException $error) {
throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
}
//create the database and set the create user with permissions //set account to unlimited use
try { try {
$tmp_sql = "CREATE DATABASE IF NOT EXISTS ".$this->global_settings->db_name()."; "; if ($this->global_settings->db_host() == "localhost" || $this->global_settings->db_host() == "127.0.0.1") {
$this->dbh->query($tmp_sql); $tmp_sql = "GRANT USAGE ON * . * TO '".$this->global_settings->db_username()."'@'localhost' ";
} $tmp_sql .= "IDENTIFIED BY '".$this->global_settings->db_password()."' ";
catch (PDOException $error) { $tmp_sql .= "WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 MAX_USER_CONNECTIONS 0; ";
throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql ); $this->dbh->query($tmp_sql);
}
//set user permissions $tmp_sql = "GRANT USAGE ON * . * TO '".$this->global_settings->db_username()."'@'127.0.0.1' ";
$tmp_sql .= "IDENTIFIED BY '".$this->global_settings->db_password()."' ";
$tmp_sql .= "WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 MAX_USER_CONNECTIONS 0; ";
$this->dbh->query($tmp_sql);
}
else {
$tmp_sql = "GRANT USAGE ON * . * TO '".$this->global_settings->db_username()."'@'".$this->global_settings->db_host()."' ";
$tmp_sql .= "IDENTIFIED BY '".$this->global_settings->db_password()."' ";
$tmp_sql .= "WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 MAX_USER_CONNECTIONS 0; ";
$this->dbh->query($tmp_sql);
}
}
catch (PDOException $error) {
throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
}
}
//create the database and set the create user with permissions
try {
$tmp_sql = "CREATE DATABASE IF NOT EXISTS ".$this->global_settings->db_name()."; ";
$this->dbh->query($tmp_sql);
}
catch (PDOException $error) {
throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
}
//set user permissions
if($this->global_settings->db_username() != $db_create_username) {
try { try {
$this->dbh->query("GRANT ALL PRIVILEGES ON ".$this->global_settings->db_name().".* TO '".$this->global_settings->db_username()."'@'%'; "); $this->dbh->query("GRANT ALL PRIVILEGES ON ".$this->global_settings->db_name().".* TO '".$this->global_settings->db_username()."'@'%'; ");
} }
catch (PDOException $error) { catch (PDOException $error) {
throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql ); throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
} }
}
//make the changes active //make the changes active
try { try {
$tmp_sql = "FLUSH PRIVILEGES; "; $tmp_sql = "FLUSH PRIVILEGES; ";
$this->dbh->query($tmp_sql); $this->dbh->query($tmp_sql);
} }
catch (PDOException $error) { catch (PDOException $error) {
throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql ); throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
} }
$this->dbh = null; $this->dbh = null;
} //if (strlen($this->global_settings->db_create_username()) > 0) }
$this->write_progress("\tInstalling data to database"); $this->write_progress("\tInstalling data to database");
//select the database //connect to the database
try { try {
$this->dbh = new PDO($connect_string, $this->global_settings->db_username(), db_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8')); $this->dbh = new PDO($connect_string, $this->global_settings->db_username(), $this->global_settings->db_password(), array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
$this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$this->dbh->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); $this->dbh->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
} }
catch (PDOException $error) { catch (PDOException $error) {
throw new Exception("error connecting to database: " . $error->getMessage() . "\n" . $sql ); throw new Exception("error connecting to database: " . $error->getMessage() . "\n" . $sql );
} }
try {
$this->dbh->query("USE ".$this->global_settings->db_name().";");
}
catch (PDOException $error) {
throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
}
//add the database structure //select the database
require_once "resources/classes/schema.php"; try {
$schema = new schema; $this->dbh->query("USE ".$this->global_settings->db_name().";");
$schema->db = $this->dbh; }
$schema->db_type = $this->global_settings->db_type(); catch (PDOException $error) {
$schema->sql(); throw new Exception("error in database: " . $error->getMessage() . "\n" . $sql );
$schema->exec(); }
//add the defaults data into the database //add the database structure
//get the contents of the sql file require_once "resources/classes/schema.php";
$schema = new schema;
$schema->db = $this->dbh;
$schema->db_type = $this->global_settings->db_type();
$schema->sql();
$schema->exec();
//add the defaults data into the database
//get the contents of the sql file
if (file_exists('/usr/share/examples/fusionpbx/resources/install/sql/mysql.sql')){ if (file_exists('/usr/share/examples/fusionpbx/resources/install/sql/mysql.sql')){
$filename = "/usr/share/examples/fusionpbx/resources/install/sql/mysql.sql"; $filename = "/usr/share/examples/fusionpbx/resources/install/sql/mysql.sql";
} }
@ -540,28 +569,28 @@ include "root.php";
} }
$file_contents = file_get_contents($filename); $file_contents = file_get_contents($filename);
//replace \r\n with \n then explode on \n //replace \r\n with \n then explode on \n
$file_contents = str_replace("\r\n", "\n", $file_contents); $file_contents = str_replace("\r\n", "\n", $file_contents);
//loop line by line through all the lines of sql code //loop line by line through all the lines of sql code
$string_array = explode("\n", $file_contents); $string_array = explode("\n", $file_contents);
$x = 0; $x = 0;
foreach($string_array as $sql) { foreach($string_array as $sql) {
if (strlen($sql) > 3) { if (strlen($sql) > 3) {
try { try {
if ($this->debug) { if ($this->debug) {
$this->write_debug( $sql."\n"); $this->write_debug( $sql."\n");
}
$this->dbh->query($sql);
}
catch (PDOException $error) {
//echo "error on line $x: " . $error->getMessage() . " sql: $sql<br/>";
//die();
} }
$this->dbh->query($sql);
}
catch (PDOException $error) {
//echo "error on line $x: " . $error->getMessage() . " sql: $sql<br/>";
//die();
} }
$x++;
} }
unset ($file_contents, $sql); $x++;
}
unset ($file_contents, $sql);
} }
protected function create_domain() { protected function create_domain() {
@ -1000,7 +1029,7 @@ include "root.php";
$_SESSION['event_socket_ip_address'] = $this->global_settings->event_host; $_SESSION['event_socket_ip_address'] = $this->global_settings->event_host;
$_SESSION['event_socket_port'] = $this->global_settings->event_port; $_SESSION['event_socket_port'] = $this->global_settings->event_port;
$_SESSION['event_socket_password'] = $this->global_settings->event_password; $_SESSION['event_socket_password'] = $this->global_settings->event_password;
//get the groups assigned to the user and then set the groups in $_SESSION["groups"] //get the groups assigned to the user and then set the groups in $_SESSION["groups"]
$sql = "SELECT * FROM v_group_users "; $sql = "SELECT * FROM v_group_users ";
$sql .= "where domain_uuid=:domain_uuid "; $sql .= "where domain_uuid=:domain_uuid ";
@ -1012,7 +1041,7 @@ include "root.php";
$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); $result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
$_SESSION["groups"] = $result; $_SESSION["groups"] = $result;
unset($sql, $row_count, $prep_statement); unset($sql, $row_count, $prep_statement);
//get the permissions assigned to the groups that the user is a member of set the permissions in $_SESSION['permissions'] //get the permissions assigned to the groups that the user is a member of set the permissions in $_SESSION['permissions']
$x = 0; $x = 0;
$sql = "select distinct(permission_name) from v_group_permissions "; $sql = "select distinct(permission_name) from v_group_permissions ";
@ -1031,7 +1060,7 @@ include "root.php";
$prep_statement_sub->execute(); $prep_statement_sub->execute();
$_SESSION['permissions'] = $prep_statement_sub->fetchAll(PDO::FETCH_NAMED); $_SESSION['permissions'] = $prep_statement_sub->fetchAll(PDO::FETCH_NAMED);
unset($sql, $prep_statement_sub); unset($sql, $prep_statement_sub);
//include the config.php //include the config.php
$db_type = $this->global_settings->db_type(); $db_type = $this->global_settings->db_type();
$db_path = $this->global_settings->db_path(); $db_path = $this->global_settings->db_path();
@ -1040,23 +1069,23 @@ include "root.php";
$db_name = $this->global_settings->db_name(); $db_name = $this->global_settings->db_name();
$db_username = $this->global_settings->db_username(); $db_username = $this->global_settings->db_username();
$db_password = $this->global_settings->db_password(); $db_password = $this->global_settings->db_password();
//add the database structure //add the database structure
require_once "resources/classes/schema.php"; require_once "resources/classes/schema.php";
$schema = new schema; $schema = new schema;
echo $schema->schema(); echo $schema->schema();
//run all app_defaults.php files //run all app_defaults.php files
$default_language = $this->install_language; $default_language = $this->install_language;
$domain = new domains; $domain = new domains;
$domain->upgrade(); $domain->upgrade();
//synchronize the config with the saved settings //synchronize the config with the saved settings
save_switch_xml(); save_switch_xml();
//do not show the apply settings reminder on the login page //do not show the apply settings reminder on the login page
$_SESSION["reload_xml"] = false; $_SESSION["reload_xml"] = false;
//clear the menu //clear the menu
$_SESSION["menu"] = ""; $_SESSION["menu"] = "";

12
core/install/resources/page_parts/install_config_database.php
View File

@ -142,15 +142,9 @@
echo " Create Database Options\n"; echo " Create Database Options\n";
echo "</td>\n"; echo "</td>\n";
echo "<td class='vtable' align='left'>\n"; echo "<td class='vtable' align='left'>\n";
echo " <label class='radio'><input type='radio' name='create_db_option' value='none'"; if($db_create=='1') { $checked = "checked='checked'"; } else { $checked = ''; }
if($db_create_option=='none') { echo " checked='checked'"; } echo " <input type='checkbox' name='db_create' value='1' $checked />&nbsp;";
echo "/>Do not create database</label>\n"; echo "Create the database\n";
echo " <label class='radio'><input type='radio' name='create_db_option' value='same'";
if($db_create_option=='same') { echo " checked='checked'"; }
echo "/>Create database using above username/password</label>\n";
echo " <label class='radio'><input type='radio' name='create_db_option' value='user'";
if($db_create_option=='user') { echo " checked='checked'"; }
echo "/>Create database using below username/password</label>\n";
echo "<br />\n"; echo "<br />\n";
echo "Choose whether to create the database\n"; echo "Choose whether to create the database\n";
echo "</td>\n"; echo "</td>\n";