add default timeout for test proc

Author: zdszero

.gitignore

@@ -6,4 +6,4 @@ __pycache__
 docker_deploy
 migrations
 onl.db
-data/log
+data

conf/views.py

@@ -190,7 +190,8 @@ def post(self, request):
 
 class LanguagesAPI(APIView):
     def get(self, request):
-        return self.success({"languages": SysOptions.languages, "spj_languages": SysOptions.spj_languages})
+        return self.success({"languages": SysOptions.languages, 
+                             "spj_languages": SysOptions.spj_languages})
 
 
 class TestCasePruneAPI(APIView):

contest/models.py

@@ -17,12 +17,11 @@ class Contest(models.Model):
     # show real time rank or cached rank
     password = models.TextField(null=True)
     # enum of ContestRuleType
-    start_time = models.DateTimeField(timezone.now())
+    start_time = models.DateTimeField(default=timezone.now())
     end_time = models.DateTimeField(null=True)
     create_time = models.DateTimeField(auto_now_add=True)
     last_update_time = models.DateTimeField(auto_now=True)
     created_by = models.ForeignKey(User, on_delete=models.CASCADE)
-    # 是否可见 false的话相当于删除
     visible = models.BooleanField(default=True)
     contest_admin = models.JSONField(default=list)
     allowed_ip_ranges = JSONField(default=list)
@@ -62,4 +61,4 @@ class ContestAnnouncement(models.Model):
 
     class Meta:
         db_table = "contest_announcement"
-        ordering = ("-create_time",)
+        ordering = ("-create_time",)

judge/testing.py

@@ -18,6 +18,11 @@
 TESTCASE_NAME = "testcases.json"
 TESTER_NAME = "tester"
 
+class TestResult:
+    Succeed = 0
+    Error   = 1
+    Timeout = 2
+
 def create_new_problem_from_template(new_problem_id: str, old_problem_id: str):
     old_path = PathManager.problem_dir(old_problem_id)
     new_path = PathManager.problem_dir(new_problem_id)
@@ -41,14 +46,20 @@ def make_file_executable(file_path):
         return False
 
 
-def run_command_with_sudo(command):
+def run_command_with_timeout(command: list, timeout: float) -> int:
     try:
         # Use the 'sudo' command to execute the given command with elevated privileges.
-        result = subprocess.run(['sudo'] + command, capture_output=True, text=True, check=True)
-        return result
+        result = subprocess.run(['sudo'] + command, capture_output=True, text=True, check=True, timeout=timeout)
+        print("Command output:")
+        print(result.stdout)
+        return TestResult.Succeed
+    except subprocess.TimeoutExpired:
+        print('program timeout')
+        return TestResult.Timeout
     except subprocess.CalledProcessError as e:
+        print("Command execution failed.")
         print(f"Error: {e}")
-        return None
+        return TestResult.Error
 
 
 class PathManager:
@@ -165,12 +176,13 @@ def judge(self):
         if not exists(tester_path):
             raise Exception("running submission: tester {} not exists".format(tester_path))
         print(f"running {tester_path}")
-        result = run_command_with_sudo([tester_path, "--log", "--json"])
-        if result:
-            print("Command output:")
-            print(result.stdout)
-        else:
-            print("Command execution failed.")
+        res = run_command_with_timeout([tester_path, "--log", "--json"], 1)
+        if res == TestResult.Timeout:
+            self.sub.result = JudgeStatus.PROGRAM_TIMEOUT
+            self.sub.save()
+            return
+        elif res == TestResult.Error:
+            raise Exception("Running test proc has some problem")
 
         log_path = join(self.sub_dirpath, 'logs')
         if not exists(log_path):

run.sh

@@ -16,6 +16,9 @@ elif [[ $cmd == "clean" ]]; then
   find . -type d -name 'migrations' -not -path './venv/*' | xargs rm -r;
   rm onl.db
 elif [[ $cmd == "rebuild" ]]; then
+  rm -rf ./data/zips
+  rm -rf ./data/problems
+  rm -rf ./data/submissions
   find . -type d -name 'migrations' -not -path './venv/*' | xargs rm -r;
   rm onl.db
   for app in "${apps[@]}"; do

submission/models.py

@@ -9,12 +9,13 @@
 
 
 class JudgeStatus:
-    PENDING      = 0
-    JUDGING      = 1
+    PENDING = 0
+    JUDGING = 1
     SYSTEM_ERROR = 2
-    ALL_PASSED   = 3
-    SOME_PASSED  = 4
-    ALL_FAILED   = 5
+    ALL_PASSED = 3
+    SOME_PASSED = 4
+    ALL_FAILED = 5
+    PROGRAM_TIMEOUT = 6
 
 
 class Submission(models.Model):
@@ -35,7 +36,12 @@ class Submission(models.Model):
     ip = models.TextField(null=True)
 
     def check_user_permission(self, user, check_share=True):
-        if self.user_id == user.id or user.is_super_admin() or user.can_mgmt_all_problem() or self.problem.created_by_id == user.id:
+        if (
+            self.user_id == user.id
+            or user.is_super_admin()
+            or user.can_mgmt_all_problem()
+            or self.problem.created_by_id == user.id
+        ):
             return True
 
         if check_share:
@@ -46,7 +52,9 @@ def check_user_permission(self, user, check_share=True):
         return False
 
     def modify_permission(self, user, check_share=True):
-        if user.is_super_admin() or (user.is_admin_role() and user.id in self.problem.contest.contest_admin):
+        if user.is_super_admin() or (
+            user.is_admin_role() and user.id in self.problem.contest.contest_admin
+        ):
             return True
         return False
 

submission/views/user.py

@@ -147,14 +147,11 @@ def get(self, request):
         if not submission.check_user_permission(request.user):
             return self.error("No permission for this submission")
 
-        if submission.result in [JudgeStatus.PENDING, JudgeStatus.JUDGING]:
-            # update_submission_status(submission)
-            pass
-
         submission_data = SubmissionSafeModelSerializer(submission).data
         submission_data["can_unshare"] = submission.check_user_permission(
             request.user, check_share=False
         )
+        submission_data["code_names"] = submission.problem.code_names
         return self.success(submission_data)
 
     @validate_serializer(ShareSubmissionSerializer)
@@ -197,11 +194,6 @@ def get(self, request):
             user_id=request.user.id
         )
 
-        for submission in submissions:
-            if submission.result in [JudgeStatus.PENDING, JudgeStatus.JUDGING]:
-                # update_submission_status(submission)
-                pass
-
         problem_id = request.GET.get("problem_id")
         result = request.GET.get("result")
         if problem_id:
@@ -248,10 +240,6 @@ def get(self, request):
         submissions = Submission.objects.filter(contest_id=contest_id).filter(
             user_id=request.user.id
         )
-        for submission in submissions:
-            if submission.result in [JudgeStatus.PENDING, JudgeStatus.JUDGING]:
-                # update_submission_status(submission)
-                pass
 
         problem_id = request.GET.get("problem_id")
         result = request.GET.get("result")