Skip to content

Read fallback auth token when keyring is reachable but empty #263

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

Merged
anisaoshafi merged 1 commit into from
May 27, 2026
Merged

Read fallback auth token when keyring is reachable but empty #263

Show file tree
Hide file tree
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
11 changes: 4 additions & 7 deletions internal/auth/token_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,9 @@ func (s *systemTokenStorage) GetAuthToken() (string, error) {
if err == nil {
return token, nil
}
if errors.Is(err, keyring.ErrNotFound) {
return "", ErrTokenNotFound
if !errors.Is(err, keyring.ErrNotFound) {
s.logger.Info("system keyring unavailable (%v), falling back to file-based storage", err)
}
s.logger.Info("system keyring unavailable (%v), falling back to file-based storage", err)
return s.file.GetAuthToken()
}

Expand All @@ -62,11 +61,9 @@ func (s *systemTokenStorage) SetAuthToken(token string) error {
}

func (s *systemTokenStorage) DeleteAuthToken() error {
err := s.keyring.Delete(keyringService, keyringAuthTokenKey)
if err == nil || errors.Is(err, keyring.ErrNotFound) {
return nil
if err := s.keyring.Delete(keyringService, keyringAuthTokenKey); err != nil && !errors.Is(err, keyring.ErrNotFound) {
s.logger.Info("system keyring unavailable (%v), falling back to file-based storage", err)
}
s.logger.Info("system keyring unavailable (%v), falling back to file-based storage", err)
return s.file.DeleteAuthToken()
}

Expand Down
23 changes: 20 additions & 3 deletions internal/auth/token_storage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,34 @@ func TestSystemTokenStorage_GetReturnsTokenFromKeyring(t *testing.T) {
assert.Equal(t, "system-token", token)
}

func TestSystemTokenStorage_GetReturnsErrTokenNotFoundWhenKeyringEmpty(t *testing.T) {
func TestSystemTokenStorage_GetReturnsErrTokenNotFoundWhenKeyringAndFileEmpty(t *testing.T) {
ctrl := gomock.NewController(t)
kr := NewMockkeyringer(ctrl)
file := NewMockAuthTokenStorage(ctrl)

kr.EXPECT().Get(keyringService, keyringAuthTokenKey).Return("", keyring.ErrNotFound)
file.EXPECT().GetAuthToken().Return("", ErrTokenNotFound)

token, err := newTestStorage(t, kr, file).GetAuthToken()

assert.Empty(t, token)
assert.ErrorIs(t, err, ErrTokenNotFound)
}

func TestSystemTokenStorage_GetReturnsFileTokenWhenKeyringEmpty(t *testing.T) {
ctrl := gomock.NewController(t)
kr := NewMockkeyringer(ctrl)
file := NewMockAuthTokenStorage(ctrl)

kr.EXPECT().Get(keyringService, keyringAuthTokenKey).Return("", keyring.ErrNotFound)
file.EXPECT().GetAuthToken().Return("file-token", nil)

token, err := newTestStorage(t, kr, file).GetAuthToken()

assert.NoError(t, err)
assert.Equal(t, "file-token", token)
}

func TestSystemTokenStorage_GetFallsBackToFileWhenKeyringUnavailable(t *testing.T) {
ctrl := gomock.NewController(t)
kr := NewMockkeyringer(ctrl)
Expand Down Expand Up @@ -84,24 +99,26 @@ func TestSystemTokenStorage_SetFallsBackToFileWhenKeyringUnavailable(t *testing.
assert.NoError(t, err)
}

func TestSystemTokenStorage_DeleteRemovesFromKeyring(t *testing.T) {
func TestSystemTokenStorage_DeleteRemovesFromKeyringAndFile(t *testing.T) {
ctrl := gomock.NewController(t)
kr := NewMockkeyringer(ctrl)
file := NewMockAuthTokenStorage(ctrl)

kr.EXPECT().Delete(keyringService, keyringAuthTokenKey).Return(nil)
file.EXPECT().DeleteAuthToken().Return(nil)

err := newTestStorage(t, kr, file).DeleteAuthToken()

assert.NoError(t, err)
}

func TestSystemTokenStorage_DeleteSucceedsWhenKeyringTokenMissing(t *testing.T) {
func TestSystemTokenStorage_DeleteClearsFileWhenKeyringTokenMissing(t *testing.T) {
ctrl := gomock.NewController(t)
kr := NewMockkeyringer(ctrl)
file := NewMockAuthTokenStorage(ctrl)

kr.EXPECT().Delete(keyringService, keyringAuthTokenKey).Return(keyring.ErrNotFound)
file.EXPECT().DeleteAuthToken().Return(nil)

err := newTestStorage(t, kr, file).DeleteAuthToken()

Expand Down
Loading