From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 15 Aug 2019 17:13:39 +0000 (-0400)
Subject: rgw: RGWSI_User_Module filters '.buckets' objects out of user listing
X-Git-Tag: v15.1.0~1856^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F29695%2Fhead;p=ceph.git

rgw: RGWSI_User_Module filters '.buckets' objects out of user listing

Fixes: https://tracker.ceph.com/issues/41300

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/services/svc_user_rados.cc b/src/rgw/services/svc_user_rados.cc
index 28858069bd9..1d16db9ce71 100644
--- a/src/rgw/services/svc_user_rados.cc
+++ b/src/rgw/services/svc_user_rados.cc
@@ -1,4 +1,4 @@
-
+#include <boost/algorithm/string.hpp>
 
 #include "svc_user.h"
 #include "svc_user_rados.h"
@@ -43,7 +43,8 @@ public:
   }
 
   bool is_valid_oid(const string& oid) override {
-    return true;
+    // filter out the user.buckets objects
+    return !boost::algorithm::ends_with(oid, RGW_BUCKETS_OBJ_SUFFIX);
   }
 
   string key_to_oid(const string& key) override {