mirror of
https://github.com/zitadel/zitadel.git
synced 2025-11-14 11:25:49 +00:00
# Which Problems Are Solved
When registering passkeys or u2f methods as second factor, some users
pressed the "Enter" key, rather than clicking the submit button. This
method has bypassed the execution of the device registration and
encoding scripts, resulting in the form being submitted without the
necessary encoded values.
# How the Problems Are Solved
This PR ensures that device registration is always executed and the
required information are submitted in the form regardless of pressing
"Enter" or clicking the button.
# Additional Changes
None
# Additional Context
- closes #6592
- closes #2910
(cherry picked from commit 27b319bd98)
71 lines
2.1 KiB
JavaScript
71 lines
2.1 KiB
JavaScript
document.addEventListener(
|
|
"DOMContentLoaded",
|
|
() => {
|
|
const form = document.getElementsByTagName("form")[0];
|
|
if (form) {
|
|
form.addEventListener("submit", (event) => {
|
|
event.preventDefault(); // Prevent the default form submission
|
|
checkWebauthnSupported(registerCredential);
|
|
});
|
|
}
|
|
}
|
|
);
|
|
|
|
async function registerCredential() {
|
|
document.getElementById("wa-error").classList.add("hidden");
|
|
|
|
let opt;
|
|
try {
|
|
opt = JSON.parse(window.atob(document.getElementsByName("credentialCreationData")[0].value));
|
|
} catch (e) {
|
|
webauthnError({ message: "Failed to parse credential creation data." });
|
|
return;
|
|
}
|
|
|
|
try {
|
|
opt.publicKey.challenge = bufferDecode(opt.publicKey.challenge, "publicKey.challenge");
|
|
opt.publicKey.user.id = bufferDecode(opt.publicKey.user.id, "publicKey.user.id");
|
|
if (opt.publicKey.excludeCredentials) {
|
|
for (let i = 0; i < opt.publicKey.excludeCredentials.length; i++) {
|
|
if (opt.publicKey.excludeCredentials[i].id !== null) {
|
|
opt.publicKey.excludeCredentials[i].id = bufferDecode(opt.publicKey.excludeCredentials[i].id, "publicKey.excludeCredentials");
|
|
}
|
|
}
|
|
}
|
|
} catch (e) {
|
|
webauthnError({ message: "Failed to decode buffer data." });
|
|
return;
|
|
}
|
|
|
|
try {
|
|
const credential = await navigator.credentials.create({
|
|
publicKey: opt.publicKey,
|
|
});
|
|
|
|
createCredential(credential);
|
|
} catch (err) {
|
|
webauthnError(err);
|
|
}
|
|
}
|
|
|
|
function createCredential(newCredential) {
|
|
let attestationObject = new Uint8Array(
|
|
newCredential.response.attestationObject
|
|
);
|
|
let clientDataJSON = new Uint8Array(newCredential.response.clientDataJSON);
|
|
let rawId = new Uint8Array(newCredential.rawId);
|
|
|
|
let data = JSON.stringify({
|
|
id: newCredential.id,
|
|
rawId: bufferEncode(rawId),
|
|
type: newCredential.type,
|
|
response: {
|
|
attestationObject: bufferEncode(attestationObject),
|
|
clientDataJSON: bufferEncode(clientDataJSON),
|
|
},
|
|
});
|
|
|
|
document.getElementsByName("credentialData")[0].value = window.btoa(data);
|
|
document.getElementsByTagName("form")[0].submit();
|
|
}
|