diff options
| author | hilimd <68371223+hilimd@users.noreply.github.com> | 2021-10-29 23:06:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-29 23:06:23 +0800 |
| commit | b5389c3b23502da7315dd258715e146be7cc0fc9 (patch) | |
| tree | 687be2f6e637ce3c341e3cc3c57c03cc7ef045c2 | |
| parent | 9e3060bb1399c8fce708289cda853a3e77f36f88 (diff) | |
| parent | 608dc11a286f31c3eb9b3e7c3c05a2e38368d789 (diff) | |
| download | seaweedfs-b5389c3b23502da7315dd258715e146be7cc0fc9.tar.xz seaweedfs-b5389c3b23502da7315dd258715e146be7cc0fc9.zip | |
Merge pull request #86 from chrislusf/master
sync
| -rw-r--r-- | weed/s3api/s3api_bucket_handlers.go | 3 | ||||
| -rw-r--r-- | weed/s3api/s3api_server.go | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/weed/s3api/s3api_bucket_handlers.go b/weed/s3api/s3api_bucket_handlers.go index b75012e9d..c45210b92 100644 --- a/weed/s3api/s3api_bucket_handlers.go +++ b/weed/s3api/s3api_bucket_handlers.go @@ -268,6 +268,7 @@ func (s3a *S3ApiServer) GetBucketLifecycleConfigurationHandler(w http.ResponseWr ttls := fc.GetCollectionTtls(bucket) if len(ttls) == 0 { s3err.WriteErrorResponse(w, s3err.ErrNoSuchLifecycleConfiguration, r) + return } response := Lifecycle{} for prefix, internalTtl := range ttls { @@ -299,6 +300,6 @@ func (s3a *S3ApiServer) PutBucketLifecycleConfigurationHandler(w http.ResponseWr // https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucketLifecycle.html func (s3a *S3ApiServer) DeleteBucketLifecycleHandler(w http.ResponseWriter, r *http.Request) { - s3err.WriteErrorResponse(w, s3err.ErrNotImplemented, r) + s3err.WriteEmptyResponse(w, http.StatusNoContent) } diff --git a/weed/s3api/s3api_server.go b/weed/s3api/s3api_server.go index ee961bf3b..1f948a9cb 100644 --- a/weed/s3api/s3api_server.go +++ b/weed/s3api/s3api_server.go @@ -103,13 +103,9 @@ func (s3a *S3ApiServer) registerRouter(router *mux.Router) { bucket.Methods("PUT").Path("/{object:.+}").HeadersRegexp("X-Amz-Copy-Source", ".*?(\\/|%2F).*?").HandlerFunc(track(s3a.iam.Auth(s3a.CopyObjectHandler, ACTION_WRITE), "COPY")) // PutObject bucket.Methods("PUT").Path("/{object:.+}").HandlerFunc(track(s3a.iam.Auth(s3a.PutObjectHandler, ACTION_WRITE), "PUT")) - // PutBucket - bucket.Methods("PUT").HandlerFunc(track(s3a.iam.Auth(s3a.PutBucketHandler, ACTION_ADMIN), "PUT")) // DeleteObject bucket.Methods("DELETE").Path("/{object:.+}").HandlerFunc(track(s3a.iam.Auth(s3a.DeleteObjectHandler, ACTION_WRITE), "DELETE")) - // DeleteBucket - bucket.Methods("DELETE").HandlerFunc(track(s3a.iam.Auth(s3a.DeleteBucketHandler, ACTION_WRITE), "DELETE")) // ListObjectsV2 bucket.Methods("GET").HandlerFunc(track(s3a.iam.Auth(s3a.ListObjectsV2Handler, ACTION_LIST), "LIST")).Queries("list-type", "2") @@ -139,6 +135,13 @@ func (s3a *S3ApiServer) registerRouter(router *mux.Router) { // ListObjectsV1 (Legacy) bucket.Methods("GET").HandlerFunc(track(s3a.iam.Auth(s3a.ListObjectsV1Handler, ACTION_LIST), "LIST")) + + // PutBucket + bucket.Methods("PUT").HandlerFunc(track(s3a.iam.Auth(s3a.PutBucketHandler, ACTION_ADMIN), "PUT")) + + // DeleteBucket + bucket.Methods("DELETE").HandlerFunc(track(s3a.iam.Auth(s3a.DeleteBucketHandler, ACTION_WRITE), "DELETE")) + /* // not implemented |