Fix path handling in storagegit (#2282)

bufbuild · Jul 12, 2023 · 1986493 · 1986493
1 parent 2ce1126
commit 1986493
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/private/pkg/storage/storagegit/bucket.go b/private/pkg/storage/storagegit/bucket.go
@@ -46,6 +46,10 @@ func newBucket(
 }
 
 func (b *bucket) Get(ctx context.Context, path string) (storage.ReadObjectCloser, error) {
+	path, err := storageutil.ValidatePath(path)
+	if err != nil {
+		return nil, err
+	}
 	node, err := b.root.Descendant(path, b.objectReader)
 	if err != nil {
 		if errors.Is(err, git.ErrTreeNodeNotFound) {
@@ -76,7 +80,7 @@ func (b *bucket) Get(ctx context.Context, path string) (storage.ReadObjectCloser
 		path, err := normalpath.NormalizeAndValidate(
 			normalpath.Join(
 				normalpath.Base(path),
-				normalpath.Normalize(string(data)),
+				string(data),
 			),
 		)
 		if err != nil {
@@ -110,6 +114,10 @@ func (b *bucket) Stat(ctx context.Context, path string) (storage.ObjectInfo, err
 }
 
 func (b *bucket) Walk(ctx context.Context, prefix string, f func(storage.ObjectInfo) error) error {
+	prefix, err := storageutil.ValidatePrefix(prefix)
+	if err != nil {
+		return err
+	}
 	walkChecker := storageutil.NewWalkChecker()
 	return b.walk(b.root, b.objectReader, prefix, func(path string) error {
 		if err := walkChecker.Check(ctx); err != nil {
@@ -125,7 +133,6 @@ func (b *bucket) walk(
 	prefix string,
 	walkFn func(string) error,
 ) error {
-	prefix = normalpath.Normalize(prefix)
 	if prefix != "." {
 		node, err := parent.Descendant(prefix, b.objectReader)
 		if err != nil {
@@ -180,10 +187,11 @@ func (b *bucket) walkTree(
 	return nil
 }
 
+// path is expected to be normalized by calling functions
 func (b *bucket) newObjectInfo(path string) storage.ObjectInfo {
 	return storageutil.NewObjectInfo(
-		normalpath.Normalize(path),
-		normalpath.Unnormalize(path),
+		path,
+		path,
 	)
 }
 

diff --git a/private/pkg/storage/storagegit/storagegit_test.go b/private/pkg/storage/storagegit/storagegit_test.go
@@ -19,7 +19,6 @@ import (
 
 	"github.com/bufbuild/buf/private/pkg/git"
 	"github.com/bufbuild/buf/private/pkg/git/gittest"
-	"github.com/bufbuild/buf/private/pkg/normalpath"
 	"github.com/bufbuild/buf/private/pkg/storage/storagetesting"
 	"github.com/stretchr/testify/require"
 )
@@ -58,7 +57,7 @@ func TestNewBucketAtTreeHash(t *testing.T) {
 		t,
 		bucket,
 		"proto/acme/grocerystore/v1/c.proto",
-		normalpath.Unnormalize("proto/acme/grocerystore/v1/c.proto"),
+		"proto/acme/grocerystore/v1/c.proto",
 	)
 	storagetesting.AssertNotExist(t, bucket, "random-path")
 	storagetesting.AssertPathToContent(