diff --git a/www/cgi-bin/cgi.lua b/www/cgi-bin/cgi.lua
deleted file mode 100644
index b37d322..0000000
--- a/www/cgi-bin/cgi.lua
+++ /dev/null
@@ -1,109 +0,0 @@
-#! /usr/bin/env lua
-
-local cgi = {}
-
-cgi.POST_MAX = 512
-
-local CL = tonumber(os.getenv("CONTENT_LENGTH")) or 0
-function getc_post()
- if (CL > 0) then
- CL = CL - 1
- return io.read(1)
- else
- return nil
- end
-end
-
-local query = os.getenv("QUERY_STRING") or ""
-local query_len = query:len()
-local query_pos = 0
-function getc_get()
- if (query_pos < query_len) then
- query_pos = query_pos + 1
- return string.sub(query, query_pos, query_pos)
- else
- return nil
- end
-end
-
-function read_hex()
- local a = getc() or 0
- local b = getc() or 0
-
- return string.char(tonumber(a, 16)*16 + tonumber(b, 16))
-end
-
-function item()
- local val = ""
-
- while (true) do
- local c = getc()
- if ((c == nil) or (c == "=") or (c == "&")) then
- return val
- elseif (c == "%") then
- c = read_hex()
- elseif (c == "+") then
- c = " "
- end
- val = val .. c
- end
-end
-
-function init()
- method = os.getenv("REQUEST_METHOD")
- if (method == "POST") then
- if (os.getenv("HTTP_CONTENT_TYPE") ~= "application/x-www-form-urlencoded") then
- cgi.http_error(415, "Unsupported content-type", "You are sending me data in a format I can't process")
- end
-
- if (CL > cgi.POST_MAX) then
- cgi.http_error(413, "Post Data Too Long", "You are sending me more data than I'm prepared to handle")
- end
-
- getc = getc_post
- elseif (method == "GET") then
- local query = os.getenv("QUERY_STRING") or ""
- local query_pos = 0
- local query_len = string.len(query)
- if (query_len > cgi.POST_MAX) then
- cgi.http_error(413, "Query Data Too Long", "You are sending me more data than I'm prepared to handle")
- end
-
- getc = getc_get
- else
- cgi.http_error(405, "Method not allowed", "I only do GET and POST.")
- end
-
- cgi.fields = {}
- while (true) do
- local k = item()
- local v = item()
-
- if (k == "") then
- break
- end
- cgi.fields[k] = v
- end
-end
-
-
-function cgi.http_error(code, name, info)
- print(code .. " " .. name)
- print("Allow: GET POST")
- print("Content-type: text/html")
- print()
- print("
" .. code .. " " .. name .. "
")
- print("
" .. info .. "
")
- os.exit(0)
-end
-
-function cgi.escape(s)
- s = string.gsub(s, "&", "&")
- s = string.gsub(s, "<", "<")
- s = string.gsub(s, ">", ">")
- return s
-end
-
-init()
-
-return cgi
diff --git a/www/cgi-bin/koth.lua b/www/cgi-bin/koth.lua
deleted file mode 100644
index 2781e98..0000000
--- a/www/cgi-bin/koth.lua
+++ /dev/null
@@ -1,120 +0,0 @@
-#! /usr/bin/env lua
-
-local koth = {}
-
--- cut -d$ANCHOR -f2- | grep -Fx "$NEEDLE"
-function koth.anchored_search(haystack, needle, anchor)
- local f, err = io.open(haystack)
- if (not f) then
- return false, err
- end
-
- for line in f:lines() do
- if (anchor) then
- pos = line:find(anchor)
- if (pos) then
- line = line:sub(pos+1)
- end
- end
-
- if (line == needle) then
- f:close()
- return true
- end
- end
-
- f:close()
- return false
-end
-
-function koth.page(title, body)
- if (os.getenv("REQUEST_METHOD")) then
- print("Content-type: text/html")
- print()
- end
- print("")
- print("" .. title .. "")
- print("
" .. title .. "
")
- if (body) then
- print("")
- print(body)
- print("")
- end
-
- print('')
-
- print('')
- print('')
- print('')
- print('')
- print('')
- print('')
- print('')
- print("")
- os.exit(0)
-end
-
---
--- We're going to rely on `bin/once` only processing files with the right number of lines.
---
-function koth.award_points(team, category, points, comment)
- team = team:gsub("[^0-9a-f]", "-")
- if (team == "") then
- team = "-"
- end
-
- local filename = team .. "." .. category .. "." .. points
- local entry = team .. " " .. category .. " " .. points
-
- if (comment) then
- entry = entry .. " " .. comment
- end
-
- local f = io.open(koth.path("state/teams/" .. team))
- if (f) then
- f:close()
- else
- return false, "No such team"
- end
-
- local ok = koth.anchored_search(koth.path("state/points.log"), entry, " ")
- if (ok) then
- return false, "Points already awarded"
- end
-
- local f = io.open(koth.path("state/points.new/" .. filename), "a")
- if (not f) then
- return false, "Unable to write to points file"
- end
-
- f:write(os.time(), " ", entry, "\n")
- f:close()
-
- return true
-end
-
--- Most web servers cd to the directory containing the CGI.
--- Not uhttpd.
-
-koth.base = ""
-function koth.path(p)
- return koth.base .. p
-end
-
--- Traverse up to find assigned.txt
-for i = 0, 5 do
- local f = io.open(koth.path("state/assigned.txt"))
- if (f) then
- f:close()
- break
- end
- koth.base = koth.base .. "../"
-end
-
-return koth
diff --git a/www/cgi-bin/puzzler.cgi b/www/cgi-bin/puzzler.cgi
deleted file mode 100755
index 3b51c70..0000000
--- a/www/cgi-bin/puzzler.cgi
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env lua
-
-package.path = "?.lua;cgi-bin/?.lua;www/cgi-bin/?.lua"
-
-local cgi = require "cgi"
-local koth = require "koth"
-
-local team = cgi.fields['t'] or ""
-local category = cgi.fields['c'] or ""
-local points = cgi.fields['p'] or ""
-local answer = cgi.fields['a'] or ""
-
--- Defang category name; prevent directory traversal
-category = category:gsub("[^A-Za-z0-9_]", "-")
-
--- Check answer
-local needle = points .. " " .. answer
-local haystack = koth.path("packages/" .. category .. "/answers.txt")
-local found, err = koth.anchored_search(haystack, needle)
-
-if (not found) then
- koth.page("Wrong answer", err)
-end
-
-local ok, err = koth.award_points(team, category, points)
-if (not ok) then
- koth.page("Error awarding points",
- "
You got the right answer, but there was a problem trying to give you points:
')
- print('
')
- print('
')
- print('
')
- print('
')
- print('