From: John Gibson <jgibson@mitre.org>
Date: Thu, 10 Aug 2017 17:39:35 +0000 (-0400)
Subject: rgw: Added support for testing the wildcard principal in policies.
X-Git-Tag: v12.2.3~207^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e4a5cf95e645d118a781b65c4ca6e5c37dd7eb6c;p=ceph.git

rgw: Added support for testing the wildcard principal in policies.

Signed-off-by: John Gibson <jgibson@mitre.org>
(cherry picked from commit e83b647d44153a7775647693fca1848e592ee107)
---

diff --git a/src/test/rgw/test_rgw_iam_policy.cc b/src/test/rgw/test_rgw_iam_policy.cc
index 7751b086898b..7738869ff37f 100644
--- a/src/test/rgw/test_rgw_iam_policy.cc
+++ b/src/test/rgw/test_rgw_iam_policy.cc
@@ -109,7 +109,10 @@ public:
   }
 
   bool is_identity(const flat_set<Principal>& ids) const override {
-    return ids.find(id) != ids.end();
+    if (id.is_wildcard() && (!ids.empty())) {
+      return true;
+    }
+    return ids.find(id) != ids.end() || ids.find(Principal::wildcard()) != ids.end();
   }
 };