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

N°1260 MySQL TLS connection : do not use persistent connection in Mutex

Browse Source 
SVN:trunk[5313]
This commit is contained in:
Pierre Goiffon
2018-02-08 14:22:05 +00:00
parent b032299b05
commit f51eb96c69
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/cmdbsource.class.inc.php
View File

@@ -174,8 +174,11 @@ class CMDBSource
self::$m_sDBSSLCaPath = empty($sSSLCaPath) ? null : $sSSLCaPath;
self::$m_sDBSSLCipher = empty($sSSLCipher) ? null : $sSSLCipher;
// when using TLS add persistent connection to reduce overhead
$bUsePersistentConnection = self::IsDbConnectionUsingSsl($sServer, $sServer, $sServer);
self::$m_oMysqli = self::GetMysqliInstance($sServer, $sUser, $sPwd, $sSource, $sSSLKey, $sSSLCert, $sSSLCA,
$sSSLCaPath, $sSSLCipher, true);
$sSSLCaPath, $sSSLCipher, $bUsePersistentConnection, true);
}
/**
@@ -188,6 +191,7 @@ class CMDBSource
* @param string $sSSLCA
* @param string $sSSLCaPath
* @param string $sSSLCipher
* @param boolean $bUsePersistentConnection {@see http://php.net/manual/en/mysqli.persistconns.php}
* @param boolean $bCheckSslAfterConnection
*
* @return \mysqli
@@ -195,14 +199,18 @@ class CMDBSource
*/
public static function GetMysqliInstance(
$sServer, $sUser, $sPwd, $sSource = '', $sSSLKey = null, $sSSLCert = null, $sSSLCA = null, $sSSLCaPath = null,
$sSSLCipher = null, $bCheckSslAfterConnection = false
$sSSLCipher = null, $bUsePersistentConnection = false, $bCheckSslAfterConnection = false
) {
$oMysqli = null;
$sServer = null;
$iPort = null;
$bSslEnabled = self::IsDbConnectionUsingSsl($sSSLKey, $sSSLCert, $sSSLCA);
self::InitServerAndPort($sServer, $iPort, $bSslEnabled);
self::InitServerAndPort($sServer, $iPort);
if ($bUsePersistentConnection)
{
$sServer = 'p:'.$sServer;
}
$iFlags = null;
@@ -259,9 +267,8 @@ class CMDBSource
*
* @param string $sServer
* @param int $iPort
* @param boolean $bSslEnabled
*/
private static function InitServerAndPort(&$sServer, &$iPort, $bSslEnabled)
private static function InitServerAndPort(&$sServer, &$iPort)
{
$aConnectInfo = explode(':', self::$m_sDBHost);
if (count($aConnectInfo) > 1)
@@ -275,13 +282,6 @@ class CMDBSource
$sServer = self::$m_sDBHost;
$iPort = null;
}
if ($bSslEnabled)
{
// use persistent connexions to limit TLS overhead
// see http://php.net/manual/en/mysqli.persistconns.php
$sServer = 'p:'.self::$m_sDBHost;
}
}
/**

2
core/mutex.class.inc.php
View File

@@ -245,7 +245,7 @@ class iTopMutex
$sSSLCipher = $this->sDBSSLCipher;
$this->hDBLink = CMDBSource::GetMysqliInstance($sServer, $sUser, $sPwd, $sSource, $sSSLKey, $sSSLCert, $sSSLCA,
$sSSLCaPath, $sSSLCipher, false);
$sSSLCaPath, $sSSLCipher, false, false);
if (!$this->hDBLink)
{

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

@@ -534,7 +534,7 @@ if (class_exists('ZipArchive')) // The setup must be able to start even if the "
try
{
$oMysqli = CMDBSource::GetMysqliInstance($sServer, $sUser, $sPwd, $sSource, $sSSLKey, $sSSLCert,
$sSSLCA, $sSSLCaPath, $sSSLCipher, false);
$sSSLCA, $sSSLCaPath, $sSSLCipher, true, false);
if ($oMysqli->connect_errno)
{