Fix normalization check for Rlocation path

go/runfiles/runfiles.go

@@ -118,8 +118,8 @@ func (r *Runfiles) Rlocation(path string) (string, error) {
 	if path == "" {
 		return "", errors.New("runfiles: path may not be empty")
 	}
-	if !isNormalizedPath(path) {
-		return "", fmt.Errorf("runfiles: path %q is not normalized", path)
+	if err := isNormalizedPath(path); err != nil {
+		return "", err
 	}
 
 	// See https://github.com/bazelbuild/bazel/commit/b961b0ad6cc2578b98d0a307581e23e73392ad02
@@ -137,10 +137,17 @@ func (r *Runfiles) Rlocation(path string) (string, error) {
 	return p, nil
 }
 
-func isNormalizedPath(s string) bool {
-	return !strings.HasPrefix(s, "../") && !strings.Contains(s, "/..") &&
-		!strings.HasPrefix(s, "./") && !strings.HasSuffix(s, "/.") &&
-		!strings.Contains(s, "/./") && !strings.Contains(s, "//")
+func isNormalizedPath(s string) error {
+	if strings.HasPrefix(s, "../") || strings.Contains(s, "/../") || strings.HasSuffix(s, "/..") {
+		return fmt.Errorf(`runfiles: path %q must not contain ".." segments`, s)
+	}
+	if strings.HasPrefix(s, "./") || strings.Contains(s, "/./") || strings.HasSuffix(s, "/.") {
+		return fmt.Errorf(`runfiles: path %q must not contain "." segments`, s)
+	}
+	if strings.Contains(s, "//") {
+		return fmt.Errorf(`runfiles: path %q must not contain "//"`, s)
+	}
+	return nil
 }
 
 // Env returns additional environmental variables to pass to subprocesses.

tests/runfiles/runfiles_test.go

@@ -84,6 +84,13 @@ func TestPath_errors(t *testing.T) {
 			}
 		})
 	}
+	for _, s := range []string{"foo/..bar", "foo/.bar"} {
+		t.Run(s, func(t *testing.T) {
+			if _, err := r.Rlocation(s); err != nil && !os.IsNotExist(err.(runfiles.Error).Err) {
+				t.Errorf("got %q, want none or 'file not found' error", err)
+			}
+		})
+	}
 }
 
 func TestRunfiles_zero(t *testing.T) {