fix(storage): distinguish keychain user cancellation, auth failure, and error status from not-found#1144
Merged
datlechin merged 1 commit intoMay 9, 2026
Conversation
…nd error status from not-found
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
KeychainResultandKeychainStringResultgain three new cases:.userCancelled,.authFailed,.error(OSStatus).KeychainHelper.read(forKey:)now mapserrSecUserCanceledanderrSecAuthFailedto their own cases and routes any other unknown OSStatus to.error(status)instead of pretending it was.notFound.readStringResult(forKey:)propagates the new cases and returns.error(errSecDecode)(not.notFound) when the bytes are not valid UTF-8.nilto the caller.Why this matters
This is bug B4 from the full-app audit. A cancelled Touch ID prompt returns
errSecUserCanceled; previously thedefault:arm collapsed it to.notFound, the caller treated the password as gone and re-prompted the user. The user re-types the password, the keychain ends up with two entries, or the connection gets re-saved with a blank password. The new cases let callers tell apart "I never had this saved" from "the user just cancelled" from "biometric auth failed" from "real keychain error", and the OSLog signal makes the failure mode diagnosable.Test plan
Keychain prompt cancelled for 'com.TablePro.password.<id>'appears and the connection is not re-saved with a blank password.