From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Tue, 8 Oct 2019 13:18:35 +0000 (+0200)
Subject: rgw: Fix IgnorePublicACLs for bucket ACLs
X-Git-Tag: v15.1.1~555^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e97b7d642618bf041acc573e2313f19dd441131e;p=ceph.git

rgw: Fix IgnorePublicACLs for bucket ACLs

Currently Bucket ACLs with IgnorePublicACLs were broken this should fix that

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index b38f3448ca00..350de785bd96 100644
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -1198,8 +1198,10 @@ bool verify_bucket_permission_no_policy(const DoutPrefixProvider* dpp, struct pe
   if ((perm & (int)s->perm_mask) != perm)
     return false;
 
-  if (bucket_acl->verify_permission(dpp, *s->identity, perm, perm,
-                                    s->get_referer()))
+  if (bucket_acl->verify_permission(dpp, *s->auth.identity, perm, perm,
+                                    s->info.env->get("HTTP_REFERER"),
+                                    s->bucket_access_conf &&
+                                    s->bucket_access_conf->ignore_public_acls()))
     return true;
 
   if (!user_acl)