Merge pull request #1 from dirtbags/master

Backport changes from upstream
This commit is contained in:
int00h5525 2018-09-09 09:50:24 -05:00 committed by GitHub
commit 2b97c4fb7e
1 changed files with 18 additions and 18 deletions

View File

@ -2,7 +2,6 @@
import argparse
import binascii
import glob
import hashlib
import io
import json
@ -10,11 +9,12 @@ import logging
import moth
import os
import shutil
import string
import sys
import tempfile
import zipfile
SEEDFN = "SEED"
def write_kv_pairs(ziphandle, filename, kv):
""" Write out a sorted map to file
:param ziphandle: a zipfile object
@ -24,7 +24,7 @@ def write_kv_pairs(ziphandle, filename, kv):
"""
filehandle = io.StringIO()
for key in sorted(kv.keys()):
if type(kv[key]) == type([]):
if isinstance(kv[key], list):
for val in kv[key]:
filehandle.write("%s %s\n" % (key, val))
else:
@ -32,9 +32,11 @@ def write_kv_pairs(ziphandle, filename, kv):
filehandle.seek(0)
ziphandle.writestr(filename, filehandle.read())
def escape(s):
return s.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
def generate_html(ziphandle, puzzle, puzzledir, category, points, authors, files):
html_content = io.StringIO()
file_content = io.StringIO()
@ -84,14 +86,13 @@ def generate_html(ziphandle, puzzle, puzzledir, category, points, authors, files
file_content=file_content.getvalue(),
authors=', '.join(authors),
scripts='\n'.join(scripts),
)
)
)
ziphandle.writestr(os.path.join(puzzledir, 'index.html'), html_content.getvalue())
def build_category(categorydir, outdir):
category_seed = binascii.b2a_hex(os.urandom(20))
puzzles_dict = {}
secrets = {}
categoryname = os.path.basename(categorydir.strip(os.sep))
zipfilename = os.path.join(outdir, "%s.zip" % categoryname)
@ -101,14 +102,14 @@ def build_category(categorydir, outdir):
# open and gather some state
existing = zipfile.ZipFile(zipfilename, 'r')
try:
category_seed = existing.open(seedfn).read().strip()
except:
category_seed = existing.open(SEEDFN).read().strip()
except Exception:
pass
existing.close()
logging.debug("Using PRNG seed {}".format(category_seed))
zipfileraw = tempfile.NamedTemporaryFile(delete=False)
mothball = package(categoryname, categorydir, zfraw)
mothball = package(categoryname, categorydir, category_seed)
shutil.copyfileobj(mothball, zipfileraw)
zipfileraw.close()
shutil.move(zipfileraw.name, zipfilename)
@ -127,7 +128,7 @@ def package(categoryname, categorydir, seed):
for puzzle in cat:
logging.info("Processing point value {}".format(puzzle.points))
hashmap = hashlib.sha1(seed.encode('utf-8'))
hashmap = hashlib.sha1(seed)
hashmap.update(str(puzzle.points).encode('utf-8'))
puzzlehash = hashmap.hexdigest()
@ -173,4 +174,3 @@ if __name__ == '__main__':
for categorydir in args.categorydirs:
build_category(categorydir, args.outdir)