From 61eb7058d0bd04fe4f616ddd011e0c0cb2eaa39d Mon Sep 17 00:00:00 2001 From: Alex Brainman Date: Mon, 14 Dec 2015 10:33:56 +1100 Subject: path/filepath: keep walking if EvalSymlinks returns symlink Fixes #13582 Change-Id: I220f3c7b9511b3c080874f5c42f2a431fdddcbb7 Reviewed-on: https://go-review.googlesource.com/17794 TryBot-Result: Gobot Gobot Reviewed-by: Russ Cox --- src/path/filepath/path_test.go | 69 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) (limited to 'src/path/filepath/path_test.go') diff --git a/src/path/filepath/path_test.go b/src/path/filepath/path_test.go index 201f4fa869..db604ba91f 100644 --- a/src/path/filepath/path_test.go +++ b/src/path/filepath/path_test.go @@ -895,6 +895,75 @@ func TestEvalSymlinks(t *testing.T) { } } +func TestIssue13582(t *testing.T) { + switch runtime.GOOS { + case "android", "nacl", "plan9": + t.Skipf("skipping on %s", runtime.GOOS) + } + if !supportsSymlinks { + t.Skip("skipping because symlinks are not supported") + } + + tmpDir, err := ioutil.TempDir("", "issue13582") + if err != nil { + t.Fatal(err) + } + defer os.RemoveAll(tmpDir) + + dir := filepath.Join(tmpDir, "dir") + err = os.Mkdir(dir, 0755) + if err != nil { + t.Fatal(err) + } + linkToDir := filepath.Join(tmpDir, "link_to_dir") + err = os.Symlink(dir, linkToDir) + if err != nil { + t.Fatal(err) + } + file := filepath.Join(linkToDir, "file") + err = ioutil.WriteFile(file, nil, 0644) + if err != nil { + t.Fatal(err) + } + link1 := filepath.Join(linkToDir, "link1") + err = os.Symlink(file, link1) + if err != nil { + t.Fatal(err) + } + link2 := filepath.Join(linkToDir, "link2") + err = os.Symlink(link1, link2) + if err != nil { + t.Fatal(err) + } + + // /tmp may itself be a symlink! + realTmpDir, err := filepath.EvalSymlinks(tmpDir) + if err != nil { + t.Fatal(err) + } + realDir := filepath.Join(realTmpDir, "dir") + realFile := filepath.Join(realDir, "file") + + tests := []struct { + path, want string + }{ + {dir, realDir}, + {linkToDir, realDir}, + {file, realFile}, + {link1, realFile}, + {link2, realFile}, + } + for _, test := range tests { + have, err := filepath.EvalSymlinks(test.path) + if err != nil { + t.Fatal(err) + } + if have != test.want { + t.Errorf("EvalSymlinks(%q) returns %q, want %q", test.path, have, test.want) + } + } +} + // Test directories relative to temporary directory. // The tests are run in absTestDirs[0]. var absTestDirs = []string{ -- cgit v1.3