diff --git a/cmd/tailscale/cli/configure-kube.go b/cmd/tailscale/cli/configure-kube.go index e2ef6becf..89c036ef7 100644 --- a/cmd/tailscale/cli/configure-kube.go +++ b/cmd/tailscale/cli/configure-kube.go @@ -56,7 +56,14 @@ func kubeconfigPath() string { if kubeconfig := os.Getenv("KUBECONFIG"); kubeconfig != "" { var out string for _, out = range filepath.SplitList(kubeconfig) { - if info, err := os.Stat(out); !os.IsNotExist(err) && !info.IsDir() { + info, err := os.Stat(out) + if err != nil { + if !os.IsNotExist(err) { + break + } + continue + } + if !info.IsDir() { break } } diff --git a/cmd/tailscale/cli/configure-kube_test.go b/cmd/tailscale/cli/configure-kube_test.go index 45ab7f542..bc6fb865b 100644 --- a/cmd/tailscale/cli/configure-kube_test.go +++ b/cmd/tailscale/cli/configure-kube_test.go @@ -304,10 +304,18 @@ func TestCheckKubeconfigWritable(t *testing.T) { if runtime.GOOS == "windows" { t.Skip("directory mode permissions are not enforced the same way on Windows") } - if os.Getuid() == 0 { - t.Skip("root bypasses directory permission checks") - } dir := t.TempDir() + loop := filepath.Join(dir, "loop") + if err := os.Symlink(filepath.Base(loop), loop); err != nil { + t.Fatal(err) + } + t.Setenv("KUBECONFIG", loop) + if got := kubeconfigPath(); got != loop { + t.Errorf("kubeconfigPath() = %q, want %q", got, loop) + } + if os.Getuid() == 0 { + return // root bypasses the remaining file permission check + } sub := filepath.Join(dir, "ro") if err := os.Mkdir(sub, 0500); err != nil { t.Fatal(err)