Skip to content

fix: handle errSecInteractionNotAllowed in KeychainCacheStore to prevent cache self-destruction on wake #594

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
josepe98 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: handle errSecInteractionNotAllowed in KeychainCacheStore to prevent cache self-destruction on wake #594

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
9 changes: 8 additions & 1 deletion Sources/CodexBarCore/KeychainCacheStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,14 @@ public enum KeychainCacheStore {
return testResult
}
#if os(macOS)
let query: [String: Any] = [
var query: [String: Any] = [
kSecClass as String: kSecClassGenericPassword,
kSecAttrService as String: self.serviceName,
kSecAttrAccount as String: key.account,
kSecMatchLimit as String: kSecMatchLimitOne,
kSecReturnData as String: true,
]
KeychainNoUIQuery.apply(to: &query)

var result: AnyObject?
let status = SecItemCopyMatching(query as CFDictionary, &result)
Expand All @@ -70,6 +71,12 @@ public enum KeychainCacheStore {
return .found(decoded)
case errSecItemNotFound:
return .missing
case errSecInteractionNotAllowed:
// Keychain is temporarily locked (e.g. immediately after wake from sleep).
// The cache entry is valid — treat as missing so the caller falls through
// gracefully rather than deleting a perfectly good cache entry.
self.log.info("Keychain cache temporarily locked (\(key.account)), will retry on next access")
return .missing
default:
self.log.error("Keychain cache read failed (\(key.account)): \(status)")
return .invalid
Expand Down