Fix for Python 3
This commit is contained in:
@@ -48,7 +48,6 @@ def complete_reg(request):
|
|||||||
client_data,
|
client_data,
|
||||||
att_obj
|
att_obj
|
||||||
)
|
)
|
||||||
print att_obj.fmt
|
|
||||||
encoded = websafe_encode(auth_data.credential_data)
|
encoded = websafe_encode(auth_data.credential_data)
|
||||||
uk=User_Keys()
|
uk=User_Keys()
|
||||||
uk.username = request.user.username
|
uk.username = request.user.username
|
||||||
@@ -60,7 +59,6 @@ def complete_reg(request):
|
|||||||
from raven.contrib.django.raven_compat.models import client
|
from raven.contrib.django.raven_compat.models import client
|
||||||
import traceback
|
import traceback
|
||||||
client.captureException()
|
client.captureException()
|
||||||
print traceback.format_exc()
|
|
||||||
return HttpResponse(simplejson.dumps({'status': 'ERR',"message":"Error on server, please try again later"}))
|
return HttpResponse(simplejson.dumps({'status': 'ERR',"message":"Error on server, please try again later"}))
|
||||||
def start(request):
|
def start(request):
|
||||||
context = csrf(request)
|
context = csrf(request)
|
||||||
|
|||||||
13
mfa/totp.py
13
mfa/totp.py
@@ -16,12 +16,6 @@ def verify_login(request,username,token):
|
|||||||
if totp.verify(token,valid_window = 30):
|
if totp.verify(token,valid_window = 30):
|
||||||
key.last_used=timezone.now()
|
key.last_used=timezone.now()
|
||||||
key.save()
|
key.save()
|
||||||
mfa = {"verified": True, "method": "TOTP"}
|
|
||||||
if getattr(settings, "MFA_RECHECK", False):
|
|
||||||
mfa["next_check"] = int((datetime.datetime.now()
|
|
||||||
+ datetime.timedelta(
|
|
||||||
seconds=random.randint(settings.MFA_RECHECK_MIN, settings.MFA_RECHECK_MAX))).strftime("%s"))
|
|
||||||
request.session["mfa"] = mfa
|
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@@ -39,6 +33,12 @@ def auth(request):
|
|||||||
context=csrf(request)
|
context=csrf(request)
|
||||||
if request.method=="POST":
|
if request.method=="POST":
|
||||||
if verify_login(request,request.session["base_username"],token = request.POST["otp"]):
|
if verify_login(request,request.session["base_username"],token = request.POST["otp"]):
|
||||||
|
mfa = {"verified": True, "method": "TOTP"}
|
||||||
|
if getattr(settings, "MFA_RECHECK", False):
|
||||||
|
mfa["next_check"] = int((datetime.datetime.now()
|
||||||
|
+ datetime.timedelta(
|
||||||
|
seconds=random.randint(settings.MFA_RECHECK_MIN, settings.MFA_RECHECK_MAX))).strftime("%s"))
|
||||||
|
request.session["mfa"] = mfa
|
||||||
return login(request)
|
return login(request)
|
||||||
context["invalid"]=True
|
context["invalid"]=True
|
||||||
return render_to_response("TOTP/Auth.html", context, context_instance = RequestContext(request))
|
return render_to_response("TOTP/Auth.html", context, context_instance = RequestContext(request))
|
||||||
@@ -48,7 +48,6 @@ def auth(request):
|
|||||||
def getToken(request):
|
def getToken(request):
|
||||||
secret_key=pyotp.random_base32()
|
secret_key=pyotp.random_base32()
|
||||||
totp = pyotp.TOTP(secret_key)
|
totp = pyotp.TOTP(secret_key)
|
||||||
print "Answer is", totp.now()
|
|
||||||
request.session["new_mfa_answer"]=totp.now()
|
request.session["new_mfa_answer"]=totp.now()
|
||||||
return HttpResponse(simplejson.dumps({"qr":pyotp.totp.TOTP(secret_key).provisioning_uri(str(request.user.username), issuer_name = settings.TOKEN_ISSUER_NAME),
|
return HttpResponse(simplejson.dumps({"qr":pyotp.totp.TOTP(secret_key).provisioning_uri(str(request.user.username), issuer_name = settings.TOKEN_ISSUER_NAME),
|
||||||
"secret_key": secret_key}))
|
"secret_key": secret_key}))
|
||||||
|
|||||||
Reference in New Issue
Block a user