gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

s3: escape object key if containing special characters

Browse source 
fix https://github.com/chrislusf/seaweedfs/issues/1884
This commit is contained in:
Chris Lu 2021-03-10 13:19:28 -08:00
parent 6d729fa742
commit ca546f47e1
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
weed/s3api/s3api_object_handlers.go
View file

@ -8,6 +8,7 @@ import (
"io"
"io/ioutil"
"net/http"
"net/url"
"sort"
"strings"
@ -69,7 +70,7 @@ func (s3a *S3ApiServer) PutObjectHandler(w http.ResponseWriter, r *http.Request)
return
}
} else {
uploadUrl := fmt.Sprintf("http://%s%s/%s%s", s3a.option.Filer, s3a.option.BucketsPath, bucket, object)
uploadUrl := s3a.buildUploadUrl(bucket, object)
etag, errCode := s3a.putToFiler(r, uploadUrl, dataReader)
@ -84,6 +85,15 @@ func (s3a *S3ApiServer) PutObjectHandler(w http.ResponseWriter, r *http.Request)
writeSuccessResponseEmpty(w)
}
func (s3a *S3ApiServer) buildUploadUrl(bucket string, object string) string {
var escapedParts []string
for _, part := range strings.Split(object, "/") {
escapedParts = append(escapedParts, url.PathEscape(part))
}
object = strings.Join(escapedParts, "/")
return fmt.Sprintf("http://%s%s/%s%s", s3a.option.Filer, s3a.option.BucketsPath, bucket, object)
}
func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) {
bucket, object := getBucketAndObject(r)

3
weed/s3api/s3api_object_handlers_postpolicy.go
View file

@ -4,7 +4,6 @@ import (
"bytes"
"encoding/base64"
"errors"
"fmt"
"github.com/chrislusf/seaweedfs/weed/s3api/policy"
"github.com/chrislusf/seaweedfs/weed/s3api/s3err"
"github.com/dustin/go-humanize"
@ -110,7 +109,7 @@ func (s3a *S3ApiServer) PostPolicyBucketHandler(w http.ResponseWriter, r *http.R
}
}
uploadUrl := fmt.Sprintf("http://%s%s/%s/%s", s3a.option.Filer, s3a.option.BucketsPath, bucket, object)
uploadUrl := s3a.buildUploadUrl(bucket, object)
etag, errCode := s3a.putToFiler(r, uploadUrl, fileBody)