Fix for lindenlab#53

BrianFanning · Feb 1, 2022 · 1450bad · 1450bad
1 parent 95af47d
commit 1450bad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/browse.go b/browse.go
@@ -54,9 +54,8 @@ func (po PageObj) GenerateJson(w http.ResponseWriter) error {
 }
 
 func (p S3Proxy) ConstructListObjInput(r *http.Request, key string) s3.ListObjectsV2Input {
-	// We should only get here if the path ends in a /, however, when we make the
-	//call to ListObjects no / should be there
-	prefix := strings.TrimSuffix(key, "/")
+	// We need to strip the first '/' from the key to make it a valid prefix
+	prefix := strings.TrimPrefix(key, "/")
 
 	input := s3.ListObjectsV2Input{
 		Bucket:    aws.String(p.Bucket),

diff --git a/browse_test.go b/browse_test.go
@@ -28,7 +28,7 @@ func TestConstructListObjInput(t *testing.T) {
 			expected: s3.ListObjectsV2Input{
 				Bucket:    aws.String("myBucket"),
 				Delimiter: aws.String("/"),
-				Prefix:    aws.String("/mypath"),
+				Prefix:    aws.String("mypath/"),
 			},
 		},
 		testCase{
@@ -39,7 +39,7 @@ func TestConstructListObjInput(t *testing.T) {
 			expected: s3.ListObjectsV2Input{
 				Bucket:    aws.String("myBucket"),
 				Delimiter: aws.String("/"),
-				Prefix:    aws.String("/mypath"),
+				Prefix:    aws.String("mypath/"),
 				MaxKeys:   aws.Int64(20),
 			},
 		},
@@ -51,7 +51,7 @@ func TestConstructListObjInput(t *testing.T) {
 			expected: s3.ListObjectsV2Input{
 				Bucket:            aws.String("myBucket"),
 				Delimiter:         aws.String("/"),
-				Prefix:            aws.String("/mypath"),
+				Prefix:            aws.String("mypath/"),
 				MaxKeys:           aws.Int64(20),
 				ContinuationToken: aws.String("FOO"),
 			},