commit 39f819c8a5794468d7e82f6efc82deefe75dd1e1
parent d75494932805b66aff666e9de456449b43e7899c
Author: Andrew Laack <andrew@laack.co>
Date: Fri, 13 Nov 2026 16:11:18 -0600
Refactoring filenames + correct directory for submissions
Diffstat:
5 files changed, 45 insertions(+), 47 deletions(-)
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ build-container:
build-ocaml:
cd ojudge && dune build
- cp ojudge/_build/default/bin/main.exe cgi-bin/submit-code
+ cp ojudge/_build/default/bin/submissions.exe cgi-bin/submit-code
chmod 755 cgi-bin/submit-code
run-container:
cd example && \
diff --git a/cgi-bin/submit-code b/cgi-bin/submit-code
Binary files differ.
diff --git a/ojudge/bin/dune b/ojudge/bin/dune
@@ -1,5 +1,5 @@
(executable
(public_name ojudge)
- (name main)
+ (name submissions)
(libraries ojudge threads netcgi2 uuidm)
(link_flags (-ccopt -static)))
diff --git a/ojudge/bin/main.ml b/ojudge/bin/main.ml
@@ -1,45 +0,0 @@
-let rec mkdir d =
- if not (Sys.file_exists d) then (mkdir (Filename.dirname d); Sys.mkdir d 0o755)
-
-let submissionReply (cgi : Netcgi.cgi) =
- cgi#set_header ~content_type:"text/html; charset=utf-8" ();
- let out = cgi#out_channel in
- out#output_string (Printf.sprintf "Your code has been submitted. Please await judging.");
- out#commit_work ()
-
-let writeFile filepath toWrite =
- Out_channel.with_open_text filepath (fun oc -> output_string oc toWrite)
-
-let setupSubmissionDir subId username =
- let () = mkdir ("/var/lib/ojudge/" ^ username ^ "/" ^ subId) in
- let () = mkdir ("/var/lib/ojudge/" ^ username ^ "/" ^ subId ^ "/code") in
- let () = mkdir ("/var/lib/ojudge/" ^ username ^ "/" ^ subId ^ "/inputs") in
- let () = mkdir ("/var/lib/ojudge/" ^ username ^ "/" ^ subId ^ "/outputs") in
- mkdir ("/var/lib/ojudge/" ^ username ^ "/" ^ subId ^ "/results")
-
-let uuid () =
- Uuidm.to_string (Uuidm.v4_gen (Random.State.make_self_init ()) ())
-
-(* TODO: Make sure username can't do traversals, and guard this *)
-
-let createCodeFile username subId code language =
- if language = "ocaml" then
- writeFile ("/var/lib/ojudge/" ^ username ^ "/" ^ subId ^ "/code/main.ml") code
- else
- if language = "cpp" then
- writeFile ("/var/lib/ojudge/" ^ username ^ "/" ^ subId ^ "/code/main.cpp") code
- else
- writeFile ("/var/lib/ojudge/" ^ username ^ "/" ^ subId ^ "/code/main.c") code
-
-
-
-let handleSubmission (cgi : Netcgi.cgi) =
- let language = cgi#argument_value "language" in
- let code = cgi#argument_value "code" in
- let username = cgi#argument_value "username" in
- let subId = uuid () in
- let () = setupSubmissionDir subId username in
- let () = createCodeFile username subId code language in
- submissionReply cgi
-
-let () = Netcgi_cgi.run handleSubmission
diff --git a/ojudge/bin/submissions.ml b/ojudge/bin/submissions.ml
@@ -0,0 +1,43 @@
+let rec mkdir d =
+ if not (Sys.file_exists d) then (mkdir (Filename.dirname d); Sys.mkdir d 0o755)
+
+let submissionReply (cgi : Netcgi.cgi) =
+ cgi#set_header ~content_type:"text/html; charset=utf-8" ();
+ let out = cgi#out_channel in
+ out#output_string (Printf.sprintf "Your code has been submitted. Please await judging.");
+ out#commit_work ()
+
+let writeFile filepath toWrite =
+ Out_channel.with_open_text filepath (fun oc -> output_string oc toWrite)
+
+let setupSubmissionDir subId username =
+ let () = mkdir ("/var/lib/ojudge/submissions/" ^ username ^ "/" ^ subId) in
+ let () = mkdir ("/var/lib/ojudge/submissions/" ^ username ^ "/" ^ subId ^ "/code") in
+ let () = mkdir ("/var/lib/ojudge/submissions/" ^ username ^ "/" ^ subId ^ "/inputs") in
+ let () = mkdir ("/var/lib/ojudge/submissions/" ^ username ^ "/" ^ subId ^ "/outputs") in
+ mkdir ("/var/lib/ojudge/submissions/" ^ username ^ "/" ^ subId ^ "/results")
+
+let uuid () =
+ Uuidm.to_string (Uuidm.v4_gen (Random.State.make_self_init ()) ())
+
+(* TODO: Make sure username can't do traversals, and guard this *)
+
+let createCodeFile username subId code language =
+ if language = "ocaml" then
+ writeFile ("/var/lib/ojudge/submissions/" ^ username ^ "/" ^ subId ^ "/code/main.ml") code
+ else
+ if language = "cpp" then
+ writeFile ("/var/lib/ojudge/submissions/" ^ username ^ "/" ^ subId ^ "/code/main.cpp") code
+ else
+ writeFile ("/var/lib/ojudge/submissions/" ^ username ^ "/" ^ subId ^ "/code/main.c") code
+
+let handleSubmission (cgi : Netcgi.cgi) =
+ let language = cgi#argument_value "language" in
+ let code = cgi#argument_value "code" in
+ let username = cgi#argument_value "username" in
+ let subId = uuid () in
+ let () = setupSubmissionDir subId username in
+ let () = createCodeFile username subId code language in
+ submissionReply cgi
+
+let () = Netcgi_cgi.run handleSubmission