Merge branch 'main' into fix-interactive-hang

Author: veluca93

cms/server/contest/authentication.py

@@ -123,8 +123,11 @@ def log_failed_attempt(msg, *args):
         return None, None
 
     if admin_token != "":
-        if (config.contest_web_server.contest_admin_token is not None
-            and admin_token != config.contest_web_server.contest_admin_token):
+        if config.contest_web_server.contest_admin_token is None:
+            log_failed_attempt("admin token not configured")
+            return None, None
+
+        if admin_token != config.contest_web_server.contest_admin_token:
             log_failed_attempt("invalid admin token")
             return None, None
 

cmstestsuite/unit_tests/server/contest/authentication_test.py

@@ -165,6 +165,10 @@ def test_successful_impersonation(self):
     def test_unsuccessful_impersonation(self):
         self.assertFailure("myuser", "", "127.0.0.1", "bad-admin-token")
 
+    def test_impersonation_with_no_config(self):
+        with patch.object(config.contest_web_server, "contest_admin_token", None):
+            self.assertFailure("myuser", "", "127.0.0.1", "admin-token")
+
     def test_impersonation_overrides_unallowed_password_authentication(self):
         self.contest.allow_password_authentication = False