gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s3api do not proxy directory requests

Browse Source
This commit is contained in:
Chris Lu
2018-07-23 01:15:59 -07:00
parent 7f32eb1e25
commit ebad3a44ab
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
weed/s3api/s3api_object_handlers.go
View File

@@ -8,6 +8,7 @@ import (
"io" "io"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"strings"
) )
var ( var (
@@ -92,6 +93,11 @@ func (s3a *S3ApiServer) PutObjectHandler(w http.ResponseWriter, r *http.Request)
func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) { func (s3a *S3ApiServer) GetObjectHandler(w http.ResponseWriter, r *http.Request) {
if strings.HasSuffix(r.URL.Path, "/") {
writeErrorResponse(w, ErrNotImplemented, r.URL)
return
}
destUrl := fmt.Sprintf("http://%s%s%s", destUrl := fmt.Sprintf("http://%s%s%s",
s3a.option.Filer, s3a.option.BucketsPath, r.RequestURI) s3a.option.Filer, s3a.option.BucketsPath, r.RequestURI)

2
weed/s3api/s3api_server.go
View File

@@ -58,7 +58,7 @@ func (s3a *S3ApiServer) registerRouter(router *mux.Router) {
// DeleteBucket // DeleteBucket
bucket.Methods("DELETE").HandlerFunc(s3a.DeleteBucketHandler) bucket.Methods("DELETE").HandlerFunc(s3a.DeleteBucketHandler)
// GetObject // GetObject, but directory listing is not supported
bucket.Methods("GET").Path("/{object:.+}").HandlerFunc(s3a.GetObjectHandler) bucket.Methods("GET").Path("/{object:.+}").HandlerFunc(s3a.GetObjectHandler)
// ListObjectsV2 // ListObjectsV2
bucket.Methods("GET").HandlerFunc(s3a.ListObjectsV2Handler).Queries("list-type", "2") bucket.Methods("GET").HandlerFunc(s3a.ListObjectsV2Handler).Queries("list-type", "2")