use underscores for python functions

This commit is contained in:
Tobias Bengfort
2021-06-23 09:19:21 +02:00
parent 68e257d60e
commit 62bb50307e
5 changed files with 23 additions and 23 deletions

View File

@@ -16,7 +16,7 @@ from .models import UserKey
from .views import login
def sendEmail(request, username, secret):
def send_email(request, username, secret):
"""Send Email to the user after rendering `mfa_email_token_template`"""
User = get_user_model()
key = getattr(User, "USERNAME_FIELD", "username")
@@ -51,7 +51,7 @@ def start(request):
request.session["email_secret"] = str(
randint(0, 100000)
) # generate a random integer
if sendEmail(request, request.user.username, request.session["email_secret"]):
if send_email(request, request.user.username, request.session["email_secret"]):
context["sent"] = True
return render(request, "Email/Add.html", context)
@@ -83,7 +83,7 @@ def auth(request):
context["invalid"] = True
else:
request.session["email_secret"] = str(randint(0, 100000))
if sendEmail(
if send_email(
request, request.session["base_username"], request.session["email_secret"]
):
context["sent"] = True

View File

@@ -28,7 +28,7 @@ def recheck(request):
return render(request, "FIDO2/recheck.html", context)
def getServer():
def get_server():
"""Get Server Info from settings and returns a Fido2Server"""
rp = PublicKeyCredentialRpEntity(settings.FIDO_SERVER_ID, settings.FIDO_SERVER_NAME)
return Fido2Server(rp)
@@ -36,14 +36,14 @@ def getServer():
def begin_registeration(request):
"""Starts registering a new FIDO Device, called from API"""
server = getServer()
server = get_server()
registration_data, state = server.register_begin(
{
u"id": request.user.username.encode("utf8"),
u"name": (request.user.first_name + " " + request.user.last_name),
u"displayName": request.user.username,
},
getUserCredentials(request.user.username),
get_user_credentials(request.user.username),
)
request.session["fido_state"] = state
@@ -60,7 +60,7 @@ def complete_reg(request):
client_data = ClientData(data["clientDataJSON"])
att_obj = AttestationObject((data["attestationObject"]))
server = getServer()
server = get_server()
auth_data = server.register_complete(
request.session["fido_state"], client_data, att_obj
)
@@ -89,7 +89,7 @@ def start(request):
return render(request, "FIDO2/Add.html", context)
def getUserCredentials(username):
def get_user_credentials(username):
credentials = []
for uk in UserKey.objects.filter(username=username, key_type="FIDO2"):
credentials.append(
@@ -104,8 +104,8 @@ def auth(request):
def authenticate_begin(request):
server = getServer()
credentials = getUserCredentials(
server = get_server()
credentials = get_user_credentials(
request.session.get("base_username", request.user.username)
)
auth_data, state = server.authenticate_begin(credentials)
@@ -118,8 +118,8 @@ def authenticate_complete(request):
try:
credentials = []
username = request.session.get("base_username", request.user.username)
server = getServer()
credentials = getUserCredentials(username)
server = get_server()
credentials = get_user_credentials(username)
data = cbor.decode(request.body)
credential_id = data["credentialId"]
client_data = ClientData(data["clientDataJSON"])

View File

@@ -22,7 +22,7 @@ def id_generator(size=6, chars=string.ascii_uppercase + string.digits):
return id_generator(size, chars)
def getUserAgent(request):
def get_user_agent(request):
id = id = request.session.get("td_id", None)
if id:
tk = UserKey.objects.get(id=id)
@@ -41,7 +41,7 @@ def trust_device(request):
return HttpResponse("OK")
def checkTrusted(request):
def check_trusted(request):
res = ""
id = request.session.get("td_id", "")
if id != "":
@@ -54,7 +54,7 @@ def checkTrusted(request):
return HttpResponse(res)
def getCookie(request):
def get_cookie(request):
tk = UserKey.objects.get(id=request.session["td_id"])
if tk.properties["status"] == "trusted":

View File

@@ -4,7 +4,7 @@ from . import FIDO2, U2F, Email, TrustedDevice, helpers, totp, views
urlpatterns = [
path("totp/start/", totp.start, name="start_new_otop"),
path("totp/getToken/", totp.getToken, name="get_new_otop"),
path("totp/getToken/", totp.get_token, name="get_new_otop"),
path("totp/verify/", totp.verify, name="verify_otop"),
path("totp/auth/", totp.auth, name="totp_auth"),
path("totp/recheck/", totp.recheck, name="totp_recheck"),
@@ -27,15 +27,15 @@ urlpatterns = [
path("td/", TrustedDevice.start, name="start_td"),
path("td/add/", TrustedDevice.add, name="add_td"),
path("td/send_link/", TrustedDevice.send_email, name="td_sendemail"),
path("td/get-ua/", TrustedDevice.getUserAgent, name="td_get_useragent"),
path("td/get-ua/", TrustedDevice.get_user_agent, name="td_get_useragent"),
path("td/trust/", TrustedDevice.trust_device, name="td_trust_device"),
path("u2f/checkTrusted/", TrustedDevice.checkTrusted, name="td_checkTrusted"),
path("u2f/secure_device", TrustedDevice.getCookie, name="td_securedevice"),
path("u2f/checkTrusted/", TrustedDevice.check_trusted, name="td_checkTrusted"),
path("u2f/secure_device", TrustedDevice.get_cookie, name="td_securedevice"),
path("", views.index, name="mfa_home"),
path("goto/<method>/", views.goto, name="mfa_goto"),
path("selct_method/", views.show_methods, name="mfa_methods_list"),
path("recheck/", helpers.recheck, name="mfa_recheck"),
path("toggleKey/", views.toggleKey, name="toggle_key"),
path("delete/", views.delKey, name="mfa_delKey"),
path("toggleKey/", views.toggle_key, name="toggle_key"),
path("delete/", views.del_key, name="mfa_delKey"),
path("reset/", views.reset_cookie, name="mfa_reset_cookie"),
]

View File

@@ -62,7 +62,7 @@ def login(request):
@login_required
def delKey(request):
def del_key(request):
key = UserKey.objects.get(id=request.GET["id"])
if key.username == request.user.username:
key.delete()
@@ -85,7 +85,7 @@ def __get_callable_function__(func_path):
@login_required
def toggleKey(request):
def toggle_key(request):
id = request.GET["id"]
q = UserKey.objects.filter(username=request.user.username, id=id)
if q.count() == 1: