Skip to content
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

Support FIDO2 authentication with devices that don’t have a PIN code #655

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Support FIDO2 authentication with devices that don’t have a PIN code #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
afa6dff
Support FIDO authentication with devices that don’t have a PIN code set
MultiColourPixel Nov 10, 2024
2dc1bcd
Update requirement for LibFido2Swift library to be at least 0.1.3
MultiColourPixel Nov 10, 2024
3d9cf73
Require LibFido2Swift to be 0.1.4 at least
MultiColourPixel Nov 12, 2024
36424a7
Make fido2 property a lazy var
MultiColourPixel Nov 12, 2024
cfef287
Add function to check if fido2 device needs a PIN
MultiColourPixel Nov 12, 2024
a43bf63
Add function to check if a FIDO2 device is even connected
MultiColourPixel Nov 12, 2024
cc03660
Push the setting of `authError` to happen on MainActor
MultiColourPixel Nov 12, 2024
259ad07
Improve the support for PIN-less FIDO2 devices
MultiColourPixel Nov 12, 2024
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
2 changes: 1 addition & 1 deletion Xcodes.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,7 +1493,7 @@
repositoryURL = "https://github.com/kinoroy/LibFido2Swift.git";
requirement = {
kind = upToNextMinorVersion;
minimumVersion = 0.1.0;
minimumVersion = 0.1.4;
};
};
CA9FF86B25951C6E00E47BAF /* XCRemoteSwiftPackageReference "data" */ = {
Expand Down
4 changes: 2 additions & 2 deletions Xcodes.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@
"repositoryURL": "https://github.com/kinoroy/LibFido2Swift.git",
"state": {
"branch": null,
"revision": "b77e5c6451bea69d15615d6578936b11777d9a6c",
"version": "0.1.2"
"revision": "94d496d6f850dcbb3e8c4a27cd7eeabfad9f14e3",
"version": "0.1.4"
}
},
{
Expand Down
44 changes: 33 additions & 11 deletions Xcodes/Backend/AppState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,11 +305,17 @@ class AppState: ObservableObject {
}

func handleTwoFactorOption(_ option: TwoFactorOption, authOptions: AuthOptionsResponse, serviceKey: String, sessionID: String, scnt: String) {
self.presentedSheet = .twoFactor(.init(
option: option,
authOptions: authOptions,
sessionData: AppleSessionData(serviceKey: serviceKey, sessionID: sessionID, scnt: scnt)
))
let sessionData = AppleSessionData(serviceKey: serviceKey, sessionID: sessionID, scnt: scnt)

if option == .securityKey, fido2DeviceIsPresent() && !fido2DeviceNeedsPin() {
createAndSubmitSecurityKeyAssertationWithPinCode(nil, sessionData: sessionData, authOptions: authOptions)
} else {
self.presentedSheet = .twoFactor(.init(
option: option,
authOptions: authOptions,
sessionData: sessionData
))
}
}

func requestSMS(to trustedPhoneNumber: AuthOptionsResponse.TrustedPhoneNumber, authOptions: AuthOptionsResponse, sessionData: AppleSessionData) {
Expand Down Expand Up @@ -355,9 +361,9 @@ class AppState: ObservableObject {
.store(in: &cancellables)
}

var fido2: FIDO2?
func createAndSubmitSecurityKeyAssertationWithPinCode(_ pinCode: String, sessionData: AppleSessionData, authOptions: AuthOptionsResponse) {
private lazy var fido2 = FIDO2()

func createAndSubmitSecurityKeyAssertationWithPinCode(_ pinCode: String?, sessionData: AppleSessionData, authOptions: AuthOptionsResponse) {
self.presentedSheet = .securityKeyTouchToConfirm

guard let fsaChallenge = authOptions.fsaChallenge else {
Expand All @@ -379,8 +385,6 @@ class AppState: ObservableObject {

Task {
do {
let fido2 = FIDO2()
self.fido2 = fido2
let response = try fido2.respondToChallenge(args: ChallengeArgs(rpId: rpId, validCredentials: validCreds, devPin: pinCode, challenge: challenge, origin: origin))

Task { @MainActor in
Expand All @@ -407,13 +411,31 @@ class AppState: ObservableObject {
// we don't have to show an error
// because the sheet will already be dismissed
} catch {
Task { @MainActor in
authError = error
}
}
}
}

func fido2DeviceIsPresent() -> Bool {
fido2.hasDeviceAttached()
}

func fido2DeviceNeedsPin() -> Bool {
do {
return try fido2.deviceHasPin()
} catch {
Task { @MainActor in
authError = error
}

return true
}
}

func cancelSecurityKeyAssertationRequest() {
self.fido2?.cancel()
self.fido2.cancel()
}

private func handleAuthenticationFlowCompletion(_ completion: Subscribers.Completion<Error>) {
Expand Down
7 changes: 7 additions & 0 deletions Xcodes/Frontend/SignIn/SignInSecurityKeyPinView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ struct SignInSecurityKeyPinView: View {
Button("Cancel", action: { isPresented = false })
.keyboardShortcut(.cancelAction)
Spacer()

Button("PIN not set", action: submitWithoutPinCode)

ProgressButton(isInProgress: appState.isProcessingAuthRequest,
action: submitPinCode) {
Text("Continue")
Expand All @@ -50,6 +53,10 @@ struct SignInSecurityKeyPinView: View {
func submitPinCode() {
appState.createAndSubmitSecurityKeyAssertationWithPinCode(pin, sessionData: sessionData, authOptions: authOptions)
}

func submitWithoutPinCode() {
appState.createAndSubmitSecurityKeyAssertationWithPinCode(nil, sessionData: sessionData, authOptions: authOptions)
}
}

#Preview {
Expand Down
13 changes: 13 additions & 0 deletions Xcodes/Resources/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,16 @@
}
}
},
"%@ (%@)" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "%1$@ (%2$@)"
}
}
}
},
"%@ %@ %@" : {
"localizations" : {
"ar" : {
Expand Down Expand Up @@ -17907,6 +17917,9 @@
}
}
}
},
"PIN not set" : {

},
"Platforms" : {
"localizations" : {
Expand Down