Skip to content

fix(naisapi/auth): return appropriate error when encountering old data in keyring #637

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
tronghn merged 1 commit into from
Jan 29, 2026
Merged

fix(naisapi/auth): return appropriate error when encountering old data in keyring #637

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
13 changes: 11 additions & 2 deletions internal/keyring/keyring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package keyring
import (
"encoding/base64"
"errors"
"fmt"
"time"

"github.com/zalando/go-keyring"
Expand All @@ -16,7 +17,10 @@ const (
keyringUser = "nais-user"
)

var ErrSecretNotFound = errors.New("secret not found in keyring")
var (
ErrSecretNotFound = errors.New("secret not found in keyring")
ErrInvalidData = errors.New("invalid data stored in keyring")
)

type TimeoutError struct {
message string
Expand Down Expand Up @@ -55,7 +59,12 @@ func GetBytes() ([]byte, error) {
if err != nil {
return nil, err
}
return base64.StdEncoding.DecodeString(encoded)

bytes, err := base64.StdEncoding.DecodeString(encoded)
if err != nil {
return nil, fmt.Errorf("%w: decode base64: %+v", ErrInvalidData, err)
}
return bytes, nil
}

func Set(value string) error {
Expand Down
2 changes: 1 addition & 1 deletion internal/naisapi/auth/oidcuser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (u *oidcUser) Refresh(ctx context.Context) (*oidcUser, error) {
func getOIDCUser(ctx context.Context) (*oidcUser, error) {
encryptionKey, err := keyring.GetBytes()
if err != nil {
if errors.Is(err, keyring.ErrSecretNotFound) {
if errors.Is(err, keyring.ErrSecretNotFound) || errors.Is(err, keyring.ErrInvalidData) {
return nil, ErrNeedsOIDCLogin
}
return nil, fmt.Errorf("get encryption key: %w", err)
Expand Down