composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°5622 Fix backup cannot be done if TLS enabled with no CA (#354)

Browse Source
This commit is contained in:
Lars Kaltefleiter
2023-01-10 12:13:33 +01:00
committed by GitHub
parent 43dd0b7df8
commit b354058eb5
3 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
setup/backup.class.inc.php
View File

@@ -464,13 +464,13 @@ EOF;
* @param Config $oConfig
*
* @return string TLS arguments for CLI programs such as mysqldump. Empty string if the config does not use TLS.
* @throws \MySQLException
*
* @uses \CMDBSource::GetDBVendor() so needs a connection opened !
* @uses \CMDBSource::GetDBVersion() so needs a connection opened !
* @uses \CMDBSource::IsSslModeDBVersion() so needs a connection opened !
*
* @since 2.5.0 N°1260
* @since 2.6.2 2.7.0 N°2336 Call DB to get vendor and version (so CMDBSource must be init before calling this method)
* @link https://dev.mysql.com/doc/refman/5.6/en/connection-options.html#encrypted-connection-options "Command Options for Encrypted Connections"
* @link https://dev.mysql.com/doc/refman/5.7/en/connection-options.html#encrypted-connection-options Command Options for Encrypted Connections
*/
public static function GetMysqlCliTlsOptions($oConfig)
{
@@ -480,13 +480,17 @@ EOF;
return '';
}
$sTlsOptions = '';
$sDBVendor = CMDBSource::GetDBVendor();
$sDBVersion = CMDBSource::GetDBVersion();
$sMysqlSSLModeVersion = '5.7.0'; //Mysql 5.7.0 and upper deprecated --ssl and uses --ssl-mode instead
if ($sDBVendor === CMDBSource::ENUM_DB_VENDOR_MYSQL && version_compare($sDBVersion, $sMysqlSSLModeVersion, '>='))
// Mysql 5.7.11 and upper deprecated --ssl and uses --ssl-mode instead
if (CMDBSource::IsSslModeDBVersion())
{
$sTlsOptions .= ' --ssl-mode=VERIFY_CA';
if(empty($oConfig->Get('db_tls.ca')))
{
$sTlsOptions .= ' --ssl-mode=REQUIRED';
}
else
{
$sTlsOptions .= ' --ssl-mode=VERIFY_CA';
}
}
else
{