Don't throw InternalError for invalid zip file

Squashed in:
  - Don't throw InternalError for dmoj checker bridged format

Author: leduythuccs

dmoj/contrib/default.py

@@ -1,6 +1,7 @@
-from typing import Any
+from typing import TYPE_CHECKING
 
-from dmoj.error import InternalError
+from dmoj.contrib.base import BaseContribModule
+from dmoj.executors.base_executor import BaseExecutor
 from dmoj.result import CheckerResult
 from dmoj.utils.helper_files import parse_helper_file_error
 
@@ -11,21 +12,6 @@
 class ContribModule(BaseContribModule):
     name = 'default'
 
-    def catch_internal_error(f: Any) -> Any:
-        def wrapper(*args, **kwargs) -> CheckerResult:
-            try:
-                return f(*args, **kwargs)
-            except InternalError as e:
-                proc = args[1]
-                return CheckerResult(
-                    False,
-                    0,
-                    feedback=f'Checker exitcode {proc.returncode}',
-                    extended_feedback=str(e),
-                )
-
-        return wrapper
-
     @classmethod
     def get_checker_args_format_string(cls) -> str:
         return '{input_file} {output_file} {answer_file}'
@@ -35,8 +21,23 @@ def get_interactor_args_format_string(cls) -> str:
         return '{input_file} {answer_file}'
 
     @classmethod
+    def get_validator_args_format_string(cls) -> str:
+        return '{batch_no} {case_no}'
+
+    @classmethod
+    @BaseContribModule.catch_internal_error
     def parse_return_code(
-        cls, proc, executor, point_value, time_limit, memory_limit, feedback, extended_feedback, name, stderr, **kwargs
+        cls,
+        proc: 'TracedPopen',
+        executor: BaseExecutor,
+        point_value: float,
+        time_limit: float,
+        memory_limit: int,
+        feedback: str,
+        extended_feedback: str,
+        name: str,
+        stderr: bytes,
+        **kwargs
     ):
         if proc.returncode == cls.AC:
             return CheckerResult(True, point_value, feedback=feedback, extended_feedback=extended_feedback)

dmoj/graders/output_only.py

@@ -35,7 +35,11 @@ def _interact_with_zipfile(self, result: Result, case: TestCase) -> None:
             result.result_flag = Result.OLE
             return
 
-        result.proc_output = self.zip_file.open(output_name).read()
+        try:
+            result.proc_output = self.zip_file.open(output_name).read()
+        except Exception as e:
+            result.feedback = f'Invalid output file: {repr(e)}'
+            result.result_flag = Result.WA
 
     def get_zip_file(self) -> ZipFile:
         zip_data = download_source_code(utf8text(self.source).strip(), self.problem.meta.get('file-size-limit', 1))