From: Seena Fallah <seenafallah@gmail.com>
Date: Thu, 5 Mar 2020 19:00:39 +0000 (+0330)
Subject: rgw: Add support wildcard subuser for bucket policy
X-Git-Tag: v14.2.11~38^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F36186%2Fhead;p=ceph.git

rgw: Add support wildcard subuser for bucket policy

Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit 0008f84cb03402b159001bf6b6c3a2ff48b2de9b)
---

diff --git a/src/rgw/rgw_auth.cc b/src/rgw/rgw_auth.cc
index b03d5b280106..df41a8c8ade5 100644
--- a/src/rgw/rgw_auth.cc
+++ b/src/rgw/rgw_auth.cc
@@ -602,7 +602,11 @@ bool rgw::auth::LocalApplier::is_identity(const idset_t& ids) const {
       if (id.get_id() == user_info.user_id.id) {
         return true;
       }
-      if (subuser != NO_SUBUSER) {
+      std::string wildcard_subuser = user_info.user_id.id;
+      wildcard_subuser.append(":*");
+      if (wildcard_subuser == id.get_id()) {
+        return true;
+      } else if (subuser != NO_SUBUSER) {
         std::string user = user_info.user_id.id;
         user.append(":");
         user.append(subuser);