Fix reuploading problemset.

Also fix uploading using PUT and some small bugs in the contest import script wrt problemset upload.

Author: nickygerritsen

composer.json

@@ -75,6 +75,7 @@
 		"phpstan/phpdoc-parser": "^1.25",
 		"promphp/prometheus_client_php": "^2.6",
 		"ramsey/uuid": "^4.2",
+		"riverline/multipart-parser": "^2.1",
 		"select2/select2": "4.*",
 		"sentry/sentry-symfony": "^4.5",
 		"symfony/asset": "6.4.*",

composer.lock

@@ -127,10 +127,10 @@ def import_contest_problemset_document(cid: str):
 
     if text_file:
         if dj_utils.confirm(f'Import {text_file} for contest?', False):
-            dj_utils.upload_file(f'contests/{cid}/problemset', 'text', text_file)
-            print('Contest text imported.')
+            dj_utils.upload_file(f'contests/{cid}/problemset', 'problemset', text_file)
+            print('Contest problemset imported.')
         else:
-            print('Skipping contest text import.')
+            print('Skipping contest problemset import.')
 
 if len(sys.argv) == 1:
     dj_utils.domjudge_webapp_folder_or_api_url = webappdir

misc-tools/import-contest.in

@@ -297,7 +297,7 @@ public function deleteProblemsetAction(Request $request, string $cid): Response
                 required: ['problemset'],
                 properties: [
                     new OA\Property(
-                        property: 'text',
+                        property: 'problemset',
                         description: 'The problemset document to use, as either text/html, text/plain or application/pdf.',
                         type: 'string',
                         format: 'binary'

webapp/src/Controller/API/ContestController.php

@@ -1390,7 +1390,7 @@ public function addExternalContestSource(ExternalContestSource $externalContestS
 
     public function setContestProblemsetContent(?ContestProblemsetContent $content): self
     {
-        $this->contestProblemsetContent->clear();
+        $this->contestProblemsetContent = new ArrayCollection();
         if ($content) {
             $this->contestProblemsetContent->add($content);
             $content->setContest($this);

webapp/src/Entity/Contest.php

@@ -0,0 +1,44 @@
+<?php declare(strict_types=1);
+
+namespace App\EventListener;
+
+use Riverline\MultiPartParser\Converters\HttpFoundation;
+use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpKernel\Event\ControllerEvent;
+
+#[AsEventListener(priority: 1)]
+class ParseFilesForPutListener
+{
+    public function __invoke(ControllerEvent $event): void
+    {
+        // When we have a PUT request, the files on the request will not be filled, since PHP doesn't
+        // fill the $_FILES array. We can manually parse the request to fill it using a library.
+        // This code is based on https://github.com/symfony/symfony/issues/36409#issuecomment-612442260.
+        $request = $event->getRequest();
+        if ($request->isMethod('PUT')) {
+            $document = HttpFoundation::convert($request);
+            // Not all PUT requests are multipart, for example JSON PUT requests aren't. So check
+            // to see if this is a multipart request and otherwise do nothing.
+            if (!$document->isMultiPart()) {
+                return;
+            }
+
+            foreach ($document->getParts() as $part) {
+                if (!$part->isFile()) {
+                    continue;
+                }
+
+                $filename = tempnam(sys_get_temp_dir(), 'dj-put');
+                file_put_contents($filename, $part->getBody());
+                $uploadedFile = new UploadedFile(
+                    $filename,
+                    $part->getFileName(),
+                    $part->getMimeType(),
+                    test: true // Since it is not a real uploaded file, mark it as test
+                );
+                $request->files->set($part->getName(), $uploadedFile);
+            }
+        }
+    }
+}

webapp/src/EventListener/ParseFilesForPutListener.php

@@ -176,12 +176,12 @@ public function testProblemsetManagement(): void
         $object = $this->verifyApiJsonResponse('GET', $url, 200, $this->apiUser);
         self::assertArrayNotHasKey('problemset', $object);
 
-        // Now upload a banner
+        // Now upload a problemset
         $problemsetFile = __DIR__ . '/../../../../../webapp/public/doc/logos/DOMjudgelogo.pdf';
         $problemset = new UploadedFile($problemsetFile, 'DOMjudgelogo.pdf');
         $this->verifyApiJsonResponse('POST', $url . '/problemset', 204, $this->apiUser, null, ['problemset' => $problemset]);
 
-        // Verify we do have a banner now
+        // Verify we do have a problemset now
         $object = $this->verifyApiJsonResponse('GET', $url, 200, $this->apiUser);
         $problemsetConfig = [
             [
@@ -200,6 +200,23 @@ public function testProblemsetManagement(): void
         $callbackData = ob_get_clean();
         self::assertEquals(file_get_contents($problemsetFile), $callbackData);
 
+        // Upload the problemset again, this time using PUT to also test that
+        $problemsetFile = __DIR__ . '/../../../../../webapp/public/doc/logos/DOMjudgelogo.pdf';
+        $problemset = new UploadedFile($problemsetFile, 'DOMjudgelogo.pdf');
+        $this->verifyApiJsonResponse('PUT', $url . '/problemset', 204, $this->apiUser, null, ['problemset' => $problemset]);
+
+        // Verify we still have a problemset
+        $object = $this->verifyApiJsonResponse('GET', $url, 200, $this->apiUser);;
+        self::assertSame($problemsetConfig, $object['problemset']);
+
+        $this->client->request('GET', '/api' . $url . '/problemset');
+        /** @var StreamedResponse $response */
+        $response = $this->client->getResponse();
+        ob_start();
+        $response->getCallback()();
+        $callbackData = ob_get_clean();
+        self::assertEquals(file_get_contents($problemsetFile), $callbackData);
+
         // Delete the problemset again
         $this->verifyApiJsonResponse('DELETE', $url . '/problemset', 204, $this->apiUser);