Skip to content

fix: fall back to ~/.config/nais for credentials on macOS #646

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

Closed
jhrv wants to merge 1 commit into from
Closed

fix: fall back to ~/.config/nais for credentials on macOS #646

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
23 changes: 12 additions & 11 deletions internal/naisapi/auth/oidcuser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ func storeOIDCUser(tok *oauth2.Token, consoleURL string) (*oidcUser, error) {
return user, nil
}

func getCredentialsFilePath() (string, error) {
const (
naisConfigDir = "nais"
credentialsFileName = "nais-credentials.json.enc"
)
const (
naisConfigDir = "nais"
credentialsFileName = "nais-credentials.json.enc"
)

func getCredentialsFilePath() (string, error) {
userConfigDir, err := os.UserConfigDir()
if err != nil {
return "", fmt.Errorf("get user config dir: %w", err)
Expand All @@ -129,14 +129,15 @@ func readCredentialsFile(encryptionKey []byte) ([]byte, error) {
return nil, err
}

_, err = os.Stat(credentialsPath)
if err != nil {
return nil, err
}

ciphertext, err := os.ReadFile(credentialsPath)
if errors.Is(err, os.ErrNotExist) && runtime.GOOS == "darwin" {
// Fallback for macOS: credentials may have been written by a process
// with a different XDG_CONFIG_HOME setting (e.g. shell vs MCP server).
home, _ := os.UserHomeDir()
ciphertext, err = os.ReadFile(filepath.Join(home, ".config", naisConfigDir, credentialsFileName))
}
if err != nil {
return nil, fmt.Errorf("read credentials file: %w", err)
return nil, err
}

plaintext, err := decryptCredentials(ciphertext, encryptionKey)
Expand Down