Merge branch 'main' into ignore-start-status-event

Author: meisterT

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,32 +7,46 @@ assignees: ''
 
 ---
 
-NOTE: If this is a _discussion starter_, you need any _installation help_ or have a _question_ on how to accomplish something,
+<!--
+NOTE: If this is a _discussion starter_, you need any _installation help_, or have a _question_ on how to accomplish something,
 rather post at [our discussion channel](https://www.domjudge.org/chat) or send an email to our
 [DOMjudge-devel mailinglist](https://www.domjudge.org/mailman/postorius/lists/domjudge-devel.domjudge.org/)
 instead of filing an issue here.
+-->
 
 ### Description of the problem
-> Replace this line with a short description.
+<!--
+Write here a short description.
+-->
 
 ### Your environment
-> Include details about your installation here.
-> - DOMjudge version (e.g. 7.0.0 or a github commit hash)
-> - Operating system / Linux distribution and version (e.g. Ubuntu 18.04)
-> - Webserver (e.g. Apache or nginx)
+<!--
+Include details about your installation here.
+- DOMjudge version (e.g. 7.0.0 or a github commit hash)
+- Operating system / Linux distribution and version (e.g. Ubuntu 18.04)
+- Webserver (e.g. Apache or nginx)
+-->
 
 ### Steps to reproduce
-> Replace this with a description how we can reproduce your bug.
-> - Step 1
-> - Step 2
-> - Step 3
+<!--
+Write here a description how we can reproduce your bug.
+1. Step 1
+1. Step 2
+1. Step 3
+-->
 
 ### Expected behaviour
-> Replace this line with what you would expect to happen.
+<!--
+Write here what you would expect to happen.
+-->
 
 ### Actual behaviour
-> Replace this line with what happens instead.
+<!--
+Write here what happens instead.
+-->
 
 ### Any other information that you want to share?
-> Please include webserver, symfony and judgedaemon log snippets here as appropriate.
-> Screenshots may help in case of UI bugs.
+<!--
+Please include webserver, symfony and judgedaemon log snippets here as appropriate.
+Screenshots may help in case of UI bugs.
+-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,25 +7,36 @@ assignees: ''
 
 ---
 
-NOTE: If this is a _discussion starter_, you need any _installation help_ or have a _question_ on how to accomplish something,
+<!--
+NOTE: If this is a _discussion starter_, you need any _installation help_, or have a _question_ on how to accomplish something,
 rather post at [our discussion channel](https://www.domjudge.org/chat) or send an email to our
 [DOMjudge-devel mailinglist](https://www.domjudge.org/mailman/postorius/lists/domjudge-devel.domjudge.org/).
 
 Thank you for suggesting ways to improve DOMjudge. Before you file a feature
 request, it might be useful to discuss it first via the chat or mailing list
 linked above. We can then assess together whether there is
 not already a way to accomplish your goal with DOMjudge currently.
+-->
 
 ### Description of the enhancement request
-> Replace this line with a short description.
+<!--
+Write here a short description.
+-->
 
 ### The goal you want to achieve
-> Please elaborate on the (larger, higher level) goal you want to achieve with this enhancement, so we have a good understanding what this feature would be useful for and how it fits in DOMjudge as a whole.
+<!--
+Please elaborate on the (larger, higher level) goal you want to achieve with this enhancement, so we have a good understanding what this feature would be useful for and how it fits in DOMjudge as a whole.
+-->
 
 ### Expected behaviour
-> Replace this line with what you would expect to happen.
-> Please describe the workflow how you want this feature to work with expected start URL
-> - Step 1
-> - Step 2
+<!--
+Write here what you would expect to happen.
+For example describe the flow how you want this feature to work.
+1. Step 1
+2. Step 2
+-->
+
 ### Any other information that you want to share?
-> Screenshots may help in case of UI enhancements with annotated drawings.
+<!--
+Screenshots with annotated drawings may help in case of UI enhancements.
+-->

webapp/public/js/domjudge.js

@@ -834,6 +834,10 @@ function initializeKeyboardShortcuts() {
         if (keysCookie != 1 && keysCookie != "") {
             return;
         }
+        // Do not trigger shortcuts if user is pressing Ctrl/Alt/Option/Meta key.
+        if (e.altKey || e.ctrlKey || e.metaKey) {
+            return;
+        }
         // Check if the user is not typing in an input field.
         if (e.target.tagName === 'INPUT' || e.target.tagName === 'TEXTAREA') {
             return;
@@ -901,38 +905,40 @@ function initializeKeyboardShortcuts() {
                 if (e.key >= '0' && e.key <= '9') {
                     sequence += e.key;
                     box.text(type + sequence);
-                } else if (e.key === 'Enter') {
-                    ignore = false;
-                    switch (type) {
-                        case 's':
-                            type = 'submissions';
-                            break;
-                        case 't':
-                            type = 'teams';
-                            break;
-                        case 'p':
-                            type = 'problems';
-                            break;
-                        case 'c':
-                            type = 'clarifications';
-                            break;
-                        case 'j':
-                            window.location = domjudge_base_url + '/jury/submissions/by-judging-id/' + sequence;
-                            return;
-                    }
-                    var redirect_to = domjudge_base_url + '/jury/' + type;
-                    if (sequence) {
-                        redirect_to += '/' + sequence;
-                    }
-                    window.location = redirect_to;
                 } else {
                     ignore = false;
                     if (box) {
                         box.remove();
                     }
+                    // We want to reset the `sequence` variable before redirecting, but then we do need to save the value typed by the user
+                    var typedSequence = sequence;
                     sequence = '';
                     $body.off('keydown');
                     $body.on('keydown', oldFunc);
+                    if (e.key === 'Enter') {
+                        switch (type) {
+                            case 's':
+                                type = 'submissions';
+                                break;
+                            case 't':
+                                type = 'teams';
+                                break;
+                            case 'p':
+                                type = 'problems';
+                                break;
+                            case 'c':
+                                type = 'clarifications';
+                                break;
+                            case 'j':
+                                type = 'submissions/by-judging-id';
+                                break;
+                        }
+                        var redirect_to = domjudge_base_url + '/jury/' + type;
+                        if (typedSequence) {
+                            redirect_to += '/' + typedSequence;
+                        }
+                        window.location = redirect_to;
+                    }
                 }
             });
         }

webapp/src/Controller/API/ContestController.php

@@ -39,6 +39,7 @@
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
@@ -637,8 +638,9 @@ public function getEventFeedAction(
             if ($event === null) {
                 throw new BadRequestHttpException(
                     sprintf(
-                        'Invalid parameter "%s" requested.',
-                        $request->query->has('since_token') ? 'since_token' : 'since_id'
+                        'Invalid parameter "%s" requested with value "%s".',
+                        $request->query->has('since_token') ? 'since_token' : 'since_id',
+                        $sinceToken ?? $sinceId
                     )
                 );
             }
@@ -654,6 +656,7 @@ public function getEventFeedAction(
         $response->setCallback(function () use ($format, $cid, $contest, $request, $since_id, $types, $strict, $stream, $metadataFactory, $kernel) {
             $lastUpdate = 0;
             $lastIdSent = max(0, $since_id); // Don't try to look for event_id=0
+            $lastIdExists = $since_id === -1;
             $typeFilter = false;
             if ($types) {
                 $typeFilter = explode(',', $types);
@@ -721,19 +724,31 @@ public function getEventFeedAction(
                 // Add missing state events that should have happened already.
                 $this->eventLogService->addMissingStateEvents($contest);
 
-                // We fetch *all* events after the last seen to check that
+                // We fetch *all* events from the last seen to check that
                 // we don't skip events that are committed out of order.
+                // This includes the last seen event itself, just to check
+                // that the database is consistent and, for example, has
+                // not been reloaded while this process is (long) running.
                 $q = $this->em->createQueryBuilder()
                     ->from(Event::class, 'e')
                     ->select('e')
-                    ->andWhere('e.eventid > :lastIdSent')
+                    ->andWhere('e.eventid >= :lastIdSent')
                     ->setParameter('lastIdSent', $lastIdSent)
                     ->orderBy('e.eventid', 'ASC')
                     ->getQuery();
 
                 /** @var Event[] $events */
                 $events = $q->getResult();
 
+                if ($lastIdExists) {
+                    if (count($events) == 0 || $events[0]->getEventid() !== $lastIdSent) {
+                        throw new HttpException(500, sprintf('Cannot find event %d in database anymore', $lastIdSent));
+                    }
+                    // Remove the previously last sent event. We just fetched
+                    // it to make sure it's there.
+                    unset($events[0]);
+                }
+
                 // Look for any missing sequential events and wait for them to
                 // be committed if so.
                 $missingEvents = false;
@@ -860,6 +875,7 @@ public function getEventFeedAction(
                     flush();
                     $lastUpdate = Utils::now();
                     $lastIdSent = $event->getEventid();
+                    $lastIdExists = true;
                     $numEventsSent++;
 
                     if ($missingEvents && $event->getEventid() >= $lastFoundId) {

webapp/src/Controller/Jury/ContestController.php

@@ -1038,8 +1038,8 @@ private function doLock(int $contestId, bool $locked): Response
         return $this->redirectToRoute('jury_contest', ['contestId' => $contestId]);
     }
 
-    #[Route(path: '/{contestId<\d+>}/scoreboard-zip/{type<public|unfrozen>}/contest.zip', name: 'jury_scoreboard_data_zip')]
-    public function publicScoreboardDataZipAction(
+    #[Route(path: '/{contestId<\d+>}/{type<public|unfrozen>}-scoreboard.zip', name: 'jury_scoreboard_data_zip')]
+    public function scoreboardDataZipAction(
         int $contestId,
         string $type,
         RequestStack $requestStack,

webapp/src/Controller/PublicController.php

@@ -89,7 +89,7 @@ public function scoreboardAction(
         return $this->render('public/scoreboard.html.twig', $data, $response);
     }
 
-    #[Route(path: '/scoreboard-zip/contest.zip', name: 'public_scoreboard_data_zip')]
+    #[Route(path: '/scoreboard.zip', name: 'public_scoreboard_data_zip')]
     public function scoreboardDataZipAction(
         RequestStack $requestStack,
         Request $request,

webapp/src/Controller/Team/SubmissionController.php

@@ -242,6 +242,10 @@ public function downloadAction(int $submitId): Response
                 $submitId));
         }
 
+        if ($this->submissionService->getSubmissionFileCount($submission) === 1) {
+            return $this->submissionService->getSubmissionFileResponse($submission);
+        }
+
         return $this->submissionService->getSubmissionZipResponse($submission);
     }
 }

webapp/src/Service/DOMJudgeService.php

@@ -1557,7 +1557,7 @@ public function getScoreboardZip(
         }
         $zip->close();
 
-        return Utils::streamZipFile($tempFilename, 'contest.zip');
+        return Utils::streamZipFile($tempFilename, 'scoreboard.zip');
     }
 
     private function allowJudge(ContestProblem $problem, Submission $submission, Language $language, bool $manualRequest): bool

webapp/src/Service/SubmissionService.php

@@ -768,4 +768,31 @@ public function getSubmissionZipResponse(Submission $submission): StreamedRespon
 
         return Utils::streamZipFile($tmpfname, 's' . $submission->getSubmitid() . '.zip');
     }
+
+    public function getSubmissionFileResponse(Submission $submission): StreamedResponse
+    {
+        /** @var SubmissionFile[] $files */
+        $files = $submission->getFiles();
+        
+        if (count($files) !== 1) {
+            throw new ServiceUnavailableHttpException(null, 'Submission does not contain exactly one file.');
+        }
+
+        $file = $files[0];
+        $filename = $file->getFilename();
+        $sourceCode = $file->getSourcecode();
+
+        return new StreamedResponse(function () use ($sourceCode) {
+            echo $sourceCode;
+        }, 200, [
+            'Content-Type'        => 'text/plain',
+            'Content-Disposition' => 'attachment; filename="' . $filename . '"',
+            'Content-Length'      => strlen($sourceCode),
+        ]);
+    }
+
+    public function getSubmissionFileCount(Submission $submission): int
+    {
+        return count($submission->getFiles());
+    }
 }