Skip to content

Add requireUserPresence option to registration verification #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add requireUserPresence option to registration verification #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Sources/WebAuthn/Ceremonies/Registration/AttestationObject.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public struct AttestationObject: Sendable {
func verify(
relyingPartyID: String,
verificationRequired: Bool,
requireUserPresence: Bool = true,
clientDataHash: SHA256.Digest,
supportedPublicKeyAlgorithms: [PublicKeyCredentialParameters],
pemRootCertificatesByFormat: [AttestationFormat: [Data]] = [:]
Expand All @@ -35,8 +36,10 @@ public struct AttestationObject: Sendable {
throw WebAuthnError.relyingPartyIDHashDoesNotMatch
}

guard authenticatorData.flags.userPresent else {
throw WebAuthnError.userPresentFlagNotSet
if requireUserPresence {
guard authenticatorData.flags.userPresent else {
throw WebAuthnError.userPresentFlagNotSet
}
}

if verificationRequired {
Expand Down
2 changes: 2 additions & 0 deletions Sources/WebAuthn/Ceremonies/Registration/RegistrationCredential.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ struct ParsedCredentialCreationResponse {
func verify(
storedChallenge: [UInt8],
verifyUser: Bool,
requireUserPresence: Bool,
relyingPartyID: String,
relyingPartyOrigin: String,
supportedPublicKeyAlgorithms: [PublicKeyCredentialParameters],
Expand All @@ -112,6 +113,7 @@ struct ParsedCredentialCreationResponse {
let attestedCredentialData = try await response.attestationObject.verify(
relyingPartyID: relyingPartyID,
verificationRequired: verifyUser,
requireUserPresence: requireUserPresence,
clientDataHash: hash,
supportedPublicKeyAlgorithms: supportedPublicKeyAlgorithms,
pemRootCertificatesByFormat: pemRootCertificatesByFormat
Expand Down
4 changes: 4 additions & 0 deletions Sources/WebAuthn/WebAuthnManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ public struct WebAuthnManager: Sendable {
/// - challenge: The challenge passed to the authenticator within the preceding registration options.
/// - credentialCreationData: The value returned from `navigator.credentials.create()`
/// - requireUserVerification: Whether or not to require that the authenticator verified the user.
/// - requireUserPresence: Whether or not to require that the user was present during registration.
/// Set to `false` for silent/conditional passkey registration (e.g., iOS 26 conditional registration).
/// - supportedPublicKeyAlgorithms: A list of public key algorithms the Relying Party chooses to restrict
/// support to. Defaults to all supported algorithms.
/// - pemRootCertificatesByFormat: A list of root certificates used for attestation verification.
Expand All @@ -95,6 +97,7 @@ public struct WebAuthnManager: Sendable {
challenge: [UInt8],
credentialCreationData: RegistrationCredential,
requireUserVerification: Bool = false,
requireUserPresence: Bool = true,
supportedPublicKeyAlgorithms: [PublicKeyCredentialParameters] = .supported,
pemRootCertificatesByFormat: [AttestationFormat: [Data]] = [:],
confirmCredentialIDNotRegisteredYet: (String) async throws -> Bool
Expand All @@ -103,6 +106,7 @@ public struct WebAuthnManager: Sendable {
let attestedCredentialData = try await parsedData.verify(
storedChallenge: challenge,
verifyUser: requireUserVerification,
requireUserPresence: requireUserPresence,
relyingPartyID: configuration.relyingPartyID,
relyingPartyOrigin: configuration.relyingPartyOrigin,
supportedPublicKeyAlgorithms: supportedPublicKeyAlgorithms,
Expand Down