Handle unexpected/missing keys on submission page.

These can happen when we change the format of a config and go to submissions in an old database.
meisterT · Oct 5, 2024 · a67ba2c · a67ba2c
1 parent f1105ea
commit a67ba2c
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/webapp/src/Controller/Jury/SubmissionController.php b/webapp/src/Controller/Jury/SubmissionController.php
@@ -1253,7 +1253,9 @@ private function maybeGetErrors(string $type, string $expectedConfigString, stri
         $observedConfig = $this->dj->jsonDecode($observedConfigString);
         $errors = [];
         foreach (array_keys($expectedConfig) as $k) {
-            if ($expectedConfig[$k] != $observedConfig[$k]) {
+            if (!array_key_exists($k, $observedConfig)) {
+                $errors[] = '- ' . preg_replace('/_/', ' ', $k) . ': missing';
+            } elseif ($expectedConfig[$k] != $observedConfig[$k]) {
                 if ($k === 'hash') {
                     $errors[] = '- script has changed';
                 } elseif ($k === 'entry_point') {
@@ -1265,6 +1267,11 @@ private function maybeGetErrors(string $type, string $expectedConfigString, stri
                 }
             }
         }
+        foreach (array_keys($observedConfig) as $k) {
+            if (!array_key_exists($k, $expectedConfig)) {
+                $errors[] = '- ' . preg_replace('/_/', ' ', $k) . ': unexpected';
+            }
+        }
         if (!empty($errors)) {
             $allErrors[] = $type . ' changes:';
             array_push($allErrors, ...$errors);