Fix problem with command usage

Author: santiagolizardo

compose.yaml

@@ -29,6 +29,7 @@ services:
       retries: 3
 
   keycloak:
+    container_name: rmap-keycloak
     image: quay.io/reconmap/keycloak-custom:latest
     command: "start --hostname=http://localhost:8080 --proxy-headers xforwarded --http-enabled true --import-realm"
     environment:

database/01-schema.sql

@@ -396,11 +396,13 @@ INSERT INTO command(id, creator_uid, name)
 VALUES (1, 1, 'nmap');
 
 TRUNCATE TABLE command_usage;
-INSERT INTO command_usage(id, creator_uid, command_id, description, executable_path, arguments, output_filename,
+INSERT INTO command_usage(id, creator_uid, command_id, name, description, executable_path, arguments, output_filename,
                           output_parser)
-VALUES (1, 1, 1, "Scan all reserved TCP ports on the machine. The -v option enables verbose mode.", "nmap",
+VALUES (1, 1, 1, "Normal scan", "Scan all reserved TCP ports on the machine. The -v option enables verbose mode.",
+        "nmap",
         "  -v scanme.nmap.org", "STDOUT", "nmap"),
        (2, 1, 1,
+        "Stealth scan",
         "Launches a stealth SYN scan against each machine that is up out of the 256 IPs on the /24 sized network where Scanme resides. It also tries to determine what operating system is running on each host that is up and running. This requires root privileges because of the SYN scan and OS detection.",
         "nmap", " -sS -O scanme.nmap.org/24", "STDOUT", "nmap");
 

src/Controllers/Commands/UploadCommandOutputController.php

@@ -12,11 +12,11 @@
 
 class UploadCommandOutputController extends UploadAttachmentController
 {
-    public function __construct(AttachmentRepository $attachmentRepository,
-                                AttachmentFilePath   $attachmentFilePathService,
-                                RedisServer          $redisServer,
-                                private              readonly CommandRepository $commandRepository,
-    private readonly CommandUsageRepository $commandUsageRepository,
+    public function __construct(AttachmentRepository                    $attachmentRepository,
+                                AttachmentFilePath                      $attachmentFilePathService,
+                                RedisServer                             $redisServer,
+                                private readonly CommandRepository      $commandRepository,
+                                private readonly CommandUsageRepository $commandUsageRepository,
     )
     {
         parent::__construct($attachmentRepository, $attachmentFilePathService, $redisServer);
@@ -26,13 +26,13 @@ public function __construct(AttachmentRepository $attachmentRepository,
     public function __invoke(ServerRequestInterface $request, array $args): array
     {
         $params = $request->getParsedBody();
-        $commandId = (int)$params['commandId'];
+        $commandUsageId = (int)$params['commandUsageId'];
         $taskId = isset($params['taskId']) ? intval($params['taskId']) : null;
 
         $files = $request->getUploadedFiles();
         $resultFile = $files['resultFile'];
 
-        $usage = $this->commandUsageRepository->findById($commandId);
+        $usage = $this->commandUsageRepository->findById($commandUsageId);
         $command = $this->commandRepository->findById($usage['command_id']);
 
         $userId = $request->getAttribute('userId');

src/Repositories/CommandUsageRepository.php

@@ -10,7 +10,7 @@
 
 class CommandUsageRepository extends MysqlRepository
 {
-    public const UPDATABLE_COLUMNS_TYPES = [
+    public const array UPDATABLE_COLUMNS_TYPES = [
         'command_id' => 'i',
         'name' => 's',
         'description' => 's',

src/Repositories/SearchCriterias/TaskSearchCriteria.php

@@ -6,49 +6,49 @@
 
 class TaskSearchCriteria extends SearchCriteria
 {
-    public function addProjectCriterion(int $projectId)
+    public function addProjectCriterion(int $projectId): void
     {
         $this->addCriterion('t.project_id = ?', [$projectId]);
     }
 
-    public function addStatusCriterion(string $status)
+    public function addStatusCriterion(string $status): void
     {
         $this->addCriterion('t.status = ?', [$status]);
     }
 
-    public function addProjectTemplateCriterion(bool $isTemplate)
+    public function addProjectTemplateCriterion(bool $isTemplate): void
     {
         $this->addCriterion('p.is_template = ?', [$isTemplate]);
     }
 
-    public function addProjectIsNotTemplateCriterion()
+    public function addProjectIsNotTemplateCriterion(): void
     {
         $this->addProjectTemplateCriterion(false);
     }
 
-    public function addAssigneeCriterion(int $assigneeUid)
+    public function addAssigneeCriterion(int $assigneeUid): void
     {
         $this->addCriterion('t.assignee_uid = ?', [$assigneeUid]);
     }
 
-    public function addPriorityCriterion(string $priority)
+    public function addPriorityCriterion(string $priority): void
     {
         $this->addCriterion('t.priority = ?', [$priority]);
     }
 
-    public function addKeywordsCriterion(string $keywords)
+    public function addKeywordsCriterion(string $keywords): void
     {
         $keywordsLike = "%$keywords%";
 
         $this->addCriterion('t.summary LIKE ? OR t.description LIKE ?', [$keywordsLike, $keywordsLike]);
     }
 
-    public function addUserCriterion(int $userId)
+    public function addUserCriterion(int $userId): void
     {
         $this->addCriterion('(p.visibility = "public" OR ? IN (SELECT user_id FROM project_user WHERE project_id = p.id))', [$userId]);
     }
 
-    public function addProjectArchivedCriterion(int $projectIsArchived)
+    public function addProjectArchivedCriterion(int $projectIsArchived): void
     {
         $this->addCriterion('p.archived = ?', [$projectIsArchived]);
     }

tests/ControllerTestCase.php

@@ -2,15 +2,15 @@
 
 namespace Reconmap;
 
-use Monolog\Logger;
+use Psr\Log\LoggerInterface;
 use Reconmap\Controllers\Controller;
 use Reconmap\Services\Security\AuthorisationService;
 
 class ControllerTestCase extends DatabaseTestCase
 {
     public function injectController(Controller $controller): Controller
     {
-        $mockLogger = $this->createMock(Logger::class);
+        $mockLogger = $this->createMock(LoggerInterface::class);
         $controller->setLogger($mockLogger);
 
         return $controller;