LobotomyLabs/classquiz-ai
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore login.py with webauthn option

Browse Source
This commit is contained in:
Mawoka
2024-07-08 11:40:54 +02:00
parent 0acd34aad5
commit f189d72728
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classquiz/routers/login.py
+1 -12
View File
@@ -102,27 +102,19 @@ def verify_webauthn(data, fidocredentialss: list[FidoCredentials], login_session
@router.post("/start") @router.post("/start")
async def start_login(data: StartLoginInput): async def start_login(data: StartLoginInput):
user = ( user = (
# TODO Find out why the fidocredentialls call fails
await User.objects.select_related("fidocredentialss") await User.objects.select_related("fidocredentialss")
.filter((User.email == data.email) | (User.username == data.email)) .filter((User.email == data.email) | (User.username == data.email))
.get_or_none() .get_or_none()
# await User.objects.filter((User.email == data.email) | (User.username == data.email))
# .get_or_none()
) )
print("User.objects.filter call completed...")
step_1: set[StartLoginResponseTypes] = set() step_1: set[StartLoginResponseTypes] = set()
step_2: set[StartLoginResponseTypes] = set() step_2: set[StartLoginResponseTypes] = set()
webauthn_data = None webauthn_data = None
webauthn_challenge = None webauthn_challenge = None
print('"webauthn_challenge = None" call completed...')
print("user.verified: " + str(user.verified))
if user is None or not user.verified: if user is None or not user.verified:
step_1.add(StartLoginResponseTypes.PASSWORD) step_1.add(StartLoginResponseTypes.PASSWORD)
return StartLoginResponse(step_1=step_1, step_2=step_2, session_id=os.urandom(16).hex(), webauthn_data=None) return StartLoginResponse(step_1=step_1, step_2=step_2, session_id=os.urandom(16).hex(), webauthn_data=None)
print("Okay. User is not None or unverified...")
if user.password is not None: if user.password is not None:
step_1.add(StartLoginResponseTypes.PASSWORD) step_1.add(StartLoginResponseTypes.PASSWORD)
""" TODO Find out why fidocredentialss is causing problems
if len(user.fidocredentialss) > 0: if len(user.fidocredentialss) > 0:
if user.require_password is True: if user.require_password is True:
step_2.add(StartLoginResponseTypes.PASSKEY) step_2.add(StartLoginResponseTypes.PASSKEY)
@@ -137,8 +129,6 @@ async def start_login(data: StartLoginInput):
) )
webauthn_challenge = base64.b64encode(webauthn_data.challenge).decode("utf-8") webauthn_challenge = base64.b64encode(webauthn_data.challenge).decode("utf-8")
webauthn_data = options_to_json(webauthn_data) webauthn_data = options_to_json(webauthn_data)
"""
print("Moving past commented code, the long string one...")
if user.totp_secret is not None: if user.totp_secret is not None:
if user.require_password: if user.require_password:
step_2.add(StartLoginResponseTypes.TOTP) step_2.add(StartLoginResponseTypes.TOTP)
@@ -180,8 +170,7 @@ async def step_1_endpoint(session_id: str, data: StepInput, request: Request, re
else: else:
print("unknown step") print("unknown step")
raise HTTPException(401) raise HTTPException(401)
# TODO fidocredentials bug fix user = await User.objects.select_related("fidocredentialss").get_or_none(id=uuid.UUID(login_session.user_id)) user = await User.objects.select_related("fidocredentialss").get_or_none(id=uuid.UUID(login_session.user_id))
user = await User.objects.get_or_none(id=uuid.UUID(login_session.user_id))
if data.auth_type == StartLoginResponseTypes.PASSWORD: if data.auth_type == StartLoginResponseTypes.PASSWORD:
if verify_password(data.data, user.password): if verify_password(data.data, user.password):
if len(login_session.step_2) == 0 or (step_id == 2 and login_session.step1_success is True): if len(login_session.step_2) == 0 or (step_id == 2 and login_session.step1_success is True):