🐛 Fixed webauthn for root_url with port

This commit is contained in:
Mawoka
2022-12-19 13:30:43 +01:00
parent ec3f6f3dd2
commit ab1ab91153
3 changed files with 24 additions and 9 deletions
+2 -2
View File
@@ -85,7 +85,7 @@ def verify_webauthn(data, fidocredentialss: list[FidoCredentials], login_session
verify_authentication_response(
credential=credential,
expected_challenge=base64.b64decode(login_session.webauthn_challenge),
expected_rp_id=urllib.parse.urlparse(settings.root_address).netloc,
expected_rp_id=urllib.parse.urlparse(settings.root_address).hostname,
expected_origin=settings.root_address,
credential_public_key=user_cred.public_key,
credential_current_sign_count=user_cred.sign_count,
@@ -116,7 +116,7 @@ async def start_login(data: StartLoginInput):
else:
step_1.add(StartLoginResponseTypes.PASSKEY)
webauthn_data = generate_authentication_options(
rp_id=urllib.parse.urlparse(settings.root_address).netloc,
rp_id=urllib.parse.urlparse(settings.root_address).hostname,
allow_credentials=[
PublicKeyCredentialDescriptor(id=cred.id, type="public-key") for cred in user.fidocredentialss
],
+2 -2
View File
@@ -28,7 +28,7 @@ router = APIRouter()
async def request_add_key_data(user: User = Depends(get_current_user)):
user = await User.objects.select_related("fidocredentialss").get(id=user.id)
options = generate_registration_options(
rp_id=urllib.parse.urlparse(settings.root_address).netloc,
rp_id=urllib.parse.urlparse(settings.root_address).hostname,
rp_name="ClassQuiz",
user_id=user.id.hex,
user_name=user.email,
@@ -59,7 +59,7 @@ async def confirm_add_key_data(credential: RegistrationCredential, user: User =
verification = verify_registration_response(
credential=credential,
expected_challenge=current_registration_challenge,
expected_rp_id=urllib.parse.urlparse(settings.root_address).netloc,
expected_rp_id=urllib.parse.urlparse(settings.root_address).hostname,
expected_origin=settings.root_address,
)
new_credential = FidoCredentials(