Author: humbedooh
Date: Fri Mar 20 20:32:31 2015
New Revision: 1668142
URL: http://svn.apache.org/r1668142
Log:
+=hexdigest()
Modified:
steve/trunk/pytest/www/cgi-bin/lib/voter.py
Modified: steve/trunk/pytest/www/cgi-bin/lib/voter.py
URL:
http://svn.apache.org/viewvc/steve/trunk/pytest/www/cgi-bin/lib/voter.py?rev=1668142&r1=1668141&r2=1668142&view=diff
==============================================================================
--- steve/trunk/pytest/www/cgi-bin/lib/voter.py (original)
+++ steve/trunk/pytest/www/cgi-bin/lib/voter.py Fri Mar 20 20:32:31 2015
@@ -1,4 +1,4 @@
-import hashlib, json, random
+import hashlib, json, random, os, sys
from __main__ import homedir
def get(election, basedata, uid):
@@ -6,15 +6,15 @@ def get(election, basedata, uid):
with open(elpath + "/voters.json", "r") as f:
voters = json.loads(f.read())
f.close()
- xhash = hashlib.sha512(basedata['hash'] + uid)
+ xhash = hashlib.sha512(basedata['hash'] + uid).hexdigest()
for voter in voters:
if voters[voter] == xhash:
return voter
return None
def add(election, basedata, email):
- uid = hashlib.sha512(email + basedata['hash'] + time.time() +
random.randint(1,99999999))
- xhash = hashlib.sha512(basedata['hash'] + uid)
+ uid = hashlib.sha512(email + basedata['hash'] + time.time() +
random.randint(1,99999999)).hexdigest()
+ xhash = hashlib.sha512(basedata['hash'] + uid).hexdigest()
elpath = os.path.join(homedir, "issues", election)
with open(elpath + "/voters.json", "r") as f:
voters = json.loads(f.read())
@@ -25,8 +25,8 @@ def add(election, basedata, email):
return uid, xhash
def remove(election, basedata, email):
- uid = hashlib.sha512(email + basedata['hash'] + time.time() +
random.randint(1,99999999))
- xhash = hashlib.sha512(basedata['hash'] + uid)
+ uid = hashlib.sha512(email + basedata['hash'] + time.time() +
random.randint(1,99999999)).hexdigest()
+ xhash = hashlib.sha512(basedata['hash'] + uid).hexdigest()
elpath = os.path.join(homedir, "issues", election)
with open(elpath + "/voters.json", "r") as f:
voters = json.loads(f.read())
