From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 3 May 2017 22:10:01 +0000 (-0700)
Subject: rgw: system users override elasticsearch permission filter
X-Git-Tag: ses5-milestone6~9^2~3^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16e07f049dcb20a96b08fc4dc5b0c267eb16c90d;p=ceph.git

rgw: system users override elasticsearch permission filter

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_sync_module_es_rest.cc b/src/rgw/rgw_sync_module_es_rest.cc
index edbbab2d185..2652a22d981 100644
--- a/src/rgw/rgw_sync_module_es_rest.cc
+++ b/src/rgw/rgw_sync_module_es_rest.cc
@@ -161,7 +161,9 @@ void RGWMetadataSearchOp::execute()
 
   list<pair<string, string> > conds;
 
-  conds.push_back(make_pair("permissions", s->user->user_id.to_str()));
+  if (s->user->system) {
+    conds.push_back(make_pair("permissions", s->user->user_id.to_str()));
+  }
 
   if (!s->bucket_name.empty()) {
     conds.push_back(make_pair("bucket", s->bucket_name));