diff --git a/pandora_console/index.php b/pandora_console/index.php
index fce3421ffe..4ca8f80a82 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -1057,6 +1057,7 @@ if ((bool) ($config['maintenance_mode'] ?? false) === true
if ((bool) ($config['maintenance_mode'] ?? false) === true
&& $page !== 'advanced/command_center'
+ && $page !== 'godmode/update_manager/update_manager'
&& is_user_admin($config['id_user']) === true
) {
// Prevent access to metaconsole if not merged.
diff --git a/pandora_console/update_manager_client/lib/UpdateManager/Client.php b/pandora_console/update_manager_client/lib/UpdateManager/Client.php
index 42d9e6367a..c75c84fefb 100644
--- a/pandora_console/update_manager_client/lib/UpdateManager/Client.php
+++ b/pandora_console/update_manager_client/lib/UpdateManager/Client.php
@@ -763,6 +763,126 @@ class Client
}
+ /**
+ * Executes a curl request.
+ *
+ * @param string $url Url to be called.
+ * @param array $request Options.
+ * @param string $destiny Path.
+ *
+ * @return mixed Response given by curl.
+ */
+ private function curlSaveToDisk(string $url, array $request, string $destiny)
+ {
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_URL, $url);
+ curl_setopt($ch, CURLOPT_POST, true);
+ curl_setopt(
+ $ch,
+ CURLOPT_POSTFIELDS,
+ $request
+ );
+
+ // Abre el archivo en modo escritura para guardar la respuesta.
+ $archivo = fopen($destiny, 'w');
+
+ // Configura cURL para guardar la respuesta directamente en el archivo.
+ curl_setopt($ch, CURLOPT_FILE, $archivo);
+
+ if ($this->insecure === true) {
+ curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+ curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+ }
+
+ curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+ curl_setopt($ch, CURLOPT_TCP_KEEPALIVE, true);
+
+ if (is_array($this->proxy) === true) {
+ curl_setopt($ch, CURLOPT_PROXY, $this->proxy['host']);
+ if (isset($this->proxy['port']) === true) {
+ curl_setopt($ch, CURLOPT_PROXYPORT, $this->proxy['port']);
+ }
+
+ if (isset($this->proxy['user']) === true) {
+ curl_setopt(
+ $ch,
+ CURLOPT_PROXYUSERPWD,
+ $this->proxy['user'].':'.$this->proxy['password']
+ );
+ }
+ }
+
+ // Track progress.
+ if ((empty($request) === true
+ || $request['action'] === 'get_package'
+ || $request['action'] === 'get_server_package')
+ ) {
+ curl_setopt(
+ $ch,
+ CURLOPT_NOPROGRESS,
+ false
+ );
+ }
+
+ $target = '';
+ if ($request['action'] === 'get_server_package') {
+ $target = __('server update %s', $request['version']);
+ } else if ($request['action'] === 'get_package') {
+ $target = __('console update %s', $request['version']);
+ }
+
+ // phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.Found
+ // phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
+ // phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed
+ curl_setopt(
+ $ch,
+ CURLOPT_PROGRESSFUNCTION,
+ function (
+ $ch,
+ $total_bytes,
+ $current_bytes,
+ $total_sent_bytes,
+ $current_sent_bytes
+ ) use ($target) {
+ if ($total_bytes > 0) {
+ $this->notify(
+ (100 * $current_bytes / $total_bytes),
+ __(
+ 'Downloading %s %.2f/ %.2f MB.',
+ $target,
+ ($current_bytes / (1024 * 1024)),
+ ($total_bytes / (1024 * 1024))
+ ),
+ true
+ );
+ } else {
+ $this->notify(
+ 0,
+ __(
+ 'Downloading %.2f MB',
+ ($current_bytes / (1024 * 1024))
+ ),
+ true
+ );
+ }
+ }
+ );
+
+ // Call.
+ curl_exec($ch);
+
+ $erro_no = curl_errno($ch);
+ if ($erro_no > 0) {
+ $this->lastError = $erro_no.':'.curl_error($ch);
+ return null;
+ }
+
+ fclose($archivo);
+ curl_close($ch);
+ return true;
+ }
+
+
/**
* Make a request to Update manager.
*
@@ -810,14 +930,26 @@ class Client
}
}
- // Initialize.
- $response = $this->curl(
- $this->url,
- array_merge(
- ['action' => $request['action']],
- $request['arguments']
- )
- );
+ if ($request['action'] === 'get_server_package') {
+ // Initialize.
+ $response = $this->curlSaveToDisk(
+ $this->url,
+ array_merge(
+ ['action' => $request['action']],
+ $request['arguments']
+ ),
+ ($request['destiny'] ?? '')
+ );
+ } else {
+ // Initialize.
+ $response = $this->curl(
+ $this->url,
+ array_merge(
+ ['action' => $request['action']],
+ $request['arguments']
+ )
+ );
+ }
if ($literal === true) {
return $response;
@@ -1393,10 +1525,6 @@ class Client
) {
unlink($file);
$processed[$file] = 'removed';
- } else if (is_dir($file) === true) {
- $processed[$file] = 'skipped, is a directory';
- } else {
- $processed[$file] = 'skipped. Unreachable.';
}
}
@@ -1836,6 +1964,9 @@ class Client
return false;
}
+ $this->notify(100, 'Updated files', true, ['reload' => true]);
+ sleep(2);
+
if ($this->globalTask === null && $this->offline === false) {
$this->percentage = 90;
$this->currentTask = __('Retrieving server update');
@@ -1985,6 +2116,10 @@ class Client
} while ($rc !== null);
}
+ if ($this->lock() !== true) {
+ return null;
+ }
+
$last_error = $this->lastError;
$this->updateServerPackage(null, $this->currentPackage);
@@ -1995,6 +2130,7 @@ class Client
$this->percentage = 100;
$this->notify(100, 'Updated to '.$this->getVersion().'.');
+ $this->unlock();
return $this->currentPackage;
}
@@ -2133,30 +2269,21 @@ class Client
}
if ($package === null) {
- // Retrieve package from UMS.
- $this->notify(0, 'Downloading server update '.$version);
- $file = $this->post(
- [
- 'action' => 'get_server_package',
- 'arguments' => ['version' => $version],
- ],
- 1
- );
-
- if (empty($file) === true) {
- // No content.
- return false;
- }
-
$file_name = 'pandorafms_server-'.$version.'.tar.gz';
$official_name = 'pandorafms_server_enterprise-7.0NG.%s_x86_64.tar.gz';
$filename_repo = sprintf($official_name, $version);
$official_path = $file_path.$filename_repo;
- if (file_put_contents($official_path, $file) === false) {
- $this->lastError = 'Failed to store server update package.';
- return false;
- }
+ // Retrieve package from UMS.
+ $this->notify(0, 'Downloading server update '.$version);
+ $this->post(
+ [
+ 'action' => 'get_server_package',
+ 'arguments' => ['version' => $version],
+ 'destiny' => $official_path,
+ ],
+ 1
+ );
$signature = $this->post(
[
diff --git a/pandora_console/update_manager_client/resources/javascript/umc.js b/pandora_console/update_manager_client/resources/javascript/umc.js
index ec87cf2c63..8cc3a2a971 100644
--- a/pandora_console/update_manager_client/resources/javascript/umc.js
+++ b/pandora_console/update_manager_client/resources/javascript/umc.js
@@ -328,11 +328,11 @@ function updateProgress(url, auth) {
}
if (general_label.innerText == "100.00 %") {
- cleanExit();
+ window.onbeforeunload = undefined;
if (_auxIntervalReference != null) {
window.clearInterval(_auxIntervalReference);
}
- return;
+ window.location.reload();
}
ajax({
@@ -375,6 +375,19 @@ function updateProgress(url, auth) {
general_action.innerText = d.result.processing;
task_action.innerText = d.result.message;
+
+ // Reload to update console.
+ if (
+ d.result.extra != undefined &&
+ d.result.extra.reload != undefined &&
+ d.result.extra.reload === true
+ ) {
+ window.onbeforeunload = undefined;
+ if (_auxIntervalReference != null) {
+ window.clearInterval(_auxIntervalReference);
+ }
+ window.location.reload();
+ }
},
error: function(d) {
dprog.innerHTML = umErrorMsg(d.error);
diff --git a/pandora_console/update_manager_client/views/online.php b/pandora_console/update_manager_client/views/online.php
index 0adbb9decf..ad071bb8c4 100644
--- a/pandora_console/update_manager_client/views/online.php
+++ b/pandora_console/update_manager_client/views/online.php
@@ -27,7 +27,9 @@
* GNU General Public License for more details.
* ============================================================================
*/
+
global $config;
+
?>
@@ -57,16 +59,25 @@ global $config;
$settings = update_manager_get_config_values();
$umc = new \UpdateManager\Client($settings);
$updates = $umc->listUpdates();
+ if ($updates === null) {
+ $updates = [];
+ }
+
$text_for_next_version = '';
$text_for_last_version = '';
$back_up_url = 'index.php?sec=gextensions&sec2=enterprise/godmode/manage_backups';
- if ($updates[0]['lts'] === true) {
+ if (isset($updates[0]['lts']) === true
+ && $updates[0]['lts'] === true
+ ) {
$text_for_next_version = __('Attention. You are about to install an LTS version. LTS versions are the most stable and are released twice a year. Before installing this LTS version, please make sure you have an up-to-date backup.');
} else {
$text_for_next_version = __('Attention. You are about to install an RRR version. This version may contain new features and changes, so its installation is not recommended if you are looking for maximum system stability. LTS versions are the most stable and are released twice a year.
Before installing this RRR version, please make sure you have an up-to-date backup.');
}
- if ($updates[array_key_last($updates)]['lts'] === true) {
+ if (isset($updates[array_key_last($updates)]) === true
+ && isset($updates[array_key_last($updates)]['lts']) === true
+ && $updates[array_key_last($updates)]['lts'] === true
+ ) {
$text_for_last_version = __('Attention. You are about to install an LTS version. LTS versions are the most stable and are released twice a year. Before installing this LTS version, please make sure you have an up-to-date backup.');
} else {
$text_for_last_version = __('Attention. You are about to install an RRR version. This version may contain new features and changes, so its installation is not recommended if you are looking for maximum system stability. LTS versions are the most stable and are released twice a year.
Before installing this RRR version, please make sure you have an up-to-date backup.');
@@ -160,14 +171,19 @@ global $config;
}
},
error: function(e, r) {
- if (typeof r != "undefined" ) {
- result.innerHTML = umErrorMsg(
- '' + nextUpdateVersion+' '+r
- );
+ if(e != '504') {
+ if (typeof r != "undefined" ) {
+ result.innerHTML = umErrorMsg(
+ '' + nextUpdateVersion+' '+r
+ );
+ } else {
+ result.innerHTML = umErrorMsg(
+ '' + nextUpdateVersion+' RC'+e
+ );
+ }
} else {
- result.innerHTML = umErrorMsg(
- '' + nextUpdateVersion+' RC'+e
- );
+ cleanExit();
+ window.location.reload();
}
},
});
@@ -202,12 +218,17 @@ global $config;
}
},
error: function(e, r) {
- if (typeof r != "undefined" ) {
- result.innerHTML = umErrorMsg(r);
+ if(e != '504') {
+ if (typeof r != "undefined" ) {
+ result.innerHTML = umErrorMsg(r);
+ } else {
+ result.innerHTML = umErrorMsg(
+ ' RC'+e
+ );
+ }
} else {
- result.innerHTML = umErrorMsg(
- ' RC'+e
- );
+ cleanExit();
+ window.location.reload();
}
},
});