From 08ebac1b5c2683012e09244f98f5c19a25700415 Mon Sep 17 00:00:00 2001 From: "denis.flaven@combodo.com" Date: Wed, 10 May 2023 17:42:50 +0200 Subject: [PATCH] Fix PR remarks --- datamodels/2.x/itop-backup/dbrestore.class.inc.php | 8 ++++++-- setup/backup.class.inc.php | 8 +++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/datamodels/2.x/itop-backup/dbrestore.class.inc.php b/datamodels/2.x/itop-backup/dbrestore.class.inc.php index 259c72990..fdb92aca1 100644 --- a/datamodels/2.x/itop-backup/dbrestore.class.inc.php +++ b/datamodels/2.x/itop-backup/dbrestore.class.inc.php @@ -232,8 +232,12 @@ class DBRestore extends DBBackup $oIterator = new RecursiveIteratorIterator($oDirectoryIterator); foreach ($oIterator as $oFileInfo) { - if (in_array($oFileInfo->getFilename(), $aStandardFiles)) continue; - if (strncmp($oFileInfo->getPathname(), $sDataDir.'/production-modules', strlen($sDataDir.'/production-modules')) == 0) continue; + if (in_array($oFileInfo->getFilename(), $aStandardFiles)) { + continue; + } + if (strncmp($oFileInfo->getPathname(), $sDataDir.'/production-modules', strlen($sDataDir.'/production-modules')) == 0) { + continue; + } $aExtraFiles[$oFileInfo->getPathname()] = APPROOT.substr($oFileInfo->getPathname(), strlen($sDataDir)); } diff --git a/setup/backup.class.inc.php b/setup/backup.class.inc.php index bbf0adfab..86c0045bb 100644 --- a/setup/backup.class.inc.php +++ b/setup/backup.class.inc.php @@ -253,10 +253,12 @@ class DBBackup $aExtraFiles = MetaModel::GetModuleSetting('itop-backup', 'extra_files', []); foreach($aExtraFiles as $sExtraFileOrDir) { - if(!file_exists(APPROOT.'/'.$sExtraFileOrDir)) continue; // Ignore non-existing files + if(!file_exists(APPROOT.'/'.$sExtraFileOrDir)) { + continue; // Ignore non-existing files + } - $sExtraFullPath = realpath(APPROOT.'/'.$sExtraFileOrDir); - if (strncmp(APPROOT, $sExtraFullPath, strlen(APPROOT)) !== 0) + $sExtraFullPath = utils::RealPath(APPROOT.'/'.$sExtraFileOrDir, APPROOT); + if ($sExtraFullPath === false) { throw new Exception("Backup: Aborting, resource '$sExtraFileOrDir'. Considered as UNSAFE because not inside the iTop directory."); }