Autres/RaspAP
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-07-08 23:37:40 +02:00
Code Issues Releases Wiki Activity

Revise installRepositoryKeys() w/ array of key data

Browse Source
This commit is contained in:
billz 2025-03-14 11:37:47 -07:00
parent c2be25271b
commit 3e0f1f16c1
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,6 +191,7 @@ class PluginInstaller
}
if (!empty($manifest['keys'])) {
$this->installRepositoryKeys($manifest['keys']);
$rollbackStack[] = 'uninstallRepositoryKeys';
}
if (!empty($manifest['dependencies'])) {
$this->installDependencies($manifest['dependencies']);
@ -212,7 +213,6 @@ class PluginInstaller
$this->copyPluginFiles($pluginDir, $this->rootPath);
$rollbackStack[] = 'removePluginFiles';
}
return true;
} catch (\Exception $e) {
throw new \Exception('Installation step failed: ' . $e->getMessage());
@ -356,20 +356,30 @@ class PluginInstaller
}
/**
* Install repository keys for third-party apt packages
* Installs repository keys for third-party apt packages
*
* @param array $keys Array of repository URLs and their associated key URLs
* @throws Exception If the key installation fails.
* @param array $keys Array containing key_url, keyring, repo, and sources
* @throws Exception on key installation failure
*/
public function installRepositoryKeys(array $keys)
{
foreach ($keys as $repo => $keyUrl) {
$repoUrl = escapeshellarg($repo);
$keyUrl = escapeshellarg($keyUrl);
$cmd = sprintf('sudo %s keys %s %s', escapeshellarg($this->helperScriptPath), $repoUrl, $keyUrl);
error_log("executing installRepositoryKeys()");
foreach ($keys as $keyData) {
if (!isset($keyData['key_url'], $keyData['keyring'], $keyData['repo'], $keyData['sources'])) {
throw new \Exception("Invalid repository key structure");
}
$cmd = sprintf(
'sudo %s keys %s %s %s %s',
escapeshellarg($this->helperScriptPath),
escapeshellarg($keyData['key_url']),
escapeshellarg($keyData['keyring']),
escapeshellarg($keyData['repo']),
escapeshellarg($keyData['sources'])
);
$return = shell_exec($cmd);
if (strpos(strtolower($return), 'ok') === false) {
throw new \Exception("Failed to add repository and key for $repo");
throw new \Exception("Failed to add repository and key for {$keyData['repo']}");
}
}
}