Fix unicode for hashlib operations

This commit is contained in:
Magnus Hagander
2019-01-19 20:12:52 +01:00
parent c6c0bf1948
commit b7f0398c15
3 changed files with 3 additions and 3 deletions

View File

@ -21,7 +21,7 @@ from .forms import SubmitBugForm
def _make_bugs_messageid(bugid):
return "<{0}-{1}@postgresql.org>".format(
bugid,
hashlib.md5("{0}-{1}".format(os.getpid(), time.time())).hexdigest()[:16],
hashlib.md5("{0}-{1}".format(os.getpid(), time.time()).encode('ascii')).hexdigest()[:16],
)

View File

@ -38,7 +38,7 @@ class PgMiddleware(object):
response['x-do-esi'] = "1"
tlist.remove('base/esi.html')
if tlist:
response['xkey'] = ' '.join(["pgwt_{0}".format(hashlib.md5(t).hexdigest()) for t in tlist])
response['xkey'] = ' '.join(["pgwt_{0}".format(hashlib.md5(t.encode('ascii')).hexdigest()) for t in tlist])
# Set security headers
sources = OrderedDict([

View File

@ -28,7 +28,7 @@ if __name__ == "__main__":
tmpl = l[len('templates/'):].strip()
if tmpl not in BANNED_TEMPLATES:
curs.execute("SELECT varnish_purge_xkey(%(key)s)", {
'key': 'pgwt_{0}'.format(hashlib.md5(tmpl).hexdigest()),
'key': 'pgwt_{0}'.format(hashlib.md5(tmpl.encode('ascii')).hexdigest()),
})
elif l.startswith('media/'):
# For media we can't xkey, but the URL is exact so we can