+
+
+
A web mirroring tool for rpm and deb package repositories
+<SNAPSHOT_ID>/diff/<SNAPSHOT_ID_2>GET<APIKEY>| Endpoint and method | +Authentication | +Parameter(s) | +Description | +Example | +
|---|---|---|---|---|
/environment/<ENV>/pointPATCH |
+ <APIKEY> |
+ snapshot Id (required, JSON body) |
+ Point an environment to an existing snapshot (starts an asynchronous task; returns 202 and task-id). |
+
+ ```bash
+ curl --fail-with-body -L -s -X PATCH -H "Authorization: Bearer |
+
<HOST_ID>/installedGET<APIKEY><HOST_ID>/availableGET<APIKEY>POST<APIKEY>DELETE<HOST_ID> and <HOST_TOKEN><APIKEY><HOST_ID> and <HOST_TOKEN>hostname (required if API key is used)| Endpoint and method | +Authentication | +Parameter(s) | +Description | +Example | +
|---|---|---|---|---|
/tasks/GET |
+ <APIKEY> |
+ + | List all tasks | +
+ ```bash
+ curl --fail-with-body -L -s -X GET -H "Authorization: Bearer |
+
/tasks/runningGET |
+ <APIKEY> |
+ + | List running tasks | +
+ ```bash
+ curl --fail-with-body -L -s -X GET -H "Authorization: Bearer |
+
/tasks/queuedGET |
+ <APIKEY> |
+ + | List queued tasks | +
+ ```bash
+ curl --fail-with-body -L -s -X GET -H "Authorization: Bearer |
+
/tasks/scheduledGET |
+ <APIKEY> |
+ + | List scheduled tasks | +
+ ```bash
+ curl --fail-with-body -L -s -X GET -H "Authorization: Bearer |
+
/tasks/doneGET |
+ <APIKEY> |
+ + | List done tasks | +
+ ```bash
+ curl --fail-with-body -L -s -X GET -H "Authorization: Bearer |
+
/task/<TASK_ID>/GET |
+ <APIKEY> |
+ + | Retrieve task details by task ID | +
+ ```bash
+ curl --fail-with-body -L -s -X GET -H "Authorization: Bearer |
+
/task/<TASK_ID>/stopPOST |
+ <APIKEY> |
+ + | Stop a running task | +
+ ```bash
+ curl --fail-with-body --post301 -L -s -X POST -H "Authorization: Bearer |
+
/task/<TASK_ID>/enablePOST |
+ <APIKEY> |
+ + | Enable a recurrent task | +
+ ```bash
+ curl --fail-with-body --post301 -L -s -X POST -H "Authorization: Bearer |
+
/task/<TASK_ID>/disablePOST |
+ <APIKEY> |
+ + | Disable a recurrent task | +
+ ```bash
+ curl --fail-with-body --post301 -L -s -X POST -H "Authorization: Bearer |
+
/task/<TASK_ID>/deleteDELETE |
+ <APIKEY> |
+ + | Delete a recurrent task | +
+ ```bash
+ curl --fail-with-body -L -s -X DELETE -H "Authorization: Bearer |
+
' . $name . ' edited');
}
+
if ($this->type == 'host') {
History::set('Host group ' . $name . ' edited');
}
+
+ unset($repoController, $hostController);
}
/**
* Delete one or more groups
*/
- public function delete(array $groups) : void
+ public function delete(array $groups): void
{
foreach ($groups as $id) {
// Check if group exists
@@ -212,16 +164,14 @@ public function delete(array $groups) : void
}
/**
- * Retourne les informations de tous les groupes en base de données
- * Sauf le groupe par défaut
+ * Return information for all groups in the database
+ * Except the default group
*/
- public function listAll($withDefault = false)
+ public function listAll($withDefault = false): array
{
$groups = $this->model->listAll();
- /**
- * Add default group 'Default' to the end of the list
- */
+ // Add default group 'Default' to the end of the list
if ($withDefault === true) {
$groups[] = [
'Id' => 0,
@@ -233,9 +183,9 @@ public function listAll($withDefault = false)
}
/**
- * Supprime des groupes les repos qui n'existent plus
+ * Remove repositories that no longer exist from groups
*/
- public function cleanRepos()
+ public function cleanRepos(): void
{
$this->model->cleanRepos();
}
@@ -243,7 +193,7 @@ public function cleanRepos()
/**
* Update group name in database
*/
- private function updateName(int $id, string $name)
+ private function updateName(int $id, string $name): void
{
$this->model->updateName($id, $name);
}
@@ -251,7 +201,7 @@ private function updateName(int $id, string $name)
/**
* Return the list of repos in a group
*/
- public function getReposMembers(int $id)
+ public function getReposMembers(int $id): array
{
return $this->model->getReposMembers($id);
}
@@ -259,7 +209,7 @@ public function getReposMembers(int $id)
/**
* Return the list of repos not in any group
*/
- public function getReposNotMembers()
+ public function getReposNotMembers(): array
{
return $this->model->getReposNotMembers();
}
@@ -267,7 +217,7 @@ public function getReposNotMembers()
/**
* Return the list of hosts in a group
*/
- public function getHostsMembers(int $id)
+ public function getHostsMembers(int $id): array
{
return $this->model->getHostsMembers($id);
}
@@ -275,7 +225,7 @@ public function getHostsMembers(int $id)
/**
* Return the list of hosts not in any group
*/
- public function getHostsNotMembers()
+ public function getHostsNotMembers(): array
{
return $this->model->getHostsNotMembers();
}
diff --git a/www/controllers/Host/Host.php b/www/controllers/Host/Host.php
index 2fcec0e19..7fa204b86 100644
--- a/www/controllers/Host/Host.php
+++ b/www/controllers/Host/Host.php
@@ -184,7 +184,7 @@ public function deleteById(int $id): void
/**
* Add/delete hosts to/from a group
*/
- public function addHostsIdToGroup(array $hostsId = [], int $groupId): void
+ public function addHostsIdToGroup(int $groupId, array $hostsId = []): void
{
$mygroup = new HostGroup();
diff --git a/www/controllers/Layout/Container/vars/header/menu.vars.inc.php b/www/controllers/Layout/Container/vars/header/menu.vars.inc.php
index 14db9e1f6..3bc13241c 100644
--- a/www/controllers/Layout/Container/vars/header/menu.vars.inc.php
+++ b/www/controllers/Layout/Container/vars/header/menu.vars.inc.php
@@ -1,10 +1,11 @@
listRunning();
+$tasksRunning = $taskListingController->getRunning();
/**
* Count running tasks
diff --git a/www/controllers/Layout/Container/vars/tasks/log.vars.inc.php b/www/controllers/Layout/Container/vars/tasks/log.vars.inc.php
index 841ba2d72..0ae7ab669 100644
--- a/www/controllers/Layout/Container/vars/tasks/log.vars.inc.php
+++ b/www/controllers/Layout/Container/vars/tasks/log.vars.inc.php
@@ -93,12 +93,6 @@
if (!empty($rawParams['arch'])) {
$repoController->setArch($rawParams['arch']);
}
- if (!empty($rawParams['packages-include'])) {
- $repoController->setPackagesToInclude($rawParams['packages-include']);
- }
- if (!empty($rawParams['packages-exclude'])) {
- $repoController->setPackagesToExclude($rawParams['packages-exclude']);
- }
if (!empty($rawParams['package-type'])) {
$repoController->setPackageType($rawParams['package-type']);
}
diff --git a/www/controllers/Layout/Table/vars/tasks/list-done.vars.inc.php b/www/controllers/Layout/Table/vars/tasks/list-done.vars.inc.php
index 8c50eb242..c6635dc6c 100644
--- a/www/controllers/Layout/Table/vars/tasks/list-done.vars.inc.php
+++ b/www/controllers/Layout/Table/vars/tasks/list-done.vars.inc.php
@@ -1,5 +1,6 @@
listDone('', true, $reloadableTableOffset);
+$reloadableTableContent = $taskListingController->getDone('', true, $reloadableTableOffset);
/**
* Get list of ALL done tasks, without offset, for the total count
*/
-$reloadableTableTotalItems = count($myTask->listDone());
+$reloadableTableTotalItems = count($taskListingController->getDone());
/**
* Count total pages for the pagination
diff --git a/www/controllers/Layout/Table/vars/tasks/list-queued.vars.inc.php b/www/controllers/Layout/Table/vars/tasks/list-queued.vars.inc.php
index 60bc6a534..99bb55784 100644
--- a/www/controllers/Layout/Table/vars/tasks/list-queued.vars.inc.php
+++ b/www/controllers/Layout/Table/vars/tasks/list-queued.vars.inc.php
@@ -1,5 +1,6 @@
listQueued('', true, $reloadableTableOffset);
+$reloadableTableContent = $taskListingController->getQueued('', true, $reloadableTableOffset);
/**
* Get list of ALL queued tasks, without offset, for the total count
*/
-$reloadableTableTotalItems = count($myTask->listQueued());
+$reloadableTableTotalItems = count($taskListingController->getQueued());
/**
* Count total pages for the pagination
diff --git a/www/controllers/Layout/Table/vars/tasks/list-running.vars.inc.php b/www/controllers/Layout/Table/vars/tasks/list-running.vars.inc.php
index 1af4ba1de..65f9a5728 100644
--- a/www/controllers/Layout/Table/vars/tasks/list-running.vars.inc.php
+++ b/www/controllers/Layout/Table/vars/tasks/list-running.vars.inc.php
@@ -1,5 +1,6 @@
listRunning('', true, $reloadableTableOffset);
+$reloadableTableContent = $taskListingController->getRunning('', true, $reloadableTableOffset);
/**
* Get list of ALL running tasks, without offset, for the total count
*/
-$reloadableTableTotalItems = count($myTask->listRunning());
+$reloadableTableTotalItems = count($taskListingController->getRunning());
/**
* Count total pages for the pagination
diff --git a/www/controllers/Layout/Table/vars/tasks/list-scheduled.vars.inc.php b/www/controllers/Layout/Table/vars/tasks/list-scheduled.vars.inc.php
index e777056fa..f08221dcb 100644
--- a/www/controllers/Layout/Table/vars/tasks/list-scheduled.vars.inc.php
+++ b/www/controllers/Layout/Table/vars/tasks/list-scheduled.vars.inc.php
@@ -1,5 +1,6 @@
listScheduled(true, $reloadableTableOffset);
+$reloadableTableContent = $taskListingController->getScheduled(true, $reloadableTableOffset);
/**
* Get list of ALL scheduled tasks, without offset, for the total count
*/
-$reloadableTableTotalItems = count($myTask->listScheduled());
+$reloadableTableTotalItems = count($taskListingController->getScheduled());
/**
* Count total pages for the pagination
diff --git a/www/controllers/Mail.php b/www/controllers/Mail.php
index cdbbc191c..e0532a149 100644
--- a/www/controllers/Mail.php
+++ b/www/controllers/Mail.php
@@ -2,9 +2,8 @@
namespace Controllers;
-require_once(ROOT . '/libs/PHPMailer/Exception.php');
-require_once(ROOT . '/libs/PHPMailer/PHPMailer.php');
-require_once(ROOT . '/libs/PHPMailer/SMTP.php');
+// Composer autoload
+require ROOT . '/libs/vendor/autoload.php';
use PHPMailer\PHPMailer\PHPMailer;
use PHPMailer\PHPMailer\Exception;
diff --git a/www/controllers/Notification.php b/www/controllers/Notification.php
index 31f733b64..9544e120c 100644
--- a/www/controllers/Notification.php
+++ b/www/controllers/Notification.php
@@ -37,9 +37,7 @@ public function retrieve(): void
$title = Validate::string($notification['title']);
$message = Validate::string($notification['message']);
- /**
- * Insert notficiation in database if not already exists
- */
+ // Insert notification in database if not already exists
if (!$this->exists($id)) {
$this->add($id, $title, $message);
}
diff --git a/www/controllers/Repo/Environment.php b/www/controllers/Repo/Environment.php
index 1f549ecb7..f99a3f937 100644
--- a/www/controllers/Repo/Environment.php
+++ b/www/controllers/Repo/Environment.php
@@ -25,9 +25,9 @@ public function getByRepoId(int $repoId): array
/**
* Associate a new environment to a snapshot
*/
- public function add(string $env, string $description = '', int $snapId) : void
+ public function add(int $snapId, string $env, string $description = '') : void
{
- $this->model->add($env, $description, $snapId);
+ $this->model->add($snapId, $env, $description);
}
/**
diff --git a/www/controllers/Repo/Metadata/Create.php b/www/controllers/Repo/Metadata/Create.php
index 399f8cbef..408ffc7c9 100644
--- a/www/controllers/Repo/Metadata/Create.php
+++ b/www/controllers/Repo/Metadata/Create.php
@@ -35,9 +35,7 @@ private function createMetadata() : void
$workingDir = $snapshotPath;
}
- /**
- * Generate repository metadata
- */
+ // Generate repository metadata
if ($this->repoController->getPackageType() == 'rpm') {
$mymetadata = new RpmMetadata($this->taskId);
$mymetadata->setRoot($workingDir);
@@ -52,6 +50,7 @@ private function createMetadata() : void
$mymetadata->setSection($this->repoController->getSection());
$mymetadata->setArch($this->repoController->getArch());
$mymetadata->setGpgSign($this->repoController->getGpgSign());
+ $mymetadata->setMetadataCustomFields($this->repoController->getAdvancedParams()['metadata-custom-fields'] ?? []);
$mymetadata->create();
}
@@ -94,18 +93,14 @@ private function createMetadata() : void
$link = REPOS_DIR . '/deb/' . $this->repoController->getName() . '/' . $this->repoController->getDist() . '/' . $this->repoController->getSection() . '/' . $env;
}
- /**
- * If a symlink with the same name already exists, we remove it
- */
+ // If a symlink with the same name already exists, we remove it
if (is_link($link)) {
if (!unlink($link)) {
throw new Exception('Could not remove existing symlink ' . $link);
}
}
- /**
- * Create symlink
- */
+ // Create symlink
if (!symlink($this->repoController->getDate(), $link)) {
throw new Exception('Could not point environment to the repository');
}
diff --git a/www/controllers/Repo/Metadata/Deb.php b/www/controllers/Repo/Metadata/Deb.php
index b10a498ed..4a31d4b21 100644
--- a/www/controllers/Repo/Metadata/Deb.php
+++ b/www/controllers/Repo/Metadata/Deb.php
@@ -3,6 +3,7 @@
namespace Controllers\Repo\Metadata;
use Controllers\Filesystem\Directory;
+use Controllers\Process;
use Exception;
class Deb extends Metadata
@@ -14,69 +15,66 @@ class Deb extends Metadata
private $arch;
private $gpgSign = false;
private $aptftparchive = '/usr/bin/apt-ftparchive';
- private $task;
+ private $customFields = [];
- public function setRoot(string $root)
+ public function setRoot(string $root): void
{
$this->root = $root;
}
- public function setRepo(string $repo)
+ public function setRepo(string $repo): void
{
$this->repo = $repo;
}
- public function setDist(string $dist)
+ public function setDist(string $dist): void
{
$this->dist = $dist;
}
- public function setSection(string $section)
+ public function setSection(string $section): void
{
$this->section = $section;
}
- public function setArch(array $arch)
+ public function setArch(array $arch): void
{
$this->arch = $arch;
}
- public function setGpgSign(string $gpgSign)
+ public function setGpgSign(string $gpgSign): void
{
$this->gpgSign = $gpgSign;
}
+ public function setMetadataCustomFields(array $fields): void
+ {
+ $this->customFields = $fields;
+ }
+
/**
* Create metadata files
*/
- public function create()
+ public function create(): void
{
- /**
- * Check which of apt-ftparchive is present on the system
- */
+ // Check if apt-ftparchive is present on the system
if (!file_exists($this->aptftparchive)) {
throw new Exception('Could not find apt-ftparchive on the system');
}
- /**
- * Check if root path exists
- */
+ // Check if root path exists
if (!is_dir($this->root)) {
throw new Exception("Repository root directory '" . $this->root . "' does not exist");
}
- /**
- * Target arch must be specified
- */
+ // Target arch must be specified
if (empty($this->arch)) {
throw new Exception('Packages architecture(s) must be specified');
}
$this->taskLogSubStepController->new('create-metadata', 'GENERATING REPOSITORY METADATA');
- /**
- * Define directory to create for the repository
- */
+ // Define directory to create for the repository
$dirs = [
'dists',
'dists/' . $this->dist,
@@ -85,9 +83,7 @@ public function create()
'cache'
];
- /**
- * Append binary arch directories to the list of directories to create
- */
+ // Append binary arch directories to the list of directories to create
foreach ($this->arch as $arch) {
if ($arch == 'src') {
$dirs[] = 'dists/' . $this->dist . '/' . $this->section . '/source';
@@ -101,16 +97,12 @@ public function create()
* Clean all but 'pool' directory, because it might contain packages to add to the repository (e.g. if the repository is being rebuilt or it is a duplicate of another one)
*/
foreach ($dirs as $dir) {
- /**
- * Skip pool directory
- */
+ // Skip pool directory
if ($dir == 'pool') {
continue;
}
- /**
- * Clean directory if it exists
- */
+ // Clean directory if it exists
if (is_dir($this->root . '/' . $dir)) {
if (!Directory::deleteRecursive($this->root . '/' . $dir)) {
throw new Exception('Cannot delete existing directory: ' . $this->root . '/' . $dir);
@@ -118,9 +110,7 @@ public function create()
}
}
- /**
- * Then create directory structure
- */
+ // Then create directory structure
foreach ($dirs as $dir) {
if (!is_dir($this->root . '/' . $dir)) {
if (!mkdir($this->root . '/' . $dir, 0770, true)) {
@@ -129,36 +119,25 @@ public function create()
}
}
- /**
- * Create apt-ftparchive.conf file
- */
+ // Create apt-ftparchive.conf file
if (!file_put_contents($this->root . '/apt-ftparchive.conf', $this->generateAptFtpArchiveConf())) {
throw new Exception('Failed to create apt-ftparchive.conf file');
}
- /**
- * Create dist.conf file
- */
+ // Create dist.conf file
if (!file_put_contents($this->root . '/dist.conf', $this->generateDistConf())) {
throw new Exception('Failed to create dist.conf file');
}
- /**
- * Create Packages file
- */
- $myprocess = new \Controllers\Process($this->aptftparchive . ' generate ' . $this->root . '/apt-ftparchive.conf');
+ // Create Packages file
+ $myprocess = new Process($this->aptftparchive . ' generate ' . $this->root . '/apt-ftparchive.conf');
$myprocess->setBackground(true);
$myprocess->execute();
- /**
- * Retrieve PID of the launched process
- * Then write PID to main PID file
- */
+ // Retrieve PID of the launched process, then write PID to main PID file
$this->taskController->addsubpid($myprocess->getPid());
- /**
- * Retrieve output from process
- */
+ // Retrieve output from process
$output = $myprocess->getOutput();
$this->taskLogSubStepController->output($output, 'pre');
@@ -169,22 +148,15 @@ public function create()
$myprocess->close();
- /**
- * Generate Release file
- */
- $myprocess = new \Controllers\Process($this->aptftparchive . ' -c ' . $this->root . '/dist.conf release ' . $this->root . '/dists/' . $this->dist . ' > ' . $this->root . '/dists/' . $this->dist . '/Release');
+ // Generate Release file
+ $myprocess = new Process($this->aptftparchive . ' -c ' . $this->root . '/dist.conf release ' . $this->root . '/dists/' . $this->dist . ' > ' . $this->root . '/dists/' . $this->dist . '/Release');
$myprocess->setBackground(true);
$myprocess->execute();
- /**
- * Retrieve PID of the launched process
- * Then write PID to main PID file
- */
+ // Retrieve PID of the launched process, then write PID to main PID file
$this->taskController->addsubpid($myprocess->getPid());
- /**
- * Retrieve output from process
- */
+ // Retrieve output from process
$output = $myprocess->getOutput();
$this->taskLogSubStepController->output($output, 'pre');
@@ -195,38 +167,29 @@ public function create()
$myprocess->close();
- /**
- * Clean configuration files
- */
+ // Clean configuration files
if (file_exists($this->root . '/apt-ftparchive.conf')) {
if (!unlink($this->root . '/apt-ftparchive.conf')) {
- throw new Exception("Failed to clean '" . $this->root . "/apt-ftparchive.conf' file");
+ throw new Exception("Failed to remove '" . $this->root . "/apt-ftparchive.conf' file");
}
}
if (file_exists($this->root . '/dist.conf')) {
if (!unlink($this->root . '/dist.conf')) {
- throw new Exception("Failed to clean '" . $this->root . "/dist.conf' file");
+ throw new Exception("Failed to remove '" . $this->root . "/dist.conf' file");
}
}
- /**
- * Quit here if GPG signature is not enabled
- */
+ // Quit here if GPG signature is not enabled
if ($this->gpgSign != 'true') {
$this->taskLogSubStepController->completed();
return;
}
- /**
- * Sign Release file with GPG key
- */
- $myprocess = new \Controllers\Process('/usr/bin/gpg --homedir ' . GPGHOME . ' -u ' . GPG_SIGNING_KEYID . ' --output ' . $this->root . '/dists/' . $this->dist . '/Release.gpg -ba ' . $this->root . '/dists/' . $this->dist . '/Release');
+ // Sign Release file with GPG key
+ $myprocess = new Process('/usr/bin/gpg --homedir ' . GPGHOME . ' -u ' . GPG_SIGNING_KEYID . ' --output ' . $this->root . '/dists/' . $this->dist . '/Release.gpg -ba ' . $this->root . '/dists/' . $this->dist . '/Release');
$myprocess->execute();
- /**
- * Retrieve PID of the launched process
- * Then write PID to main PID file
- */
+ // Retrieve PID of the launched process, then write PID to main PID file
$this->taskController->addsubpid($myprocess->getPid());
if ($myprocess->getExitCode() != 0) {
@@ -241,13 +204,11 @@ public function create()
/**
* Generate apt-ftparchive.conf file
*/
- private function generateAptFtpArchiveConf()
+ private function generateAptFtpArchiveConf(): string
{
$architectures = '';
- /**
- * Generate architectures string
- */
+ // Generate architectures string
foreach ($this->arch as $arch) {
if ($arch == 'src') {
$architectures .= 'source ';
@@ -296,13 +257,27 @@ private function generateAptFtpArchiveConf()
/**
* Generate dist.conf file
*/
- private function generateDistConf()
+ private function generateDistConf(): string
{
$architectures = '';
- /**
- * Generate architectures string
- */
+ // Default values for Release fields
+ $origin = $this->repo . ' > ' . $this->dist . ' > ' . $this->section . ' repository';
+ $label = 'deb packages repository';
+ $description = $this->repo . ' > ' . $this->dist . ' > ' . $this->section . ' repository';
+
+ // Overwrite with custom fields if defined
+ if (!empty($this->customFields['origin'])) {
+ $origin = $this->customFields['origin'];
+ }
+ if (!empty($this->customFields['label'])) {
+ $label = $this->customFields['label'];
+ }
+ if (!empty($this->customFields['description'])) {
+ $description = $this->customFields['description'];
+ }
+
+ // Generate architectures string
foreach ($this->arch as $arch) {
if ($arch == 'src') {
$architectures .= 'source ';
@@ -320,13 +295,13 @@ private function generateDistConf()
$template = <<' . $modulesFileTargetName . '' . $e->getMessage() . ''); } - // Delete original (uncompressed) file - if (!unlink($this->workingDir . '/' . $modulesFileTargetName)) { - throw new Exception('Could not delete
' . $this->workingDir . '/' . $modulesFileTargetName . '');
+ // Delete original file (only if it was compressed and not already a plain .yaml file)
+ if ($modulesFileExtension != 'yaml') {
+ if (!unlink($this->workingDir . '/' . $modulesFileTargetName)) {
+ throw new Exception('Could not delete ' . $this->workingDir . '/' . $modulesFileTargetName . '');
+ }
}
$this->taskLogSubStepController->completed();
@@ -196,10 +198,10 @@ private function downloadUpdateInfo(string $url) : void
* We'll give this updateinfo file a target name according to its file extension
*/
$updateInfoFileExtension == 'gz' ? $updateInfoFileTargetName = 'updateinfo.xml.gz' : null;
- $updateInfoFileExtension == 'bz2' ? $updateInfoFileTargetName = 'updateinfo.xml.bz2' : null;
$updateInfoFileExtension == 'xz' ? $updateInfoFileTargetName = 'updateinfo.xml.xz' : null;
- $updateInfoFileExtension == 'xml' ? $updateInfoFileTargetName = 'updateinfo.xml' : null;
+ $updateInfoFileExtension == 'bz2' ? $updateInfoFileTargetName = 'updateinfo.xml.bz2' : null;
$updateInfoFileExtension == 'zst' ? $updateInfoFileTargetName = 'updateinfo.xml.zst' : null;
+ $updateInfoFileExtension == 'xml' ? $updateInfoFileTargetName = 'updateinfo.xml' : null;
/**
* Download updateinfo file
@@ -238,9 +240,11 @@ private function downloadUpdateInfo(string $url) : void
throw new Exception('Error while uncompressing ' . $updateInfoFileTargetName . '' . $e->getMessage() . ''); } - // Delete original (uncompressed) file - if (!unlink($this->workingDir . '/' . $updateInfoFileTargetName)) { - throw new Exception('Could not delete
' . $this->workingDir . '/' . $updateInfoFileTargetName . '');
+ // Delete original file (only if it was compressed and not already a plain .xml file)
+ if ($updateInfoFileExtension != 'xml') {
+ if (!unlink($this->workingDir . '/' . $updateInfoFileTargetName)) {
+ throw new Exception('Could not delete ' . $this->workingDir . '/' . $updateInfoFileTargetName . '');
+ }
}
$this->taskLogSubStepController->completed();
@@ -539,8 +543,6 @@ private function parsePrimaryPackagesList(string $primaryFile) : void
if ($error == 0) {
$this->taskLogSubStepController->completed();
}
-
- unset($jsonArray, $data);
}
/**
@@ -594,10 +596,10 @@ private function downloadRpmPackages(string $url) : void
* If a list of package(s) to include has been provided, check if the package is in the list
* If not, skip the package
*/
- if (!empty($this->packagesToInclude)) {
+ if (!empty($this->advancedParams['packages']['include'])) {
$isIn = false;
- foreach ($this->packagesToInclude as $packageToInclude) {
+ foreach ($this->advancedParams['packages']['include'] as $packageToInclude) {
if (preg_match('/' . $packageToInclude . '/', $rpmPackageName)) {
$isIn = true;
}
@@ -616,10 +618,10 @@ private function downloadRpmPackages(string $url) : void
* If a list of package(s) to exclude has been provided, check if the package is in the list
* If so, skip the package
*/
- if (!empty($this->packagesToExclude)) {
+ if (!empty($this->advancedParams['packages']['exclude'])) {
$isIn = false;
- foreach ($this->packagesToExclude as $packageToExclude) {
+ foreach ($this->advancedParams['packages']['exclude'] as $packageToExclude) {
if (preg_match('/' . $packageToExclude . '/', $rpmPackageName)) {
$isIn = true;
}
diff --git a/www/controllers/Repo/Package/Deb.php b/www/controllers/Repo/Package/Deb.php
new file mode 100644
index 000000000..d74db0291
--- /dev/null
+++ b/www/controllers/Repo/Package/Deb.php
@@ -0,0 +1,64 @@
+/dev/null';
+
+ try {
+ // Execute the command and capture the output
+ exec($cmd, $out, $rc);
+
+ if ($rc !== 0) {
+ throw new Exception('DEB query command failed with return code ' . $rc);
+ }
+
+ if (empty($out)) {
+ throw new Exception('no output from DEB query command');
+ }
+
+ $info = [];
+
+ foreach ($out as $line) {
+ $parts = explode(':', $line, 2);
+
+ if (count($parts) !== 2) {
+ throw new Exception('unexpected output format from DEB query command: ' . $line);
+ }
+
+ $field = trim($parts[0]);
+ $value = trim($parts[1]);
+
+ switch ($field) {
+ case 'Package':
+ $info['name'] = $value;
+ break;
+
+ case 'Version':
+ $info['version'] = $value;
+ break;
+
+ case 'Architecture':
+ $info['arch'] = $value;
+ break;
+ }
+ }
+
+ if (!isset($info['name'], $info['version'], $info['arch'])) {
+ throw new Exception('missing required fields in DEB query output');
+ }
+ } catch (Exception $e) {
+ throw new Exception('Failed to extract DEB info from file: ' . $path . ' (' . $e->getMessage() . ')');
+ }
+
+ return $info;
+ }
+}
diff --git a/www/controllers/Repo/Package/Rpm.php b/www/controllers/Repo/Package/Rpm.php
new file mode 100644
index 000000000..8b3402973
--- /dev/null
+++ b/www/controllers/Repo/Package/Rpm.php
@@ -0,0 +1,50 @@
+/dev/null';
+
+ try {
+ // Execute the command and capture the output
+ exec($cmd, $out, $rc);
+
+ if ($rc !== 0) {
+ throw new Exception('RPM query command failed with return code ' . $rc);
+ }
+
+ if (empty($out)) {
+ throw new Exception('no output from RPM query command');
+ }
+
+ // The output should be in the format: name|version|release|arch
+ $parts = explode('|', $out[0], 4);
+
+ // Validate that we got exactly 4 parts
+ if (count($parts) !== 4) {
+ throw new Exception('unexpected output format from RPM query command: ' . $out[0]);
+ }
+ } catch (Exception $e) {
+ throw new Exception('Failed to extract RPM info from file:' . $path . ' (' . $e->getMessage() . ')');
+ }
+
+ return [
+ 'name' => $parts[0],
+ 'version' => $parts[1],
+ 'release' => $parts[2],
+ 'arch' => $parts[3],
+ ];
+ }
+}
diff --git a/www/controllers/Repo/Package/Sign.php b/www/controllers/Repo/Package/Sign.php
index d9902be3a..21f2735a8 100644
--- a/www/controllers/Repo/Package/Sign.php
+++ b/www/controllers/Repo/Package/Sign.php
@@ -3,7 +3,6 @@
namespace Controllers\Repo\Package;
use Controllers\Filesystem\File;
-use Controllers\Filesystem\Directory;
use Controllers\Process;
use Exception;
diff --git a/www/controllers/Repo/Package/Sync.php b/www/controllers/Repo/Package/Sync.php
index 0a914b9df..bad8438bf 100644
--- a/www/controllers/Repo/Package/Sync.php
+++ b/www/controllers/Repo/Package/Sync.php
@@ -146,8 +146,7 @@ private function syncPackage()
$mymirror->setUrl($sourceUrl);
$mymirror->setArch($this->repoController->getArch());
$mymirror->setCheckSignature($this->repoController->getGpgCheck());
- $mymirror->setPackagesToInclude($this->repoController->getPackagesToInclude());
- $mymirror->setPackagesToExclude($this->repoController->getPackagesToExclude());
+ $mymirror->setAdvancedParams($this->repoController->getAdvancedParams());
/**
* If the task is an update, set the previous repo directory path
diff --git a/www/controllers/Repo/Repo.php b/www/controllers/Repo/Repo.php
index 12b4e373c..eb34138d1 100644
--- a/www/controllers/Repo/Repo.php
+++ b/www/controllers/Repo/Repo.php
@@ -4,7 +4,9 @@
use Exception;
use DateTime;
+use JsonException;
use Controllers\Utils\Validate;
+use Controllers\Group\Repo as RepoGroup;
class Repo
{
@@ -26,8 +28,7 @@ class Repo
private $env;
private $description;
private $group;
- private $packagesToInclude = [];
- private $packagesToExclude = [];
+ private $advancedParams = [];
private $signed;
private $status;
private $rebuild;
@@ -70,6 +71,11 @@ public function setSection(string $section): void
$this->section = $section;
}
+ public function setReleasever(string $releasever): void
+ {
+ $this->releasever = $releasever;
+ }
+
public function setEnv(string|array $env): void
{
$this->env = $env;
@@ -108,10 +114,6 @@ public function setStatus(string $status): void
public function setDescription($description = ''): void
{
- if ($description == 'nodescription') {
- $description = '';
- }
-
$this->description = Validate::string($description);
}
@@ -125,13 +127,9 @@ public function setPackageType(string $type): void
$this->packageType = $type;
}
- public function setGroup(string $group): void
+ public function setGroup(string $group = ''): void
{
- if ($group == 'nogroup') {
- $this->group = '';
- } else {
- $this->group = $group;
- }
+ $this->group = Validate::string($group);
}
public function setGpgCheck(string $gpgCheck): void
@@ -149,19 +147,9 @@ public function setArch(array $arch): void
$this->arch = $arch;
}
- public function setPackagesToInclude(array $packages): void
- {
- $this->packagesToInclude = $packages;
- }
-
- public function setPackagesToExclude(array $packages): void
+ public function setAdvancedParams(array $advancedParams): void
{
- $this->packagesToExclude = $packages;
- }
-
- public function setReleasever(string $releasever): void
- {
- $this->releasever = $releasever;
+ $this->advancedParams = $advancedParams;
}
public function setTaskId(int $taskId): void
@@ -179,7 +167,7 @@ public function getSnapId(): int
return $this->snapId;
}
- public function getEnvId()
+ public function getEnvId(): int
{
return $this->envId;
}
@@ -199,12 +187,17 @@ public function getSection(): string
return $this->section;
}
+ public function getReleasever()
+ {
+ return $this->releasever;
+ }
+
public function getPackageType(): string
{
return $this->packageType;
}
- public function getEnv()
+ public function getEnv(): string|array
{
return $this->env;
}
@@ -224,12 +217,12 @@ public function getTime(): string
return $this->time;
}
- public function getRebuild()
+ public function getRebuild(): string|null
{
return $this->rebuild;
}
- public function getStatus()
+ public function getStatus(): string
{
return $this->status;
}
@@ -239,34 +232,24 @@ public function getSource(): string
return $this->source;
}
- public function getType()
+ public function getType(): string
{
return $this->type;
}
- public function getSigned()
+ public function getSigned(): string
{
return $this->signed;
}
- public function getArch()
+ public function getArch(): array
{
return $this->arch;
}
- public function getPackagesToInclude()
+ public function getAdvancedParams(): array
{
- return $this->packagesToInclude;
- }
-
- public function getPackagesToExclude()
- {
- return $this->packagesToExclude;
- }
-
- public function getReleasever()
- {
- return $this->releasever;
+ return $this->advancedParams;
}
public function getDescription(): string|null
@@ -274,17 +257,17 @@ public function getDescription(): string|null
return $this->description;
}
- public function getGroup()
+ public function getGroup(): string|null
{
return $this->group;
}
- public function getGpgCheck()
+ public function getGpgCheck(): string
{
return $this->gpgCheck;
}
- public function getGpgSign()
+ public function getGpgSign(): string
{
return $this->gpgSign;
}
@@ -309,6 +292,15 @@ public function getAllById(string|int|null $repoId = null, string|int|null $snap
{
$data = $this->model->getAllById($repoId, $snapId, $envId);
+ if (!empty($data['repoId'])) {
+ $this->setRepoId($data['repoId']);
+ }
+ if (!empty($data['snapId'])) {
+ $this->setSnapId($data['snapId']);
+ }
+ if (!empty($data['envId'])) {
+ $this->setEnvId($data['envId']);
+ }
if (!empty($data['Source'])) {
$this->setSource($data['Source']);
}
@@ -351,30 +343,30 @@ public function getAllById(string|int|null $repoId = null, string|int|null $snap
if (!empty($data['Description'])) {
$this->setDescription($data['Description']);
}
- if (!empty($data['repoId'])) {
- $this->setRepoId($data['repoId']);
- }
- if (!empty($data['snapId'])) {
- $this->setSnapId($data['snapId']);
- }
- if (!empty($data['envId'])) {
- $this->setEnvId($data['envId']);
- }
if (!empty($data['Arch'])) {
$this->setArch(explode(',', $data['Arch']));
}
- if (!empty($data['Pkg_included'])) {
- $this->setPackagesToInclude(explode(',', $data['Pkg_included']));
- }
- if (!empty($data['Pkg_excluded'])) {
- $this->setPackagesToExclude(explode(',', $data['Pkg_excluded']));
+
+ /**
+ * Extract Advanced_params JSON
+ * This includes package include/exclude, metadata custom fields and potentially other parameters in the future
+ * It is optional and can be empty
+ */
+ if (!empty($data['Advanced_params'])) {
+ try {
+ $advancedParams = json_decode($data['Advanced_params'], true, 512, JSON_THROW_ON_ERROR);
+ } catch (JsonException $e) {
+ throw new Exception('Failed to decode advanced parameters JSON: ' . $e->getMessage());
+ }
+
+ $this->setAdvancedParams($advancedParams);
}
}
/**
* Get unused repos Id (repos that have no active snapshot and so are not visible from web UI)
*/
- public function getUnused() : array
+ public function getUnused(): array
{
return $this->model->getUnused();
}
@@ -382,7 +374,7 @@ public function getUnused() : array
/**
* Return true if a repo Id exists in database
*/
- public function existsId(string $repoId) : bool
+ public function existsId(string $repoId): bool
{
return $this->model->existsId($repoId);
}
@@ -390,7 +382,7 @@ public function existsId(string $repoId) : bool
/**
* Return true if a snapshot Id exists in database
*/
- public function existsSnapId(string $snapId) : bool
+ public function existsSnapId(string $snapId): bool
{
return $this->model->existsSnapId($snapId);
}
@@ -398,7 +390,7 @@ public function existsSnapId(string $snapId) : bool
/**
* Return true if env exists, based on its name and the snapshot Id it points to
*/
- public function existsSnapIdEnv(string $snapId, string $env)
+ public function existsSnapIdEnv(string $snapId, string $env): bool
{
return $this->model->existsSnapIdEnv($snapId, $env);
}
@@ -406,7 +398,7 @@ public function existsSnapIdEnv(string $snapId, string $env)
/**
* Return the total number of repositories
*/
- public function count()
+ public function count(): int
{
return $this->model->count();
}
@@ -414,9 +406,9 @@ public function count()
/**
* Add / remove repositories to/from a group
*/
- public function addReposIdToGroup(array $reposId = [], int $groupId)
+ public function addReposIdToGroup(int $groupId, array $reposId = []): void
{
- $mygroup = new \Controllers\Group\Repo();
+ $groupController = new RepoGroup();
if (!empty($reposId)) {
foreach ($reposId as $repoId) {
@@ -431,7 +423,7 @@ public function addReposIdToGroup(array $reposId = [], int $groupId)
}
// Retrieve the list of repositories currently in the group in order to remove those that were not specified by the user
- $actualReposMembers = $mygroup->getReposMembers($groupId);
+ $actualReposMembers = $groupController->getReposMembers($groupId);
// Among this list, only retrieve the Ids of the currently member repositories
$actualReposId = [];
@@ -446,17 +438,21 @@ public function addReposIdToGroup(array $reposId = [], int $groupId)
$this->model->removeFromGroup($actualRepoId, $groupId);
}
}
+
+ unset($groupController);
}
/**
* Add a repository to a group
*/
- public function addRepoIdToGroup(string $repoId, string $groupName)
+ public function addRepoIdToGroup(int $repoId, string $groupName): void
{
- $mygroup = new \Controllers\Group\Repo();
- $groupId = $mygroup->getIdByName($groupName);
+ $groupController = new RepoGroup();
+ $groupId = $groupController->getIdByName($groupName);
$this->model->addToGroup($repoId, $groupId);
+
+ unset($groupController);
}
/**
@@ -493,7 +489,7 @@ public function cleanGroups(): void
}
}
- public function getLastInsertRowID()
+ public function getLastInsertRowID(): int
{
return $this->model->getLastInsertRowID();
}
diff --git a/www/controllers/Repo/Snapshot/Package.php b/www/controllers/Repo/Snapshot/Package.php
index 9acafe968..65d73dfa5 100644
--- a/www/controllers/Repo/Snapshot/Package.php
+++ b/www/controllers/Repo/Snapshot/Package.php
@@ -2,6 +2,8 @@
namespace Controllers\Repo\Snapshot;
+use Controllers\Repo\Package\Rpm as RpmPackage;
+use Controllers\Repo\Package\Deb as DebPackage;
use Controllers\User\Permission\Repo as RepoPermission;
use Controllers\Repo\Snapshot\Snapshot;
use Controllers\Exception\AppException;
@@ -67,11 +69,27 @@ public function list(): array
// Extract package name from path and add it to the list of packages
foreach ($scan as $path) {
- $package = end(explode('/', $path));
+ $filename = explode('/', $path);
+ $filename = end($filename);
$size = filesize($path);
+ $ext = pathinfo($path, PATHINFO_EXTENSION);
+
+ // Extract package info (name, version, release, arch) when deb
+ if ($ext == 'deb') {
+ $info = DebPackage::getInfo($path);
+ }
+
+ // Extract package info (name, version, release, arch) when rpm
+ if ($ext == 'rpm') {
+ $info = RpmPackage::getInfo($path);
+ }
$packages[] = [
- 'name' => $package,
+ 'filename' => $filename,
+ 'name' => $info['name'],
+ 'version' => $info['version'],
+ 'release' => $info['release'] ?? null,
+ 'arch' => $info['arch'],
'size' => $size,
'size-human' => Convert::sizeToHuman($size),
'relative-path' => str_replace($this->snapshotPath . '/', '', $path),
diff --git a/www/controllers/Repo/Snapshot/Snapshot.php b/www/controllers/Repo/Snapshot/Snapshot.php
index d9847ae72..31b3b15a6 100644
--- a/www/controllers/Repo/Snapshot/Snapshot.php
+++ b/www/controllers/Repo/Snapshot/Snapshot.php
@@ -3,6 +3,8 @@
namespace Controllers\Repo\Snapshot;
use Controllers\Filesystem\Directory;
+use Controllers\Repo\Repo;
+use JsonException;
use Exception;
use DateTime;
@@ -64,9 +66,16 @@ public function getLastInsertRowID()
/**
* Add a snapshot in database
*/
- public function add(string $date, string $time, string $gpgSignature, array $arch, array $includeTranslation, array $packagesIncluded, array $packagesExcluded, string $type, string $status, int $repoId): void
+ public function add(string $date, string $time, string $gpgSignature, array $arch, array $advancedParams, string $type, string $status, int $repoId): void
{
- $this->model->add($date, $time, $gpgSignature, $arch, $includeTranslation, $packagesIncluded, $packagesExcluded, $type, $status, $repoId);
+ // Convert advanced params to JSON string
+ try {
+ $advancedParams = json_encode($advancedParams, JSON_THROW_ON_ERROR);
+ } catch (JsonException $e) {
+ throw new Exception('Error while encoding advanced parameters to JSON: ' . $e->getMessage());
+ }
+
+ $this->model->add($date, $time, $gpgSignature, $arch, $advancedParams, $type, $status, $repoId);
}
/**
@@ -93,22 +102,6 @@ public function updateGpgSignature(int $snapId, string $gpgSignature): void
$this->model->updateGpgSignature($snapId, $gpgSignature);
}
- /**
- * Update snapshot included packages in the database
- */
- public function updatePackagesIncluded(int $snapId, array $packagesIncluded): void
- {
- $this->model->updatePackagesIncluded($snapId, implode(',', $packagesIncluded));
- }
-
- /**
- * Update snapshot excluded packages in the database
- */
- public function updatePackagesExcluded(int $snapId, array $packagesExcluded): void
- {
- $this->model->updatePackagesExcluded($snapId, implode(',', $packagesExcluded));
- }
-
/**
* Update snapshot status in the database
*/
@@ -133,6 +126,21 @@ public function updateArch(int $snapId, array $arch): void
$this->model->updateArch($snapId, $arch);
}
+ /**
+ * Update snapshot advanced parameters in the database
+ */
+ public function updateAdvancedParams(int $snapId, array $advancedParams): void
+ {
+ // Convert advanced params to JSON string
+ try {
+ $advancedParams = json_encode($advancedParams, JSON_THROW_ON_ERROR);
+ } catch (JsonException $e) {
+ throw new Exception('Error while encoding advanced parameters to JSON: ' . $e->getMessage());
+ }
+
+ $this->model->updateAdvancedParams($snapId, $advancedParams);
+ }
+
/**
* Clean unused snapshots and return a message
*/
@@ -278,4 +286,59 @@ public function taskRunning(int $snapId) : bool
{
return $this->model->taskRunning($snapId);
}
+
+ /**
+ * Return the difference between two snapshots (list of added, removed and common packages)
+ */
+ public function diff(int $snapId1, int $snapId2): array
+ {
+ $repoController = new Repo();
+ $diff = [
+ 'added' => [],
+ 'removed' => []
+ ];
+
+ // Check if both snapshots exist
+ if (!$this->exists($snapId1)) {
+ throw new Exception('Unknown snapshot ID #' . $snapId1);
+ }
+
+ if (!$this->exists($snapId2)) {
+ throw new Exception('Unknown snapshot ID #' . $snapId2);
+ }
+
+ // Get snapshot #1 package type
+ $repoController->getAllById(null, $snapId1);
+ $packageType1 = $repoController->getPackageType();
+
+ // Get snapshot #2 package type
+ $repoController->getAllById(null, $snapId2);
+ $packageType2 = $repoController->getPackageType();
+
+ // Quit if the two snapshots do not have the same package type
+ if ($packageType1 != $packageType2) {
+ throw new Exception('Cannot compare snapshots with different package types');
+ }
+
+ // Get snapshot #1 packages list
+ $snapshotPackageController1 = new Package($snapId1);
+ $packagesList1 = $snapshotPackageController1->list();
+
+ // Get snapshot #2 packages list
+ $snapshotPackageController2 = new Package($snapId2);
+ $packagesList2 = $snapshotPackageController2->list();
+
+ unset($repoController, $snapshotPackageController1, $snapshotPackageController2);
+
+ // Compare the two snapshots packages list to get the list of added, removed and common packages
+ $diff['added'] = array_values(array_udiff($packagesList2, $packagesList1, function ($a, $b) {
+ return strcmp($a['relative-path'], $b['relative-path']);
+ }));
+
+ $diff['removed'] = array_values(array_udiff($packagesList1, $packagesList2, function ($a, $b) {
+ return strcmp($a['relative-path'], $b['relative-path']);
+ }));
+
+ return $diff;
+ }
}
diff --git a/www/controllers/Repo/Task/Create.php b/www/controllers/Repo/Task/Create.php
index 0b56d4be6..cd9f25a87 100644
--- a/www/controllers/Repo/Task/Create.php
+++ b/www/controllers/Repo/Task/Create.php
@@ -245,7 +245,7 @@ private function local()
/**
* Add snapshot to database
*/
- $this->repoSnapshotController->add($this->repoController->getDate(), $this->repoController->getTime(), 'false', $this->repoController->getArch(), array(), array(), array(), $this->repoController->getType(), 'active', $this->repoController->getRepoId());
+ $this->repoSnapshotController->add($this->repoController->getDate(), $this->repoController->getTime(), 'false', $this->repoController->getArch(), $this->repoController->getAdvancedParams(), $this->repoController->getType(), 'active', $this->repoController->getRepoId());
/**
* Retrieve snapshot Id from the last insert row
@@ -257,7 +257,7 @@ private function local()
*/
if (!empty($this->repoController->getEnv())) {
foreach ($this->repoController->getEnv() as $env) {
- $this->repoEnvController->add($env, $this->repoController->getDescription(), $this->repoController->getSnapId());
+ $this->repoEnvController->add($this->repoController->getSnapId(), $env, $this->repoController->getDescription());
}
}
diff --git a/www/controllers/Repo/Task/Duplicate.php b/www/controllers/Repo/Task/Duplicate.php
index 1498da00a..9d0e7bc07 100644
--- a/www/controllers/Repo/Task/Duplicate.php
+++ b/www/controllers/Repo/Task/Duplicate.php
@@ -17,6 +17,11 @@ public function __construct(string $taskId)
// Get source repository details from its snapshot Id
$this->sourceRepoController->getAllById(null, $this->params['snap-id'], null);
+ // Reset some params for the new repo, to avoid carrying over values that are not relevant for the new repo (e.g. metadata custom fields)
+ $advancedParams = $this->sourceRepoController->getAdvancedParams();
+ unset($advancedParams['metadata-custom-fields']);
+ $this->repoController->setAdvancedParams($advancedParams);
+
// Execute the task
try {
$this->execute();
@@ -270,7 +275,7 @@ public function execute()
/**
* Add the new repo snapshot in database
*/
- $this->repoSnapshotController->add($this->repoController->getDate(), $this->repoController->getTime(), $this->repoController->getSigned(), $this->repoController->getArch(), array(), $this->repoController->getPackagesToInclude(), $this->repoController->getPackagesToExclude(), $this->repoController->getType(), $this->repoController->getStatus(), $targetRepoId);
+ $this->repoSnapshotController->add($this->repoController->getDate(), $this->repoController->getTime(), $this->repoController->getSigned(), $this->repoController->getArch(), $this->repoController->getAdvancedParams(), $this->repoController->getType(), $this->repoController->getStatus(), $targetRepoId);
/**
* Retrieve the Id of the new repo snapshot in database
@@ -282,7 +287,7 @@ public function execute()
*/
if (!empty($this->repoController->getEnv())) {
foreach ($this->repoController->getEnv() as $env) {
- $this->repoEnvController->add($env, $this->repoController->getDescription(), $targetSnapId);
+ $this->repoEnvController->add($targetSnapId, $env, $this->repoController->getDescription());
}
}
diff --git a/www/controllers/Repo/Task/Env.php b/www/controllers/Repo/Task/Env.php
index 7514a3b81..4d9634645 100644
--- a/www/controllers/Repo/Task/Env.php
+++ b/www/controllers/Repo/Task/Env.php
@@ -171,7 +171,7 @@ public function execute()
* Add environment to database
*/
$this->taskLogSubStepController->new('update-database', 'UPDATING DATABASE');
- $this->repoEnvController->add($env, $this->repoController->getDescription(), $this->repoController->getSnapId());
+ $this->repoEnvController->add($this->repoController->getSnapId(), $env, $this->repoController->getDescription());
$this->taskLogSubStepController->completed();
$this->taskLogStepController->completed();
}
diff --git a/www/controllers/Repo/Task/Finalize.php b/www/controllers/Repo/Task/Finalize.php
index e24665f00..aad2e24f8 100644
--- a/www/controllers/Repo/Task/Finalize.php
+++ b/www/controllers/Repo/Task/Finalize.php
@@ -29,63 +29,44 @@ protected function finalize()
* If the task is a 'create' then we add the repository to the database.
*/
if ($this->action == 'create') {
- /**
- * If currently no rpm repo of this name exists in the database then we add it
- */
+ // If currently no rpm repo of this name exists in the database then we add it
if ($this->repoController->getPackageType() == 'rpm') {
if (!$this->rpmRepoController->exists($this->repoController->getName(), $this->repoController->getReleasever())) {
$this->rpmRepoController->add($this->repoController->getName(), $this->repoController->getReleasever(), $this->repoController->getSource());
- /**
- * Repository Id becomes the Id of the last inserted row in the database
- */
+ // Repository Id becomes the Id of the last inserted row in the database
$this->repoController->setRepoId($this->rpmRepoController->getLastInsertRowID());
- /**
- * Otherwise, if a repo of the same name exists, we retrieve its Id from the database
- */
+ // Otherwise, if a repo of the same name exists, we retrieve its Id from the database
} else {
$this->repoController->setRepoId($this->rpmRepoController->getIdByNameReleasever($this->repoController->getName(), $this->repoController->getReleasever()));
}
}
- /**
- * If currently no deb repo of this name exists in the database then we add it
- */
+ // If currently no deb repo of this name exists in the database then we add it
if ($this->repoController->getPackageType() == 'deb') {
if (!$this->debRepoController->exists($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection())) {
$this->debRepoController->add($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection(), $this->repoController->getSource());
- /**
- * Repository Id becomes the Id of the last inserted row in the database
- */
+ // Repository Id becomes the Id of the last inserted row in the database
$this->repoController->setRepoId($this->debRepoController->getLastInsertRowID());
- /**
- * Otherwise, if a repo of the same name exists, we retrieve its Id from the database
- */
+ // Otherwise, if a repo of the same name exists, we retrieve its Id from the database
} else {
$this->repoController->setRepoId($this->debRepoController->getIdByNameDistComponent($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection()));
}
}
- /**
- * Add snapshot in database
- * Empty array() for package translation because it's not used for the moment
- */
- $this->repoSnapshotController->add($this->repoController->getDate(), $this->repoController->getTime(), $this->repoController->getGpgSign(), $this->repoController->getArch(), array(), $this->repoController->getPackagesToInclude(), $this->repoController->getPackagesToExclude(), $this->repoController->getType(), 'active', $this->repoController->getRepoId());
+ // Add snapshot in database
+ $this->repoSnapshotController->add($this->repoController->getDate(), $this->repoController->getTime(), $this->repoController->getGpgSign(), $this->repoController->getArch(), $this->repoController->getAdvancedParams(), $this->repoController->getType(), 'active', $this->repoController->getRepoId());
- /**
- * Retrieve the last insert row ID
- */
+ // Retrieve the last insert row ID
$this->repoController->setSnapId($this->repoSnapshotController->getLastInsertRowID());
- /**
- * Add env in database if an env has been specified by the user
- */
+ // Add env in database if an env has been specified by the user
if (!empty($this->repoController->getEnv())) {
foreach ($this->repoController->getEnv() as $env) {
- $this->repoEnvController->add($env, $this->repoController->getDescription(), $this->repoController->getSnapId());
+ $this->repoEnvController->add($this->repoController->getSnapId(), $env, $this->repoController->getDescription());
}
}
}
@@ -96,49 +77,27 @@ protected function finalize()
* We only update the repository information in the database and nothing else.
*/
if ($this->sourceRepoController->getDate() == $this->repoController->getDate()) {
- /**
- * Update GPG signature state
- */
+ // Update GPG signature state
$this->repoSnapshotController->updateGpgSignature($this->repoController->getSnapId(), $this->repoController->getGpgSign());
- /**
- * Update architecture (it could be different from the previous one)
- */
+ // Update architecture (it could be different from the previous one)
$this->repoSnapshotController->updateArch($this->repoController->getSnapId(), $this->repoController->getArch());
- /**
- * Update packages to include (it could be different from the previous one)
- */
- $this->repoSnapshotController->updatePackagesIncluded($this->repoController->getSnapId(), $this->repoController->getPackagesToInclude());
-
- /**
- * Update packages to exclude (it could be different from the previous one)
- */
- $this->repoSnapshotController->updatePackagesExcluded($this->repoController->getSnapId(), $this->repoController->getPackagesToExclude());
-
- /**
- * Update date
- */
+ // Update date
$this->repoSnapshotController->updateDate($this->repoController->getSnapId(), $this->repoController->getDate());
- /**
- * Update time
- */
+ // Update time
$this->repoSnapshotController->updateTime($this->repoController->getSnapId(), $this->repoController->getTime());
- /**
- * Otherwise we add a new snapshot in the database with today's date
- */
+ // Update advanced params
+ $this->repoSnapshotController->updateAdvancedParams($this->repoController->getSnapId(), $this->repoController->getAdvancedParams());
+
+ // Otherwise we add a new snapshot in the database with today's date
} else {
- /**
- * Add snapshot in database
- */
- $this->repoSnapshotController->add($this->repoController->getDate(), $this->repoController->getTime(), $this->repoController->getGpgSign(), $this->repoController->getArch(), array(), $this->repoController->getPackagesToInclude(), $this->repoController->getPackagesToExclude(), $this->repoController->getType(), 'active', $this->repoController->getRepoId());
-
- /**
- * Retrieve the last insert row Id
- * And we can set snapId = this Id
- */
+ // Add snapshot in database
+ $this->repoSnapshotController->add($this->repoController->getDate(), $this->repoController->getTime(), $this->repoController->getGpgSign(), $this->repoController->getArch(), $this->repoController->getAdvancedParams(), $this->repoController->getType(), 'active', $this->repoController->getRepoId());
+
+ // Retrieve the last insert row Id, so we can set snapId = this Id
$this->repoController->setSnapId($this->repoSnapshotController->getLastInsertRowID());
}
}
@@ -157,17 +116,13 @@ protected function finalize()
$this->taskLogSubStepController->completed();
- /**
- * If the user has specified an environment to point to the created snapshot
- */
+ // If the user has specified an environment to point to the created snapshot
if (in_array($this->action, ['create', 'update'])) {
if (!empty($this->repoController->getEnv())) {
$this->taskLogSubStepController->new('adding-env', 'ADDING ENVIRONMENT');
foreach ($this->repoController->getEnv() as $env) {
- /**
- * If the user has not specified any description, then we retrieve the one currently in place on the environment of the same name (if the environment exists and if it has a description)
- */
+ // If the user has not specified any description, then we retrieve the one currently in place on the environment of the same name (if the environment exists and if it has a description)
if (empty($this->repoController->getDescription())) {
if ($this->repoController->getPackageType() == 'rpm') {
$actualDescription = $this->rpmRepoController->getDescriptionByName($this->repoController->getName(), $this->repoController->getReleasever(), $env);
@@ -176,9 +131,7 @@ protected function finalize()
$actualDescription = $this->debRepoController->getDescriptionByName($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection(), $env);
}
- /**
- * If the retrieved description is empty then the description will remain empty
- */
+ // If the retrieved description is empty then the description will remain empty
if (!empty($actualDescription)) {
$this->repoController->setDescription(htmlspecialchars_decode($actualDescription));
} else {
@@ -186,9 +139,7 @@ protected function finalize()
}
}
- /**
- * Retrieve the Id of the environment currently in place (if there is one)
- */
+ // Retrieve the Id of the environment currently in place (if there is one)
if ($this->repoController->getPackageType() == 'rpm') {
$actualEnvIds = $this->rpmRepoController->getEnvIdFromRepoName($this->repoController->getName(), $this->repoController->getReleasever(), $env);
}
@@ -196,28 +147,22 @@ protected function finalize()
$actualEnvIds = $this->debRepoController->getEnvIdFromRepoName($this->repoController->getName(), $this->repoController->getDist(), $this->repoController->getSection(), $env);
}
- /**
- * Delete the possible environment of the same name pointing to a snapshot of this repo (if there is one)
- */
+ // Delete the possible environment of the same name pointing to a snapshot of this repo (if there is one)
if (!empty($actualEnvIds)) {
foreach ($actualEnvIds as $actualEnvId) {
$this->repoEnvController->remove($actualEnvId);
}
}
- /**
- * Then we declare the new environment and make it point to the previously created snapshot
- */
- $this->repoEnvController->add($env, $this->repoController->getDescription(), $this->repoController->getSnapId());
+ // Then we declare the new environment and make it point to the previously created snapshot
+ $this->repoEnvController->add($this->repoController->getSnapId(), $env, $this->repoController->getDescription());
}
$this->taskLogSubStepController->completed();
}
}
- /**
- * Apply permissions on the snapshot
- */
+ // Apply permissions on the snapshot
$this->taskLogSubStepController->new('applying-permissions', 'APPLYING PERMISSIONS');
if ($this->repoController->getPackageType() == 'rpm') {
diff --git a/www/controllers/Repo/Task/Rebuild.php b/www/controllers/Repo/Task/Rebuild.php
index 26be36086..c74aa37bf 100644
--- a/www/controllers/Repo/Task/Rebuild.php
+++ b/www/controllers/Repo/Task/Rebuild.php
@@ -10,6 +10,8 @@ class Rebuild extends \Controllers\Task\Execution
use \Controllers\Repo\Metadata\Create;
use \Controllers\Repo\Task\Finalize;
+ private $packagesToSign = 'all';
+
public function __construct(string $taskId)
{
parent::__construct($taskId, 'rebuild');
diff --git a/www/controllers/Service/Unit/ScheduledTask.php b/www/controllers/Service/Unit/ScheduledTask.php
index 578079546..fb7d61d46 100644
--- a/www/controllers/Service/Unit/ScheduledTask.php
+++ b/www/controllers/Service/Unit/ScheduledTask.php
@@ -8,6 +8,7 @@
class ScheduledTask extends \Controllers\Service\Service
{
private $taskController;
+ private $taskListingController;
private $taskNotifyController;
public function __construct(string $unit)
@@ -15,6 +16,7 @@ public function __construct(string $unit)
parent::__construct($unit);
$this->taskController = new \Controllers\Task\Task();
+ $this->taskListingController = new \Controllers\Task\Listing();
$this->taskNotifyController = new \Controllers\Task\Notify();
}
@@ -41,7 +43,7 @@ public function execute() : void
/**
* Get scheduled tasks
*/
- $scheduledTasks = $this->taskController->listScheduled();
+ $scheduledTasks = $this->taskListingController->getScheduled();
/**
* Quit if there is no task to execute
@@ -193,7 +195,7 @@ public function sendReminders() : void
/**
* Get scheduled tasks
*/
- $scheduledTasks = $this->taskController->listScheduled();
+ $scheduledTasks = $this->taskListingController->getScheduled();
/**
* Quit if there is no task to execute
diff --git a/www/controllers/Settings.php b/www/controllers/Settings.php
index 7a50ea250..c9dbf6429 100644
--- a/www/controllers/Settings.php
+++ b/www/controllers/Settings.php
@@ -249,19 +249,6 @@ public function apply(array $sendSettings) : void
$settingsToApply['DEB_DEFAULT_ARCH'] = $debDefaultArch;
}
- if (!empty($sendSettings['debDefaultTranslation'])) {
- /**
- * Convert array to a string with values separated by a comma
- */
- $debDefaultTranslation = Validate::string(implode(',', $sendSettings['debDefaultTranslation']));
-
- if (!Validate::alphaNumeric($debDefaultTranslation, [','])) {
- throw new Exception('Invalid translation value for ' . $debDefaultTranslation);
- }
-
- $settingsToApply['DEB_DEFAULT_TRANSLATION'] = $debDefaultTranslation;
- }
-
if (!empty($sendSettings['deb-allow-empty-repo'])) {
if ($sendSettings['deb-allow-empty-repo'] == 'true') {
$settingsToApply['DEB_ALLOW_EMPTY_REPO'] = 'true';
diff --git a/www/controllers/Task/Execution.php b/www/controllers/Task/Execution.php
index 5a280e557..3f114bbf1 100644
--- a/www/controllers/Task/Execution.php
+++ b/www/controllers/Task/Execution.php
@@ -229,9 +229,7 @@ public function paramsCheck($requiredParams)
*/
public function paramsSet($requiredParams = [], $optionalParams = [])
{
- /**
- * Repo controller setter functions depending on parameters
- */
+ // Repo controller setter functions depending on parameters
$setters = [
'repo-id' => 'setRepoId',
'snap-id' => 'setSnapId',
@@ -250,13 +248,10 @@ public function paramsSet($requiredParams = [], $optionalParams = [])
'env' => 'setEnv',
'description' => 'setDescription',
'group' => 'setGroup',
- 'package-include' => 'setPackagesToInclude',
- 'package-exclude' => 'setPackagesToExclude'
+ 'advanced-params' => 'setAdvancedParams'
];
- /**
- * Set required parameters, using the appropriate setter function
- */
+ // Set required parameters, using the appropriate setter function
if (!empty($requiredParams)) {
foreach ($requiredParams as $param) {
$setterFunction = $setters[$param];
@@ -264,9 +259,7 @@ public function paramsSet($requiredParams = [], $optionalParams = [])
}
}
- /**
- * Set optional parameters if defined, using the appropriate setter function
- */
+ // Set optional parameters if defined, using the appropriate setter function
if (!empty($optionalParams)) {
foreach ($optionalParams as $param) {
if (isset($this->params[$param])) {
@@ -358,8 +351,6 @@ public function end() : void
$this->taskController->updateTime($newTaskId, '');
$this->taskController->updateStatus($newTaskId, 'scheduled');
}
-
- unset($myTaskNotify);
}
// Clean unused repos from profiles
diff --git a/www/controllers/Task/Form/Create.php b/www/controllers/Task/Form/Create.php
index 7db70e22f..9ceb5faa2 100644
--- a/www/controllers/Task/Form/Create.php
+++ b/www/controllers/Task/Form/Create.php
@@ -3,128 +3,93 @@
namespace Controllers\Task\Form;
use Exception;
+use Controllers\Repo\Rpm;
+use Controllers\Repo\Deb;
use Controllers\History\Save as History;
class Create
{
- public function validate(array $formParams)
+ public function validate(array $formParams): void
{
- $rpmRepoController = new \Controllers\Repo\Rpm();
- $debRepoController = new \Controllers\Repo\Deb();
+ $rpmRepoController = new Rpm();
+ $debRepoController = new Deb();
- /**
- * Check package type
- */
+ // Check package type
Param\PackageType::check($formParams['package-type']);
- /**
- * Check repo type
- */
+ // Check repo type
Param\RepoType::check($formParams['repo-type']);
- /**
- * Case package type is 'rpm'
- */
+ // Case package type is 'rpm'
if ($formParams['package-type'] == 'rpm') {
- /**
- * Check releasever
- */
+ // Check releasever
Param\Releasever::check($formParams['releasever']);
}
- /**
- * Case package type is 'deb'
- */
+ // Case package type is 'deb'
if ($formParams['package-type'] == 'deb') {
- /**
- * Check distribution
- */
+ // Check distribution
Param\Dist::check($formParams['dist']);
- /**
- * Check section
- */
+ // Check section
Param\Section::check($formParams['section']);
+
+ // Check metadata custom fields
+ Param\Metadata::checkOrigin($formParams['advanced-params']['metadata-custom-fields']['origin']);
+ Param\Metadata::checkLabel($formParams['advanced-params']['metadata-custom-fields']['label']);
+ Param\Metadata::checkDescription($formParams['advanced-params']['metadata-custom-fields']['description']);
}
- /**
- * Check env
- */
+ // Check env
if (!empty($formParams['env'])) {
Param\Environment::check($formParams['env']);
}
- /**
- * Check description
- */
+ // Check description
Param\Description::check($formParams['description']);
- /**
- * Check group
- */
+ // Check group
if (!empty($formParams['group'])) {
Param\Group::check($formParams['group']);
}
- /**
- * If the selected repo type is 'local' we will have to check that a name has been provided (can be left empty in the case of a mirror)
- */
+ // If the selected repo type is 'local' we will have to check that a name has been provided (can be left empty in the case of a mirror)
if ($formParams['repo-type'] == 'local') {
$targetName = $formParams['alias'];
}
- /**
- * If the selected repo type is 'mirror' then we check additional parameters
- */
+ // If the selected repo type is 'mirror' then we check additional parameters
if ($formParams['repo-type'] == 'mirror') {
- /**
- * Check source
- */
+ // Check source
Param\Source::check($formParams['source'], $formParams['package-type']);
- /**
- * If no alias has been given, we use the source name as alias
- */
+ // If no alias has been given, we use the source name as alias
if (!empty($formParams['alias'])) {
$targetName = $formParams['alias'];
} else {
$targetName = $formParams['source'];
}
- /**
- * Check gpg check
- */
+ // Check gpg check
Param\GpgCheck::check($formParams['gpg-check']);
- /**
- * Check gpg sign
- */
+ // Check gpg sign
Param\GpgSign::check($formParams['gpg-sign']);
- /**
- * Check package(s) to include
- */
- Param\PackageInclude::check($formParams['package-include']);
+ // Check package(s) to include
+ Param\PackageInclude::check($formParams['advanced-params']['packages']['include']);
- /**
- * Check package(s) to exclude
- */
- Param\PackageExclude::check($formParams['package-exclude']);
+ // Check package(s) to exclude
+ Param\PackageExclude::check($formParams['advanced-params']['packages']['exclude']);
}
- /**
- * Check name
- */
+ // Check name
Param\Name::check($targetName);
- /**
- * Check architecture
- */
+ // Check architecture
Param\Arch::check($formParams['arch']);
- /**
- * Check if a repository with the same name is already active with snapshots
- */
+ // Check if a repository with the same name is already active with snapshots
if ($formParams['package-type'] == 'rpm') {
foreach ($formParams['releasever'] as $releasever) {
if ($rpmRepoController->isActive($targetName, $releasever)) {
@@ -134,9 +99,7 @@ public function validate(array $formParams)
}
if ($formParams['package-type'] == 'deb') {
- /**
- * For deb repo, we check that no repo/dist/section with the same name is already active
- */
+ // For deb repo, we check that no repo/dist/section with the same name is already active
foreach ($formParams['dist'] as $distribution) {
foreach ($formParams['section'] as $section) {
if ($debRepoController->isActive($targetName, $distribution, $section)) {
@@ -146,14 +109,10 @@ public function validate(array $formParams)
}
}
- /**
- * Check scheduling parameters
- */
+ // Check scheduling parameters
Param\Schedule::check($formParams['schedule']);
- /**
- * Add history
- */
+ // Add history
if ($formParams['package-type'] == 'rpm') {
History::set('Running task: New repository ' . $targetName . ' (' . $formParams['repo-type'] . ')');
}
diff --git a/www/controllers/Task/Form/Delete.php b/www/controllers/Task/Form/Delete.php
index 4f34a8c2b..646bfa385 100644
--- a/www/controllers/Task/Form/Delete.php
+++ b/www/controllers/Task/Form/Delete.php
@@ -3,47 +3,38 @@
namespace Controllers\Task\Form;
use Exception;
+use Controllers\Repo\Repo;
use Controllers\History\Save as History;
class Delete
{
- public function validate(array $formParams)
+ public function validate(array $formParams): void
{
- $myrepo = new \Controllers\Repo\Repo();
+ $repoController = new Repo();
- /**
- * Check that the snapshot id is valid
- */
+ // Check that the snapshot id is valid
Param\Snapshot::checkId($formParams['snap-id']);
- /**
- * Retrieve all repo data from the Ids,
- */
- $myrepo->setSnapId($formParams['snap-id']);
- $myrepo->getAllById('', $formParams['snap-id'], '');
+ // Retrieve all repo data from the Id
+ $repoController->setSnapId($formParams['snap-id']);
+ $repoController->getAllById('', $formParams['snap-id'], '');
- /**
- * Check that the repo exists
- */
- if ($myrepo->existsSnapId($formParams['snap-id']) === false) {
+ // Check that the repo exists
+ if ($repoController->existsSnapId($formParams['snap-id']) === false) {
throw new Exception('Snapshot Id ' . $formParams['snap-id'] . ' does not exist');
}
- /**
- * Check scheduling parameters
- */
+ // Check scheduling parameters
Param\Schedule::check($formParams['schedule']);
- /**
- * Add history
- */
- if ($myrepo->getPackageType() == 'rpm') {
- History::set('Running task: delete repository snapshot ' . $myrepo->getName() . '⸺' . $myrepo->getDateFormatted() . '');
+ // Add history
+ if ($repoController->getPackageType() == 'rpm') {
+ History::set('Running task: delete repository snapshot ' . $repoController->getName() . '⸺' . $repoController->getDateFormatted() . '');
}
- if ($myrepo->getPackageType() == 'deb') {
- History::set('Running task: delete repository snapshot ' . $myrepo->getName() . ' ❯ ' . $myrepo->getDist() . ' ❯ ' . $myrepo->getSection() . '⸺' . $myrepo->getDateFormatted() . '');
+ if ($repoController->getPackageType() == 'deb') {
+ History::set('Running task: delete repository snapshot ' . $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection() . '⸺' . $repoController->getDateFormatted() . '');
}
- unset($myrepo);
+ unset($repoController);
}
}
diff --git a/www/controllers/Task/Form/Duplicate.php b/www/controllers/Task/Form/Duplicate.php
index aa600aa4c..463d5f135 100644
--- a/www/controllers/Task/Form/Duplicate.php
+++ b/www/controllers/Task/Form/Duplicate.php
@@ -3,82 +3,65 @@
namespace Controllers\Task\Form;
use Exception;
+use Controllers\Repo\Repo;
use Controllers\History\Save as History;
class Duplicate
{
- public function validate(array $formParams)
+ public function validate(array $formParams): void
{
- $myrepo = new \Controllers\Repo\Repo();
+ $repoController = new Repo();
$rpmRepoController = new \Controllers\Repo\Rpm();
$debRepoController = new \Controllers\Repo\Deb();
- /**
- * Check that the snapshot id is valid
- */
+ // Check that the snapshot id is valid
Param\Snapshot::checkId($formParams['snap-id']);
- /**
- * Retrieve all repo data from the Ids,
- */
- $myrepo->setSnapId($formParams['snap-id']);
- $myrepo->getAllById('', $formParams['snap-id'], '');
+ // Retrieve all repo data from the Id
+ $repoController->setSnapId($formParams['snap-id']);
+ $repoController->getAllById('', $formParams['snap-id'], '');
- /**
- * Check name
- */
+ // Check name
Param\Name::check($formParams['name']);
- /**
- * Check env
- */
+ // Check env
if (!empty($formParams['env'])) {
Param\Environment::check($formParams['env']);
}
- /**
- * Check description
- */
+ // Check description
if (!empty($formParams['description'])) {
Param\Description::check($formParams['description']);
}
- /**
- * Check group
- */
+ // Check group
if (!empty($formParams['group'])) {
Param\Group::check($formParams['group']);
}
- /**
- * Check that a repo with the same name does not already exist
- */
- if ($myrepo->getPackageType() == 'rpm') {
- if ($rpmRepoController->isActive($formParams['name'], $myrepo->getReleasever())) {
- throw new Exception('' . $formParams['name'] . ' ❯ ' . $myrepo->getReleasever() . ' repository already exists');
+ // Check that a repo with the same name does not already exist
+ if ($repoController->getPackageType() == 'rpm') {
+ if ($rpmRepoController->isActive($formParams['name'], $repoController->getReleasever())) {
+ throw new Exception('' . $formParams['name'] . ' ❯ ' . $repoController->getReleasever() . ' repository already exists');
}
}
- if ($myrepo->getPackageType() == 'deb') {
- if ($debRepoController->isActive($formParams['name'], $myrepo->getDist(), $myrepo->getSection())) {
- throw new Exception('' . $formParams['name'] . ' ❯ ' . $myrepo->getDist() . ' ❯ ' . $myrepo->getSection() . ' repo already exists');
+ if ($repoController->getPackageType() == 'deb') {
+ if ($debRepoController->isActive($formParams['name'], $repoController->getDist(), $repoController->getSection())) {
+ throw new Exception('' . $formParams['name'] . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection() . ' repo already exists');
}
}
- /**
- * Check scheduling parameters
- */
+ // Check scheduling parameters
Param\Schedule::check($formParams['schedule']);
- /**
- * Add history
- */
- if ($myrepo->getPackageType() == 'rpm') {
- History::set('Running task: duplicate repository ' . $myrepo->getName() . '⸺' . $myrepo->getDateFormatted() . ' ➡ ' . $formParams['name'] . '');
+ // Add history
+ if ($repoController->getPackageType() == 'rpm') {
+ History::set('Running task: duplicate repository ' . $repoController->getName() . '⸺' . $repoController->getDateFormatted() . ' ➡ ' . $formParams['name'] . '');
}
- if ($myrepo->getPackageType() == 'deb') {
- History::set('Running task: duplicate repository ' . $myrepo->getName() . ' ❯ ' . $myrepo->getDist() . ' ❯ ' . $myrepo->getSection() . '⸺' . $myrepo->getDateFormatted() . ' ➡ ' . $formParams['name'] . ' ❯ ' . $myrepo->getDist() . ' ❯ ' . $myrepo->getSection() . '');
+ if ($repoController->getPackageType() == 'deb') {
+ History::set('Running task: duplicate repository ' . $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection() . '⸺' . $repoController->getDateFormatted() . ' ➡ ' . $formParams['name'] . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection() . '');
}
- unset($myrepo, $rpmRepoController, $debRepoController);
+ unset($repoController, $rpmRepoController, $debRepoController);
}
}
diff --git a/www/controllers/Task/Form/Env.php b/www/controllers/Task/Form/Env.php
index 0315854ee..486fbb4b7 100644
--- a/www/controllers/Task/Form/Env.php
+++ b/www/controllers/Task/Form/Env.php
@@ -2,56 +2,45 @@
namespace Controllers\Task\Form;
+use Controllers\Repo\Repo;
use Controllers\Utils\Generate\Html\Label;
use Controllers\History\Save as History;
class Env
{
- public function validate(array $formParams)
+ public function validate(array $formParams): void
{
- $myrepo = new \Controllers\Repo\Repo();
+ $repoController = new Repo();
- /**
- * Check that the snapshot id is valid
- */
+ // Check that the snapshot id is valid
Param\Snapshot::checkId($formParams['snap-id']);
- /**
- * Retrieve all repo data from the Ids,
- */
- $myrepo->setSnapId($formParams['snap-id']);
- $myrepo->getAllById('', $formParams['snap-id'], '');
+ // Retrieve all repo data from the Id
+ $repoController->setSnapId($formParams['snap-id']);
+ $repoController->getAllById('', $formParams['snap-id'], '');
- /**
- * Check environment
- */
+ // Check environment
Param\Environment::check($formParams['env']);
- /**
- * Check description
- */
+ // Check description
Param\Description::check($formParams['description']);
- /**
- * Check scheduling parameters
- */
+ // Check scheduling parameters
Param\Schedule::check($formParams['schedule']);
- /**
- * Add history
- */
+ // Add history
$content = '';
foreach ($formParams['env'] as $env) {
$content .= Label::envtag($env) . ' ';
}
- if ($myrepo->getPackageType() == 'rpm') {
- History::set('Running task: point environment(s) ' . trim($content) . ' to repository ' . $myrepo->getName() . '⸺' . $myrepo->getDateFormatted() . '');
+ if ($repoController->getPackageType() == 'rpm') {
+ History::set('Running task: point environment(s) ' . trim($content) . ' to repository ' . $repoController->getName() . '⸺' . $repoController->getDateFormatted() . '');
}
- if ($myrepo->getPackageType() == 'deb') {
- History::set('Running task: point environment(s) ' . trim($content) . ' to repository ' . $myrepo->getName() . ' ❯ ' . $myrepo->getDist() . ' ❯ ' . $myrepo->getSection() . '⸺' . $myrepo->getDateFormatted() . '');
+ if ($repoController->getPackageType() == 'deb') {
+ History::set('Running task: point environment(s) ' . trim($content) . ' to repository ' . $repoController->getName() . ' ❯ ' . $repoController->getDist() . ' ❯ ' . $repoController->getSection() . '⸺' . $repoController->getDateFormatted() . '');
}
- unset($myrepo);
+ unset($repoController);
}
}
diff --git a/www/controllers/Task/Form/Form.php b/www/controllers/Task/Form/Form.php
index 110ecf275..fab2243f5 100644
--- a/www/controllers/Task/Form/Form.php
+++ b/www/controllers/Task/Form/Form.php
@@ -3,7 +3,10 @@
namespace Controllers\Task\Form;
use Exception;
+use Controllers\Repo\Repo;
use Controllers\Utils\Validate;
+use Controllers\Repo\Environment;
+use Controllers\Task\Scheduled as ScheduledTask;
use Controllers\User\Permission\Repo as RepoPermission;
class Form
@@ -21,74 +24,56 @@ public function get(string $action, array $repos) : string
$content = '
+
+Donations are very welcome, whether in beer 🍺, T-shirts 👕, or cold, hard cash 💰. Sponsorship through GitHub is a simple and convenient way to say "thank you" to PHPMailer's maintainers and contributors – just click the "Sponsor" button [on the project page](https://github.com/PHPMailer/PHPMailer). If your company uses PHPMailer, consider taking part in Tidelift's enterprise support programme.
+
+## PHPMailer For Enterprise
+
+Available as part of the Tidelift Subscription.
+
+The maintainers of PHPMailer and thousands of other packages are working with Tidelift to deliver commercial
+support and maintenance for the open-source packages you use to build your applications. Save time, reduce risk, and
+improve code health, while paying the maintainers of the exact packages you
+use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-phpmailer-phpmailer?utm_source=packagist-phpmailer-phpmailer&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)
+
+## Changelog
+See [changelog](changelog.md).
+
+## History
+- PHPMailer was originally written in 2001 by Brent R. Matzelle as a [SourceForge project](https://sourceforge.net/projects/phpmailer/).
+- [Marcus Bointon](https://github.com/Synchro) (`coolbru` on SF) and Andy Prevost (`codeworxtech`) took over the project in 2004.
+- Became an Apache incubator project on Google Code in 2010, managed by Jim Jagielski.
+- Marcus created [his fork on GitHub](https://github.com/Synchro/PHPMailer) in 2008.
+- Jim and Marcus decide to join forces and use GitHub as the canonical and official repo for PHPMailer in 2013.
+- PHPMailer moves to [the PHPMailer organisation](https://github.com/PHPMailer) on GitHub in 2013.
+
+### What's changed since moving from SourceForge?
+- Official successor to the SourceForge and Google Code projects.
+- Test suite.
+- Continuous integration with GitHub Actions.
+- Composer support.
+- Public development.
+- Additional languages and language strings.
+- CRAM-MD5 authentication support.
+- Preserves full repo history of authors, commits, and branches from the original SourceForge project.
diff --git a/www/libs/vendor/phpmailer/phpmailer/SECURITY.md b/www/libs/vendor/phpmailer/phpmailer/SECURITY.md
new file mode 100644
index 000000000..4f34026df
--- /dev/null
+++ b/www/libs/vendor/phpmailer/phpmailer/SECURITY.md
@@ -0,0 +1,37 @@
+# Security notices relating to PHPMailer
+
+Please disclose any security issues or vulnerabilities found through [Tidelift's coordinated disclosure system](https://tidelift.com/security) or to the maintainers privately.
+
+PHPMailer 6.4.1 and earlier contain a vulnerability that can result in untrusted code being called (if such code is injected into the host project's scope by other means). If the `$patternselect` parameter to `validateAddress()` is set to `'php'` (the default, defined by `PHPMailer::$validator`), and the global namespace contains a function called `php`, it will be called in preference to the built-in validator of the same name. Mitigated in PHPMailer 6.5.0 by denying the use of simple strings as validator function names. Recorded as [CVE-2021-3603](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3603). Reported by [Vikrant Singh Chauhan](mailto:vi@hackberry.xyz) via [huntr.dev](https://www.huntr.dev/).
+
+PHPMailer versions 6.4.1 and earlier contain a possible remote code execution vulnerability through the `$lang_path` parameter of the `setLanguage()` method. If the `$lang_path` parameter is passed unfiltered from user input, it can be set to [a UNC path](https://docs.microsoft.com/en-us/dotnet/standard/io/file-path-formats#unc-paths), and if an attacker is also able to persuade the server to load a file from that UNC path, a script file under their control may be executed. This vulnerability only applies to systems that resolve UNC paths, typically only Microsoft Windows.
+PHPMailer 6.5.0 mitigates this by no longer treating translation files as PHP code, but by parsing their text content directly. This approach avoids the possibility of executing unknown code while retaining backward compatibility. This isn't ideal, so the current translation format is deprecated and will be replaced in the next major release. Recorded as [CVE-2021-34551](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-34551). Reported by [Jilin Diting Information Technology Co., Ltd](https://listensec.com) via Tidelift.
+
+PHPMailer versions between 6.1.8 and 6.4.0 contain a regression of the earlier CVE-2018-19296 object injection vulnerability as a result of [a fix for Windows UNC paths in 6.1.8](https://github.com/PHPMailer/PHPMailer/commit/e2e07a355ee8ff36aba21d0242c5950c56e4c6f9). Recorded as [CVE-2020-36326](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-36326). Reported by Fariskhi Vidyan via Tidelift. 6.4.1 fixes this issue, and also enforces stricter checks for URL schemes in local path contexts.
+
+PHPMailer versions 6.1.5 and earlier contain an output escaping bug that occurs in `Content-Type` and `Content-Disposition` when filenames passed into `addAttachment` and other methods that accept attachment names contain double quote characters, in contravention of RFC822 3.4.1. No specific vulnerability has been found relating to this, but it could allow file attachments to bypass attachment filters that are based on matching filename extensions. Recorded as [CVE-2020-13625](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-13625). Reported by Elar Lang of Clarified Security.
+
+PHPMailer versions prior to 6.0.6 and 5.2.27 are vulnerable to an object injection attack by passing `phar://` paths into `addAttachment()` and other functions that may receive unfiltered local paths, possibly leading to RCE. Recorded as [CVE-2018-19296](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2018-19296). See [this article](https://knasmueller.net/5-answers-about-php-phar-exploitation) for more info on this type of vulnerability. Mitigated by blocking the use of paths containing URL-protocol style prefixes such as `phar://`. Reported by Sehun Oh of cyberone.kr.
+
+PHPMailer versions prior to 5.2.24 (released July 26th 2017) have an XSS vulnerability in one of the code examples, [CVE-2017-11503](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-11503). The `code_generator.phps` example did not filter user input prior to output. This file is distributed with a `.phps` extension, so it is not normally executable unless it is explicitly renamed, and the file is not included when PHPMailer is loaded through composer, so it is safe by default. There was also an undisclosed potential XSS vulnerability in the default exception handler (unused by default). Patches for both issues kindly provided by Patrick Monnerat of the Fedora Project.
+
+PHPMailer versions prior to 5.2.22 (released January 9th 2017) have a local file disclosure vulnerability, [CVE-2017-5223](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-5223). If content passed into `msgHTML()` is sourced from unfiltered user input, relative paths can map to absolute local file paths and added as attachments. Also note that `addAttachment` (just like `file_get_contents`, `passthru`, `unlink`, etc) should not be passed user-sourced params either! Reported by Yongxiang Li of Asiasecurity.
+
+PHPMailer versions prior to 5.2.20 (released December 28th 2016) are vulnerable to [CVE-2016-10045](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10045) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10045-Vuln-Patch-Bypass.html), and patched by Paul Buonopane (@Zenexer).
+
+PHPMailer versions prior to 5.2.18 (released December 2016) are vulnerable to [CVE-2016-10033](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10033) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10033-Vuln.html).
+
+PHPMailer versions prior to 5.2.14 (released November 2015) are vulnerable to [CVE-2015-8476](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-8476) an SMTP CRLF injection bug permitting arbitrary message sending.
+
+PHPMailer versions prior to 5.2.10 (released May 2015) are vulnerable to [CVE-2008-5619](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2008-5619), a remote code execution vulnerability in the bundled html2text library. This file was removed in 5.2.10, so if you are using a version prior to that and make use of the html2text function, it's vitally important that you upgrade and remove this file.
+
+PHPMailer versions prior to 2.0.7 and 2.2.1 are vulnerable to [CVE-2012-0796](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-0796), an email header injection attack.
+
+Joomla 1.6.0 uses PHPMailer in an unsafe way, allowing it to reveal local file paths, reported in [CVE-2011-3747](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3747).
+
+PHPMailer didn't sanitise the `$lang_path` parameter in `SetLanguage`. This wasn't a problem in itself, but some apps (PHPClassifieds, ATutor) also failed to sanitise user-provided parameters passed to it, permitting semi-arbitrary local file inclusion, reported in [CVE-2010-4914](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-4914), [CVE-2007-2021](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-2021) and [CVE-2006-5734](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2006-5734).
+
+PHPMailer 1.7.2 and earlier contained a possible DDoS vulnerability reported in [CVE-2005-1807](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2005-1807).
+
+PHPMailer 1.7 and earlier (June 2003) have a possible vulnerability in the `SendmailSend` method where shell commands may not be sanitised. Reported in [CVE-2007-3215](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-3215).
+
diff --git a/www/libs/vendor/phpmailer/phpmailer/SMTPUTF8.md b/www/libs/vendor/phpmailer/phpmailer/SMTPUTF8.md
new file mode 100644
index 000000000..ca284ee21
--- /dev/null
+++ b/www/libs/vendor/phpmailer/phpmailer/SMTPUTF8.md
@@ -0,0 +1,48 @@
+# A short history of UTF-8 in email
+
+## Background
+
+For most of its existence, SMTP has been a 7-bit channel, only supporting US-ASCII characters. This has been a problem for many languages, especially those that use non-Latin scripts, and has led to the development of various workarounds.
+
+The first major improvement, introduced in 1994 in [RFC 1652](https://www.rfc-editor.org/rfc/rfc1652) and extended in 2011 in [RFC 6152](https://www.rfc-editor.org/rfc/rfc6152), was the addition of the `8BITMIME` SMTP extension, which allowed raw 8-bit data to be included in message bodies sent over SMTP.
+This allowed the message *contents* to contain 8-bit data, including things like UTF-8 text, even though the SMTP protocol itself was still firmly 7-bit. This worked by having the server switch to 8-bit after the headers, and then back to 7-bit after the completion of a `DATA` command.
+
+From 1996, messages could support [RFC 2047 encoding](https://www.rfc-editor.org/rfc/rfc2047), which permitted inserting characters from any character set into header *values* (but not names), but only by encoding them in somewhat unreadable ways to allow them to survive passage through a 7-bit channel. An example with a subject of "Schrödinger's cat" would be:
+
+```
+Subject: =?utf-8?Q=Schr=C3=B6dinger=92s_Cat?=
+```
+
+Here the accented `ö` is encoded as `=C3=B6`, which is the UTF-8 encoding of the 2-byte character, and the whole thing is wrapped in `=?utf-8?Q?` to indicate that it uses the UTF-8 charset and `quoted-printable` encoding. This is a bit of a hack, and not very human-friendly, but it works.
+
+Similarly, 8-bit message bodies could be encoded using the same `quoted-printable` and `base64` content transfer encoding (CTE) schemes, which preserved the 8-bit content while encoding it in a format that could survive transmission through a 7-bit channel.
+
+Domain names were originally also stuck in a 7-bit world, actually even more constrained to only a subset of the US-ASCII character set. But of course, many people want to have domains in their own language/script. Internationalized domain name (IDN) permitted this, using yet another complex encoding scheme called punycode, defined for domain names in 2003 in [RFC 3492](https://www.rfc-editor.org/rfc/rfc3492). This finally allowed the domain part (after the `@`) of email addresses to contain UTF-8, though it was actually an illusion preserved by email client applications. For example, an address of
+`user@café.example.com` translates to
+`user@xn--caf-dma.example.com` in punycode, rendering it mostly unreadable, but 7-bit friendly, and remaining compatible with email clients that don't know about IDN.
+
+The one remaining part of email that could not handle UTF-8 is the local part of email addresses (the part before the `@`).
+
+I've only mentioned UTF-8 here, but most of these approaches also allowed other character sets that were popular, such as [the ISO-8859 family](https://en.wikipedia.org/wiki/ISO/IEC_8859). However, UTF-8 solves so many problems that these other character sets are gradually falling out of favour, as UTF-8 can support all languages.
+
+This patchwork of overlapping approaches has served us well, but we have to admit that it's a mess.
+
+## SMTPUTF8
+
+`SMTPUTF8` is another SMTP extension, defined in [RFC 6531](https://www.rfc-editor.org/rfc/rfc6531) in 2012. This essentially solves the whole problem, allowing the entire SMTP conversation — commands, headers, and message bodies — to be sent in raw, unencoded UTF-8.
+
+But there's a problem with this approach: adoption. If you send a UTF-8 message to a recipient whose mail server doesn't support this format, the sender has to somehow downgrade the message to make it survive a transition to 7-bit. This is a hard problem to solve, especially since there is no way to make a 7-bit system support UTF-8 in the local parts of addresses. This downgrade problem is what held up the adoption of `SMTPUTF8` in PHPMailer for many years, but in that time the *de facto* approach has become to simply fail in that situation, and tell the recipient it's time they upgraded their mail server 😅.
+
+The vast majority of large email providers (gmail, Yahoo, Microsoft, etc), mail servers (postfix, exim, IIS, etc), and mail clients (Apple Mail, Outlook, Thunderbird, etc) now all support SMTPUTF8, so the need for backward compatibility is no longer what it was.
+
+## SMTPUTF8 in PHPMailer
+
+Several other PHP email libraries have implemented a halfway solution to `SMTPUTF8`, adding only the ability to support UTF-8 in email addresses, not elsewhere in the protocol. I wanted PHPMailer to do it "the right way", and this has taken much longer. PHPMailer now supports UTF-8 everywhere, and does not need to use transfer or header encodings for UTF-8 text when connecting to an `SMTPUTF8`-capable mail server.
+
+This support is handled automatically: if you add an email address that requires UTF-8, PHPMailer will use UTF-8 for everything. If not, it will fall back to 7-bit and encode the message as necessary.
+
+The one place you will need to be careful is in the selection of the address validator. By default, PHPMailer uses PHP's built-in `filter_var` validator, which does not allow UTF-8 email addresses. When PHPMailer spots that you have submitted a UTF-8 address, but have not altered the default validator, it will automatically switch to using a UTF-8-compatible validator. As soon as you do this, any SMTP connection you make will *require* that the server you connect to supports `SMTPUTF8`. You can select this validator explicitly by setting `PHPMailer::$validator = 'eai'` (an acronym for Email Address Internationalization).
+
+### Postfix gotcha
+
+Postfix has supported `SMTPUTF8` for a long time, but it has a peculiarity that it does not always advertise that it does so. However, rather surprisingly, if you use UTF-8 in the conversation, it will work anyway.
diff --git a/www/libs/vendor/phpmailer/phpmailer/VERSION b/www/libs/vendor/phpmailer/phpmailer/VERSION
new file mode 100644
index 000000000..21c8c7b46
--- /dev/null
+++ b/www/libs/vendor/phpmailer/phpmailer/VERSION
@@ -0,0 +1 @@
+7.1.1
diff --git a/www/libs/vendor/phpmailer/phpmailer/composer.json b/www/libs/vendor/phpmailer/phpmailer/composer.json
new file mode 100644
index 000000000..63d0ffd67
--- /dev/null
+++ b/www/libs/vendor/phpmailer/phpmailer/composer.json
@@ -0,0 +1,84 @@
+{
+ "name": "phpmailer/phpmailer",
+ "type": "library",
+ "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
+ "authors": [
+ {
+ "name": "Marcus Bointon",
+ "email": "phpmailer@synchromedia.co.uk"
+ },
+ {
+ "name": "Jim Jagielski",
+ "email": "jimjag@gmail.com"
+ },
+ {
+ "name": "Andy Prevost",
+ "email": "codeworxtech@users.sourceforge.net"
+ },
+ {
+ "name": "Brent R. Matzelle"
+ }
+ ],
+ "funding": [
+ {
+ "url": "https://github.com/Synchro",
+ "type": "github"
+ }
+ ],
+ "config": {
+ "allow-plugins": {
+ "dealerdirect/phpcodesniffer-composer-installer": true
+ },
+ "lock": false
+ },
+ "require": {
+ "php": ">=5.5.0",
+ "ext-ctype": "*",
+ "ext-filter": "*",
+ "ext-hash": "*"
+ },
+ "require-dev": {
+ "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
+ "doctrine/annotations": "^1.2.6 || ^1.13.3",
+ "php-parallel-lint/php-console-highlighter": "^1.0.0",
+ "php-parallel-lint/php-parallel-lint": "^1.3.2",
+ "phpcompatibility/php-compatibility": "^10.0.0@dev",
+ "squizlabs/php_codesniffer": "^3.13.5",
+ "yoast/phpunit-polyfills": "^1.0.4"
+ },
+ "suggest": {
+ "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication",
+ "ext-imap": "Needed to support advanced email address parsing according to RFC822",
+ "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
+ "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
+ "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
+ "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
+ "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
+ "psr/log": "For optional PSR-3 debug logging",
+ "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
+ "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication",
+ "directorytree/imapengine": "For uploading sent messages via IMAP, see gmail example"
+ },
+ "minimum-stability": "dev",
+ "prefer-stable": true,
+ "autoload": {
+ "psr-4": {
+ "PHPMailer\\PHPMailer\\": "src/"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "PHPMailer\\Test\\": "test/"
+ }
+ },
+ "license": "LGPL-2.1-only",
+ "scripts": {
+ "check": "./vendor/bin/phpcs",
+ "style": "./vendor/bin/phpcbf",
+ "test": "./vendor/bin/phpunit --no-coverage",
+ "coverage": "./vendor/bin/phpunit",
+ "lint": [
+ "@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . --show-deprecated -e php,phps --exclude vendor --exclude .git --exclude build"
+ ]
+ }
+}
diff --git a/www/libs/vendor/phpmailer/phpmailer/get_oauth_token.php b/www/libs/vendor/phpmailer/phpmailer/get_oauth_token.php
new file mode 100644
index 000000000..9342b9c75
--- /dev/null
+++ b/www/libs/vendor/phpmailer/phpmailer/get_oauth_token.php
@@ -0,0 +1,182 @@
+
+ * @author Jim Jagielski (jimjag)
+ 
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[**You can sponsor my open-source work on PHPStan through GitHub Sponsors and also directly.**](https://phpstan.org/sponsor)
+
+One-time donations [through Revolut.me](https://revolut.me/ondrejmirtes) are also accepted. To request an invoice, [contact me](mailto:ondrej@mirtes.cz) through e-mail.
+
+## Documentation
+
+All the documentation lives on the [phpstan.org website](https://phpstan.org/):
+
+* [Getting Started & User Guide](https://phpstan.org/user-guide/getting-started)
+* [Config Reference](https://phpstan.org/config-reference)
+* [PHPDocs Basics](https://phpstan.org/writing-php-code/phpdocs-basics) & [PHPDoc Types](https://phpstan.org/writing-php-code/phpdoc-types)
+* [Extension Library](https://phpstan.org/user-guide/extension-library)
+* [Developing Extensions](https://phpstan.org/developing-extensions/extension-types)
+* [API Reference](https://apiref.phpstan.org/)
+
+## PHPStan Pro
+
+PHPStan Pro is a paid add-on on top of open-source PHPStan Static Analysis Tool with these premium features:
+
+* Web UI for browsing found errors, you can click and open your editor of choice on the offending line.
+* Continuous analysis (watch mode): scans changed files in the background, refreshes the UI automatically.
+
+Try it on PHPStan 0.12.45 or later by running it with the `--pro` option. You can create an account either by following the on-screen instructions, or by visiting [account.phpstan.com](https://account.phpstan.com/).
+
+After 30-day free trial period it costs 7 EUR for individuals monthly, 70 EUR for teams (up to 25 members). By paying for PHPStan Pro, you're supporting the development of open-source PHPStan.
+
+You can read more about it on [PHPStan's website](https://phpstan.org/blog/introducing-phpstan-pro).
+
+## Code of Conduct
+
+This project adheres to a [Contributor Code of Conduct](https://github.com/phpstan/phpstan/blob/master/CODE_OF_CONDUCT.md). By participating in this project and its community, you are expected to uphold this code.
+
+## Contributing
+
+Any contributions are welcome. PHPStan's source code open to pull requests lives at [`phpstan/phpstan-src`](https://github.com/phpstan/phpstan-src).
diff --git a/www/libs/vendor/phpstan/phpstan/UPGRADING.md b/www/libs/vendor/phpstan/phpstan/UPGRADING.md
new file mode 100644
index 000000000..522949096
--- /dev/null
+++ b/www/libs/vendor/phpstan/phpstan/UPGRADING.md
@@ -0,0 +1,338 @@
+Upgrading from PHPStan 1.x to 2.0
+=================================
+
+## PHP version requirements
+
+PHPStan now requires PHP 7.4 or newer to run.
+
+## Upgrading guide for end users
+
+The best way to get ready for upgrade to PHPStan 2.0 is to update to the **latest PHPStan 1.12 release**
+and enable [**Bleeding Edge**](https://phpstan.org/blog/what-is-bleeding-edge). This will enable the new rules and behaviours that 2.0 turns on for all users.
+
+Also make sure to install and enable [`phpstan/phpstan-deprecation-rules`](https://github.com/phpstan/phpstan-deprecation-rules).
+
+Once you get to a green build with no deprecations showed on latest PHPStan 1.12.x with Bleeding Edge enabled, you can update all your related PHPStan dependencies to 2.0 in `composer.json`:
+
+```json
+"require-dev": {
+ "phpstan/phpstan": "^2.0",
+ "phpstan/phpstan-deprecation-rules": "^2.0",
+ "phpstan/phpstan-doctrine": "^2.0",
+ "phpstan/phpstan-nette": "^2.0",
+ "phpstan/phpstan-phpunit": "^2.0",
+ "phpstan/phpstan-strict-rules": "^2.0",
+ "phpstan/phpstan-symfony": "^2.0",
+ "phpstan/phpstan-webmozart-assert": "^2.0",
+ ...
+}
+```
+
+Don't forget to update [3rd party PHPStan extensions](https://phpstan.org/user-guide/extension-library) as well.
+
+After changing your `composer.json`, run `composer update 'phpstan/*' -W`.
+
+It's up to you whether you go through the new reported errors or if you just put them all to the [baseline](https://phpstan.org/user-guide/baseline) ;) Everyone who's on PHPStan 1.12 should be able to upgrade to PHPStan 2.0.
+
+### Noteworthy changes to code analysis
+
+* [**Enhancements in handling parameters passed by reference**](https://phpstan.org/blog/enhancements-in-handling-parameters-passed-by-reference)
+* [**Validate inline PHPDoc `@var` tag type**](https://phpstan.org/blog/phpstan-1-10-comes-with-lie-detector#validate-inline-phpdoc-%40var-tag-type)
+* [**List type enforced**](https://phpstan.org/blog/phpstan-1-9-0-with-phpdoc-asserts-list-type#list-type)
+* **Always `true` conditions always reported**: previously reported only with phpstan-strict-rules, this is now always reported.
+
+### Removed option `checkMissingIterableValueType`
+
+It's strongly recommended to add the missing array typehints.
+
+If you want to continue ignoring missing typehints from arrays, add `missingType.iterableValue` error identifier to your `ignoreErrors`:
+
+```neon
+parameters:
+ ignoreErrors:
+ -
+ identifier: missingType.iterableValue
+```
+
+### Removed option `checkGenericClassInNonGenericObjectType`
+
+It's strongly recommended to add the missing generic typehints.
+
+If you want to continue ignoring missing typehints from generics, add `missingType.generics` error identifier to your `ignoreErrors`:
+
+```neon
+parameters:
+ ignoreErrors:
+ -
+ identifier: missingType.generics
+```
+
+### Removed `checkAlwaysTrue*` options
+
+These options have been removed because PHPStan now always behaves as if these were set to `true`:
+
+* `checkAlwaysTrueCheckTypeFunctionCall`
+* `checkAlwaysTrueInstanceof`
+* `checkAlwaysTrueStrictComparison`
+* `checkAlwaysTrueLooseComparison`
+
+### Removed option `excludes_analyse`
+
+It has been replaced with [`excludePaths`](https://phpstan.org/user-guide/ignoring-errors#excluding-whole-files).
+
+### Paths in `excludePaths` and `ignoreErrors` have to be a valid file path or a fnmatch pattern
+
+If you are excluding a file path that might not exist but you still want to have it in `excludePaths`, append `(?)`:
+
+```neon
+parameters:
+ excludePaths:
+ - tests/*/data/*
+ - src/broken
+ - node_modules (?) # optional path, might not exist
+```
+
+If you have the same situation in `ignoreErrors` (ignoring an error in a path that might not exist), use `reportUnmatchedIgnoredErrors: false`.
+
+```neon
+parameters:
+ reportUnmatchedIgnoredErrors: false
+```
+
+Appending `(?)` in `ignoreErrors` is not supported.
+
+### Changes in 1st party PHPStan extensions
+
+* [phpstan-doctrine](https://github.com/phpstan/phpstan-doctrine)
+ * Removed config parameter `searchOtherMethodsForQueryBuilderBeginning` (extension now behaves as when this was set to `true`)
+ * Removed config parameter `queryBuilderFastAlgorithm` (extension now behaves as when this was set to `false`)
+* [phpstan-symfony](https://github.com/phpstan/phpstan-symfony)
+ * Removed legacy options with `_` in the name
+ * `container_xml_path` -> use `containerXmlPath`
+ * `constant_hassers` -> use `constantHassers`
+ * `console_application_loader` -> use `consoleApplicationLoader`
+
+### Minor backward compatibility breaks
+
+* Removed unused config parameter `cache.nodesByFileCountMax`
+* Removed unused config parameter `memoryLimitFile`
+* Removed unused feature toggle `disableRuntimeReflectionProvider`
+* Removed unused config parameter `staticReflectionClassNamePatterns`
+* Remove `fixerTmpDir` config parameter, use `pro.tmpDir` instead
+* Remove `tempResultCachePath` config parameter, use `resultCachePath` instead
+* `additionalConfigFiles` config parameter must be a list
+
+## Upgrading guide for extension developers
+
+> [!NOTE]
+> Please switch to PHPStan 2.0 in a new major version of your extension. It's not feasible to try to support both PHPStan 1.x and PHPStan 2.x with the same extension code.
+>
+> You can definitely get closer to supporting PHPStan 2.0 without increasing major version by solving reported deprecations and other issues by analysing your extension code with PHPStan & phpstan-deprecation-rules & Bleeding Edge, but the final leap and solving backward incompatibilities should be done by requiring `"phpstan/phpstan": "^2.0"` in your `composer.json`, and releasing a new major version.
+
+### PHPStan now uses nikic/php-parser v5
+
+See [UPGRADING](https://github.com/nikic/PHP-Parser/blob/master/UPGRADE-5.0.md) guide for PHP-Parser.
+
+The most notable change is how `throw` statement is represented. Previously, `throw` statements like `throw $e;` were represented using the `Stmt\Throw_` class, while uses inside other expressions (such as `$x ?? throw $e`) used the `Expr\Throw_` class.
+
+Now, `throw $e;` is represented as a `Stmt\Expression` that contains an `Expr\Throw_`. The
+`Stmt\Throw_` class has been removed.
+
+### PHPStan now uses phpstan/phpdoc-parser v2
+
+See [UPGRADING](https://github.com/phpstan/phpdoc-parser/blob/2.0.x/UPGRADING.md) guide for phpstan/phpdoc-parser.
+
+### Returning plain strings as errors no longer supported, use RuleErrorBuilder
+
+Identifiers are also required in custom rules.
+
+Learn more: [Using RuleErrorBuilder to enrich reported errors in custom rules](https://phpstan.org/blog/using-rule-error-builder)
+
+**Before**:
+
+```php
+return ['My error'];
+```
+
+**After**:
+
+```php
+return [
+ RuleErrorBuilder::message('My error')
+ ->identifier('my.error')
+ ->build(),
+];
+```
+
+### Deprecate various `instanceof *Type` in favour of new methods on `Type` interface
+
+Learn more: [Why Is instanceof *Type Wrong and Getting Deprecated?](https://phpstan.org/blog/why-is-instanceof-type-wrong-and-getting-deprecated)
+
+### Removed deprecated `ParametersAcceptorSelector::selectSingle()`
+
+Use [`ParametersAcceptorSelector::selectFromArgs()`](https://apiref.phpstan.org/2.0.x/PHPStan.Reflection.ParametersAcceptorSelector.html#_selectFromArgs) instead. It should be used in most places where `selectSingle()` was previously used, like dynamic return type extensions.
+
+**Before**:
+
+```php
+$defaultReturnType = ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
+```
+
+**After**:
+
+```php
+$defaultReturnType = ParametersAcceptorSelector::selectFromArgs(
+ $scope,
+ $functionCall->getArgs(),
+ $functionReflection->getVariants()
+)->getReturnType();
+```
+
+If you're analysing function or method body itself and you're using one of the following methods, ask for `getParameters()` and `getReturnType()` directly on the reflection object:
+
+* [InClassMethodNode::getMethodReflection()](https://apiref.phpstan.org/2.0.x/PHPStan.Node.InClassMethodNode.html)
+* [InFunctionNode::getFunctionReflection()](https://apiref.phpstan.org/2.0.x/PHPStan.Node.InFunctionNode.html)
+* [FunctionReturnStatementsNode::getFunctionReflection()](https://apiref.phpstan.org/2.0.x/PHPStan.Node.FunctionReturnStatementsNode.html)
+* [MethodReturnStatementsNode::getMethodReflection()](https://apiref.phpstan.org/2.0.x/PHPStan.Node.MethodReturnStatementsNode.html)
+* [Scope::getFunction()](https://apiref.phpstan.org/2.0.x/PHPStan.Analyser.Scope.html#_getFunction)
+
+**Before**:
+
+```php
+$function = $node->getFunctionReflection();
+$returnType = ParametersAcceptorSelector::selectSingle($function->getVariants())->getReturnType();
+```
+
+**After**:
+
+```php
+$returnType = $node->getFunctionReflection()->getReturnType();
+```
+
+### Changed `TypeSpecifier::create()` and `SpecifiedTypes` constructor parameters
+
+[`PHPStan\Analyser\TypeSpecifier::create()`](https://apiref.phpstan.org/2.0.x/PHPStan.Analyser.TypeSpecifier.html#_create) now accepts (all parameters are required):
+
+* `Expr $expr`
+* `Type $type`
+* `TypeSpecifierContext $context`
+* `Scope $scope`
+
+If you want to change `$overwrite` or `$rootExpr` (previous parameters also used to be accepted by this method), call `setAlwaysOverwriteTypes()` and `setRootExpr()` on [`SpecifiedTypes`](https://apiref.phpstan.org/2.0.x/PHPStan.Analyser.SpecifiedTypes.html) (object returned by `TypeSpecifier::create()`). These methods return a new object (SpecifiedTypes is immutable).
+
+[`SpecifiedTypes`](https://apiref.phpstan.org/2.0.x/PHPStan.Analyser.SpecifiedTypes.html) constructor now accepts:
+
+* `array $sureTypes`
+* `array $sureNotTypes`
+
+If you want to change `$overwrite` or `$rootExpr` (previous parameters also used to be accepted by the constructor), call `setAlwaysOverwriteTypes()` and `setRootExpr()`. These methods return a new object (SpecifiedTypes is immutable).
+
+### `ConstantArrayType` no longer extends `ArrayType`
+
+`Type::getArrays()` now returns `listNnx5qPhz{L%05Z`#9O})l$01n+A@o{
z@M}2gl0IO++m4