mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-09-21 17:08:52 +02:00
ent 9154 SSL MySQL console connection
This commit is contained in:
parent
3a1ec66bfb
commit
544f337181
@ -1,4 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* General setup.
|
* General setup.
|
||||||
*
|
*
|
||||||
@ -771,6 +772,10 @@ $(document).ready (function () {
|
|||||||
$('#ssl-path-tr').show();
|
$('#ssl-path-tr').show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($("input[name=mysql_use_cert]").is(':checked')) {
|
||||||
|
$('#mysql-ssl-path-tr').show();
|
||||||
|
}
|
||||||
|
|
||||||
$("input[name=use_cert]").change(function() {
|
$("input[name=use_cert]").change(function() {
|
||||||
if ($(this).is(":checked"))
|
if ($(this).is(":checked"))
|
||||||
$('#ssl-path-tr').show();
|
$('#ssl-path-tr').show();
|
||||||
@ -778,20 +783,27 @@ $(document).ready (function () {
|
|||||||
$('#ssl-path-tr').hide();
|
$('#ssl-path-tr').hide();
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$("input[name=mysql_use_cert]").change(function() {
|
||||||
|
if ($(this).is(":checked"))
|
||||||
|
$('#mysql-ssl-path-tr').show();
|
||||||
|
else
|
||||||
|
$('#mysql-ssl-path-tr').hide();
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
$("input[name=https]").change(function() {
|
$("input[name=https]").change(function() {
|
||||||
if ($("input[name=https]").prop('checked')) {
|
if ($("input[name=https]").prop('checked')) {
|
||||||
$("#dialog").dialog({
|
$("#dialog").dialog({
|
||||||
modal: true,
|
modal: true,
|
||||||
width: 500,
|
width: 500,
|
||||||
buttons:[
|
buttons: [{
|
||||||
{
|
|
||||||
class: 'ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-next',
|
class: 'ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-next',
|
||||||
text: "<?php echo __('OK'); ?>",
|
text: "<?php echo __('OK'); ?>",
|
||||||
click: function() {
|
click: function() {
|
||||||
$(this).dialog("close");
|
$(this).dialog("close");
|
||||||
}
|
}
|
||||||
}
|
}]
|
||||||
]
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -801,15 +813,13 @@ $(document).ready (function () {
|
|||||||
$("#force_public_url_dialog").dialog({
|
$("#force_public_url_dialog").dialog({
|
||||||
modal: true,
|
modal: true,
|
||||||
width: 500,
|
width: 500,
|
||||||
buttons: [
|
buttons: [{
|
||||||
{
|
|
||||||
class: 'ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-next',
|
class: 'ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-next',
|
||||||
text: "<?php echo __('OK'); ?>",
|
text: "<?php echo __('OK'); ?>",
|
||||||
click: function() {
|
click: function() {
|
||||||
$(this).dialog("close");
|
$(this).dialog("close");
|
||||||
}
|
}
|
||||||
}
|
}]
|
||||||
]
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configuraton sample file.
|
* Configuraton sample file.
|
||||||
*
|
*
|
||||||
@ -38,6 +39,11 @@
|
|||||||
* $config["homedir"]="/var/www/pandora_console/";
|
* $config["homedir"]="/var/www/pandora_console/";
|
||||||
* $config["homeurl"]="/pandora_console/";
|
* $config["homeurl"]="/pandora_console/";
|
||||||
* $config["auth"]["scheme"] = "mysql";
|
* $config["auth"]["scheme"] = "mysql";
|
||||||
|
*
|
||||||
|
* This is used to configure MySQL SSL console connection
|
||||||
|
* $config["dbssl"]=0;
|
||||||
|
* $config["dbsslcafile"]="/path/ca-cert.pem";
|
||||||
|
* $config["sslverifyservercert"]=0;
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// By default report any error but notices.
|
// By default report any error but notices.
|
||||||
|
@ -31,7 +31,9 @@ function mysql_connect_db(
|
|||||||
$user=null,
|
$user=null,
|
||||||
$pass=null,
|
$pass=null,
|
||||||
$port=null,
|
$port=null,
|
||||||
$charset=null
|
$charset=null,
|
||||||
|
$ssl=null,
|
||||||
|
$verify=null
|
||||||
) {
|
) {
|
||||||
global $config;
|
global $config;
|
||||||
|
|
||||||
@ -55,6 +57,14 @@ function mysql_connect_db(
|
|||||||
$port = $config['dbport'];
|
$port = $config['dbport'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($ssl === null && (bool) $config['dbssl'] === true) {
|
||||||
|
$ssl = $config['dbsslcafile'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($verify === null && (bool) $config['sslverifyservercert'] === true) {
|
||||||
|
$verify = 'ignore verify';
|
||||||
|
}
|
||||||
|
|
||||||
// Check if mysqli is available
|
// Check if mysqli is available
|
||||||
if (!isset($config['mysqli'])) {
|
if (!isset($config['mysqli'])) {
|
||||||
$config['mysqli'] = extension_loaded(mysqli);
|
$config['mysqli'] = extension_loaded(mysqli);
|
||||||
@ -63,6 +73,7 @@ function mysql_connect_db(
|
|||||||
// Non-persistent connection: This will help to avoid mysql errors like "has gone away" or locking problems
|
// Non-persistent connection: This will help to avoid mysql errors like "has gone away" or locking problems
|
||||||
// If you want persistent connections change it to mysql_pconnect().
|
// If you want persistent connections change it to mysql_pconnect().
|
||||||
if ($config['mysqli']) {
|
if ($config['mysqli']) {
|
||||||
|
if (empty($ssl)) {
|
||||||
$connect_id = mysqli_connect($host, $user, $pass, $db, $port);
|
$connect_id = mysqli_connect($host, $user, $pass, $db, $port);
|
||||||
if (mysqli_connect_errno() > 0) {
|
if (mysqli_connect_errno() > 0) {
|
||||||
include 'general/mysqlerr.php';
|
include 'general/mysqlerr.php';
|
||||||
@ -76,6 +87,22 @@ function mysql_connect_db(
|
|||||||
}
|
}
|
||||||
|
|
||||||
mysqli_select_db($connect_id, $db);
|
mysqli_select_db($connect_id, $db);
|
||||||
|
} else {
|
||||||
|
$connect_id = mysqli_init();
|
||||||
|
|
||||||
|
mysqli_ssl_set($connect_id, null, null, $ssl, null, null);
|
||||||
|
|
||||||
|
if ($verify === null) {
|
||||||
|
mysqli_real_connect($connect_id, $host, $user, $pass, $db, $port, null, MYSQLI_CLIENT_SSL);
|
||||||
|
} else {
|
||||||
|
mysqli_real_connect($connect_id, $host, $user, $pass, $db, $port, null, MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mysqli_connect_errno() > 0) {
|
||||||
|
include 'general/mysqlerr.php';
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
$connect_id = @mysql_connect($host.':'.$port, $user, $pass, true);
|
$connect_id = @mysql_connect($host.':'.$port, $user, $pass, true);
|
||||||
if (!$connect_id) {
|
if (!$connect_id) {
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Main configuration of Pandora FMS
|
* Main configuration of Pandora FMS
|
||||||
*
|
*
|
||||||
@ -30,6 +31,7 @@
|
|||||||
require_once __DIR__.'/../vendor/autoload.php';
|
require_once __DIR__.'/../vendor/autoload.php';
|
||||||
require_once __DIR__.'/functions.php';
|
require_once __DIR__.'/functions.php';
|
||||||
enterprise_include_once('include/functions_config.php');
|
enterprise_include_once('include/functions_config.php');
|
||||||
|
|
||||||
use PandoraFMS\Core\DBMaintainer;
|
use PandoraFMS\Core\DBMaintainer;
|
||||||
use PandoraFMS\Core\Config;
|
use PandoraFMS\Core\Config;
|
||||||
|
|
||||||
@ -3399,7 +3401,6 @@ function config_check()
|
|||||||
$supervisor = new ConsoleSupervisor(false);
|
$supervisor = new ConsoleSupervisor(false);
|
||||||
$supervisor->runBasic();
|
$supervisor->runBasic();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -3424,7 +3425,6 @@ function get_um_url()
|
|||||||
}
|
}
|
||||||
|
|
||||||
return $url;
|
return $url;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user