From 694fd184313a99980710627e648dd8a0bafed307 Mon Sep 17 00:00:00 2001
From: Angus Ritossa <angusritossa@gmail.com>
Date: Wed, 14 Feb 2024 11:42:46 +1100
Subject: [PATCH 01/17] display provided subtask name, rather than
 automatically using 1-indexing

---
 cms/grading/scoretypes/abc.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cms/grading/scoretypes/abc.py b/cms/grading/scoretypes/abc.py
index f0fe3e3dd2..930fc6cd9d 100644
--- a/cms/grading/scoretypes/abc.py
+++ b/cms/grading/scoretypes/abc.py
@@ -218,7 +218,7 @@ class ScoreTypeGroup(ScoreTypeAlone):
     {% endif %}
     <div class="subtask-head">
         <span class="title">
-            {% trans index=st["idx"] %}Subtask {{ index }}{% endtrans %}
+            {% trans name=st["name"] %}{{ name }}{% endtrans %}
         </span>
     {% if "score_fraction" in st and "max_score" in st %}
         {% set score = st["score_fraction"] * st["max_score"] %}
@@ -427,6 +427,7 @@ def compute_score(self, submission_result):
                 # correct or incorrect.
                 "score_fraction": st_score_fraction,
                 "max_score": parameter[0],
+                "name": parameter[2],
                 "testcases": testcases})
             if all(self.public_testcases[tc_idx] for tc_idx in target):
                 public_score += st_score

From 738fca32a53f2fbf6b8dc48be9f1599252698d96 Mon Sep 17 00:00:00 2001
From: Angus Ritossa <angusritossa@gmail.com>
Date: Wed, 14 Feb 2024 13:13:48 +1100
Subject: [PATCH 02/17] fix restricted feedback: show all test cases up to the
 first lowest-scoring case

---
 cms/grading/scoretypes/abc.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/cms/grading/scoretypes/abc.py b/cms/grading/scoretypes/abc.py
index 930fc6cd9d..d5a22c8b3b 100644
--- a/cms/grading/scoretypes/abc.py
+++ b/cms/grading/scoretypes/abc.py
@@ -392,10 +392,13 @@ def compute_score(self, submission_result):
 
             testcases = []
             public_testcases = []
-            previous_tc_all_correct = True
+
+            restricted_feedback_idx = None
+            restricted_feedback_outcome = None
+
             for tc_idx in target:
-                tc_outcome = self.get_public_outcome(
-                    float(evaluations[tc_idx].outcome), parameter)
+                outcome = float(evaluations[tc_idx].outcome)
+                tc_outcome = self.get_public_outcome(outcome, parameter)
 
                 testcases.append({
                     "idx": tc_idx,
@@ -403,14 +406,13 @@ def compute_score(self, submission_result):
                     "text": evaluations[tc_idx].text,
                     "time": evaluations[tc_idx].execution_time,
                     "memory": evaluations[tc_idx].execution_memory,
-                    "show_in_restricted_feedback": previous_tc_all_correct})
+                    "show_in_restricted_feedback": True})
                 if self.public_testcases[tc_idx]:
                     public_testcases.append(testcases[-1])
-                    # Only block restricted feedback if this is the first
-                    # *public* non-correct testcase, otherwise we might be
-                    # leaking info on private testcases.
-                    if tc_outcome != "Correct":
-                        previous_tc_all_correct = False
+
+                    if restricted_feedback_outcome is None or outcome < restricted_feedback_outcome:
+                        restricted_feedback_outcome = outcome
+                        restricted_feedback_idx = tc_idx
                 else:
                     public_testcases.append({"idx": tc_idx})
 
@@ -419,6 +421,10 @@ def compute_score(self, submission_result):
                 parameter)
             st_score = st_score_fraction * parameter[0]
 
+            if st_score_fraction < 1.0 and parameter[0] > 0: # display full feedback for sample cases
+                for t in testcases:
+                    t["show_in_restricted_feedback"] = (t["idx"] <= restricted_feedback_idx)
+
             score += st_score
             subtasks.append({
                 "idx": st_idx + 1,

From 00ce5edca0142ab130b9423ef0cf7a99db6cf7d3 Mon Sep 17 00:00:00 2001
From: Angus Ritossa <angusritossa@gmail.com>
Date: Fri, 12 Jul 2024 11:36:16 +1000
Subject: [PATCH 03/17] hide old/upcoming contests

---
 cms/server/contest/handlers/base.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cms/server/contest/handlers/base.py b/cms/server/contest/handlers/base.py
index 00e24c273f..e31ad008b3 100644
--- a/cms/server/contest/handlers/base.py
+++ b/cms/server/contest/handlers/base.py
@@ -31,6 +31,7 @@
 
 import logging
 import traceback
+from datetime import datetime, timedelta
 
 try:
     import tornado4.web as tornado_web
@@ -168,6 +169,11 @@ def get(self):
         # able to import new contests without having to restart CWS.
         contest_list = dict()
         for contest in self.sql_session.query(Contest).all():
-            contest_list[contest.name] = contest
+            # We hide contests that ended more than a week ago, or start more than a week from now
+            today = datetime.now()
+            seven_days_ago = today - timedelta(days=7)
+            seven_days_ahead = today + timedelta(days=7)
+            if contest.start < seven_days_ahead and contest.stop > seven_days_ago:
+                contest_list[contest.name] = contest
         self.render("contest_list.html", contest_list=contest_list,
                     **self.r_params)

From 1a1df035f540b11fad96543d5ccece0c5230af67 Mon Sep 17 00:00:00 2001
From: Angus Ritossa <angusritossa@gmail.com>
Date: Tue, 13 Aug 2024 20:39:26 +1000
Subject: [PATCH 04/17] add are you sure popup before rejudging all subs

---
 .../templates/macro/reevaluation_buttons.html  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/cms/server/admin/templates/macro/reevaluation_buttons.html b/cms/server/admin/templates/macro/reevaluation_buttons.html
index 7e769d0cd9..c71de755de 100644
--- a/cms/server/admin/templates/macro/reevaluation_buttons.html
+++ b/cms/server/admin/templates/macro/reevaluation_buttons.html
@@ -35,7 +35,8 @@
 {% elif contest_id is not none %}
   {% set invalidate_arguments = {"contest_id": contest_id} %}
 {% endif %}
-<button onclick="cmsrpc_request(
+<button onclick="if (confirm('Are you sure you want to recompile and judge all submissions?')) {
+                cmsrpc_request(
                  'EvaluationService', 0,
                  'invalidate_submission', {
 {% for key, value in invalidate_arguments.items() %}
@@ -43,12 +44,14 @@
 {% endfor %}
                   'level': 'compilation'},
                  function(response) { utils.redirect_if_ok('{{ next_page }}', response); }
-                 );"
+                 );
+               }"
 {% if not allowed %}
         disabled
 {% endif %}
         title="Compilation" >C</button>
-<button onclick="cmsrpc_request(
+<button onclick="if (confirm('Are you sure you want to rejudge all submissions?')) {
+                cmsrpc_request(
                  'EvaluationService', 0,
                  'invalidate_submission', {
 {% for key, value in invalidate_arguments.items() %}
@@ -56,12 +59,14 @@
 {% endfor %}
                   'level': 'evaluation'},
                  function(response) { utils.redirect_if_ok('{{ next_page }}', response); }
-                  );"
+                  );
+                }"
 {% if not allowed %}
         disabled
 {% endif %}
         title="Evaluation" >E</button>
-<button onclick="cmsrpc_request(
+<button onclick="if (confirm('Are you sure you want to rescore all submissions?')) {
+                cmsrpc_request(
                  'ScoringService', 0,
                  'invalidate_submission', {
 {% for key, value in invalidate_arguments.items() %}
@@ -69,7 +74,8 @@
 {% endfor %}
                  },
                  function(response) { utils.redirect_if_ok('{{ next_page }}', response); }
-                 );"
+                 );
+                }"
 {% if not allowed %}
         disabled
 {% endif %}

From 7a718129183bd13077e0c689fe3d2ab58c90356a Mon Sep 17 00:00:00 2001
From: Angus Ritossa <angusritossa@gmail.com>
Date: Tue, 13 Aug 2024 20:53:44 +1000
Subject: [PATCH 05/17] only show confirm popup when rejudging multiple subs at
 once

---
 cms/server/admin/templates/macro/reevaluation_buttons.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cms/server/admin/templates/macro/reevaluation_buttons.html b/cms/server/admin/templates/macro/reevaluation_buttons.html
