summary refs log tree commit diff
path: root/src/api/routes/auth/mfa
diff options
context:
space:
mode:
authorPuyodead1 <puyodead@proton.me>2023-02-02 23:05:54 -0500
committerGitHub <noreply@github.com>2023-02-03 15:05:54 +1100
commite290965d007a3faea650b2d137a123ccbf3c3b1a (patch)
treeea0ad5edbd5d3b84ddd30253ac2c40b72ca70ffe /src/api/routes/auth/mfa
parentrun add:license (diff)
downloadserver-e290965d007a3faea650b2d137a123ccbf3c3b1a.tar.xz
various fixes for webauthn (#973)
Diffstat (limited to 'src/api/routes/auth/mfa')
-rw-r--r--src/api/routes/auth/mfa/webauthn.ts17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/api/routes/auth/mfa/webauthn.ts b/src/api/routes/auth/mfa/webauthn.ts
index e574b969..c4334c4c 100644
--- a/src/api/routes/auth/mfa/webauthn.ts
+++ b/src/api/routes/auth/mfa/webauthn.ts
@@ -64,20 +64,23 @@ router.post(
 		await User.update({ id: user.id }, { totp_last_ticket: "" });
 
 		const clientAttestationResponse = JSON.parse(code);
-		const securityKey = await SecurityKey.findOneOrFail({
-			where: {
-				user_id: req.user_id,
-				key_id: clientAttestationResponse.rawId,
-			},
-		});
 
 		if (!clientAttestationResponse.rawId)
 			throw new HTTPError("Missing rawId", 400);
 
 		clientAttestationResponse.rawId = toArrayBuffer(
-			Buffer.from(clientAttestationResponse.rawId, "base64"),
+			Buffer.from(clientAttestationResponse.rawId, "base64url"),
 		);
 
+		const securityKey = await SecurityKey.findOneOrFail({
+			where: {
+				key_id: Buffer.from(
+					clientAttestationResponse.rawId,
+					"base64url",
+				).toString("base64"),
+			},
+		});
+
 		const assertionExpectations: ExpectedAssertionResult = JSON.parse(
 			Buffer.from(
 				clientAttestationResponse.response.clientDataJSON,