Skip to content

Fix tsh profile dir #26010

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
zmb3 merged 1 commit into from
May 10, 2023
Merged

Fix tsh profile dir #26010

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
2 changes: 1 addition & 1 deletion api/profile/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ func defaultProfilePath() string {
// a user lookup (which can be very slow on large AD environments)
home, err := os.UserHomeDir()
if err == nil && home != "" {
return home
return filepath.Join(home, profileDir)
}

home = os.TempDir()
Expand Down
14 changes: 14 additions & 0 deletions api/profile/profile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package profile_test
import (
"os"
"path/filepath"
"runtime"
"testing"

"github.com/gravitational/trace"
Expand Down Expand Up @@ -102,3 +103,16 @@ func TestAppPath(t *testing.T) {
expected := filepath.Join(dir, "keys", "proxy", "testuser-app", "example.com", "banana-x509.pem")
require.Equal(t, expected, p.AppCertPath("banana"))
}

func TestProfilePath(t *testing.T) {
switch runtime.GOOS {
case "darwin", "linux":
default:
t.Skip("this test only runs on Unix")
}
dir := t.TempDir()
t.Setenv("HOME", dir)

require.Equal(t, "/foo/bar", profile.FullProfilePath("/foo/bar"))
require.Equal(t, filepath.Join(dir, ".tsh"), profile.FullProfilePath(""))
}