neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add a few things for new CyFi theme

This commit is contained in:
Neale Pickett 2020-02-25 17:22:39 -07:00 committed by John Donaldson
parent adf34e673b
commit 9be4387316
1 changed files with 49 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
devel/devel-server.py
View File

@ -69,6 +69,26 @@ class MothRequestHandler(http.server.SimpleHTTPRequestHandler):
return puzzle return puzzle
def send_json(self, obj):
self.send_response(200)
self.send_header("Content-Type", "application/json")
self.end_headers()
self.wfile.write(json.dumps(obj).encode("utf-8"))
def handle_register(self):
# Everybody eats when they come to my house
ret = {
"status": "success",
"data": {
"short": "You win",
"description": "Welcome to the development server, you wily hacker you"
}
}
self.send_json(ret)
endpoints.append(('/{seed}/register', handle_register))
def handle_answer(self): def handle_answer(self):
for f in ("cat", "points", "answer"): for f in ("cat", "points", "answer"):
self.req[f] = self.fields.getfirst(f) self.req[f] = self.fields.getfirst(f)
@ -83,17 +103,12 @@ class MothRequestHandler(http.server.SimpleHTTPRequestHandler):
if self.req.get("answer") in puzzle.answers: if self.req.get("answer") in puzzle.answers:
ret["data"]["description"] = "Answer is correct" ret["data"]["description"] = "Answer is correct"
self.send_response(200) self.send_json(ret)
self.send_header("Content-Type", "application/json")
self.end_headers()
self.wfile.write(json.dumps(ret).encode("utf-8"))
endpoints.append(('/{seed}/answer', handle_answer)) endpoints.append(('/{seed}/answer', handle_answer))
def handle_puzzlelist(self): def puzzlelist(self):
puzzles = { puzzles = {}
"__devel__": [[0, ""]],
}
for p in self.server.args["puzzles_dir"].glob("*"): for p in self.server.args["puzzles_dir"].glob("*"):
if not p.is_dir() or p.match(".*"): if not p.is_dir() or p.match(".*"):
continue continue
@ -103,13 +118,28 @@ class MothRequestHandler(http.server.SimpleHTTPRequestHandler):
puzzles[catName].append([0, ""]) puzzles[catName].append([0, ""])
if len(puzzles) <= 1: if len(puzzles) <= 1:
logging.warning("No directories found matching {}/*".format(self.server.args["puzzles_dir"])) logging.warning("No directories found matching {}/*".format(self.server.args["puzzles_dir"]))
self.send_response(200)
self.send_header("Content-Type", "application/json") return puzzles
self.end_headers()
self.wfile.write(json.dumps(puzzles).encode("utf-8"))
# XXX: Remove this (redundant) when we've upgraded the bundled theme (probably v3.6 and beyond)
def handle_puzzlelist(self):
self.send_json(self.puzzlelist())
endpoints.append(('/{seed}/puzzles.json', handle_puzzlelist)) endpoints.append(('/{seed}/puzzles.json', handle_puzzlelist))
def handle_state(self):
resp = {
"config": {
"devel": True,
},
"puzzles": self.puzzlelist(),
"messages": "<p><b>[MOTH Development Server]</b> Participant broadcast messages would go here.</p>",
}
self.send_json(resp)
endpoints.append(('/{seed}/state', handle_state))
def handle_puzzle(self): def handle_puzzle(self):
puzzle = self.get_puzzle() puzzle = self.get_puzzle()
@ -120,10 +150,7 @@ class MothRequestHandler(http.server.SimpleHTTPRequestHandler):
obj["logs"] = puzzle.logs obj["logs"] = puzzle.logs
obj["format"] = puzzle._source_format obj["format"] = puzzle._source_format
self.send_response(200) self.send_json(obj)
self.send_header("Content-Type", "application/json")
self.end_headers()
self.wfile.write(json.dumps(obj).encode("utf-8"))
endpoints.append(('/{seed}/content/{cat}/{points}/puzzle.json', handle_puzzle)) endpoints.append(('/{seed}/content/{cat}/{points}/puzzle.json', handle_puzzle))
@ -151,7 +178,7 @@ class MothRequestHandler(http.server.SimpleHTTPRequestHandler):
try: try:
catdir = self.server.args["puzzles_dir"].joinpath(category) catdir = self.server.args["puzzles_dir"].joinpath(category)
mb = mothballer.package(category, catdir, self.seed) mb = mothballer.package(category, str(catdir), self.seed)
except Exception as ex: except Exception as ex:
logging.exception(ex) logging.exception(ex)
self.send_response(200) self.send_response(200)
@ -169,48 +196,11 @@ class MothRequestHandler(http.server.SimpleHTTPRequestHandler):
def handle_index(self): def handle_index(self):
seed = random.getrandbits(32) seed = random.getrandbits(32)
body = """<!DOCTYPE html> self.send_response(307)
<html> self.send_header("Location", "%s/" % seed)
<head> self.send_header("Content-Type", "text/html")
<title>Dev Server</title>
<script>
// Skip trying to log in
sessionStorage.setItem("id", "devel-server")
</script>
</head>
<body>
<h1>Dev Server</h1>
<p>
Pick a seed:
</p>
<ul>
<li><a href="{seed}/">{seed}</a>: a special seed I made just for you!</li>
<li><a href="random/">random</a>: will use a different seed every time you load a page (could be useful for debugging)</li>
<li>You can also hack your own seed into the URL, if you want to.</li>
</ul>
<p>
Puzzles can be generated from Python code: these puzzles can use a random number generator if they want.
The seed is used to create these random numbers.
</p>
<p>
We like to make a new seed for every contest,
and re-use that seed whenever we regenerate a category during an event
(say to fix a bug).
By using the same seed,
we make sure that all the dynamically-generated puzzles have the same values
in any new packages we build.
</p>
</body>
</html>
""".format(seed=seed)
self.send_response(200)
self.send_header("Content-Type", "text/html; charset=utf-8")
self.end_headers() self.end_headers()
self.wfile.write(body.encode('utf-8')) self.wfile.write("Your browser was supposed to redirect you to <a href=\"%s/\">here</a>." % seed)
endpoints.append((r"/", handle_index)) endpoints.append((r"/", handle_index))