diff --git a/weed/s3api/s3api_bucket_handlers.go b/weed/s3api/s3api_bucket_handlers.go
index 7a86457ff2..1d734c164a 100644
--- a/weed/s3api/s3api_bucket_handlers.go
+++ b/weed/s3api/s3api_bucket_handlers.go
@@ -1399,9 +1399,14 @@ func (s3a *S3ApiServer) GetBucketLocationHandler(w http.ResponseWriter, r *http.
writeSuccessResponseXML(w, r, CreateBucketConfiguration{})
}
-// GetBucketRequestPaymentHandler Get bucket location
+// GetBucketRequestPaymentHandler Get bucket request payment
// https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketRequestPayment.html
func (s3a *S3ApiServer) GetBucketRequestPaymentHandler(w http.ResponseWriter, r *http.Request) {
+ bucket, _ := s3_constants.GetBucketAndObject(r)
+ if err := s3a.checkBucket(r, bucket); err != s3err.ErrNone {
+ s3err.WriteErrorResponse(w, r, err)
+ return
+ }
writeSuccessResponseXML(w, r, RequestPaymentConfiguration{Payer: "BucketOwner"})
}
diff --git a/weed/s3api/s3api_bucket_handlers_misc_test.go b/weed/s3api/s3api_bucket_handlers_misc_test.go
index 51f52706ec..a9f2058f8c 100644
--- a/weed/s3api/s3api_bucket_handlers_misc_test.go
+++ b/weed/s3api/s3api_bucket_handlers_misc_test.go
@@ -115,6 +115,29 @@ func TestPutBucketRequestPaymentBucketOwner(t *testing.T) {
}
}
+func TestGetBucketRequestPayment(t *testing.T) {
+ s3a := newMiscTestServer(t, "b")
+ s3a.bucketConfigCache.SetNegativeCache("missing")
+
+ rec := httptest.NewRecorder()
+ s3a.GetBucketRequestPaymentHandler(rec, newBucketRequest(http.MethodGet, "b", "requestPayment=", ""))
+ if rec.Code != http.StatusOK {
+ t.Fatalf("status = %d, want %d", rec.Code, http.StatusOK)
+ }
+ if !strings.Contains(rec.Body.String(), "BucketOwner") {
+ t.Fatalf("missing BucketOwner payer: %s", rec.Body.String())
+ }
+
+ rec = httptest.NewRecorder()
+ s3a.GetBucketRequestPaymentHandler(rec, newBucketRequest(http.MethodGet, "missing", "requestPayment=", ""))
+ if rec.Code != http.StatusNotFound {
+ t.Fatalf("missing bucket status = %d, want %d", rec.Code, http.StatusNotFound)
+ }
+ if !strings.Contains(rec.Body.String(), "NoSuchBucket") {
+ t.Fatalf("body = %s, want NoSuchBucket", rec.Body.String())
+ }
+}
+
func TestPutBucketRequestPaymentRequesterRejected(t *testing.T) {
s3a := newMiscTestServer(t, "b")
body := `Requester`