frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-03-01 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add checks for empty vars, improve error propagation

Browse Source
This commit is contained in:
billz 2025-01-26 01:25:12 -08:00
parent a6fdb63dd2
commit 47c509277c
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/RaspAP/Plugins/PluginInstaller.php
View File

@ -84,7 +84,8 @@ class PluginInstaller
} }
return $plugins; return $plugins;
} catch (\Exception $e) { } catch (\Exception $e) {
echo "An error occurred: " . $e->getMessage(); error_log("An error occurred: " . $e->getMessage());
throw $e; // re-throw to global ExceptionHandler
return []; return [];
} }
} }
@ -117,9 +118,14 @@ class PluginInstaller
* *
* @param string $archiveUrl * @param string $archiveUrl
* @return boolean * @return boolean
* @throws \Exception
*/ */
public function installPlugin($archiveUrl): bool public function installPlugin($archiveUrl): bool
{ {
$tempFile = null;
$extractDir = null;
$pluginDir = null;
try { try {
list($tempFile, $extractDir, $pluginDir) = $this->getPluginArchive($archiveUrl); list($tempFile, $extractDir, $pluginDir) = $this->getPluginArchive($archiveUrl);
@ -151,18 +157,19 @@ class PluginInstaller
} catch (\Exception $e) { } catch (\Exception $e) {
//$this->rollback($rollbackStack, $manifest, $pluginDir); //$this->rollback($rollbackStack, $manifest, $pluginDir);
throw new \Exception('Installation step failed: ' . $e->getMessage());
error_log('Plugin installation failed: ' . $e->getMessage()); error_log('Plugin installation failed: ' . $e->getMessage());
return false;
} }
} catch (\Exception $e) { } catch (\Exception $e) {
throw new \Exception('error: ' .$e->getMessage()); error_log('An error occured: ' .$e->getMessage());
throw new \Exception( $e->getMessage());
//throw $e;
} finally { } finally {
// cleanup tmp files if (!empty($tempFile) && file_exists($tempFile)) {
if (file_exists($tempFile)) {
unlink($tempFile); unlink($tempFile);
} }
if (is_dir($extractDir)) { if (!empty($extractDir) && is_dir($extractDir)) {
$this->deleteDir($extractDir); $this->deleteDir($extractDir);
} }
} }
@ -295,17 +302,21 @@ class PluginInstaller
* *
* @param string $archiveUrl * @param string $archiveUrl
* @return array * @return array
* @throws \Exception
*/ */
private function getPluginArchive(string $archiveUrl): array private function getPluginArchive(string $archiveUrl): array
{ {
try { $tempFile = '';
$extractDir = '';
try {
$tempFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . uniqid('plugin_', true) . '.zip'; $tempFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . uniqid('plugin_', true) . '.zip';
$extractDir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . uniqid('plugin_', true); $extractDir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . uniqid('plugin_', true);
$data = file_get_contents($archiveUrl); $data = @file_get_contents($archiveUrl); // suppress PHP warnings for better exception handling
if ($data === false) { if ($data === false) {
throw new \Exception('Failed to download archive.'); $error = error_get_last();
throw new \Exception('Failed to download archive: ' . ($error['message'] ?? 'Unknown error'));
} }
file_put_contents($tempFile, $data); file_put_contents($tempFile, $data);
@ -317,19 +328,25 @@ class PluginInstaller
$cmd = escapeshellcmd("unzip -o $tempFile -d $extractDir"); $cmd = escapeshellcmd("unzip -o $tempFile -d $extractDir");
$output = shell_exec($cmd); $output = shell_exec($cmd);
if ($output === null) { if ($output === null) {
throw new \Exception('Failed to extract archive.'); throw new \Exception('Failed to extract plugin archive.');
} }
$extractedDirs = glob($extractDir . DIRECTORY_SEPARATOR . '*', GLOB_ONLYDIR); $extractedDirs = glob($extractDir . DIRECTORY_SEPARATOR . '*', GLOB_ONLYDIR);
if (empty($extractedDirs)) { if (empty($extractedDirs)) {
throw new \Exception('No directories found in archive.'); throw new \Exception('No directories found in plugin archive.');
} }
$pluginDir = $extractedDirs[0]; $pluginDir = $extractedDirs[0];
return [$tempFile, $extractDir, $pluginDir]; return [$tempFile, $extractDir, $pluginDir];
} catch (\Exception $e) { } catch (\Exception $e) {
throw new \Exception('Error occurred: ' .$e->getMessage()); if (!empty($tempFile) && file_exists($tempFile)) {
unlink($tempFile);
}
if (!empty($extractDir) && is_dir($extractDir)) {
rmdir($extractDir);
}
throw new \Exception('Error occurred during plugin archive retrieval: ' . $e->getMessage());
} }
} }