Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions www/controllers/Task/Form/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ public function get(string $action, array $repos) : string
* Validate the task form filled by the user
* @param array $tasksParams
*/
public function validate(array $tasksParams) : void
public function validate(array &$tasksParams) : void
{
foreach ($tasksParams as $task) {
foreach ($tasksParams as &$task) {
/**
* Retrieve action
*/
Expand Down Expand Up @@ -149,11 +149,20 @@ public function validate(array $tasksParams) : void
throw new Exception('Invalid action: ' . $task['action']);
}

/**
* Normalize known DEB distribution aliases before validation and task execution.
*/
if ($task['action'] == 'create' and ($task['package-type'] ?? '') == 'deb' and !empty($task['dist'])) {
$task['dist'] = Param\Dist::normalize($task['dist']);
}

/**
* Validate form by calling the controller
*/
$controller = new $controllerPath();
$controller->validate($task);
}

unset($task);
}
}
39 changes: 39 additions & 0 deletions www/controllers/Task/Form/Param/Dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,21 @@

class Dist
{
/**
* Normalize known distribution aliases to their canonical codenames.
*/
public static function normalize(array $dists) : array
{
$normalizedDists = [];
$aliases = self::aliases();

foreach ($dists as $dist) {
$normalizedDists[] = $aliases[strtolower(trim($dist))] ?? $dist;
}

return array_values(array_unique($normalizedDists));
}

public static function check(array $dists) : void
{
if (empty($dists)) {
Expand All @@ -19,4 +34,28 @@ public static function check(array $dists) : void
}
}
}

/**
* Build aliases from configured DEB distributions.
*/
private static function aliases() : array
{
$aliases = [];

foreach (DEB_DISTRIBUTIONS as $distributionName => $distributionDescription) {
$name = strtolower($distributionName);
$description = strtolower($distributionDescription);
$aliases[$name] = $distributionName;
$aliases[$description] = $distributionName;

if (preg_match('/^(?<family>[a-z]+)\s+(?<version>[0-9]+(?:\.[0-9]+)?)/i', $distributionDescription, $matches)) {
$version = strtolower($matches['version']);
$family = strtolower($matches['family']);
$aliases[$version] = $distributionName;
$aliases[$family . ' ' . $version] = $distributionName;
}
}

return $aliases;
}
}
Loading