Use external submission ID in judgehost API

Part of #3024

� Conflicts:
�	judge/judgedaemon.main.php

Author: nickygerritsen

judge/judgedaemon.main.php

@@ -624,7 +624,7 @@ private function checkDiskSpace(string $workdirpath): void
 
     private function judgingDirectory(string $workdirpath, array $judgeTask): string
     {
-        if (filter_var($judgeTask['submitid'], FILTER_VALIDATE_INT) === false ||
+        if (filter_var($judgeTask['submitid'], FILTER_VALIDATE_REGEXP, ['options' => ['regexp' => '/^[a-zA-Z0-9_.-]+$/']]) === false ||
             filter_var($judgeTask['jobid'], FILTER_VALIDATE_INT) === false) {
             error("Malformed data returned in judgeTask IDs: " . var_export($judgeTask, true));
         }
@@ -1289,7 +1289,7 @@ private function compile(
 
             // Revoke readablity for domjudge-run user to this workdir.
             chmod($workdir, 0700);
-            logmsg(LOG_NOTICE, "Judging s$judgeTask[submitid], task $judgeTask[judgetaskid]: compile error");
+            logmsg(LOG_NOTICE, "Judging $judgeTask[submitid], task $judgeTask[judgetaskid]: compile error");
             return false;
         }
 
@@ -1353,7 +1353,7 @@ private function compile(
         // What does the exitcode mean?
         if (!isset($this->EXITCODES[$retval])) {
             alert('error');
-            $description = "Unknown exitcode from compile.sh for s$judgeTask[submitid]: $retval";
+            $description = "Unknown exitcode from compile.sh for $judgeTask[submitid]: $retval";
             logmsg(LOG_ERR, $description);
             $this->disable('compile_script', 'compile_script_id', $judgeTask['compile_script_id'], $description, $judgeTask['judgetaskid'], $compile_output);
 
@@ -1568,7 +1568,7 @@ private function runTestcase(
             // What does the exitcode mean?
             if (!isset($this->EXITCODES[$retval])) {
                 alert('error');
-                error("Unknown exitcode ($retval) from testcase_run.sh for s$judgeTask[submitid]");
+                error("Unknown exitcode ($retval) from testcase_run.sh for $judgeTask[submitid]");
             }
             $result = $this->EXITCODES[$retval];
 

webapp/src/Controller/API/JudgehostController.php

@@ -114,7 +114,7 @@ public function getJudgehostsAction(
      * Add a new judgehost to the list of judgehosts.
      * Also restarts (and returns) unfinished judgings.
      *
-     * @return array<array{jobid: int, submitid: int}>
+     * @return array<array{jobid: int, submitid: string}>
      * @throws NonUniqueResultException
      */
     #[IsGranted('ROLE_JUDGEHOST')]
@@ -127,7 +127,7 @@ public function getJudgehostsAction(
             items: new OA\Items(
                 properties: [
                     new OA\Property(property: 'jobid', type: 'integer'),
-                    new OA\Property(property: 'submitid', type: 'integer'),
+                    new OA\Property(property: 'submitid', type: 'string'),
                 ],
                 type: 'object'
             )
@@ -188,7 +188,7 @@ public function createJudgehostAction(Request $request): array
 
         return array_map(fn(Judging $judging) => [
             'jobid' => $judging->getJudgingid(),
-            'submitid' => $judging->getSubmission()->getSubmitid(),
+            'submitid' => $judging->getSubmission()->getExternalid(),
         ], $judgings);
     }
 
@@ -460,8 +460,8 @@ public function updateJudgingAction(
                     $problem    = $submission->getProblem();
                     $this->scoreboardService->calculateScoreRow($contest, $team, $problem);
 
-                    $message = sprintf("submission %d, judging %d: compiler-error",
-                                       $submission->getSubmitid(), $judging->getJudgingid());
+                    $message = sprintf("submission %s, judging %d: compiler-error",
+                                       $submission->getExternalid(), $judging->getJudgingid());
                     $this->dj->alert('reject', $message);
                 });
             }
@@ -1119,7 +1119,7 @@ private function addSingleJudgingRun(
                 // this means that these alert messages should be treated as
                 // confidential information.
                 $msg = sprintf("submission %s, judging %s: %s",
-                               $submission->getSubmitid(), $judging->getJudgingid(), $result);
+                               $submission->getExternalid(), $judging->getJudgingid(), $result);
                 $this->dj->alert($result === 'correct' ? 'accept' : 'reject', $msg);
 
                 // Potentially send a balloon, i.e. if no verification required (case of verification required is
@@ -1224,7 +1224,7 @@ private function maybeUpdateActiveJudging(Judging $judging): void
      * @return JudgehostFile[]
      */
     #[IsGranted(new Expression("is_granted('ROLE_JURY') or is_granted('ROLE_JUDGEHOST')"))]
-    #[Rest\Get('/get_files/{type}/{id<\d+>}')]
+    #[Rest\Get('/get_files/{type}/{id}')]
     #[OA\Response(
         response: 200,
         description: 'The files for the submission, testcase or script.',
@@ -1271,7 +1271,7 @@ public function getVersionCommands(string $judgetaskid): array
         }
 
         $submission = $this->em->getRepository(Submission::class)
-            ->findOneBy(['submitid' => $judgeTask->getSubmitid()]);
+            ->findByExternalId($judgeTask->getSubmitid());
         if (!$submission) {
             throw new HttpException(500, 'Unknown submission with submitid ' . $judgeTask->getSubmitid());
         }
@@ -1335,7 +1335,7 @@ public function checkVersions(Request $request, string $judgetaskid): array
         }
 
         $submission = $this->em->getRepository(Submission::class)
-            ->findOneBy(['submitid' => $judgeTask->getSubmitid()]);
+            ->findByExternalId($judgeTask->getSubmitid());
         if (!$submission) {
             throw new BadRequestHttpException('Unknown submission with submitid ' . $judgeTask->getSubmitid());
         }
@@ -1419,7 +1419,8 @@ private function getSourceFiles(string $id): array
         $queryBuilder = $this->em->createQueryBuilder()
             ->from(SubmissionFile::class, 'f')
             ->select('f')
-            ->andWhere('f.submission = :submitid')
+            ->join('f.submission', 's')
+            ->andWhere('s.externalid = :submitid')
             ->setParameter('submitid', $id)
             ->orderBy('f.ranknumber');
 
@@ -1837,7 +1838,7 @@ private function getJudgetasks(string|int|null $jobId, int $max_batchsize, Judge
                 ->getQuery()
                 ->execute();
             $this->em->flush();
-            $this->dj->auditlog('queuetask', $jobId, 'deleted');
+            $this->dj->auditlog('queuetask', (string)$jobId, 'deleted');
         } else {
             return $this->serializeJudgeTasks($judgetasks, $judgehost);
         }

webapp/src/Entity/JudgeTask.php

@@ -79,9 +79,9 @@ class JudgeTask
     #[Serializer\VirtualProperty]
     #[Serializer\SerializedName('submitid')]
     #[Serializer\Type('string')]
-    public function getSubmitid(): ?int
+    public function getSubmitid(): ?string
     {
-        return $this->submission?->getSubmitid();
+        return $this->submission?->getExternalid();
     }