Preserve information whether attachments are executable.

This is relevant for testing tools which are often uploaded as attachments for interactive problems. When we download the samples (via the web interface or API), we should mark these files as executable iff they were executable when uploading.
DOMjudge · Sep 17, 2024 · b2ef223 · b2ef223
1 parent f30e6d3
commit b2ef223
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/webapp/src/Entity/ProblemAttachmentContent.php b/webapp/src/Entity/ProblemAttachmentContent.php
@@ -25,6 +25,10 @@ class ProblemAttachmentContent
     #[ORM\Column(type: 'blobtext', options: ['comment' => 'Attachment content'])]
     private string $content;
 
+    #[ORM\Column(options: ['comment' => 'Whether this file gets an executable bit.', 'default' => 0])]
+    #[Serializer\Exclude]
+    private bool $isExecutable = false;
+
     public function getAttachment(): ProblemAttachment
     {
         return $this->attachment;
@@ -48,4 +52,15 @@ public function setContent(string $content): self
 
         return $this;
     }
+
+    public function setIsExecutable(bool $isExecutable): ProblemAttachmentContent
+    {
+        $this->isExecutable = $isExecutable;
+        return $this;
+    }
+
+    public function isExecutable(): bool
+    {
+        return $this->isExecutable;
+    }
 }
diff --git a/webapp/src/Service/DOMJudgeService.php b/webapp/src/Service/DOMJudgeService.php
@@ -892,6 +892,14 @@ public function getSamplesZipForContest(Contest $contest): StreamedResponse
             foreach ($problem->getProblem()->getAttachments() as $attachment) {
                 $filename = sprintf('%s/attachments/%s', $problem->getShortname(), $attachment->getName());
                 $zip->addFromString($filename, $attachment->getContent()->getContent());
+                if ($attachment->getContent()->isExecutable()) {
+                    // 100755 = regular file, executable
+                    $zip->setExternalAttributesName(
+                        $filename,
+                        ZipArchive::OPSYS_UNIX,
+                        octdec('100755') << 16
+                    );
+                }
             }
         }
 

diff --git a/webapp/src/Service/ImportProblemService.php b/webapp/src/Service/ImportProblemService.php
@@ -539,6 +539,14 @@ public function importZippedProblem(
                 continue;
             }
 
+            // In doubt make files executable, but try to read it from the zip file.
+            $executableBit = true;
+            if ($zip->getExternalAttributesIndex($j, $opsys, $attr)
+                && $opsys==ZipArchive::OPSYS_UNIX
+                && (($attr >> 16) & 0100) === 0) {
+                $executableBit = false;
+            }
+
             $name = basename($filename);
 
             $fileParts = explode('.', $name);
@@ -558,6 +566,10 @@ public function importZippedProblem(
                     $messages['info'][] = sprintf("Updated attachment '%s'", $name);
                     $numAttachments++;
                 }
+                if ($executableBit !== $attachmentContent->isExecutable()) {
+                    $attachmentContent->setIsExecutable($executableBit);
+                    $messages['info'][] = sprintf("Updated executable bit of attachment '%s'", $name);
+                }
             } else {
                 $attachment = new ProblemAttachment();
                 $attachmentContent = new ProblemAttachmentContent();
@@ -567,7 +579,9 @@ public function importZippedProblem(
                     ->setType($type)
                     ->setContent($attachmentContent);
 
-                $attachmentContent->setContent($content);
+                $attachmentContent
+                    ->setContent($content)
+                    ->setIsExecutable($executableBit);
 
                 $this->em->persist($attachment);