Skip to content

Make Challenge generation more customisable #90

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 2 commits into
base: main
Choose a base branch
from
Open

Make Challenge generation more customisable #90

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d84f44
Make Challenge generation more customisable
dscreve Jan 28, 2025
352487d
Allow custom data addon on challenge while keeping random generation …
dscreve Jan 29, 2025
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
16 changes: 13 additions & 3 deletions Sources/WebAuthn/Helpers/ChallengeGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,20 @@
//
//===----------------------------------------------------------------------===//

package struct ChallengeGenerator: Sendable {
import Foundation

public struct ChallengeGenerator: Sendable {
var generate: @Sendable () -> [UInt8]

package static var live: Self {
.init(generate: { [UInt8].random(count: 32) })
public static var live: Self {
.init(generate: {
// try to use secured random generator
var bytes = [UInt8](repeating: 0, count: 32)
let result = SecRandomCopyBytes(kSecRandomDefault, bytes.count, &bytes)
guard result == errSecSuccess else {
return [UInt8].random(count: 32)
}
return bytes
})
}
}
10 changes: 6 additions & 4 deletions Sources/WebAuthn/WebAuthnManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@ public struct WebAuthnManager: Sendable {
user: PublicKeyCredentialUserEntity,
timeout: Duration? = .seconds(5*60),
attestation: AttestationConveyancePreference = .none,
publicKeyCredentialParameters: [PublicKeyCredentialParameters] = .supported
publicKeyCredentialParameters: [PublicKeyCredentialParameters] = .supported,
challenge : [UInt8]? = nil
) -> PublicKeyCredentialCreationOptions {
let challenge = challengeGenerator.generate()
let challenge = challenge ?? challengeGenerator.generate()

return PublicKeyCredentialCreationOptions(
challenge: challenge,
Expand Down Expand Up @@ -138,9 +139,10 @@ public struct WebAuthnManager: Sendable {
public func beginAuthentication(
timeout: Duration? = .seconds(60),
allowCredentials: [PublicKeyCredentialDescriptor]? = nil,
userVerification: UserVerificationRequirement = .preferred
userVerification: UserVerificationRequirement = .preferred,
challenge : [UInt8]? = nil
) throws -> PublicKeyCredentialRequestOptions {
let challenge = challengeGenerator.generate()
let challenge = challenge ?? challengeGenerator.generate()

return PublicKeyCredentialRequestOptions(
challenge: challenge,
Expand Down