Merge pull request #1948 from jpentland/repeated-separators

Improve handling of paths containing repeated separators (fix #1946).

Author: sdboyer

context.go

@@ -302,7 +302,7 @@ func (c *Ctx) detectGOPATH(path string) (string, error) {
 			return "", errors.Wrap(err, "failed to detect GOPATH")
 		}
 		if isPrefix {
-			return gp, nil
+			return filepath.Clean(gp), nil
 		}
 	}
 	return "", errors.Errorf("%s is not within a known GOPATH/src", path)

context_test.go

@@ -524,10 +524,14 @@ func TestDetectGOPATH(t *testing.T) {
 	th.TempDir(filepath.Join("code", "src", "github.com", "username", "package"))
 	th.TempDir(filepath.Join("go", "src", "github.com", "username", "package"))
 	th.TempDir(filepath.Join("gotwo", "src", "github.com", "username", "package"))
+	th.TempDir(filepath.Join("gothree", "sep", "src", "github.com", "username", "package"))
+
+	sep := string(os.PathSeparator)
 
 	ctx := &Ctx{GOPATHs: []string{
 		th.Path("go"),
 		th.Path("gotwo"),
+		th.Path("gothree") + sep + sep + "sep",
 	}}
 
 	testcases := []struct {
@@ -538,6 +542,8 @@ func TestDetectGOPATH(t *testing.T) {
 		{th.Path("go"), th.Path(filepath.Join("go", "src", "github.com", "username", "package")), false},
 		{th.Path("go"), th.Path(filepath.Join("go", "src", "github.com", "username", "package")), false},
 		{th.Path("gotwo"), th.Path(filepath.Join("gotwo", "src", "github.com", "username", "package")), false},
+		{th.Path(filepath.Join("gothree", "sep")),
+			th.Path(filepath.Join("gothree", "sep", "src", "github.com", "username", "package")), false},
 		{"", th.Path(filepath.Join("code", "src", "github.com", "username", "package")), true},
 	}
 
@@ -547,7 +553,7 @@ func TestDetectGOPATH(t *testing.T) {
 			t.Error("expected error but got none")
 		}
 		if GOPATH != tc.GOPATH {
-			t.Errorf("expected GOPATH to be %s, got %s", GOPATH, tc.GOPATH)
+			t.Errorf("expected GOPATH to be %s, got %s", tc.GOPATH, GOPATH)
 		}
 	}
 }

internal/fs/fs.go

@@ -61,8 +61,8 @@ func HasFilepathPrefix(path, prefix string) (bool, error) {
 		dn = filepath.Dir(path)
 	}
 
-	dn = strings.TrimSuffix(dn, string(os.PathSeparator))
-	prefix = strings.TrimSuffix(prefix, string(os.PathSeparator))
+	dn = filepath.Clean(dn)
+	prefix = filepath.Clean(prefix)
 
 	// [1:] in the lines below eliminates empty string on *nix and volume name on Windows
 	dirs := strings.Split(dn, string(os.PathSeparator))[1:]

internal/fs/fs_test.go

@@ -47,12 +47,19 @@ func TestHasFilepathPrefix(t *testing.T) {
 		dir2 = dir
 	}
 
+	// For testing trailing and repeated separators
+	sep := string(os.PathSeparator)
+
 	cases := []struct {
 		path   string
 		prefix string
 		want   bool
 	}{
 		{filepath.Join(dir, "a", "b"), filepath.Join(dir2), true},
+		{filepath.Join(dir, "a", "b"), dir2 + sep + sep + "a", true},
+		{filepath.Join(dir, "a", "b"), filepath.Join(dir2, "a") + sep, true},
+		{filepath.Join(dir, "a", "b") + sep, filepath.Join(dir2), true},
+		{dir + sep + sep + filepath.Join("a", "b"), filepath.Join(dir2, "a"), true},
 		{filepath.Join(dir, "a", "b"), filepath.Join(dir2, "a"), true},
 		{filepath.Join(dir, "a", "b"), filepath.Join(dir2, "a", "b"), true},
 		{filepath.Join(dir, "a", "b"), filepath.Join(dir2, "c"), false},