SERVER-60572 Validate collection name for system.buckets.* namespaces

2 files changed, 11 insertions, 1 deletions

diff --git a/src/mongo/db/namespace_string.cpp b/src/mongo/db/namespace_string.cpp
index e0d068ecf3e..5daec8c5310 100644
--- a/src/mongo/db/namespace_string.cpp
+++ b/src/mongo/db/namespace_string.cpp
@@ -188,7 +188,8 @@ bool NamespaceString::isLegalClientSystemNS(
     if (isTemporaryReshardingCollection()) {
         return true;
     }
-    if (isTimeseriesBucketsCollection()) {
+    if (isTimeseriesBucketsCollection() &&
+        validCollectionName(coll().substr(kTimeseriesBucketsCollectionPrefix.size()))) {
         return true;
     }
     if (isChangeStreamPreImagesCollection()) {
diff --git a/src/mongo/db/namespace_string_test.cpp b/src/mongo/db/namespace_string_test.cpp
index bc8b68e2c64..1a81e856e5f 100644
--- a/src/mongo/db/namespace_string_test.cpp
+++ b/src/mongo/db/namespace_string_test.cpp
@@ -127,6 +127,15 @@ TEST(NamespaceStringTest, IsCollectionlessCursorNamespace) {
     ASSERT_FALSE(NamespaceString{"$cmd.listCollections"}.isCollectionlessCursorNamespace());
 }
 
+TEST(NamespaceStringTest, IsLegalClientSystemNamespace) {
+    const auto& currentFCV = serverGlobalParams.featureCompatibility;
+    ASSERT_TRUE(NamespaceString{"test.system.buckets.1234"}.isLegalClientSystemNS(currentFCV));
+    ASSERT_TRUE(NamespaceString{"test.system.buckets.abcde"}.isLegalClientSystemNS(currentFCV));
+    ASSERT_FALSE(NamespaceString{"test.system.buckets..1234"}.isLegalClientSystemNS(currentFCV));
+    ASSERT_FALSE(NamespaceString{"test.system.buckets.a234$"}.isLegalClientSystemNS(currentFCV));
+    ASSERT_FALSE(NamespaceString{"test.system.buckets."}.isLegalClientSystemNS(currentFCV));
+}
+
 TEST(NamespaceStringTest, IsDropPendingNamespace) {
     ASSERT_TRUE(NamespaceString{"test.system.drop.0i0t-1.foo"}.isDropPendingNamespace());
     ASSERT_TRUE(NamespaceString{"test.system.drop.1234567i8t9.foo"}.isDropPendingNamespace());