mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
Remove duplicate slashes in object path to prevent 500 errors (#3442)
This commit is contained in:
parent
cb476a53ff
commit
31faa6d43d
|
@ -130,9 +130,30 @@ func urlPathEscape(object string) string {
|
||||||
return strings.Join(escapedParts, "/")
|
return strings.Join(escapedParts, "/")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func removeDuplicateSlashes(object string) string {
|
||||||
|
result := strings.Builder{}
|
||||||
|
result.Grow(len(object))
|
||||||
|
|
||||||
|
isLastSlash := false
|
||||||
|
for _, r := range object {
|
||||||
|
switch r {
|
||||||
|
case '/':
|
||||||
|
if !isLastSlash {
|
||||||
|
result.WriteRune(r)
|
||||||
|
}
|
||||||
|
isLastSlash = true
|
||||||
|
default:
|
||||||
|
result.WriteRune(r)
|
||||||
|
isLastSlash = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result.String()
|
||||||
|
}
|
||||||
|
|
||||||
func (s3a *S3ApiServer) toFilerUrl(bucket, object string) string {
|
func (s3a *S3ApiServer) toFilerUrl(bucket, object string) string {
|
||||||
|
object = urlPathEscape(removeDuplicateSlashes(object))
|
||||||
destUrl := fmt.Sprintf("http://%s%s/%s%s",
|
destUrl := fmt.Sprintf("http://%s%s/%s%s",
|
||||||
s3a.option.Filer.ToHttpAddress(), s3a.option.BucketsPath, bucket, urlPathEscape(object))
|
s3a.option.Filer.ToHttpAddress(), s3a.option.BucketsPath, bucket, object)
|
||||||
return destUrl
|
return destUrl
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
48
weed/s3api/s3api_object_handlers_test.go
Normal file
48
weed/s3api/s3api_object_handlers_test.go
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
package s3api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestRemoveDuplicateSlashes(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
path string
|
||||||
|
expectedResult string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "empty",
|
||||||
|
path: "",
|
||||||
|
expectedResult: "",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "slash",
|
||||||
|
path: "/",
|
||||||
|
expectedResult: "/",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "object",
|
||||||
|
path: "object",
|
||||||
|
expectedResult: "object",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "correct path",
|
||||||
|
path: "/path/to/object",
|
||||||
|
expectedResult: "/path/to/object",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "path with duplicates",
|
||||||
|
path: "///path//to/object//",
|
||||||
|
expectedResult: "/path/to/object/",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tst := range tests {
|
||||||
|
t.Run(tst.name, func(t *testing.T) {
|
||||||
|
obj := removeDuplicateSlashes(tst.path)
|
||||||
|
assert.Equal(t, tst.expectedResult, obj)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue