🐛 Fixed webauthn
This commit is contained in:
@@ -4,6 +4,7 @@
|
|||||||
import base64
|
import base64
|
||||||
import enum
|
import enum
|
||||||
import os
|
import os
|
||||||
|
import urllib.parse
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
import pyotp
|
import pyotp
|
||||||
@@ -84,7 +85,7 @@ def verify_webauthn(data, fidocredentialss: list[FidoCredentials], login_session
|
|||||||
verify_authentication_response(
|
verify_authentication_response(
|
||||||
credential=credential,
|
credential=credential,
|
||||||
expected_challenge=base64.b64decode(login_session.webauthn_challenge),
|
expected_challenge=base64.b64decode(login_session.webauthn_challenge),
|
||||||
expected_rp_id="localhost",
|
expected_rp_id=urllib.parse.urlparse(settings.root_address).netloc,
|
||||||
expected_origin=settings.root_address,
|
expected_origin=settings.root_address,
|
||||||
credential_public_key=user_cred.public_key,
|
credential_public_key=user_cred.public_key,
|
||||||
credential_current_sign_count=user_cred.sign_count,
|
credential_current_sign_count=user_cred.sign_count,
|
||||||
@@ -115,7 +116,7 @@ async def start_login(data: StartLoginInput):
|
|||||||
else:
|
else:
|
||||||
step_1.add(StartLoginResponseTypes.PASSKEY)
|
step_1.add(StartLoginResponseTypes.PASSKEY)
|
||||||
webauthn_data = generate_authentication_options(
|
webauthn_data = generate_authentication_options(
|
||||||
rp_id="localhost",
|
rp_id=urllib.parse.urlparse(settings.root_address).netloc,
|
||||||
allow_credentials=[
|
allow_credentials=[
|
||||||
PublicKeyCredentialDescriptor(id=cred.id, type="public-key") for cred in user.fidocredentialss
|
PublicKeyCredentialDescriptor(id=cred.id, type="public-key") for cred in user.fidocredentialss
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import urllib.parse
|
||||||
|
|
||||||
from fastapi import APIRouter, Depends, HTTPException
|
from fastapi import APIRouter, Depends, HTTPException
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from webauthn.helpers.cose import COSEAlgorithmIdentifier
|
from webauthn.helpers.cose import COSEAlgorithmIdentifier
|
||||||
@@ -26,7 +28,7 @@ router = APIRouter()
|
|||||||
async def request_add_key_data(user: User = Depends(get_current_user)):
|
async def request_add_key_data(user: User = Depends(get_current_user)):
|
||||||
user = await User.objects.select_related("fidocredentialss").get(id=user.id)
|
user = await User.objects.select_related("fidocredentialss").get(id=user.id)
|
||||||
options = generate_registration_options(
|
options = generate_registration_options(
|
||||||
rp_id="localhost",
|
rp_id=urllib.parse.urlparse(settings.root_address).netloc,
|
||||||
rp_name="ClassQuiz",
|
rp_name="ClassQuiz",
|
||||||
user_id=user.id.hex,
|
user_id=user.id.hex,
|
||||||
user_name=user.email,
|
user_name=user.email,
|
||||||
@@ -57,7 +59,7 @@ async def confirm_add_key_data(credential: RegistrationCredential, user: User =
|
|||||||
verification = verify_registration_response(
|
verification = verify_registration_response(
|
||||||
credential=credential,
|
credential=credential,
|
||||||
expected_challenge=current_registration_challenge,
|
expected_challenge=current_registration_challenge,
|
||||||
expected_rp_id="localhost",
|
expected_rp_id=urllib.parse.urlparse(settings.root_address).netloc,
|
||||||
expected_origin=settings.root_address,
|
expected_origin=settings.root_address,
|
||||||
)
|
)
|
||||||
new_credential = FidoCredentials(
|
new_credential = FidoCredentials(
|
||||||
|
|||||||
Reference in New Issue
Block a user