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

N°8379 - fix backup issue

Browse Source
This commit is contained in:
jf-cbd
2025-05-13 16:05:39 +02:00
parent 5232694c04
commit 960133c0df
4 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
datamodels/2.x/itop-backup/dbrestore.class.inc.php
View File

@@ -53,14 +53,7 @@ class DBRestore extends DBBackup
$sUser = self::EscapeShellArg($this->sDBUser); $sUser = self::EscapeShellArg($this->sDBUser);
$sPwd = self::EscapeShellArg($this->sDBPwd); $sPwd = self::EscapeShellArg($this->sDBPwd);
$sDBName = self::EscapeShellArg($this->sDBName); $sDBName = self::EscapeShellArg($this->sDBName);
if (empty($this->sMySQLBinDir)) $sMySQLExe = DBBackup::MakeSafeMySQLCommand($this->sMySQLBinDir, 'mysql');
{
$sMySQLExe = 'mysql';
}
else
{
$sMySQLExe = '"'.$this->sMySQLBinDir.'/mysql"';
}
if (is_null($this->iDBPort)) if (is_null($this->iDBPort))
{ {
$sPortOption = ''; $sPortOption = '';

10
datamodels/2.x/itop-backup/status.php
View File

@@ -56,15 +56,7 @@ try
// //
$sMySQLBinDir = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', ''); $sMySQLBinDir = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', '');
$sMySQLBinDir = utils::ReadParam('mysql_bindir', $sMySQLBinDir, true); $sMySQLBinDir = utils::ReadParam('mysql_bindir', $sMySQLBinDir, true);
if (empty($sMySQLBinDir)) $sMySQLDump = DBBackup::MakeSafeMySQLCommand($sMySQLBinDir, 'mysqldump');
{
$sMySQLDump = 'mysqldump';
}
else
{
//echo 'Info - Found mysql_bindir: '.$sMySQLBinDir;
$sMySQLDump = '"'.$sMySQLBinDir.'/mysqldump"';
}
$sCommand = "$sMySQLDump -V 2>&1"; $sCommand = "$sMySQLDump -V 2>&1";
$aOutput = array(); $aOutput = array();

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

@@ -104,6 +104,8 @@ class DBBackup
/** @var string */ /** @var string */
protected $sDBName; protected $sDBName;
/** @var string */ /** @var string */
protected $sMySQLBinDir = '';
/** @var string */
protected $sDBSubName; protected $sDBSubName;
/** /**
@@ -131,7 +133,6 @@ class DBBackup
$this->sDBSubName = $oConfig->get('db_subname'); $this->sDBSubName = $oConfig->get('db_subname');
} }
protected $sMySQLBinDir = '';
/** /**
* Create a normalized backup name, depending on the current date/time and Database * Create a normalized backup name, depending on the current date/time and Database
@@ -299,8 +300,9 @@ class DBBackup
} }
$this->LogInfo("Starting backup of $this->sDBHost/$this->sDBName(suffix:'$this->sDBSubName')"); $this->LogInfo("Starting backup of $this->sDBHost/$this->sDBName(suffix:'$this->sDBSubName')");
$sMySQLBinDir = utils::ReadParam('mysql_bindir', $this->sMySQLBinDir, true);
$sMySQLDump = $this->GetMysqldumpCommand(); $sMySQLDump = $this->MakeSafeMySQLCommand($sMySQLBinDir, 'mysqldump');
// Store the results in a temporary file // Store the results in a temporary file
$sTmpFileName = self::EscapeShellArg($sBackupFileName); $sTmpFileName = self::EscapeShellArg($sBackupFileName);
@@ -557,20 +559,22 @@ EOF;
/** /**
* @return string the command to launch mysqldump (without its params) * @return string the command to launch mysqldump (without its params)
* @throws \BackupException
*/ */
private function GetMysqldumpCommand() public static function MakeSafeMySQLCommand($sMySQLBinDir, string $sCmd)
{ {
$sMySQLBinDir = utils::ReadParam('mysql_bindir', $this->sMySQLBinDir, true); if (empty($sMySQLBinDir)) {
if (empty($sMySQLBinDir)) $sMySQLCommand = $sCmd;
{
$sMysqldumpCommand = 'mysqldump';
} }
else else {
{ $sMySQLBinDir = escapeshellcmd($sMySQLBinDir);
$sMysqldumpCommand = '"'.$sMySQLBinDir.'/mysqldump"'; $sMySQLCommand = '"'.$sMySQLBinDir.'/$sCmd"';
if (!file_exists($sMySQLCommand)) {
throw new BackupException("$sCmd not found in $sMySQLBinDir");
}
} }
return $sMysqldumpCommand; return $sMySQLCommand;
} }
} }

17
setup/setuputils.class.inc.php
View File

@@ -484,16 +484,15 @@ class SetupUtils
{ {
$sMySQLBinDir = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', ''); $sMySQLBinDir = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', '');
} }
try {
if (empty($sMySQLBinDir)) $sMySQLDump = DBBackup::MakeSafeMySQLCommand($sMySQLBinDir, 'mysqldump');
{ } catch (Exception $e) {
$sMySQLDump = 'mysqldump'; $aResult[] = new CheckResult(CheckResult::ERROR, $e->getMessage());
} return $aResult;
else
{
SetupPage::log('Info - Found mysql_bindir: '.$sMySQLBinDir);
$sMySQLDump = '"'.$sMySQLBinDir.'/mysqldump"';
} }
if (!empty($sMySQLBinDir)) {
SetupPage::log('Info - Found mysql_bindir: '.$sMySQLBinDir);
}
$sCommand = "$sMySQLDump -V 2>&1"; $sCommand = "$sMySQLDump -V 2>&1";
$aOutput = array(); $aOutput = array();