From 2af27be08eb8131ab8cc0fb2218a00aacd44a127 Mon Sep 17 00:00:00 2001
From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 15 Aug 2019 13:13:39 -0400
Subject: [PATCH] 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>
---
 src/rgw/services/svc_user_rados.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 {
-- 
2.39.5