index c71de755de..eb9684075b 100644
--- a/cms/server/admin/templates/macro/reevaluation_buttons.html
+++ b/cms/server/admin/templates/macro/reevaluation_buttons.html
@@ -35,7 +35,7 @@
 {% elif contest_id is not none %}
   {% set invalidate_arguments = {"contest_id": contest_id} %}
 {% endif %}
-<button onclick="if (confirm('Are you sure you want to recompile and judge all submissions?')) {
+<button onclick="if ('submission_id' in {{ invalidate_arguments}} || confirm('Are you sure you want to recompile and judge all submissions?')) {
                 cmsrpc_request(
                  'EvaluationService', 0,
                  'invalidate_submission', {
@@ -50,7 +50,7 @@
         disabled
 {% endif %}
         title="Compilation" >C</button>
-<button onclick="if (confirm('Are you sure you want to rejudge all submissions?')) {
+<button onclick="if ('submission_id' in {{ invalidate_arguments}} || confirm('Are you sure you want to rejudge all submissions?')) {
                 cmsrpc_request(
                  'EvaluationService', 0,
                  'invalidate_submission', {
@@ -65,7 +65,7 @@
         disabled
 {% endif %}
         title="Evaluation" >E</button>
-<button onclick="if (confirm('Are you sure you want to rescore all submissions?')) {
+<button onclick="if ('submission_id' in {{ invalidate_arguments}} || confirm('Are you sure you want to rescore all submissions?')) {
                 cmsrpc_request(
                  'ScoringService', 0,
                  'invalidate_submission', {

From 0a4f3871a6b10b0dd35403529021cd3b38947f06 Mon Sep 17 00:00:00 2001
From: Angus Ritossa <angusritossa@gmail.com>
Date: Wed, 11 Sep 2024 16:39:31 +1000
Subject: [PATCH 06/17] add ctf loader

---
 cmscontrib/loaders/ctf_loader.py | 322 +++++++++++++++++++++++++++++++
 1 file changed, 322 insertions(+)
 create mode 100644 cmscontrib/loaders/ctf_loader.py

diff --git a/cmscontrib/loaders/ctf_loader.py b/cmscontrib/loaders/ctf_loader.py
new file mode 100644
index 0000000000..bbf60e27e4
--- /dev/null
+++ b/cmscontrib/loaders/ctf_loader.py
@@ -0,0 +1,322 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Programming contest management system
+# Copyright © 2017 Kiarash Golezardi <kiarashgolezardi@gmail.com>
+# Copyright © 2017 Amir Keivan Mohtashami <akmohtashami97@gmail.com>
+# Copyright © 2018 Stefano Maggiolo <s.maggiolo@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+from future.builtins.disabled import *  # noqa
+from future.builtins import *  # noqa
+
+import io
+import json
+import logging
+import os
+import re
+import subprocess
+import zipfile
+
+from datetime import timedelta
+from tempfile import TemporaryDirectory
+
+from cms.db import Task, Dataset, Manager, Testcase, Attachment, Statement
+
+from .base_loader import TaskLoader
+
+from cmscommon.constants import SCORE_MODE_MAX_SUBTASK
+
+
+logger = logging.getLogger(__name__)
+
+
+def make_timedelta(t):
+    return timedelta(seconds=t)
+
+
+class CtfTaskLoader(TaskLoader):
+    """Loader for CTF formatted tasks.
+
+    """
+
+    short_name = 'ctf_task'
+    description = 'CTF task format'
+
+    @staticmethod
+    def detect(path):
+        """See docstring in class Loader.
+
+        """
+        return os.path.exists(os.path.join(path, "metadata.json"))
+
+    def task_has_changed(self):
+        """See docstring in class Loader.
+
+        """
+        return True
+
+    def _get_task_type_parameters_oo(self, data, evaluation_param):
+        return [
+            evaluation_param
+        ]
+
+    def _get_task_type_parameters_comm(self, data, has_grader):
+        return [
+            data["num_processes"],
+            "stub" if has_grader else "alone",
+            "fifo_io", # TODO: Support "std_io" as well
+        ]
+
+    def _get_task_type_parameters_batch(self, data, evaluation_param, has_grader):
+        return [
+            # alone:  Self-sufficient
+            # grader: Compiled with grader
+            "grader" if has_grader else "alone",
+            [
+                data['input_file'] if 'input_file' in data else '',
+                data['output_file'] if 'output_file' in data else '',
+            ],
+            evaluation_param
+        ]
+
+    def get_task(self, get_statement=True):
+        """See docstring in class Loader.
+
+        """
+
+        json_src = os.path.join(self.path, 'metadata.json')
+        if not os.path.exists(json_src):
+            logger.critical('No task found.')
+            raise IOError('No task found at path %s' % json_src)
+
+        with io.open(json_src, 'rt', encoding='utf-8') as json_file:
+            data = json.load(json_file)
+            if 'cms' in data:
+                cms_specific_data = data['cms']
+                logger.info("%s", str(cms_specific_data))
+            else:
+                cms_specific_data = {}
+
+        short_name = data['short_name']
+        logger.info("Loading parameters for task %s.", short_name)
+
+        ## Args for Task object
+        args = {}
+
+        # TODO: We should probably use a friendlier name
+        args["name"] = cms_specific_data['name'] if 'name' in cms_specific_data else short_name
+        args["title"] = data['problem_name']
+
+        # Statements
+        if get_statement:
+          logger.info('Statement requested')
+
+          # Just pick english as the primary language
+          args['statements'] = dict()
+          args["primary_statements"] = ["en"]
+          digest = self.file_cacher.put_file_from_path(
+              os.path.join(self.path, 'statement.pdf'),
+              "Statement for task %s" % (short_name,))
+          args['statements']["en"] = Statement("en", digest)
+
+        # Attachments
+        args["attachments"] = dict()
+        attachments_dir = os.path.join(self.path, 'attachments')
+        if os.path.exists(attachments_dir):
+            logger.info("Attachments found")
+            for filename in sorted(os.listdir(attachments_dir)):
+                digest = self.file_cacher.put_file_from_path(
+                    os.path.join(attachments_dir, filename),
+                    "Attachment %s for task %s" % (filename, short_name))
+                args["attachments"][filename] = Attachment(filename, digest)
+
+        # Obtaining testcases' codename
+        # FIXME: Unzip or something?
+        td = TemporaryDirectory()
+
+        with zipfile.ZipFile(os.path.join(self.path, 'data.zip'), 'r') as zip_ref:
+            zip_ref.extractall(td.name)
+
+        testcase_codenames = sorted([
+            filename[:-3]
+            for filename in os.listdir(td.name)
+            if filename[-3:] == '.in'])
+
+        if "task_type" in data and data["task_type"] == "output_only":
+            args["submission_format"] = ["output_%s.txt" % (cn,) for cn in testcase_codenames]
+        else:
+            args["submission_format"] = ["%s.%%l" % args["name"]]
+
+        # These options cannot be configured in the CTF format.
+        # Uncomment the following to set specific values for them.
+
+        # No user tests for AIO
+        # args['max_user_test_number'] = 10
+        # args['min_user_test_interval'] = make_timedelta(60)
+        # args['min_user_test_interval'] = make_timedelta(60)
+
+        # No tokens for AIO
+        # args['token_mode'] = 'infinite'
+        # args['token_max_number'] = 100
+        # args['token_min_interval'] = make_timedelta(60)
+        # args['token_gen_initial'] = 1
+        # args['token_gen_number'] = 1
+        # args['token_gen_interval'] = make_timedelta(1800)
+        # args['token_gen_max'] = 2
+
+        # Takes best score for each subtask
+        args['score_mode'] = SCORE_MODE_MAX_SUBTASK
+
+        # Unlimited submissions per problem
+        #args['max_submission_number'] = 50
+        #args['max_user_test_number'] = 50
+        
+        # 60 seconds between submissions
+        args['min_submission_interval'] = make_timedelta(60)
+
+        args['score_precision'] = 2
+
+        args['feedback_level'] = 'restricted'
+
+        task = Task(**args)
+
+        # Args for test data
+        args = dict()
+
+        args["task"] = task
+        args["description"] = "Default" # Default dataset
+        args["autojudge"] = True
+
+        MB_TO_BYTES = 1024*1024
+        if "task_type" not in data or data["task_type"] != "output_only":
+            if "timelimit" in cms_specific_data:
+                args["time_limit"] = float(cms_specific_data['timelimit'])
+            else:
+                args["time_limit"] = float(data['timelimit'])
+            if "memlimit" in cms_specific_data:
+                args["memory_limit"] = int(cms_specific_data['memlimit'])*MB_TO_BYTES
+            else:
+                args["memory_limit"] = int(data['memlimit'])*MB_TO_BYTES
+
+        args["managers"] = {}
+
+        # Graders
+        has_grader_files = False
+        managers_dir = os.path.join(self.path, 'managers')
+        logger.info("Now for manager files {}".format(managers_dir))
+        if os.path.exists(managers_dir):
+            for manager_file in os.listdir(managers_dir):
+                manager_file_path = os.path.join(managers_dir, manager_file)
+                # Directories in managers/ are checker sources, so ignore.
+                if os.path.isfile(manager_file_path):
+                    logger.info("Found manager file {}".format(manager_file_path))
+                    # We can make this assumption because the only non-grader
+                    # manager files are checkers, which are not handled in this
+                    # if statement
+                    has_grader_files = True
+                    manager_digest = self.file_cacher.put_file_from_path(
+                        manager_file_path,
+                        "Manager file %s for task %s" % (manager_file, short_name))
+                    args["managers"][manager_file] = Manager(manager_file, manager_digest)
+
+        # Checker
+        # Unlike grader files, we have to compile the checker from source
+        checker_dir = os.path.join(self.path, 'managers', 'checker')
+        if os.path.isdir(checker_dir):
+            evaluation_param = "comparator"
+            subprocess.run(["make", "-C", checker_dir, "clean"])
+            subprocess.run(["make", "-C", checker_dir, "all"])
+            checker_digest = self.file_cacher.put_file_from_path(
+                os.path.join(checker_dir, "bin", "checker"),
+                "Checker for task %s" % (short_name,))
+            args["managers"]["checker"] = Manager("checker", checker_digest)
+        else:
+            evaluation_param = "diff"
+
+        # Manager
+        # Unlike grader files, we have to compile the maager from source
+        manager_dir = os.path.join(self.path, 'managers', 'manager')
+        if os.path.isdir(manager_dir):
+            subprocess.run(["make", "-C", manager_dir, "clean"])
+            subprocess.run(["make", "-C", manager_dir, "all"])
+            manager_digest = self.file_cacher.put_file_from_path(
+                os.path.join(manager_dir, "bin", "manager"),
+                "Manager for task %s" % (short_name,))
+            args["managers"]["manager"] = Manager("manager", manager_digest)
+
+        # Note that the original TPS worked with custom task type Batch2017
+        # and Communication2017 instead of Batch and Communication.
+        if "task_type" in data and data["task_type"] == "communication":
+            args["task_type"] = "Communication"
+            args["task_type_parameters"] = self._get_task_type_parameters_comm(
+                data, has_grader_files)
+        elif "task_type" in data and data["task_type"] == "output_only":
+            args["task_type"] = "OutputOnly"
+            args["task_type_parameters"] = self._get_task_type_parameters_oo(
+                data, evaluation_param)
+        else:
+            args["task_type"] = "Batch"
+            args["task_type_parameters"] = self._get_task_type_parameters_batch(
+                data, evaluation_param, has_grader_files)
+
+        # Manager (for Communcation tasks)
+        # TODO: Add support for getting the manager
+
+        # Testcases
+        args["testcases"] = {}
+
+        # Finally, upload testcases
+        for codename in testcase_codenames:
+            infile = os.path.join(td.name, "%s.in" % codename)
+            outfile = os.path.join(td.name, "%s.out" % codename)
+            if not os.path.exists(outfile):
+                logger.critical(
+                    'Could not find the output file for testcase %s', codename)
+                logger.critical('Aborting...')
+                return
+
+            input_digest = self.file_cacher.put_file_from_path(
+                infile,
+                "Input %s for task %s" % (codename, short_name))
+            output_digest = self.file_cacher.put_file_from_path(
+                outfile,
+                "Output %s for task %s" % (codename, short_name))
+            testcase = Testcase(codename, True,
+                                input_digest, output_digest)
+            args["testcases"][codename] = testcase
+
+        # Score Type
+        cms_spec_path = os.path.join(self.path, 'cms_spec')
+        if not os.path.exists(cms_spec_path):
+            logger.critical('Could not find CMS spec. Aborting...')
+            return
+        with io.open(cms_spec_path, 'rt', encoding='utf-8') as f:
+            cms_spec_string = f.read()
+
+        # TODO: Support other score types
+        args["score_type"] = "GroupMin"
+        args["score_type_parameters"] = json.loads(cms_spec_string)
+
+        dataset = Dataset(**args)
+        task.active_dataset = dataset
+
+        logger.info("Task parameters loaded.")
+
+        return task
\ No newline at end of file

From b356364f02af8463315ee8ca5973a3bf945e7ca9 Mon Sep 17 00:00:00 2001
From: Angus Ritossa <angusritossa@gmail.com>
Date: Fri, 13 Sep 2024 17:08:09 +1000
Subject: [PATCH 07/17] fix error for wrong file

---
 cms/server/contest/submission/workflow.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cms/server/contest/submission/workflow.py b/cms/server/contest/submission/workflow.py
index c451045011..ac82f70283 100644
--- a/cms/server/contest/submission/workflow.py
+++ b/cms/server/contest/submission/workflow.py
@@ -144,7 +144,7 @@ def accept_submission(sql_session, file_cacher, participation, task, timestamp,
     except InvalidFilesOrLanguage:
         raise UnacceptableSubmission(
             N_("Invalid submission format!"),
-            N_("Please select the correct files."))
+            N_("Please select the correct file and ensure that it has the correct file extension. For example, in C++, you should submit a .cpp file."))
 
     digests = dict()
     missing_codenames = required_codenames.difference(files.keys())
@@ -156,7 +156,7 @@ def accept_submission(sql_session, file_cacher, participation, task, timestamp,
         else:
             raise UnacceptableSubmission(
                 N_("Invalid submission format!"),
-                N_("Please select the correct files."))
+                N_("Please select the correct file and ensure that it has the correct file extension. For example, in C++, you should submit a .cpp file."))
 
     if any(len(content) > config.max_submission_length
            for content in files.values()):

From 72b215bfb7e11b8baa86530c2cbd17e4892e3ddd Mon Sep 17 00:00:00 2001
From: Angus Ritossa <angusritossa@gmail.com>
Date: Fri, 13 Sep 2024 18:59:12 +1000
Subject: [PATCH 08/17] adjust polygon loader to have score_mode,
 feedback_level and min_submission_interval

---
 cmscontrib/loaders/polygon.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cmscontrib/loaders/polygon.py b/cmscontrib/loaders/polygon.py
index 6107b6b3e9..4a9567b5e2 100644
--- a/cmscontrib/loaders/polygon.py
+++ b/cmscontrib/loaders/polygon.py
@@ -204,6 +204,10 @@ def get_task(self, get_statement=True):
         # args['token_gen_number'] = 1
         # args['token_gen_interval'] = make_timedelta(1800)
         # args['token_gen_max'] = 2
+        args['score_mode'] = SCORE_MODE_MAX_SUBTASK
+        args['feedback_level'] = 'restricted'
+        args['min_submission_interval'] = make_timedelta(60)
+
 
         task_cms_conf_path = os.path.join(self.path, 'files', 'cms_conf.py')
         task_cms_conf = None

From aa0d3b5ea6de18d815cd2045bd6fc3e1ca844927 Mon Sep 17 00:00:00 2001
From: Angus Ritossa <angusritossa@gmail.com>
Date: Fri, 13 Sep 2024 19:04:11 +1000
Subject: [PATCH 09/17] add import

---
 cmscontrib/loaders/polygon.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmscontrib/loaders/polygon.py b/cmscontrib/loaders/polygon.py
index 4a9567b5e2..051cea84ae 100644
--- a/cmscontrib/loaders/polygon.py
+++ b/cmscontrib/loaders/polygon.py
@@ -32,6 +32,7 @@
 from cmscommon.crypto import build_password
 from cmscontrib import touch
 from .base_loader import ContestLoader, TaskLoader, UserLoader
+from cmscommon.constants import SCORE_MODE_MAX_SUBTASK
 
 
 logger = logging.getLogger(__name__)

From 92954f0ef616688eae3aa39c516d14a2ae690ffd Mon Sep 17 00:00:00 2001
From: Angus Ritossa <angusritossa@gmail.com>
Date: Fri, 13 Sep 2024 19:20:18 +1000
Subject: [PATCH 10/17] Polygon loader puts all cases in one subtask, rather
 than scoring using percentage of cases solved

---
 cmscontrib/loaders/polygon.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/cmscontrib/loaders/polygon.py b/cmscontrib/loaders/polygon.py
index 051cea84ae..30d68f2bf6 100644
--- a/cmscontrib/loaders/polygon.py
+++ b/cmscontrib/loaders/polygon.py
@@ -23,6 +23,7 @@
 import imp
 import logging
 import os
+import json
 import subprocess
 import xml.etree.ElementTree as ET
 from datetime import datetime, timedelta
@@ -277,17 +278,14 @@ def get_task(self, get_statement=True):
             args["task_type_parameters"] = \
                 ["alone", [infile_param, outfile_param], evaluation_param]
 
-            args["score_type"] = "Sum"
+            args["score_type"] = "GroupMin"
+            args["score_type_parameters"] = json.loads('[100, "^.*", "Subtask 1"]')
+
             total_value = 100.0
             input_value = 0.0
 
             testcases = int(testset.find('test-count').text)
 
-            n_input = testcases
-            if n_input != 0:
-                input_value = total_value / n_input
-            args["score_type_parameters"] = input_value
-
             args["testcases"] = {}
 
             for i in range(testcases):

From fdf6ef8f5349417d28e49b25a28f59a0e2e316b3 Mon Sep 17 00:00:00 2001
From: Angus Ritossa <angusritossa@gmail.com>
Date: Fri, 13 Sep 2024 19:27:58 +1000
Subject: [PATCH 11/17] fix polygon loader score spec

---
 cmscontrib/loaders/polygon.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmscontrib/loaders/polygon.py b/cmscontrib/loaders/polygon.py
index 30d68f2bf6..e302da6462 100644
--- a/cmscontrib/loaders/polygon.py
+++ b/cmscontrib/loaders/polygon.py
@@ -279,7 +279,7 @@ def get_task(self, get_statement=True):
                 ["alone", [infile_param, outfile_param], evaluation_param]
 
             args["score_type"] = "GroupMin"
-            args["score_type_parameters"] = json.loads('[100, "^.*", "Subtask 1"]')
+            args["score_type_parameters"] = json.loads('[[100, ".*", "Test Cases"]]')
 
             total_value = 100.0
             input_value = 0.0

From 6e2a2fa2fddeb2ab3c5cc0c3784ef6c51781c6da Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@ip-172-31-12-16.ap-southeast-2.compute.internal>
Date: Tue, 10 Dec 2024 16:52:57 +1100
Subject: [PATCH 12/17] fix ctf loader

---
 cmscontrib/loaders/__init__.py               | 4 +++-
 cmscontrib/loaders/{ctf_loader.py => ctf.py} | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename cmscontrib/loaders/{ctf_loader.py => ctf.py} (99%)

diff --git a/cmscontrib/loaders/__init__.py b/cmscontrib/loaders/__init__.py
index 337403a0b7..2b6a99e56c 100644
--- a/cmscontrib/loaders/__init__.py
+++ b/cmscontrib/loaders/__init__.py
@@ -18,13 +18,15 @@
 from .italy_yaml import YamlLoader
 from .polygon import PolygonTaskLoader, PolygonUserLoader, PolygonContestLoader
 from .tps import TpsTaskLoader
+from .ctf import CtfTaskLoader
 
 
 LOADERS = dict(
     (loader_class.short_name, loader_class) for loader_class in [
         YamlLoader,
         PolygonTaskLoader, PolygonUserLoader, PolygonContestLoader,
-        TpsTaskLoader
+        TpsTaskLoader,
+        CtfTaskLoader
     ]
 )
 
diff --git a/cmscontrib/loaders/ctf_loader.py b/cmscontrib/loaders/ctf.py
similarity index 99%
rename from cmscontrib/loaders/ctf_loader.py
rename to cmscontrib/loaders/ctf.py
index bbf60e27e4..0bbc7be47a 100644
--- a/cmscontrib/loaders/ctf_loader.py
+++ b/cmscontrib/loaders/ctf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Programming contest management system
@@ -319,4 +319,4 @@ def get_task(self, get_statement=True):
 
         logger.info("Task parameters loaded.")
 
-        return task
\ No newline at end of file
+        return task

From 45374dd235a994eb625ba400c3354554620c8a57 Mon Sep 17 00:00:00 2001
From: Angus Ritossa <35321275+AngusRitossa@users.noreply.github.com>
Date: Fri, 6 Jun 2025 22:50:17 +1000
Subject: [PATCH 13/17] Update polygon.py

---
 cmscontrib/loaders/polygon.py | 77 ++++++++++++++++++++++++++++++++---
 1 file changed, 72 insertions(+), 5 deletions(-)

diff --git a/cmscontrib/loaders/polygon.py b/cmscontrib/loaders/polygon.py
index 5332bda517..e302da6462 100644
--- a/cmscontrib/loaders/polygon.py
+++ b/cmscontrib/loaders/polygon.py
@@ -20,6 +20,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import imp
 import logging
 import os
 import json
@@ -42,6 +43,70 @@ def make_timedelta(t):
     return timedelta(seconds=t)
 
 
+LANGUAGE_MAP = {
+    'afrikaans': 'af',
+    'arabic': 'ar',
+    'armenian': 'hy',
+    'azerbaijani': 'az',
+    'belarusian': 'be',
+    'bengali': 'bn',
+    'bosnian': 'bs',
+    'bulgarian': 'bg',
+    'catalan': 'ca',
+    'chinese': 'zh',
+    'croatian': 'hr',
+    'czech': 'cs',
+    'danish': 'da',
+    'dutch': 'nl',
+    'english': 'en',
+    'estonian': 'et',
+    'filipino': 'fil',
+    'finnish': 'fi',
+    'french': 'fr',
+    'georgian': 'ka',
+    'german': 'de',
+    'greek': 'el',
+    'hebrew': 'he',
+    'hindi': 'hi',
+    'hungarian': 'hu',
+    'icelandic': 'is',
+    'indonesian': 'id',
+    'irish': 'ga',
+    'italian': 'it',
+    'japanese': 'ja',
+    'kazakh': 'kk',
+    'korean': 'ko',
+    'kyrgyz': 'ky',
+    'latvian': 'lv',
+    'lithuanian': 'lt',
+    'macedonian': 'mk',
+    'malay': 'ms',
+    'mongolian': 'mn',
+    'norwegian': 'no',
+    'persian': 'fa',
+    'polish': 'pl',
+    'portuguese': 'pt',
+    'romanian': 'ro',
+    'russian': 'ru',
+    'serbian': 'sr',
+    'sinhala': 'si',
+    'slovak': 'sk',
+    'slovene': 'sl',
+    'spanish': 'es',
+    'swedish': 'sv',
+    'tajik': 'tg',
+    'tamil': 'ta',
+    'thai': 'th',
+    'turkish': 'tr',
+    'turkmen': 'tk',
+    'ukrainian': 'uk',
+    'urdu': 'ur',
+    'uzbek': 'uz',
+    'vietnamese': 'vi',
+    'other': 'other',
+}
+
+
 class PolygonTaskLoader(TaskLoader):
     """Load a task stored using the Codeforces Polygon format.
 
@@ -150,11 +215,10 @@ def get_task(self, get_statement=True):
         task_cms_conf = None
         if os.path.exists(task_cms_conf_path):
             logger.info("Found additional CMS options for task %s.", name)
-            import importlib.util
-            spec = importlib.util.spec_from_file_location(
-                'cms_conf', task_cms_conf_path)
-            task_cms_conf = importlib.util.module_from_spec(spec)
-            spec.loader.exec_module(task_cms_conf)
+            with open(task_cms_conf_path, 'rb') as f:
+                task_cms_conf = imp.load_module('cms_conf', f,
+                                                task_cms_conf_path,
+                                                ('.py', 'r', imp.PY_SOURCE))
         if task_cms_conf is not None and hasattr(task_cms_conf, "general"):
             args.update(task_cms_conf.general)
 
@@ -191,6 +255,9 @@ def get_task(self, get_statement=True):
                     os.path.dirname(checker_src), "checker")
                 testlib_path = "/usr/local/include/cms"
                 testlib_include = os.path.join(testlib_path, "testlib.h")
+                if not config.installed:
+                    testlib_path = os.path.join(os.path.dirname(__file__),
+                                                "polygon")
                 code = subprocess.call(["g++", "-x", "c++", "-O2", "-static",
                                         "-DCMS", "-I", testlib_path,
                                         "-include", testlib_include,

From 8640d2f80fe6e73752e5d04639da8ab6bf9271cf Mon Sep 17 00:00:00 2001
From: Angus Ritossa <35321275+AngusRitossa@users.noreply.github.com>
Date: Fri, 6 Jun 2025 22:55:35 +1000
Subject: [PATCH 14/17] Update polygon.py

---
 cmscontrib/loaders/polygon.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/cmscontrib/loaders/polygon.py b/cmscontrib/loaders/polygon.py
index e302da6462..3f8100c5c9 100644
--- a/cmscontrib/loaders/polygon.py
+++ b/cmscontrib/loaders/polygon.py
@@ -20,7 +20,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import imp
 import logging
 import os
 import json
@@ -42,7 +41,6 @@
 def make_timedelta(t):
     return timedelta(seconds=t)
 
-
 LANGUAGE_MAP = {
     'afrikaans': 'af',
     'arabic': 'ar',
@@ -215,10 +213,11 @@ def get_task(self, get_statement=True):
         task_cms_conf = None
         if os.path.exists(task_cms_conf_path):
             logger.info("Found additional CMS options for task %s.", name)
-            with open(task_cms_conf_path, 'rb') as f:
-                task_cms_conf = imp.load_module('cms_conf', f,
-                                                task_cms_conf_path,
-                                                ('.py', 'r', imp.PY_SOURCE))
+            import importlib.util
+            spec = importlib.util.spec_from_file_location(
+                'cms_conf', task_cms_conf_path)
+            task_cms_conf = importlib.util.module_from_spec(spec)
+            spec.loader.exec_module(task_cms_conf)
         if task_cms_conf is not None and hasattr(task_cms_conf, "general"):
             args.update(task_cms_conf.general)
 
@@ -255,9 +254,6 @@ def get_task(self, get_statement=True):
                     os.path.dirname(checker_src), "checker")
                 testlib_path = "/usr/local/include/cms"
                 testlib_include = os.path.join(testlib_path, "testlib.h")
-                if not config.installed:
-                    testlib_path = os.path.join(os.path.dirname(__file__),
-                                                "polygon")
                 code = subprocess.call(["g++", "-x", "c++", "-O2", "-static",
                                         "-DCMS", "-I", testlib_path,
                                         "-include", testlib_include,

From 81bb84bcd0dba5a45007006f91dcf20b728b3505 Mon Sep 17 00:00:00 2001
From: Angus Ritossa <35321275+AngusRitossa@users.noreply.github.com>
Date: Sat, 7 Jun 2025 10:19:24 +1000
Subject: [PATCH 15/17] fix delay time in USACO-style contests

---
 cms/server/contest/phase_management.py | 37 +++++++++++++++++---------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/cms/server/contest/phase_management.py b/cms/server/contest/phase_management.py
index b7f19f1414..d007343a65 100644
--- a/cms/server/contest/phase_management.py
+++ b/cms/server/contest/phase_management.py
@@ -97,17 +97,20 @@ def compute_actual_phase(timestamp, contest_start, contest_stop,
         actual_start = None
         actual_stop = None
 
-        if contest_start <= timestamp <= contest_stop:
+        adjusted_start = contest_start + delay_time
+        adjusted_stop = contest_stop + delay_time + extra_time
+
+        if adjusted_start <= timestamp <= adjusted_stop:
             actual_phase = -1
-            current_phase_begin = contest_start
-            current_phase_end = contest_stop
-        elif timestamp < contest_start:
+            current_phase_begin = adjusted_start
+            current_phase_end = adjusted_stop
+        elif timestamp < adjusted_start:
             actual_phase = -2
             current_phase_begin = None
-            current_phase_end = contest_start
-        elif contest_stop < timestamp:
+            current_phase_end = adjusted_start
+        elif adjusted_stop < timestamp:
             actual_phase = +2
-            current_phase_begin = contest_stop
+            current_phase_begin = adjusted_stop
             current_phase_end = None
         else:
             raise RuntimeError("Logic doesn't seem to be working...")
@@ -117,18 +120,26 @@ def compute_actual_phase(timestamp, contest_start, contest_stop,
             # "Traditional" contest.
             intended_start = contest_start
             intended_stop = contest_stop
+
+            # delay time shifts the window, extra time shifts just the endpoint
+            actual_start = intended_start + delay_time
+            actual_stop = intended_stop + delay_time + extra_time
         else:
             # "USACO-like" contest, and we already know when the user
             # started/will start.
             # Both values are lower- and upper-bounded to prevent the
             # ridiculous situations of starting_time being set by the
             # admin way before contest_start or after contest_stop.
-            intended_start = min(max(starting_time,
-                                     contest_start), contest_stop)
-            intended_stop = min(max(starting_time + per_user_time,
-                                    contest_start), contest_stop)
-        actual_start = intended_start + delay_time
-        actual_stop = intended_stop + delay_time + extra_time
+
+            # delay time shifts the contest_start / contest_end, but it doesn't shift the starting_time (i.e. the time that they press the button)
+            intended_start = min(max(starting_time, contest_start + delay_time),
+                                 contest_stop + delay_time)
+            intended_stop = min(max(starting_time + per_user_time, contest_start + delay_time),
+                                contest_stop + delay_time)
+
+            actual_start = intended_start
+            actual_stop = intended_stop + extra_time
+
 
         assert contest_start <= actual_start <= actual_stop
 

From ae9fc7953df471cd7dcbbcecfc323967dbe25375 Mon Sep 17 00:00:00 2001
From: Angus Ritossa <35321275+AngusRitossa@users.noreply.github.com>
Date: Sat, 7 Jun 2025 10:53:27 +1000
Subject: [PATCH 16/17] Update testlib.h

---
 cmscontrib/loaders/polygon/testlib.h | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/cmscontrib/loaders/polygon/testlib.h b/cmscontrib/loaders/polygon/testlib.h
index 612a439a9d..1a2a53b447 100644
--- a/cmscontrib/loaders/polygon/testlib.h
+++ b/cmscontrib/loaders/polygon/testlib.h
@@ -1919,6 +1919,8 @@ struct InStream
     std::vector<int> readIntegers(int size, int minv, int maxv, const std::string& variablesName = "", int indexBase = 1);
     /* Reads space-separated sequence of integers. */
     std::vector<int> readInts(int size, int minv, int maxv, const std::string& variablesName = "", int indexBase = 1);
+    /* Reads space-separated sequence of integers. */
+    std::vector<int> readInts(int size, int indexBase = 1);
 
     /* 
      * Reads new double. Ignores white-spaces into the non-strict mode 
@@ -2018,6 +2020,13 @@ struct InStream
      * input/answer streams replace any result to FAIL.
      */
     NORETURN void quitf(TResult result, const char* msg, ...);
+
+    /*
+     * Quit-functions aborts program with <result> and <message>:
+     * input/answer streams replace any result to FAIL.
+     */
+    void quitif(bool condition, TResult result, const char *msg, ...);
+
     /* 
      * Quit-functions aborts program with <result> and <message>:
      * input/answer streams replace any result to FAIL.
@@ -2638,6 +2647,16 @@ NORETURN void InStream::quitf(TResult result, const char* msg, ...)
     InStream::quit(result, message.c_str());
 }
 
+#ifdef __GNUC__
+__attribute__ ((format (printf, 4, 5)))
+#endif
+void InStream::quitif(bool condition, TResult result, const char *msg, ...) {
+    if (condition) {
+        FMT_TO_RESULT(msg, msg, message);
+        InStream::quit(result, message.c_str());
+    }
+}
+
 NORETURN void InStream::quits(TResult result, std::string msg)
 {
     InStream::quit(result, msg.c_str());
@@ -3404,6 +3423,10 @@ std::vector<int> InStream::readInts(int size, int minv, int maxv, const std::str
     __testlib_readMany(readInts, readInt(minv, maxv, variablesName), int, true)
 }
 
+std::vector<int> InStream::readInts(int size, int indexBase) {
+    __testlib_readMany(readInts, readInt(), int, true)
+}
+
 std::vector<int> InStream::readIntegers(int size, int minv, int maxv, const std::string& variablesName, int indexBase)
 {
     __testlib_readMany(readIntegers, readInt(minv, maxv, variablesName), int, true)

From 8b4f3e958e07890c4c87c912e5ba7bbaf6a816c5 Mon Sep 17 00:00:00 2001
From: Angus Ritossa <35321275+AngusRitossa@users.noreply.github.com>
Date: Fri, 13 Jun 2025 16:55:37 +1000
Subject: [PATCH 17/17] Update testlib.h

---
 cmscontrib/loaders/polygon/testlib.h | 466 ++++++++++++++++++++-------
 1 file changed, 343 insertions(+), 123 deletions(-)

diff --git a/cmscontrib/loaders/polygon/testlib.h b/cmscontrib/loaders/polygon/testlib.h
index 1a2a53b447..31669c8dc3 100644
--- a/cmscontrib/loaders/polygon/testlib.h
+++ b/cmscontrib/loaders/polygon/testlib.h
@@ -42,22 +42,46 @@
  */
 
 /*
- * Artem Iglikov
- * Alexander Kernozhitsky
- * Andrey Vihrov
+ * Kian Mirjalali:
  *
- * Modifications for Contest Management System (CMS) support:
- *   - Write checker outcome to stdout and message to stderr
- *   - Use special localizable message strings by default
- *   - Adjust checker exit code
- *   - Adjust checker argument order (except in help and comments)
- *   - Add the "CMS" conditional macro for CMS checker format
- *   - Add the "CMS_VERBOSE_FEEDBACK" conditional macro to enable
- *     testlib-style messages
- *   - Interactors are not supported
+ * Modified to be compatible with CMS & requirements for preparing IOI tasks
+ *
+ * * defined FOR_LINUX in order to force linux-based line endings in validators.
+ *
+ * * Changed the ordering of checker arguments
+ *    from <input-file> <output-file> <answer-file>
+ *    to <input-file> <answer-file> <output-file>
+ *
+ * * Added "Security Violation" & "Protocol Violation" as new result types.
+ *
+ * * Changed checker quit behaviors to make it compliant with CMS.
+ *
+ * * The checker exit codes should always be 0 in CMS.
+ *
+ * * For partial scoring, forced quitp() functions to accept only scores in the range [0,1].
+ *   If the partial score is less than 1e-5, it becomes 1e-5, because 0 grades are considered wrong in CMS.
+ *   Grades in range [1e-5, 0.0001) are printed exactly (to prevent rounding to zero).
+ *   Grades in [0.0001, 1] are printed with 4 digits after decimal point.
+ *
+ * * Added the following utility types/variables/functions/methods:
+ *     type HaltListener (as a function with no parameters or return values)
+ *     vector<HaltListener> __haltListeners
+ *     void registerHaltListener(HaltListener haltListener)
+ *     void callHaltListeners()  (which is called in quit)
+ *     void closeOnHalt(FILE* file)
+ *     void closeOnHalt(F& f) (template using f.close())
+ *     void InStream::readSecret(string secret, TResult mismatchResult, string mismatchMessage)
+ *     void InStream::readGraderResult()
+ *         +supporting conversion of graderResult to CMS result
+ *     void quitp(double), quitp(int)
+ *     void registerChecker(string probName, argc, argv)
+ *     void readBothSecrets(string secret)
+ *     void readBothGraderResults()
+ *     void quit(TResult)
+ *     bool compareTokens(string a, string b, char separator=' ')
+ *     void compareRemainingLines(int lineNo=1)
+ *     void skip_ok()
  *
- * Backports:
- *   - 1bcfacc3a97667b38a3aef9d95b97edc6a9db688 (MikeMirzayanov/testlib#79)
  */
 
 /* NOTE: This file contains testlib library for C++.
@@ -82,7 +106,6 @@
  */
 
 const char* latestFeatures[] = {
-                          "Fixed issue #79: fixed missed guard against repeated header include",
                           "Fixed stringstream repeated usage issue",
                           "Fixed compilation in g++ (for std=c++03)",
                           "Batch of println functions (support collections, iterator ranges)",
@@ -154,6 +177,8 @@ const char* latestFeatures[] = {
                           "Added compatibility with Contester (compile with CONTESTER directive)"
                          };
 
+#define FOR_LINUX
+
 #ifdef _MSC_VER
 #define _CRT_SECURE_NO_DEPRECATE
 #define _CRT_SECURE_NO_WARNINGS
@@ -168,6 +193,7 @@ const char* latestFeatures[] = {
 #include <algorithm>
 #undef random
 
+#include <functional>
 #include <cstdio>
 #include <cctype>
 #include <string>
@@ -275,6 +301,14 @@ const char* latestFeatures[] = {
 #   define UNEXPECTED_EOF_EXIT_CODE 8
 #endif
 
+#ifndef SV_EXIT_CODE
+#   define SV_EXIT_CODE 20
+#endif
+
+#ifndef PV_EXIT_CODE
+#   define PV_EXIT_CODE 21
+#endif
+
 #ifndef PC_BASE_EXIT_CODE
 #   ifdef TESTSYS
 #       define PC_BASE_EXIT_CODE 50
@@ -304,7 +338,40 @@ const char* latestFeatures[] = {
 #else
 #   define NORETURN
 #endif
-                   
+
+/**************** HaltListener material ****************/
+#if __cplusplus > 199711L || defined(_MSC_VER)
+typedef std::function<void()> HaltListener;
+#else
+typedef void (*HaltListener)();
+#endif
+
+std::vector<HaltListener> __haltListeners;
+
+inline void registerHaltListener(HaltListener haltListener) {
+    __haltListeners.push_back(haltListener);
+}
+
+inline void callHaltListeners() {
+    // Removing and calling haltListeners in reverse order.
+    while (!__haltListeners.empty()) {
+        HaltListener haltListener = __haltListeners.back();
+        __haltListeners.pop_back();
+        haltListener();
+    }
+}
+
+#if __cplusplus > 199711L || defined(_MSC_VER)
+inline void closeOnHalt(FILE* file) {
+    registerHaltListener([file] { fclose(file); });
+}
+template<typename F>
+inline void closeOnHalt(F& f) {
+    registerHaltListener([&f] { f.close(); });
+}
+#endif
+/*******************************************************/
+
 static char __testlib_format_buffer[16777216];
 static int __testlib_format_buffer_usage_count = 0;
 
@@ -1422,6 +1489,8 @@ enum TResult
     _dirt = 4,
     _points = 5,
     _unexpected_eof = 8,
+    _sv = 10,
+    _pv = 11,
     _partially = 16
 };
 
@@ -1448,8 +1517,8 @@ const std::string outcomes[] = {
     "reserved",
     "unexpected-eof",
     "reserved",
-    "reserved",
-    "reserved",
+    "security-violation",
+    "protocol-violation",
     "reserved",
     "reserved",
     "reserved",
@@ -2052,15 +2121,20 @@ struct InStream
     const static WORD LightCyan = 0x0b;    
     const static WORD LightGreen = 0x0a;    
     const static WORD LightYellow = 0x0e;    
+    const static WORD LightMagenta = 0x0d;    
 
     static void textColor(WORD color);
     static void quitscr(WORD color, const char* msg);
     static void quitscrS(WORD color, std::string msg);
     void xmlSafeWrite(std::FILE * file, const char* msg);
 
+    void readSecret(std::string secret, TResult mismatchResult=_pv, std::string mismatchMessage="Secret mismatch");
+    void readGraderResult();
+
 private:
     InStream(const InStream&);
     InStream& operator =(const InStream&);
+    void quitByGraderResult(TResult result, std::string defaultMessage);
 };
 
 InStream inf;
@@ -2382,6 +2456,8 @@ __attribute__((const))
 #endif
 int resultExitCode(TResult r)
 {
+    if (testlibMode == _checker)
+        return 0;//CMS Checkers should always finish with zero exit code.
     if (r == _ok)
         return OK_EXIT_CODE;
     if (r == _wa)
@@ -2400,6 +2476,10 @@ int resultExitCode(TResult r)
 #else
         return PE_EXIT_CODE;
 #endif
+    if (r == _sv)
+        return SV_EXIT_CODE;
+    if (r == _pv)
+        return PV_EXIT_CODE;
     if (r >= _partially)
         return PC_BASE_EXIT_CODE + (r - _partially);
     return FAIL_EXIT_CODE;
@@ -2433,6 +2513,9 @@ void InStream::textColor(
         case LightYellow:
             fprintf(stderr, "\033[1;33m");
             break;
+        case LightMagenta:
+            fprintf(stderr, "\033[1;35m");
+            break;
         case LightGray:
         default:
             fprintf(stderr, "\033[0m");
@@ -2443,6 +2526,7 @@ void InStream::textColor(
 
 NORETURN void halt(int exitCode)
 {
+    callHaltListeners();
 #ifdef FOOTER
     InStream::textColor(InStream::LightGray);
     std::fprintf(stderr, "Checker: \"%s\"\n", checkerName.c_str());
@@ -2457,6 +2541,14 @@ static bool __testlib_shouldCheckDirt(TResult result)
     return result == _ok || result == _points || result >= _partially;
 }
 
+
+std::string RESULT_MESSAGE_CORRECT = "Output is correct";
+std::string RESULT_MESSAGE_PARTIALLY_CORRECT = "Output is partially correct";
+std::string RESULT_MESSAGE_WRONG = "Output isn't correct";
+std::string RESULT_MESSAGE_SECURITY_VIOLATION = "Security Violation";
+std::string RESULT_MESSAGE_PROTOCOL_VIOLATION = "Protocol Violation";
+std::string RESULT_MESSAGE_FAIL = "Judge Failure; Contact staff!";
+
 NORETURN void InStream::quit(TResult result, const char* msg)
 {
     if (TestlibFinalizeGuard::alive)
@@ -2497,97 +2589,96 @@ NORETURN void InStream::quit(TResult result, const char* msg)
     int pctype = result - _partially;
     bool isPartial = false;
 
-#ifdef CMS
-    inf.close();
-    ouf.close();
-    ans.close();
-    if (tout.is_open())
-        tout.close();
-
-#  define CMS_SUCCESS "success"
-#  define CMS_PARTIAL "partial"
-#  define CMS_WRONG   "wrong"
-#  ifndef CMS_VERBOSE_FEEDBACK
-#    define CMS_MSG(code, text) "translate:" code "\n"
-#  else
-#    define CMS_MSG(code, text) text " %s\n", msg
-#  endif
-
-    if (result == _ok) {
-        std::fprintf(stdout, "1.0\n");
-        std::fprintf(stderr, CMS_MSG(CMS_SUCCESS, "OK"));
-    } else if (result == _wa) {
-        std::fprintf(stdout, "0.0\n");
-        std::fprintf(stderr, CMS_MSG(CMS_WRONG, "Wrong Answer"));
-    } else if (result == _pe) {
-        std::fprintf(stdout, "0.0\n");
-        std::fprintf(stderr, CMS_MSG(CMS_WRONG, "Presentation Error"));
-    } else if (result == _dirt) {
-        std::fprintf(stdout, "0.0\n");
-        std::fprintf(stderr, CMS_MSG(CMS_WRONG, "Wrong Output Format"));
-    } else if (result == _points) {
-        std::string stringPoints(removeDoubleTrailingZeroes(
-            format("%.10f", __testlib_points)));
-        std::fprintf(stdout, "%s\n", stringPoints.c_str());
-        std::fprintf(stderr, CMS_MSG(CMS_PARTIAL, "Partial Score"));
-    } else if (result == _unexpected_eof) {
-        std::fprintf(stdout, "0.0\n");
-        std::fprintf(stderr, CMS_MSG(CMS_WRONG, "Unexpected EOF"));
-    } else if (result >= _partially) {
-        double score = (double)pctype / 200.0;
-        std::fprintf(stdout, "%.3f\n", score);
-        std::fprintf(stderr, CMS_MSG(CMS_PARTIAL, "Partial Score"));
-    } else if (result == _fail) {
-        std::fprintf(stderr, "FAIL %s\n", msg);
-        halt(1);
+    if (testlibMode == _checker) {
+        WORD color;
+        std::string pointsStr = "0";
+        switch (result)
+        {
+        case _ok:
+            pointsStr = format("%d", 1);
+            color = LightGreen;
+            errorName = RESULT_MESSAGE_CORRECT;
+            break;
+        case _wa:
+        case _pe:
+        case _dirt:
+        case _unexpected_eof:
+            color = LightRed;
+            errorName = RESULT_MESSAGE_WRONG;
+            break;
+        case _fail:
+            color = LightMagenta;
+            errorName = RESULT_MESSAGE_FAIL;
+            break;
+        case _sv:
+            color = LightMagenta;
+            errorName = RESULT_MESSAGE_SECURITY_VIOLATION;
+            break;
+        case _pv:
+            color = LightMagenta;
+            errorName = RESULT_MESSAGE_PROTOCOL_VIOLATION;
+            break;
+        case _points:
+            if (__testlib_points < 1e-5)
+                pointsStr = "0.00001"; // Prevent zero scores in CMS as zero is considered wrong
+            else if (__testlib_points < 0.0001)
+                pointsStr = format("%lf", __testlib_points); // Prevent rounding the numbers below 0.0001
+            else
+                pointsStr = format("%.4lf", __testlib_points);
+            color = LightYellow;
+            errorName = RESULT_MESSAGE_PARTIALLY_CORRECT;
+            break;
+        default:
+            if (result >= _partially)
+                quit(_fail, "testlib partially mode not supported");
+            else
+                quit(_fail, "What is the code ??? ");
+        }    
+        std::fprintf(stdout, "%s\n", pointsStr.c_str());
+        quitscrS(color, errorName);
+        std::fprintf(stderr, "\n");
     } else {
-        std::fprintf(stderr, "FAIL unknown result %d\n", (int)result);
-        halt(1);
-    }
-
-    halt(0);
-#endif
-
-    switch (result)
-    {
-    case _ok:
-        errorName = "ok ";
-        quitscrS(LightGreen, errorName);
-        break;
-    case _wa:
-        errorName = "wrong answer ";
-        quitscrS(LightRed, errorName);
-        break;
-    case _pe:
-        errorName = "wrong output format ";
-        quitscrS(LightRed, errorName);
-        break;
-    case _fail:
-        errorName = "FAIL ";
-        quitscrS(LightRed, errorName);
-        break;
-    case _dirt:
-        errorName = "wrong output format ";
-        quitscrS(LightCyan, errorName);
-        result = _pe;
-        break;
-    case _points:
-        errorName = "points ";
-        quitscrS(LightYellow, errorName);
-        break;
-    case _unexpected_eof:
-        errorName = "unexpected eof ";
-        quitscrS(LightCyan, errorName);
-        break;
-    default:
-        if (result >= _partially)
+        switch (result)
         {
-            errorName = format("partially correct (%d) ", pctype);
-            isPartial = true;
+        case _ok:
+            errorName = "ok ";
+            quitscrS(LightGreen, errorName);
+            break;
+        case _wa:
+            errorName = "wrong answer ";
+            quitscrS(LightRed, errorName);
+            break;
+        case _pe:
+            errorName = "wrong output format ";
+            quitscrS(LightRed, errorName);
+            break;
+        case _fail:
+            errorName = "FAIL ";
+            quitscrS(LightRed, errorName);
+            break;
+        case _dirt:
+            errorName = "wrong output format ";
+            quitscrS(LightCyan, errorName);
+            result = _pe;
+            break;
+        case _points:
+            errorName = "points ";
             quitscrS(LightYellow, errorName);
+            break;
+        case _unexpected_eof:
+            errorName = "unexpected eof ";
+            quitscrS(LightCyan, errorName);
+            break;
+        default:
+            if (result >= _partially)
+            {
+                errorName = format("partially correct (%d) ", pctype);
+                isPartial = true;
+                quitscrS(LightYellow, errorName);
+            }
+            else
+                quit(_fail, "What is the code ??? ");
         }
-        else
-            quit(_fail, "What is the code ??? ");
     }
 
     if (resultName != "")
@@ -2647,7 +2738,7 @@ NORETURN void InStream::quitf(TResult result, const char* msg, ...)
     InStream::quit(result, message.c_str());
 }
 
-#ifdef __GNUC__
+#ifdef __GNUC__Add
 __attribute__ ((format (printf, 4, 5)))
 #endif
 void InStream::quitif(bool condition, TResult result, const char *msg, ...) {
@@ -3847,8 +3938,15 @@ NORETURN void quit(TResult result, const char* msg)
     ouf.quit(result, msg);
 }
 
+#ifdef __GNUC__
+__attribute__ ((format (printf, 2, 3)))
+#endif
+NORETURN void quitf(TResult result, const char* format, ...);
+
 NORETURN void __testlib_quitp(double points, const char* message)
 {
+    if (points<0 || points>1)
+        quitf(_fail, "wrong points: %lf, it must be in [0,1]", points);
     __testlib_points = points;
     std::string stringPoints = removeDoubleTrailingZeroes(format("%.10f", points));
 
@@ -3856,13 +3954,15 @@ NORETURN void __testlib_quitp(double points, const char* message)
     if (NULL == message || 0 == strlen(message))
         quitMessage = stringPoints;
     else
-        quitMessage = stringPoints + " " + message;
+        quitMessage = message;
 
     quit(_points, quitMessage.c_str());
 }
 
 NORETURN void __testlib_quitp(int points, const char* message)
 {
+    if (points<0 || points>1)
+        quitf(_fail, "wrong points: %d, it must be in [0,1]", points);
     __testlib_points = points;
     std::string stringPoints = format("%d", points);
 
@@ -3870,7 +3970,7 @@ NORETURN void __testlib_quitp(int points, const char* message)
     if (NULL == message || 0 == strlen(message))
         quitMessage = stringPoints;
     else
-        quitMessage = stringPoints + " " + message;
+        quitMessage = message;
 
     quit(_points, quitMessage.c_str());
 }
@@ -3905,6 +4005,13 @@ NORETURN void quitp(F points, const char* format, ...)
     quitp(points, message);
 }
 
+template<typename F>
+NORETURN void quitp(F points)
+{
+    __testlib_quitp(points, std::string(""));
+}
+
+
 #ifdef __GNUC__
 __attribute__ ((format (printf, 2, 3)))
 #endif
@@ -3943,7 +4050,7 @@ NORETURN void __testlib_help()
     std::fprintf(stderr, "\n");
 
     std::fprintf(stderr, "Program must be run with the following arguments: \n");
-    std::fprintf(stderr, "    <input-file> <output-file> <answer-file> [<report-file> [<-appes>]]\n\n");
+    std::fprintf(stderr, "    <input-file> <answer-file> <output-file> [<report-file> [<-appes>]]\n\n");
 
     std::exit(FAIL_EXIT_CODE);
 }
@@ -4016,10 +4123,6 @@ void registerGen(int argc, char* argv[])
 
 void registerInteraction(int argc, char* argv[])
 {
-#ifdef CMS
-    quit(_fail, "Interactors are not supported");
-#endif
-
     __testlib_ensuresPreconditions();
 
     testlibMode = _interactor;
@@ -4148,7 +4251,7 @@ void registerTestlibCmd(int argc, char* argv[])
     if (argc < 4 || argc > 6)
     {
         quit(_fail, std::string("Program must be run with the following arguments: ") +
-            std::string("<input-file> <output-file> <answer-file> [<report-file> [<-appes>]]") + 
+            std::string("<input-file> <answer-file> <output-file> [<report-file> [<-appes>]]") + 
             "\nUse \"--help\" to get help information");
     }
 
@@ -4169,7 +4272,7 @@ void registerTestlibCmd(int argc, char* argv[])
         if (strcmp("-APPES", argv[5]) && strcmp("-appes", argv[5]))
         {
             quit(_fail, std::string("Program must be run with the following arguments: ") +
-                        "<input-file> <output-file> <answer-file> [<report-file> [<-appes>]]");
+                        "<input-file> <answer-file> <output-file> [<report-file> [<-appes>]]");
         }
         else
         {
@@ -4179,20 +4282,15 @@ void registerTestlibCmd(int argc, char* argv[])
     }
 
     inf.init(argv[1], _input);
-#ifdef CMS
-    ouf.init(argv[3], _output);
     ans.init(argv[2], _answer);
-#else
-    ouf.init(argv[2], _output);
-    ans.init(argv[3], _answer);
-#endif
+    ouf.init(argv[3], _output);
 }
 
 void registerTestlib(int argc, ...)
 {
     if (argc  < 3 || argc > 5)
         quit(_fail, std::string("Program must be run with the following arguments: ") +
-            "<input-file> <output-file> <answer-file> [<report-file> [<-appes>]]");
+            "<input-file> <answer-file> <output-file> [<report-file> [<-appes>]]");
 
     char** argv = new char*[argc + 1];
     
@@ -4591,6 +4689,8 @@ NORETURN void expectedButFound<long double>(TResult result, long double expected
     __testlib_expectedButFound(result, double(expected), double(found), prepend.c_str());
 }
 
+#endif
+
 #if __cplusplus > 199711L || defined(_MSC_VER)
 template <typename T>
 struct is_iterable
@@ -4780,4 +4880,124 @@ void println(const A& a, const B& b, const C& c, const D& d, const E& e, const F
     std::cout << std::endl;
 }
 #endif
-#endif
+
+
+
+void registerChecker(std::string probName, int argc, char* argv[])
+{
+    setName("checker for problem %s", probName.c_str());
+    registerTestlibCmd(argc, argv);
+}
+
+
+
+const std::string _grader_OK = "OK";
+const std::string _grader_SV = "SV";
+const std::string _grader_PV = "PV";
+const std::string _grader_WA = "WA";
+const std::string _grader_FAIL = "FAIL";
+
+
+void InStream::readSecret(std::string secret, TResult mismatchResult, std::string mismatchMessage)
+{
+    if (readWord() != secret)
+        quits(mismatchResult, mismatchMessage);
+    eoln();
+}
+
+void readBothSecrets(std::string secret)
+{
+    ans.readSecret(secret, _fail, "Secret mismatch in the (correct) answer file");
+    ouf.readSecret(secret, _pv, "Possible tampering with the output");
+}
+
+
+void InStream::quitByGraderResult(TResult result, std::string defaultMessage)
+{
+    std::string msg = "";
+    if (!eof())
+        msg = readLine();
+    if (msg.empty())
+        quits(result, defaultMessage);
+    quits(result, msg);
+}
+
+void InStream::readGraderResult()
+{
+    std::string result = readWord();
+    eoln();
+    if (result == _grader_OK)
+        return;
+    if (result == _grader_SV)
+        quitByGraderResult(_sv, "Security violation detected in grader");
+    if (result == _grader_PV)
+        quitByGraderResult(_pv, "Protocol violation detected in grader");
+    if (result == _grader_WA)
+        quitByGraderResult(_wa, "Wrong answer detected in grader");
+    if (result == _grader_FAIL)
+        quitByGraderResult(_fail, "Failure in grader");
+    quitf(_fail, "Unknown grader result");
+}
+
+void readBothGraderResults()
+{
+    ans.readGraderResult();
+    ouf.readGraderResult();
+}
+
+
+NORETURN void quit(TResult result)
+{
+    ouf.quit(result, "");
+}
+
+/// Used in validators: skips the rest of input, assuming it to be correct
+NORETURN void skip_ok()
+{
+    if (testlibMode != _validator)
+        quitf(_fail, "skip_ok() only works in validators");
+    testlibFinalizeGuard.quitCount++;
+    halt(0);
+}
+
+/// 1 -> 1st, 2 -> 2nd, 3 -> 3rd, 4 -> 4th, ...
+std::string englishTh(int x)
+{
+    char c[100];
+    sprintf(c, "%d%s", x, englishEnding(x).c_str());
+    return c;
+}
+
+/// Compares the tokens of two lines
+void compareTokens(int lineNo, std::string a, std::string b, char separator=' ')
+{
+    std::vector<std::string> toka = tokenize(a, separator);
+    std::vector<std::string> tokb = tokenize(b, separator);
+    if (toka == tokb)
+        return;
+    std::string dif = format("%s lines differ - ", englishTh(lineNo).c_str());
+    if (toka.size() != tokb.size())
+        quitf(_wa, "%sexpected: %d tokens, found %d tokens", dif.c_str(), int(toka.size()), int(tokb.size()));
+    for (int i=0; i<int(toka.size()); i++)
+        if (toka[i] != tokb[i])
+            quitf(_wa, "%son the %s token, expected: '%s', found: '%s'", dif.c_str(), englishTh(i+1).c_str(), compress(toka[i]).c_str(), compress(tokb[i]).c_str());
+    quitf(_fail, "%sbut I don't know why!", dif.c_str());
+}
+
+/// Compares the tokens of the remaining lines
+NORETURN void compareRemainingLines(int lineNo=1)
+{
+    for (; !ans.eof(); lineNo++) 
+    {
+        std::string j = ans.readString();
+
+        if (j == "" && ans.eof())
+          break;
+        
+        std::string p = ouf.readString();
+
+        compareTokens(lineNo, j, p);
+    }
+    quit(_ok);
+}
+