jfraeysd/fetch_ml
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(auth): make DeleteAPIKey resilient to keyring errors
Some checks failed
Security Scan / Security Analysis (push) Waiting to run
Details
Security Scan / Native Library Security (push) Waiting to run
Details
Checkout test / test (push) Successful in 4s
Details
CI/CD Pipeline / Test (push) Has been cancelled
Details
CI/CD Pipeline / Dev Compose Smoke Test (push) Has been cancelled
Details
CI/CD Pipeline / Build (push) Has been cancelled
Details
CI/CD Pipeline / Test Scripts (push) Has been cancelled
Details
CI/CD Pipeline / Test Native Libraries (push) Has been cancelled
Details
CI/CD Pipeline / Docker Build (push) Has been cancelled
Details
Documentation / build-and-publish (push) Has been cancelled
Details

Browse source 
DeleteAPIKey now ignores primary keyring errors (e.g., dbus unavailable)

and always cleans up the fallback store
This commit is contained in:
Jeremie Fraeys 2026-02-21 21:19:46 -05:00
parent ec568b4c85
commit 1b0781dc68
No known key found for this signature in database
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
internal/auth/keychain.go
View file

@ -92,11 +92,11 @@ func (km *KeychainManager) GetAPIKey(service, account string) (string, error) {
// DeleteAPIKey removes a key from both stores. // DeleteAPIKey removes a key from both stores.
func (km *KeychainManager) DeleteAPIKey(service, account string) error { func (km *KeychainManager) DeleteAPIKey(service, account string) error {
if err := km.primary.Delete(service, account); err != nil && // Try to delete from primary keyring, but don't fail on keyring errors
!errors.Is(err, keyring.ErrNotFound) && // (e.g., dbus unavailable, permission denied) - just clean up fallback
!errors.Is(err, keyring.ErrUnsupportedPlatform) { _ = km.primary.Delete(service, account)
return fmt.Errorf("failed to delete API key: %w", err)
} // Always clean up fallback
if err := km.fallback.delete(service, account); err != nil && !errors.Is(err, os.ErrNotExist) { if err := km.fallback.delete(service, account); err != nil && !errors.Is(err, os.ErrNotExist) {
return err return err
} }