N°8458 - Improve backup/restore mechanisms

composer.json

@@ -19,7 +19,7 @@
     "laminas/laminas-servicemanager": "^3.5",
     "league/oauth2-google": "^4.0.1",
     "nikic/php-parser": "^4.14.0",
-    "pear/archive_tar": "~1.4.14",
+    "pear/archive_tar": "^1.6.0",
     "pelago/emogrifier": "^7.2.0",
     "psr/log": "^3.0.0",
     "scssphp/scssphp": "^1.12.1",

datamodels/2.x/itop-backup/backup.php

@@ -127,9 +127,7 @@ function ExecuteMainOperation($oP){
 		exit;
 	}
 
-
-	$sDefaultBackupFileName = SetupUtils::GetTmpDir().'/'."__DB__-%Y-%m-%d";
-	$sBackupFile =  utils::ReadParam('backup_file', $sDefaultBackupFileName, true, 'raw_data');
+	$sBackupFile =  utils::ReadParam('backup_file', BACKUP_DEFAULT_FORMAT, true, 'raw_data');
 
 // Interpret strftime specifications (like %Y) and database placeholders
 	$oBackup = new MyDBBackup($oP);

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

@@ -128,30 +128,26 @@ public function RestoreFromCompressedBackup($sFile, $sEnvironment = 'production'
 			IssueLog::Info('Backup Restore - LOCK acquired, executing...');
 			$bReadonlyBefore = SetupUtils::EnterMaintenanceMode(MetaModel::GetConfig());
 
+			$sDataDir = static::GetTmpDir($this->oConfig);
+			SetupUtils::builddir($sDataDir); // Here is the directory
+
 			try {
 				//safe zone for db backup => cron is stopped/ itop in readonly
 				$this->LogInfo("Starting restore of ".basename($sFile));
 
-
 				$sNormalizedFile = strtolower(basename($sFile));
-				if (substr($sNormalizedFile, -4) == '.zip') {
-					$this->LogInfo('zip file detected');
-					$oArchive = new ZipArchiveEx();
-					$oArchive->open($sFile);
-				} elseif (substr($sNormalizedFile, -7) == '.tar.gz') {
+				if (str_ends_with($sNormalizedFile, '.tar.gz')) {
 					$this->LogInfo('tar.gz file detected');
 					$oArchive = new TarGzArchive($sFile);
+					if (!$oArchive->extractTo($sDataDir)) {
+						throw new BackupException('Failed to extract archive.');
+					}
 				} else {
 					throw new BackupException('Unsupported format for a backup file: '.$sFile);
 				}
 
 				// Load the database
 				//
-				$sDataDir = APPROOT.'data/tmp-backup-'.rand(10000, getrandmax());
-
-				SetupUtils::builddir($sDataDir); // Here is the directory
-				$oArchive->extractTo($sDataDir);
-
 				$sDataFile = $sDataDir.'/itop-dump.sql';
 				$this->LoadDatabase($sDataFile);
 
@@ -187,12 +183,6 @@ public function RestoreFromCompressedBackup($sFile, $sEnvironment = 'production'
 					rename($sSourceFilePath, $sDestinationFilePath);
 				}
 
-				try {
-					SetupUtils::rrmdir($sDataDir);
-				} catch (Exception $e) {
-					throw new BackupException("Can't remove data dir", 0, $e);
-				}
-
 				$oEnvironment = new RunTimeEnvironment($sEnvironment);
 				$oEnvironment->CompileFrom($sEnvironment);
 			} finally {
@@ -202,6 +192,12 @@ public function RestoreFromCompressedBackup($sFile, $sEnvironment = 'production'
 					//we are in the scope of main process that needs to handle/keep readonly mode.
 					$this->LogInfo("Keep maintenance mode after restore");
 				}
+
+				try {
+					SetupUtils::rrmdir($sDataDir);
+				} catch (Exception $e) {
+					throw new BackupException("Can't remove tmp folder", 0, $e);
+				}
 			}
 		}
 		finally

datamodels/2.x/itop-backup/module.itop-backup.php

@@ -52,6 +52,7 @@
 			'retention_count' => 5, 
 			'enabled' => true,
 			'itop_backup_incident' => '',
+			'backup_tmpdir' => 'data/',
 		),
 	)
 );

lib/composer/installed.json

@@ -1165,22 +1165,22 @@
         },
         {
             "name": "pear/archive_tar",
-            "version": "1.4.14",
-            "version_normalized": "1.4.14.0",
+            "version": "1.6.0",
+            "version_normalized": "1.6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Archive_Tar.git",
-                "reference": "4d761c5334c790e45ef3245f0864b8955c562caa"
+                "reference": "dc3285537f1832da8ddbbe45f5a007248b6cc00e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/4d761c5334c790e45ef3245f0864b8955c562caa",
-                "reference": "4d761c5334c790e45ef3245f0864b8955c562caa",
+                "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/dc3285537f1832da8ddbbe45f5a007248b6cc00e",
+                "reference": "dc3285537f1832da8ddbbe45f5a007248b6cc00e",
                 "shasum": ""
             },
             "require": {
                 "pear/pear-core-minimal": "^1.10.0alpha2",
-                "php": ">=5.2.0"
+                "php": ">=5.4.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "*"
@@ -1190,7 +1190,7 @@
                 "ext-xz": "Lzma2 compression support.",
                 "ext-zlib": "Gzip compression support."
             },
-            "time": "2021-07-20T13:53:39+00:00",
+            "time": "2025-07-19T14:49:16+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -1208,7 +1208,7 @@
                 "./"
             ],
             "license": [
-                "BSD-3-Clause"
+                "BSD-2-Clause"
             ],
             "authors": [
                 {
@@ -1234,16 +1234,6 @@
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Archive_Tar",
                 "source": "https://github.com/pear/Archive_Tar"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/mrook",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/michielrook",
-                    "type": "patreon"
-                }
-            ],
             "install-path": "../pear/archive_tar"
         },
         {

lib/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'combodo/itop',
         'pretty_version' => 'dev-develop',
         'version' => 'dev-develop',
-        'reference' => '7a3e770c00619e93628235b12fe820f3f1ce6c77',
+        'reference' => '19ae119a551b860d7ff50b5c0f592219ac6b313c',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -22,7 +22,7 @@
         'combodo/itop' => array(
             'pretty_version' => 'dev-develop',
             'version' => 'dev-develop',
-            'reference' => '7a3e770c00619e93628235b12fe820f3f1ce6c77',
+            'reference' => '19ae119a551b860d7ff50b5c0f592219ac6b313c',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -161,9 +161,9 @@
             'dev_requirement' => false,
         ),
         'pear/archive_tar' => array(
-            'pretty_version' => '1.4.14',
-            'version' => '1.4.14.0',
-            'reference' => '4d761c5334c790e45ef3245f0864b8955c562caa',
+            'pretty_version' => '1.6.0',
+            'version' => '1.6.0.0',
+            'reference' => 'dc3285537f1832da8ddbbe45f5a007248b6cc00e',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/archive_tar',
             'aliases' => array(),