Various fixes

Author: jsannemo

deploy/host.yml

@@ -18,6 +18,4 @@
       src: ./packages/omogenjudge-host.deb
       dest: omogenjudge-host.deb
   - name: Install omogenjudge-host.deb
-    ansible.builtin.apt:
-      deb: omogenjudge-host.deb
-      state: present
+    ansible.builtin.command: sudo dpkg -i omogenjudge-host.deb

judgehost/judgehost/eval.go

@@ -23,13 +23,17 @@ var langMap = map[string]apipb.LanguageGroup{
 	"ruby":    apipb.LanguageGroup_RUBY,
 	"rust":    apipb.LanguageGroup_RUST,
 	"java":    apipb.LanguageGroup_JAVA,
-	"csharp":   apipb.LanguageGroup_CSHARP,
+	"csharp":  apipb.LanguageGroup_CSHARP,
 }
 
 type submissionJson struct {
 	Files map[string]string
 }
 
+type includedCodeJson struct {
+	FilesByLanguage map[string]map[string]string `json:"files_by_language"`
+}
+
 var evalMutex sync.Mutex
 
 func toStorageVerdict(verdict apipb.Verdict) storage.Verdict {
@@ -62,18 +66,27 @@ func evaluate(runId int64) error {
 	}
 	lang, ok := langMap[run.Submission.Language]
 	if !ok {
-        return fmt.Errorf("run has unknown language %s", run.Submission.Language)
+		return fmt.Errorf("run has unknown language %s", run.Submission.Language)
 	}
 	program := &apipb.Program{
 		Language: lang,
 	}
 	submissionFiles := submissionJson{}
-	err := json.Unmarshal(run.Submission.SubmissionFiles, &submissionFiles)
-	if err != nil {
+	if err := json.Unmarshal(run.Submission.SubmissionFiles, &submissionFiles); err != nil {
 		return err
 	}
+	includedCode := includedCodeJson{}
+	if err := json.Unmarshal(run.ProblemVersion.IncludedFiles, &includedCode); err != nil {
+		return err
+	}
+	logger.Infof("Lang: %v, included code:", run.Submission.Language, includedCode)
+	extraFiles := includedCode.FilesByLanguage[run.Submission.Language]
+
 	logger.Infof("Files: %v", submissionFiles)
 	for path, content := range submissionFiles.Files {
+		if _, hasExtraFile := extraFiles[path]; hasExtraFile {
+			continue
+		}
 		content, err := base64.StdEncoding.DecodeString(content)
 		if err != nil {
 			return err
@@ -83,6 +96,15 @@ func evaluate(runId int64) error {
 			Contents: content,
 		})
 	}
+
+	logger.Infof("Extra files: %v", extraFiles)
+	for path, content := range extraFiles {
+		program.Sources = append(program.Sources, &apipb.SourceFile{
+			Path:     filepath.Base(path),
+			Contents: []byte(content),
+		})
+	}
+
 	// In case we retry judging of the run, put it in a new folder instead to avoid collisions
 	subRoot := fmt.Sprintf("/var/lib/omogen/submissions/%d-%d", runId, time.Now().Unix())
 	compile, err := eval.Compile(program, filepath.Join(subRoot, "compile"))

omogenjudge/contests/active_contest.py

@@ -34,20 +34,21 @@ def process_view(self, request: OmogenRequest, view_func, view_args, view_kwargs
                     request.contest_site = True
             except Contest.DoesNotExist:
                 request.contest = None
+        if request.contest:
+            request.team = contest_team_for_user(request.contest, request.user)
 
 
 def contest_context(request: OmogenRequest) -> dict[str, typing.Any]:
     if request.contest:
         contest = request.contest
-        team = contest_team_for_user(contest, request.user)
         ctx: dict[str, typing.Any] = {
             'contest': contest,
             'all_contest_problems': SimpleLazyObject(lambda: contest_problems(contest)),
-            'contest_team': team,
-            'contest_started': contest_has_started_for_team(contest, team),
-            'contest_ended': contest_has_ended_for_team(contest, team),
+            'contest_team': request.team,
+            'contest_started': contest_has_started_for_team(contest, request.team),
+            'contest_ended': contest_has_ended_for_team(contest, request.team),
         }
-        if not team_can_view_problems(contest, team):
+        if not team_can_view_problems(contest, request.team):
             ctx['contest_problems'] = []
         else:
             ctx['contest_problems'] = SimpleLazyObject(lambda: contest_problems(contest))

omogenjudge/contests/permissions.py

@@ -7,4 +7,4 @@
 def team_can_view_problems(contest: Contest, team: Optional[Team]) -> bool:
     if not contest.published:
         return False
-    return contest_has_started_for_team(contest, team)
+    return contest_has_started_for_team(contest, team)

omogenjudge/contests/scoreboard.py

@@ -177,6 +177,10 @@ def _contest_submissions(self, team: Team, submissions: list[Submission]) -> lis
                 contest_submissions.append(submission)
         return contest_submissions
 
+    @property
+    def has_penalty(self):
+        return NotImplementedError
+
 
 def _subtask_runs(group_runs: List[SubmissionGroupRun], subtasks: int):
     # First run is sample; assume all other subtasks have depth 1
@@ -228,6 +232,10 @@ def _process_problem(self, submissions: List[Submission], scoreboard_problem: Sc
     def _team_sort_key(self, team):
         return -team.total_score, team.tiebreak
 
+    @property
+    def has_penalty(self):
+        return False
+
 
 class BinaryWithPenalty(ScoreboardMaker):
 
@@ -255,11 +263,15 @@ def _process_problem(self, submissions: List[Submission], scoreboard_problem: Sc
                 problem_result.problem_score += 1
                 if start_time:
                     seconds = math.floor((sub.date_created - start_time).total_seconds())
-                    problem_result.tiebreak = -failures * 20 + seconds // 60
+                    problem_result.tiebreak = failures * 20 + seconds // 60
             else:
                 failures += 1
         return problem_result
 
+    @property
+    def has_penalty(self):
+        return True
+
 
 _SCOREBOARDS: Dict[ScoringType, Type[ScoreboardMaker]] = {
     ScoringType.BINARY_WITH_PENALTY: BinaryWithPenalty,

omogenjudge/frontend/accounts/login.py

@@ -149,13 +149,20 @@ def github_auth(request: OmogenRequest) -> HttpResponse:
         response = requests.post("https://github.com/login/oauth/access_token", data=request_params)
         response.raise_for_status()
         client.parse_request_body_response(response.text)
-        uri, headers, body = client.add_token("https://api.github.com/user", "get", )
 
+        uri, headers, body = client.add_token("https://api.github.com/user", "get", )
         user_details = requests.get(uri, data=body, headers=headers).json()
         username = user_details["login"]
-        email = user_details["email"]
         full_name = user_details.get("name")
-        return oauth_login(request, username, email, full_name)
+
+        uri, headers, body = client.add_token("https://api.github.com/user/emails", "get", )
+        emails = requests.get(uri, data=body, headers=headers).json()
+        for email in emails:
+            if email["primary"] and email["verified"]:
+                return oauth_login(request, username, email["email"], full_name)
+        messages.error(request, "You need to verify your primary email on your Github account to log in.")
+        return redirect("login")
+
     else:
         url, _, _ = client.prepare_authorization_request(
             "https://github.com/login/oauth/authorize",

omogenjudge/frontend/jinja2/accounts/register.html

@@ -16,7 +16,7 @@
                     {% if social_logins %}
                         <hr>
                         <div class="text-center">
-                            {{ social.signins(social_logins) }}
+                            {{ social.social_logins(social_logins) }}
                         </div>
                     {% endif %}
                 </div>

omogenjudge/frontend/jinja2/problems/view_problem.html

@@ -22,10 +22,17 @@
         onload="
         document.querySelectorAll('.tex2jax_process').forEach(
             el => renderMathInElement(el, { delimiters: [
-              {left: '$', right: '$', display: false},
               {left: '$$', right: '$$', display: true},
+              {left: '$', right: '$', display: false},
               {left: '\\(', right: '\\)', display: false},
               {left: '\\[', right: '\\]', display: true},
+              {left: '\\begin{equation}', right: '\\end{equation}', display: true},
+              {left: '\\begin{equation*}', right: '\\end{equation*}', display: true},
+              {left: '\\begin{align}', right: '\\end{align}', display: true},
+              {left: '\\begin{align*}', right: '\\end{align*}', display: true},
+              {left: '\\begin{alignat}', right: '\\end{alignat}', display: true},
+              {left: '\\begin{gather}', right: '\\end{gather}', display: true},
+              {left: '\\begin{CD}', right: '\\end{CD}', display: true},
           ],
           ignoredClasses: ['*']
         }));
@@ -57,9 +64,19 @@ <h6 class="card-subtitle text-muted">
                 </div>
                 {% endif %}
             </div>
-            <div class="card-body problemstatement">
-                {{ statement_html | safe }}
-            </div>
+            <ul class="list-group list-group-flush">
+                {% if attachments %}
+                <li class="list-group-item">
+                    <strong>Attachments:</strong>
+                    {% for name, url in attachments %}
+                        <a href="{{url}}" class="text-decoration-none">{{name}}</a>
+                    {% endfor %}
+                </li>
+                {% endif %}
+                <li class="list-group-item problemstatement">
+                    {{ statement_html | safe }}
+                </li>
+            </ul>
             <div class="card-footer d-flex justify-content-between">
                 {% if statement_authors %}
                 <span>
@@ -74,7 +91,7 @@ <h6 class="card-subtitle text-muted">
                     {% else %}
                         License: {{ statement_license.display() }}
                     {% endif %}
-                    </span>
+                </span>
             </div>
         </div>
     </div>

omogenjudge/frontend/jinja2/scoreboard/view_scoreboard.html

@@ -57,7 +57,7 @@ <h1 class="text-center">{{ contest.title }}</h1>
                             {% endif %}
                         {% endfor %}
                         <th class="text-center" style="width: 5em">Score</th>
-                        {% if contest.start_time %}
+                        {% if scoreboard.has_penalty %}
                             <th class="text-center" style="width: 4em"
                                     {% if contest.scoring_type == 'scoring' %}
                                 data-bs-toggle="tooltip" data-bs-placement="right"
@@ -69,7 +69,13 @@ <h1 class="text-center">{{ contest.title }}</h1>
                     {% endif %}
                 </tr>
                 </thead>
+                {% set sc = namespace(upsolving_section = False, has_regular_team = False) %}
                 {% for team in scoreboard.scoreboard_teams %}
+                    {% set sc.has_regular_team = sc.has_regular_team or team.rank %}
+                    {% if sc.has_regular_team and not sc.upsolving_section and not team.rank %}
+                        <tr class="bg-opacity-10 bg-dark"><td colspan="1000"></td></tr>
+                    {% endif %}
+                    {% set sc.upsolving_section = not team.rank %}
                     <tr
                             id="rank-{{ loop.index0 }}"
                             {% if user.is_authenticated and loop.index0 == scoreboard.user_to_rank[user.account_id] %}
@@ -133,8 +139,12 @@ <h1 class="text-center">{{ contest.title }}</h1>
                                 </td>
                             {% endfor %}
                             <td class="text-center">{{ formatting.format_score(team.total_score) }}</td>
-                            {% if contest.start_time %}
-                                <td class="text-center">{{ scoreboard.format_tiebreak(team.tiebreak) }}</td>
+                            {% if scoreboard.has_penalty %}
+                                <td class="text-center">
+                                    {% if team.virtual or (contest.start_time and not team.practice) %}
+                                    {{ scoreboard.format_tiebreak(team.tiebreak) }}
+                                    {% endif %}
+                                </td>
                             {% endif %}
                         {% endif %}
                     </tr>

omogenjudge/frontend/js_context.py

@@ -20,7 +20,7 @@ class JsContext:
 def js_context(request: OmogenRequest) -> Dict[str, str]:
     contest = request.contest
     if contest:
-        team = contest_team_for_user(contest, request.user)
+        team = request.team
         return {
             'js_context':
                 json.dumps(dataclasses.asdict(JsContext(