From 8e6d29f1806cc569b48d913564c7d80a1c2f2355 Mon Sep 17 00:00:00 2001 From: Christian Cleberg Date: Fri, 17 Jul 2026 17:04:15 -0500 Subject: Replace env-var PAT with GitHub device authorization flow + Keychain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #6, #7 (milestone 0.4.0). - GitHubDeviceAuthClient implements the OAuth 2.0 device authorization grant (device code request + poll for token) against GitHub's OAuth App endpoints. Verified against the real endpoints directly. - KeychainTokenStore stores the resulting token in the app's own Keychain item (not synced to iCloud Keychain), no shared entitlement needed since nothing else reads it. - AuthStore drives the sign-in state machine (signedOut / awaitingAuthorization / signedIn) and a new SignInView replaces the old "missing token" error state with an actual sign-in UI. - SecurityEventStore now reads the token from Keychain instead of the GITHUB_TOKEN environment variable, which is fully retired. - Scope requested is security_events, the narrowest available for classic OAuth Apps (no read-only variant exists at this level, unlike fine-grained PATs). Private-repo Dependabot alerts may need broader repo scope — to be confirmed with real-world testing. --- octosentry/KeychainTokenStore.swift | 73 +++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 octosentry/KeychainTokenStore.swift (limited to 'octosentry/KeychainTokenStore.swift') diff --git a/octosentry/KeychainTokenStore.swift b/octosentry/KeychainTokenStore.swift new file mode 100644 index 0000000..c48c9f6 --- /dev/null +++ b/octosentry/KeychainTokenStore.swift @@ -0,0 +1,73 @@ +// +// KeychainTokenStore.swift +// octosentry +// +// Stores the GitHub OAuth token in the app's own Keychain item. Not +// synced to iCloud Keychain by default (spec §6) — deliberate given the +// token's access scope. No keychain-access-groups entitlement needed: +// that's only required to share an item across multiple apps/extensions, +// not for an app reading/writing its own item. +// + +import Foundation +import Security + +nonisolated enum KeychainTokenStore { + private static let service = "net.cleberg.octosentry.github-token" + private static let account = "github-oauth-token" + + static func save(_ token: String) throws { + let query: [String: Any] = [ + kSecClass as String: kSecClassGenericPassword, + kSecAttrService as String: service, + kSecAttrAccount as String: account, + ] + SecItemDelete(query as CFDictionary) + + var attributes = query + attributes[kSecValueData as String] = Data(token.utf8) + attributes[kSecAttrAccessible as String] = kSecAttrAccessibleAfterFirstUnlock + attributes[kSecAttrSynchronizable as String] = false + + let status = SecItemAdd(attributes as CFDictionary, nil) + guard status == errSecSuccess else { + throw KeychainError.unhandled(status) + } + } + + static func load() -> String? { + let query: [String: Any] = [ + kSecClass as String: kSecClassGenericPassword, + kSecAttrService as String: service, + kSecAttrAccount as String: account, + kSecReturnData as String: true, + kSecMatchLimit as String: kSecMatchLimitOne, + ] + + var result: AnyObject? + let status = SecItemCopyMatching(query as CFDictionary, &result) + guard status == errSecSuccess, let data = result as? Data else { return nil } + return String(data: data, encoding: .utf8) + } + + static func delete() { + let query: [String: Any] = [ + kSecClass as String: kSecClassGenericPassword, + kSecAttrService as String: service, + kSecAttrAccount as String: account, + ] + SecItemDelete(query as CFDictionary) + } + + enum KeychainError: Error, LocalizedError { + case unhandled(OSStatus) + + var errorDescription: String? { + switch self { + case .unhandled(let status): + let message = SecCopyErrorMessageString(status, nil) as String? ?? "unknown" + return "Keychain error \(status): \(message)" + } + } + } +} -- cgit v1.2.3