Merge pull request ceph#34462 from inspur-wyq/wip-44987

rgw: belong the anonymous object to the bucket owner Reviewed-by: Casey Bodley <[email protected]>
senax · Dec 1, 2020 · 9d973a0 · 9d973a0
2 parents fe054e0 + e6f9aed
commit 9d973a0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/rgw/rgw_acl_s3.h b/src/rgw/rgw_acl_s3.h
@@ -89,8 +89,12 @@ class RGWAccessControlPolicy_S3 : public RGWAccessControlPolicy, public XMLObj
 
   virtual int create_canned(ACLOwner& _owner, ACLOwner& bucket_owner, const string& canned_acl) {
     RGWAccessControlList_S3& _acl = static_cast<RGWAccessControlList_S3 &>(acl);
-    int ret = _acl.create_canned(_owner, bucket_owner, canned_acl);
-    owner = _owner;
+    if (_owner.get_id() == rgw_user("anonymous")) {
+      owner = bucket_owner;
+    } else {
+      owner = _owner;
+    }
+    int ret = _acl.create_canned(owner, bucket_owner, canned_acl);
     return ret;
   }
   int create_from_headers(RGWUserCtl *user_ctl, const RGWEnv *env, ACLOwner& _owner);