composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 23:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3007 - Warn the user that installing a patch on a non conform install is not recommended

Browse Source
This commit is contained in:
Eric
2020-06-04 10:38:58 +02:00
parent 8064a20718
commit 9d8a7bf561
6 changed files with 99 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
datamodels/2.x/itop-files-information/src/Service/FilesInformation.php
View File

@@ -21,33 +21,71 @@ class FilesInformation
*
* @param string $sMessage
*
* @return bool true if core update is possible
* @return string 'Yes', 'No', 'Warning'
* @throws \Combodo\iTop\FilesInformation\Service\FileNotExistException
* @throws \Exception
*/
public static function CanUpdateCore(&$sMessage)
{
self::Init();
// Check than iTop can write everywhere
if (!self::CanWriteRecursive('', $sMessage))
$aFilesInfo = FilesIntegrity::GetInstalledFiles(APPROOT.'manifest.xml');
if ($aFilesInfo === false)
{
$sMessage = Dict::Format('FilesInformation:Error:MissingFile', 'manifest.xml');
return 'No';
}
// generate files and folders list
$aInstalledFiles = array();
foreach (array_keys($aFilesInfo) as $sFile)
{
$sLocalDirPath = utils::LocalPath(APPROOT.dirname($sFile));
if ($sLocalDirPath !== false)
{
if (!isset($aInstalledFiles[$sLocalDirPath]))
{
$aInstalledFiles[$sLocalDirPath] = true;
}
$aInstalledFiles[$sFile] = true;
}
}
if (!self::CanWriteRecursive('', $sMessage, $aInstalledFiles))
{
return false;
return 'No';
}
return true;
try
{
FilesIntegrity::CheckInstallationIntegrity();
}
catch (FileIntegrityException $e)
{
$sMessage = $e->getMessage();
return 'Warning';
}
return 'Yes';
}
/**
* @param string $sRootPath
* @param string $sMessage
* @param array $aInstalledFiles
*
* @return bool
* @throws \Combodo\iTop\FilesInformation\Service\FileNotExistException
*/
private static function CanWriteRecursive($sRootPath = '', &$sMessage = null)
private static function CanWriteRecursive($sRootPath = '', &$sMessage = null, $aInstalledFiles = array())
{
$aDirStats = FilesInformationUtils::Scan($sRootPath, false);
foreach ($aDirStats as $sFileName => $aFileStats)
{
// For name normalization
$sLocalPath = utils::LocalPath(APPROOT.$sRootPath.DIRECTORY_SEPARATOR.$sFileName);
if (($sLocalPath === false) || !isset($aInstalledFiles[$sLocalPath]))
{
continue;
}
if (!self::CanWriteToFile($aFileStats))
{
$sMessage = Dict::Format('FilesInformation:Error:CantWriteToFile', $sRootPath.DIRECTORY_SEPARATOR.$sFileName);
@@ -55,7 +93,7 @@ class FilesInformation
}
if (($sFileName != '.') && ($aFileStats['type'] == 'dir'))
{
if (!self::CanWriteRecursive($sRootPath.DIRECTORY_SEPARATOR.$sFileName, $sMessage))
if (!self::CanWriteRecursive($sRootPath.DIRECTORY_SEPARATOR.$sFileName, $sMessage, $aInstalledFiles))
{
return false;
}

10
datamodels/2.x/itop-files-information/src/Service/FilesIntegrity.php
View File

@@ -25,7 +25,7 @@ class FilesIntegrity
* @return array|false list of file info (path, size, md5)
* @throws \Exception
*/
private static function GetInstalledFiles($sManifest)
public static function GetInstalledFiles($sManifest)
{
$aFiles = array();
@@ -54,14 +54,19 @@ class FilesIntegrity
if ($oFileNode->hasChildNodes())
{
$aFileInfo = array();
$sFilePath = uniqid(); // just in case no path...
foreach ($oFileNode->childNodes as $oFileInfo)
{
if ($oFileInfo instanceof DOMElement)
{
$aFileInfo[$oFileInfo->tagName] = $oFileInfo->textContent;
if ($oFileInfo->tagName == 'path')
{
$sFilePath = $oFileInfo->textContent;
}
}
}
$aFiles[] = $aFileInfo;
$aFiles[$sFilePath] = $aFileInfo;
}
}
}
@@ -98,7 +103,6 @@ class FilesIntegrity
$sChecksum = md5($sContent);
if (($iSize != $aFileInfo['size']) || ($sChecksum != $aFileInfo['md5']))
{
throw new FileIntegrityException(Dict::Format('FilesInformation:Error:CorruptedFile', basename($sFile)));
}
}