Windows

.gitignore

@@ -8,6 +8,7 @@ kjudge.db.bak
 kjudge.db-*
 
 /kjudge
+/kjudge.exe
 /templates
 /keys
 /embed/templates

cmd/kjudge/main.go

@@ -18,7 +18,7 @@ import (
 
 var (
 	dbfile      = flag.String("file", "kjudge.db", "Path to the database file.")
-	sandboxImpl = flag.String("sandbox", "isolate", "The sandbox implementation to be used (isolate, raw). If anything other than 'raw' is given, isolate is used.")
+	sandboxImpl = flag.String("sandbox", "isolate", "The sandbox implementation to be used (isolate, raw). Defaults to isolate.")
 	port        = flag.Int("port", 8088, "The port for the server to listen on.")
 
 	httpsDir = flag.String("https", "", "Path to the directory where the HTTPS private key (kjudge.key) and certificate (kjudge.crt) is located. If omitted or empty, HTTPS is disabled.")
@@ -34,11 +34,14 @@ func main() {
 	defer db.Close()
 
 	var sandbox worker.Sandbox
-	if *sandboxImpl == "raw" {
-		log.Println("'raw' sandbox selected. WE ARE NOT RESPONSIBLE FOR ANY BREAKAGE CAUSED BY FOREIGN CODE.")
-		sandbox = &raw.Sandbox{}
-	} else {
-		sandbox = isolate.New()
+	switch *sandboxImpl {
+		case "raw":
+			log.Println("'raw' sandbox selected. WE ARE NOT RESPONSIBLE FOR ANY BREAKAGE CAUSED BY FOREIGN CODE.")
+			sandbox = &raw.Sandbox{}
+		case "isolate":
+			sandbox = isolate.New()
+		default:
+			log.Fatalf("Sandbox %s doesn't exists or not yet implemented.", *sandboxImpl);
 	}
 
 	// Start the queue
@@ -58,9 +61,9 @@ func main() {
 	go queue.Start()
 	go startServer(server)
 
-	<-stop
+	received_signal := <- stop
 
-	log.Println("Shutting down")
+	log.Printf("Shutting down on receiving %s", received_signal)
 }
 
 func startServer(server *server.Server) {

db/migrations.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"io/fs"
 	"log"
-	"path"
+	"path/filepath"
 	"regexp"
 	"sort"
 
@@ -44,7 +44,7 @@ func (db *DB) migrate() error {
 
 	// Do migrations one by one
 	for _, name := range versions {
-		sqlFile := path.Join(assetsSql, name+".sql")
+		sqlFile := filepath.Join(assetsSql, name+".sql")
 		file, err := fs.ReadFile(embed.Content, sqlFile)
 		if err != nil {
 			return errors.Wrapf(err, "File %s", sqlFile)

embed/embed_dev.go

@@ -16,16 +16,16 @@ var Content fs.FS
 func init() {
 	wd, err := os.Getwd()
 	if err != nil {
-		log.Panicf("cannot get current directory: %v", err)
+		log.Panicf("Cannot get current directory: %v", err)
 	}
 
 	embedDir := filepath.Join(wd, "embed")
 	stat, err := os.Stat(embedDir)
 	if err != nil {
-		log.Panicf("cannot stat embed directory: %v", err)
+		log.Panicf("Cannot stat embed directory: %v", err)
 	}
 	if !stat.IsDir() {
-		log.Panicf("embed directory is not a directory: %s", embedDir)
+		log.Panicf("Embed directory is not a directory: %s", embedDir)
 	}
 
 	log.Printf("[dev] serving embedded content from %s", embedDir)

frontend/package.json

@@ -29,7 +29,8 @@
         "test": "echo No tests... yet",
         "fmt": "prettier \"css/**/*\" \"ts/**/*\" \"*.json\" \"*.js\"",
         "dev": "parcel watch \"html/**/*.html\"",
-        "build": "mkdir -p ../embed/templates && rm -rf ../embed/templates/* && parcel build --no-source-maps --no-cache \"html/**/*.html\""
+        "build": "mkdir -p ../embed/templates && rm -rf ../embed/templates/* && parcel build --no-source-maps --no-cache \"html/**/*.html\"",
+        "build:windows": "pwsh --command ../scripts/windows/frontend_build.ps1"
     },
     "alias": {
         "react": "preact/compat",

models/generate/main.go

@@ -7,6 +7,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"sort"
 	"strings"
 	"text/template"
@@ -331,14 +332,26 @@ func init() {
 	template.Must(t.Parse(FileTemplate))
 }
 
+func removeLeftoverGeneratedFiles() {
+	files, err := filepath.Glob("models/*_generated.go")
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	for _, file := range files {
+		if err := os.Remove(file); err != nil {
+			log.Fatal(err);
+		}
+	}
+}
+
 func main() {
 	var tables TomlTables
 	if _, err := toml.DecodeFile("models/models.toml", &tables); err != nil {
 		log.Fatal(err)
 	}
-	if err := exec.Command("rm", "-fv", "models/*_generated.go").Run(); err != nil {
-		log.Fatal(err)
-	}
+	removeLeftoverGeneratedFiles()
+
 	files := []string{"-w"} // This is actually goimports's parameters.
 	for name, fields := range tables {
 		table := TableFromToml(tables, name, fields)

models/rejudge.go

@@ -20,7 +20,7 @@ func batchScoreJobs(subIDs ...int) []*Job {
 
 // Remove the submission's `score`, `penalty` and `verdict`.
 func resetScore(db db.DBContext, subIDs ...int) error {
-	query, params, err := sqlx.In(`UPDATE submissions SET score = NULL, penalty = NULL, verdict = "..." WHERE id IN (?)`, subIDs)
+	query, params, err := sqlx.In(`UPDATE submissions SET score = NULL, penalty = NULL, verdict = `+VerdictIsInQueue+`WHERE id IN (?)`, subIDs)
 	if err != nil {
 		return errors.WithStack(err)
 	}

models/scoreboard.go

@@ -4,6 +4,7 @@ import (
 	"encoding/csv"
 	"fmt"
 	"io"
+	"log"
 	"sort"
 	"time"
 
@@ -134,25 +135,30 @@ func (s *Scoreboard) JSON() JSONScoreboard {
 // Returns (comparison, is it just tie-breaking)
 func compareUserRanking(userResult []*UserResult, contestType ContestType, i, j int) (bool, bool) {
 	a, b := userResult[i], userResult[j]
-	if contestType == ContestTypeWeighted {
-		// sort based on totalScore if two users have same totalScore sort based on totalPenalty in an ascending order
-		if a.TotalScore != b.TotalScore {
-			return a.TotalScore > b.TotalScore, false
-		}
-		if a.TotalPenalty != b.TotalPenalty {
-			return a.TotalPenalty < b.TotalPenalty, false
-		}
-		return a.User.ID < b.User.ID, true
-	} else {
-		// sort based on solvedProblems if two users have same solvedProblems sort based on totalPenalty in an ascending order
-		if a.SolvedProblems != b.SolvedProblems {
-			return a.SolvedProblems > b.SolvedProblems, false
-		}
-		if a.TotalPenalty != b.TotalPenalty {
-			return a.TotalPenalty < b.TotalPenalty, false
-		}
-		return a.User.ID < b.User.ID, true
+	switch contestType {
+		case ContestTypeWeighted:
+			// sort based on totalScore if two users have same totalScore sort based on totalPenalty in an ascending order
+			if a.TotalScore != b.TotalScore {
+				return a.TotalScore > b.TotalScore, false
+			}
+			if a.TotalPenalty != b.TotalPenalty {
+				return a.TotalPenalty < b.TotalPenalty, false
+			}
+			return a.User.ID < b.User.ID, true
+		case ContestTypeUnweighted:
+			// sort based on solvedProblems if two users have same solvedProblems sort based on totalPenalty in an ascending order
+			if a.SolvedProblems != b.SolvedProblems {
+				return a.SolvedProblems > b.SolvedProblems, false
+			}
+			if a.TotalPenalty != b.TotalPenalty {
+				return a.TotalPenalty < b.TotalPenalty, false
+			}
+			return a.User.ID < b.User.ID, true
 	}
+	// in no case should this path be reached
+	// this just stays here in case someone implements a custom contest type
+	log.Panicf("Contest type %s does not exists or not yet implemented", contestType)
+	return true, true
 }
 
 // Get scoreboard given problems and contest

models/submissions.go

@@ -24,6 +24,13 @@ const (
 	LanguageRust Language = "rustc"
 )
 
+const (
+	VerdictCompileError = "Compile Error"
+	VerdictScored       = "Scored"
+	VerdictAccepted     = "Accepted"
+	VerdictIsInQueue    = "..."
+)
+
 var availableLanguages []string
 
 // LanguageByExt returns a language based on the file extension.

scripts/windows/frontend_build.ps1

@@ -0,0 +1,5 @@
+$ErrorActionPreference = "Stop"
+
+New-Item -Type Directory -Force ../embed/templates | Out-Null
+Remove-Item -Recurse -Force ../embed/templates/*
+parcel build --no-source-maps --no-cache "html/**/*.html"

scripts/windows/gen_cert.ps1

@@ -0,0 +1,100 @@
+<#
+.SYNOPSIS
+    Generate self-signed SSL certificate
+.DESCRIPTION
+    cert generation environment variables:
+    - OPENSSL_PATH  [openssl]                      Path to openssl.exe
+    - RSA_BITS      [4096]                         Strength of the RSA key.
+    - CERT_C        [JP]                           Certificate country code
+    - CERT_ST       [Moonland]                     Certificate State
+    - CERT_L        [Kagamitown]                   Certificate Locality
+    - CERT_O        [nki inc.]                     Certificate Organization Name
+    - CERT_CN       [kjudge]                       Certificate Common name
+    - CERT_EMAIL    [[email protected]]               Certificate Email address
+    - CERT_ALTNAMES [IP:127.0.0.1,DNS:localhost]   A list of hosts that kjudge will be listening on, either by IP (as 'IP:1.2.3.4') or DNS (as 'DNS:google.com'), separated by ','"
+.PARAMETER TargetDir
+    Target directory to export generated SSL certificate
+#>
+
+Param (
+    [Parameter(
+        Mandatory,
+        HelpMessage = "Target directory to export generated SSL certificate",
+        Position = 0
+    )] [System.IO.FileInfo] $TargetDir
+)
+
+# Break on first error
+$ErrorActionPreference = "Stop"
+
+$OPENSSL_PATH = $Env:OPENSSL_PATH ?? "openssl"
+Write-Host "OpenSSL Path: $OPENSSL_PATH"
+
+$CERT_C = $Env:CERT_C ?? "JP" # Country code
+$CERT_ST = $Env:CERT_ST ?? "Moonland" # State
+$CERT_L = $Env:CERT_L ?? "Kagamitown" # Locality
+$CERT_O = $Env:CERT_O ?? "nki inc." # Organization Name
+$CERT_CN = $Env:CERT_CN ?? "kjudge" # Common name
+$CERT_EMAIL = $Env:CERT_EMAIL ?? "[email protected]" # Email address
+$CERT_ALTNAMES = $Env:CERT_ALTNAMES ?? "IP:127.0.0.1,DNS:localhost" # Alt hosts
+
+# All information
+$CERT_SUBJ = "/C=$CERT_C/ST=$CERT_ST/L=$CERT_L/O=$CERT_O/CN=$CERT_CN/emailAddress=$CERT_EMAIL"
+$CERT_EXT = "subjectAltName = $CERT_ALTNAMES"
+
+$RSA_BITS = $Env:RSA_BITS ?? 4096 # RSA bits
+
+# Paths
+$ROOT_DIR = $TargetDir
+
+$CERT_GPATH = [IO.Path]::Combine($ROOT_DIR, '.certs_generated')
+$ROOT_KEY = [IO.Path]::Combine($ROOT_DIR, "root.key")
+$ROOT_CERT = [IO.Path]::Combine($ROOT_DIR, "root.pem")
+
+$KJUDGE_KEY = [IO.Path]::Combine($ROOT_DIR, "kjudge.key")
+$KJUDGE_CERT = [IO.Path]::Combine($ROOT_DIR, "kjudge.crt")
+$KJUDGE_CSR = [IO.Path]::Combine($ROOT_DIR, "kjudge.csr")
+
+Write-Host "Key info:"
+Write-Host "- Country code = $CERT_C"
+Write-Host "- State = $CERT_ST"
+Write-Host "- Locality = $CERT_L"
+Write-Host "- Organization Name = $CERT_O"
+Write-Host "- Common name = $CERT_CN"
+Write-Host "- Email address = $CERT_EMAIL"
+Write-Host "- Alt hosts = $CERT_ALTNAMES"
+
+Function generateKey {
+    If ([System.IO.File]::Exists([IO.Path]::Combine($ROOT_DIR, ".certs_generated"))){
+        Write-Host "Certificate has already been generated."
+        return 0
+    }
+    Write-Host "Generating root private key to $ROOT_KEY"
+    openssl genrsa -out "$ROOT_KEY" "$RSA_BITS"
+
+    Write-Host "Generating a root certificate authority to $ROOT_CERT"
+    openssl req -x509 -new -key "$ROOT_KEY" -days 1285 -out "$ROOT_CERT" `
+        -subj "$CERT_SUBJ"
+
+    Write-Host "Generating a sub-key for kjudge to $KJUDGE_KEY"
+    openssl genrsa -out "$KJUDGE_KEY" "$RSA_BITS"
+
+    Write-Host "Generating a certificate signing request to $KJUDGE_CSR"
+    openssl req -new -key "$KJUDGE_KEY" -out "$KJUDGE_CSR" `
+        -subj "$CERT_SUBJ" -addext "$CERT_EXT"
+
+    Write-Host "Generating a certificate signature to $KJUDGE_CERT"
+    Write-Output "[v3_ca]\n%s\n" "$CERT_EXT" | openssl x509 -req -days 730 `
+        -in "$KJUDGE_CSR" `
+        -CA "$ROOT_CERT" -CAkey "$ROOT_KEY" -CAcreateserial `
+        -extensions v3_ca -extfile - `
+        -out "$KJUDGE_CERT"
+
+    Write-Host "Certificate generation complete."
+    Out-File -FilePath "$CERT_GPATH"
+}
+generateKey
+
+Write-Host "To re-generate the keys, delete " "$CERT_GPATH"
+Write-Host "Please keep $ROOT_KEY and $KJUDGE_KEY secret, while distributing" `
+    "$ROOT_CERT as the certificate authority."

scripts/windows/generate.ps1

@@ -0,0 +1,8 @@
+$ErrorActionPreference = "Stop"
+
+Set-Location .\frontend
+yarn
+yarn run --prod build:windows
+Set-Location ..
+
+go generate

scripts/windows/production_build.ps1

@@ -0,0 +1,6 @@
+$ErrorActionPreference = "Stop"
+
+& "scripts\windows\generate.ps1"
+
+# Build
+go build -tags "production" -o kjudge.exe cmd/kjudge/main.go

server/admin/submission.go

@@ -11,7 +11,6 @@ import (
 	"github.com/natsukagami/kjudge/db"
 	"github.com/natsukagami/kjudge/models"
 	"github.com/natsukagami/kjudge/server/httperr"
-	"github.com/natsukagami/kjudge/worker"
 	"github.com/pkg/errors"
 )
 
@@ -104,7 +103,7 @@ func (g *Group) SubmissionVerdictGet(c echo.Context) error {
 	if err != nil {
 		return err
 	}
-	if ctx.Submission.Verdict == "..." || ctx.Submission.Verdict == worker.VerdictCompileError {
+	if ctx.Submission.Verdict == models.VerdictIsInQueue || ctx.Submission.Verdict == models.VerdictCompileError {
 		return c.JSON(http.StatusOK, map[string]interface{}{
 			"verdict": ctx.Submission.Verdict,
 		})

server/contests/problem.go

@@ -164,7 +164,7 @@ func (g *Group) SubmitPost(c echo.Context) error {
 		Source:      source,
 		Language:    lang,
 		SubmittedAt: now,
-		Verdict:     "...",
+		Verdict:     models.VerdictIsInQueue,
 	}
 
 	if err := sub.Write(tx); err != nil {

server/contests/submission.go

@@ -9,7 +9,6 @@ import (
 	"github.com/natsukagami/kjudge/db"
 	"github.com/natsukagami/kjudge/models"
 	"github.com/natsukagami/kjudge/server/httperr"
-	"github.com/natsukagami/kjudge/worker"
 	"github.com/pkg/errors"
 )
 
@@ -111,7 +110,7 @@ func (g *Group) SubmissionVerdictGet(c echo.Context) error {
 	if err != nil {
 		return err
 	}
-	if ctx.Submission.Verdict == "..." || ctx.Submission.Verdict == worker.VerdictCompileError {
+	if ctx.Submission.Verdict == models.VerdictIsInQueue || ctx.Submission.Verdict == models.VerdictCompileError {
 		return c.JSON(http.StatusOK, map[string]interface{}{
 			"verdict": ctx.Submission.Verdict,
 		})

server/root_ca.go

@@ -9,8 +9,8 @@ import (
 	"github.com/pkg/errors"
 )
 
-// ServeHTTPRootCA starts a HTTP server running on `address`
-// serving the root CA from "/ca". It rejects all other requests.
+// ServeHTTPRootCA starts a HTTP server running on `address` using the .pem file at
+// rootCA, serving the root CA from "/ca". It rejects all other requests.
 func (s *Server) ServeHTTPRootCA(address, rootCA string) error {
 	if stat, err := os.Stat(rootCA); err != nil {
 		return errors.WithStack(err)