]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: add AWS4 completion support for RGW_OP_SET_BUCKET_WEBSITE 9018/head
authorJavier M. Mellid <jmunhoz@igalia.com>
Wed, 27 Apr 2016 18:28:08 +0000 (20:28 +0200)
committerYehuda Sadeh <yehuda@redhat.com>
Mon, 9 May 2016 22:59:48 +0000 (15:59 -0700)
Fixes: http://tracker.ceph.com/issues/15626
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
(cherry picked from commit 05373354e4725c3fc675df652fbf97da26160bcb)

src/rgw/rgw_rest_s3.cc

index 2ef10a5ed7426611b1a440dedb98be4108b54361..dc4e9708efa1565f13d0b5dcba07bf52c2b17dca 100644 (file)
@@ -761,6 +761,13 @@ int RGWSetBucketWebsite_ObjStore_S3::get_params()
     return r;
   }
 
+  if (s->aws4_auth_needs_complete) {
+      int ret_auth = do_aws4_auth_completion();
+      if (ret_auth < 0) {
+        return ret_auth;
+      }
+  }
+
   bufferlist bl;
   bl.append(data, len);
 
@@ -3576,6 +3583,7 @@ int RGW_Auth_S3::authorize_v4(RGWRados *store, struct req_state *s)
       case RGW_OP_SET_BUCKET_VERSIONING:
       case RGW_OP_DELETE_MULTI_OBJ:
       case RGW_OP_ADMIN_SET_METADATA:
+      case RGW_OP_SET_BUCKET_WEBSITE:
         break;
       default:
         dout(10) << "ERROR: AWS4 completion for this operation NOT IMPLEMENTED" << dendl;