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

Add support for PostgreSQL TLS (#4262)

Browse Source 
This commit adds support for PostgreSQL TLS communication. This requires /etc/fusionpbx/config.php to have two parameters added:

$db_secure = true;
$db_cert_authority = "/path/to/ca.crt";
This commit is contained in:
jpattWPC
2019-06-05 21:10:58 -06:00
committed by FusionPBX
parent e2d6f5520d
commit 7937f72ed3
5 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/classes/config.php
+6
View File
@@ -19,6 +19,8 @@ class config {
public $db_host;
public $db_path;
public $db_port;
public $db_secure;
public $db_cert_authority;
public $config_path;
/**
@@ -47,6 +49,8 @@ class config {
* @var string $db_host - hostname of the database server
* @var string $db_path - path of the database file
* @var string $db_port - network port to connect to the database
* @var bool $db_secure - whether or not to connect with SSL
* @var string $db_cert_authority - location of certificate authority
*/
public function get() {
$this->find();
@@ -56,6 +60,8 @@ class config {
$this->db_name = $db_name;
$this->db_username = $db_username;
$this->db_password = $db_password;
$this->db_secure = $db_secure;
$this->db_cert_authority = $db_cert_authority;
$this->db_host = $db_host;
$this->db_path = $db_path;
$this->db_port = $db_port;
resources/classes/database.php
+14 -1
View File
@@ -35,6 +35,8 @@ include "root.php";
public $host;
public $port;
public $db_name;
public $db_secure;
public $db_cert_authority;
public $username;
public $password;
public $path;
@@ -107,6 +109,12 @@ include "root.php";
if (!isset($this->host) && isset($db_host)) { $this->host = $db_host; }
if (!isset($this->port) && isset($db_port)) { $this->port = $db_port; }
if (!isset($this->db_name) && isset($db_name)) { $this->db_name = $db_name; }
if (!isset($this->db_secure) && isset($db_secure)) {
$this->db_secure = $db_secure;
}
else {
$this->db_secure = false;
}
if (!isset($this->username) && isset($db_username)) { $this->username = $db_username; }
if (!isset($this->password) && isset($db_password)) { $this->password = $db_password; }
if (!isset($this->path) && isset($db_path)) { $this->path = $db_path; }
@@ -183,7 +191,12 @@ include "root.php";
try {
if (strlen($this->host) > 0) {
if (strlen($this->port) == 0) { $this->port = "5432"; }
$this->db = new PDO("pgsql:host=$this->host port=$this->port dbname=$this->db_name user=$this->username password=$this->password");
if ($this->db_secure == true) {
$this->db = new PDO("pgsql:host=$this->host port=$this->port dbname=$this->db_name user=$this->username password=$this->password sslmode=verify-ca sslrootcert=$this->db_cert_authority");
}
else {
$this->db = new PDO("pgsql:host=$this->host port=$this->port dbname=$this->db_name user=$this->username password=$this->password");
}
}
else {
$this->db = new PDO("pgsql:dbname=$this->db_name user=$this->username password=$this->password");
resources/classes/domains.php
+2
View File
@@ -222,6 +222,8 @@ if (!class_exists('domains')) {
$db_name = $config->db_name;
$db_username = $config->db_username;
$db_password = $config->db_password;
$db_secure = $config->db_secure;
$db_cert_authority = $config->db_cert_authority;
$db_host = $config->db_host;
$db_path = $config->db_path;
$db_port = $config->db_port;