SERVER-16741 Add escape sequence to directoryperdb paths in KV Store

6 files changed, 54 insertions, 1 deletions

diff --git a/src/mongo/db/namespace_string.cpp b/src/mongo/db/namespace_string.cpp
index d4637695ee7..fe50e2039be 100644
--- a/src/mongo/db/namespace_string.cpp
+++ b/src/mongo/db/namespace_string.cpp
@@ -34,6 +34,38 @@ namespace mongo {
 
     using std::string;
 
+    /*  A map of characters to escape. Instead of printing certain characters we output
+     *  based on the following table.
+     */
+    static const std::string escapeTable[256] = {
+        ".00", ".01", ".02", ".03", ".04", ".05", ".06", ".07", ".08", ".09",
+        ".10", ".11", ".12", ".13", ".14", ".15", ".16", ".17", ".18", ".19",
+        ".20", ".21", ".22", ".23", ".24", ".25", ".26", ".27", ".28", ".29",
+        ".30", ".31", ".32", ".33", ".34", ".35", ".36", ".37", ".38", ".39",
+        ".40", ".41", ".42", ".43", ".44", ".45", ".", ".47", "0", "1",
+        "2", "3", "4", "5", "6", "7", "8", "9", ".58", ".59",
+        ".60", ".61", ".62", ".63", ".64", "A", "B", "C", "D", "E",
+        "F", "G", "H", "I", "J", "K", "L", "M", "N", "O",
+        "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y",
+        "Z", ".91", ".92", ".93", ".94", "_", ".96", "a", "b", "c",
+        "d", "e", "f", "g", "h", "i", "j", "k", "l", "m",
+        "n", "o", "p", "q", "r", "s", "t", "u", "v", "w",
+        "x", "y", "z", ".123", ".124", ".125", ".126", ".127", ".128", ".129",
+        ".130", ".131", ".132", ".133", ".134", ".135", ".136", ".137", ".138", ".139",
+        ".140", ".141", ".142", ".143", ".144", ".145", ".146", ".147", ".148", ".149",
+        ".150", ".151", ".152", ".153", ".154", ".155", ".156", ".157", ".158", ".159",
+        ".160", ".161", ".162", ".163", ".164", ".165", ".166", ".167", ".168", ".169",
+        ".170", ".171", ".172", ".173", ".174", ".175", ".176", ".177", ".178", ".179",
+        ".180", ".181", ".182", ".183", ".184", ".185", ".186", ".187", ".188", ".189",
+        ".190", ".191", ".192", ".193", ".194", ".195", ".196", ".197", ".198", ".199",
+        ".200", ".201", ".202", ".203", ".204", ".205", ".206", ".207", ".208", ".209",
+        ".210", ".211", ".212", ".213", ".214", ".215", ".216", ".217", ".218", ".219",
+        ".220", ".221", ".222", ".223", ".224", ".225", ".226", ".227", ".228", ".229",
+        ".230", ".231", ".232", ".233", ".234", ".235", ".236", ".237", ".238", ".239",
+        ".240", ".241", ".242", ".243", ".244", ".245", ".246", ".247", ".248", ".249",
+        ".250", ".251", ".252", ".253", ".254", ".255"
+    };
+
     bool legalClientSystemNS( StringData ns , bool write ) {
         if( ns == "local.system.replset" ) return true;
 
@@ -68,4 +100,16 @@ namespace mongo {
         return NamespaceString(db(), coll().substr(listIndexesGetMoreNSPrefix.size()));
     }
 
+    string NamespaceString::escapeDbName( const StringData dbname ) {
+        std::string escapedDbName;
+
+        // pre-alloc the return string as it will always be the same as dbname at a minimum.
+        escapedDbName.reserve(dbname.size());
+
+        for (unsigned char c : dbname) {
+            escapedDbName += escapeTable[c];
+        }
+        return escapedDbName;
+    }
+
 }
diff --git a/src/mongo/db/namespace_string.h b/src/mongo/db/namespace_string.h
index 72f357f13c3..655dbf68a73 100644
--- a/src/mongo/db/namespace_string.h
+++ b/src/mongo/db/namespace_string.h
@@ -145,6 +145,11 @@ namespace mongo {
         std::string getCommandNS() const;
 
         /**
+         * Function to escape most non-alpha characters from file names
+         */
+        static std::string escapeDbName( const StringData dbname );
+
+        /**
          * @return true if ns is 'normal'.  A "$" is used for namespaces holding index data,
          * which do not contain BSON objects in their records. ("oplog.$main" is the exception)
          */
diff --git a/src/mongo/db/storage/in_memory/SConscript b/src/mongo/db/storage/in_memory/SConscript
index 95862326711..70676b463d1 100644
--- a/src/mongo/db/storage/in_memory/SConscript
+++ b/src/mongo/db/storage/in_memory/SConscript
@@ -22,6 +22,7 @@ env.Library(
     LIBDEPS= [
         'in_memory_record_store',
         '$BUILD_DIR/mongo/bson/bson',
+        '$BUILD_DIR/mongo/db/namespace_string',
         '$BUILD_DIR/mongo/db/catalog/collection_options',
         '$BUILD_DIR/mongo/db/index/index_descriptor',
         '$BUILD_DIR/mongo/db/storage/index_entry_comparison',
diff --git a/src/mongo/db/storage/kv/SConscript b/src/mongo/db/storage/kv/SConscript
index 6f44dfcc52f..2e1b78fc748 100644
--- a/src/mongo/db/storage/kv/SConscript
+++ b/src/mongo/db/storage/kv/SConscript
@@ -73,6 +73,7 @@ env.CppUnitTest(
         ],
     LIBDEPS=[
         'kv_engine_mock',
+        '$BUILD_DIR/mongo/db/namespace_string',
         '$BUILD_DIR/mongo/db/catalog/collection_options',
         '$BUILD_DIR/mongo/db/storage/devnull/storage_devnull_core',
         '$BUILD_DIR/mongo/db/storage/in_memory/in_memory_record_store',
diff --git a/src/mongo/db/storage/kv/kv_catalog.cpp b/src/mongo/db/storage/kv/kv_catalog.cpp
index 764e4b4c93e..271eb7e12c0 100644
--- a/src/mongo/db/storage/kv/kv_catalog.cpp
+++ b/src/mongo/db/storage/kv/kv_catalog.cpp
@@ -36,6 +36,7 @@
 #include <stdlib.h>
 
 #include "mongo/db/concurrency/d_concurrency.h"
+#include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/storage/record_store.h"
 #include "mongo/db/storage/recovery_unit.h"
@@ -122,7 +123,7 @@ namespace {
         // If this changes to not put _rand at the end, _hasEntryCollidingWithRand will need fixing.
         StringBuilder buf;
         if ( _directoryPerDb ) {
-            buf << nsToDatabaseSubstring( ns ) << '/';
+            buf << NamespaceString::escapeDbName( nsToDatabaseSubstring( ns ) ) << '/';
         }
         buf << kind;
         buf << ( _directoryForIndexes ? '/' : '-' );
diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript
index 41bac81652c..7d5bd894fb9 100644
--- a/src/mongo/db/storage/wiredtiger/SConscript
+++ b/src/mongo/db/storage/wiredtiger/SConscript
@@ -21,6 +21,7 @@ if wiredtiger:
             ],
         LIBDEPS= [
             '$BUILD_DIR/mongo/bson/bson',
+            '$BUILD_DIR/mongo/db/namespace_string',
             '$BUILD_DIR/mongo/db/catalog/collection_options',
             '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception',
             '$BUILD_DIR/mongo/db/index/index_descriptor',