SERVER-34040 Disallow $changeStream on internal databases and system collections

1 files changed, 8 insertions, 18 deletions

diff --git a/jstests/change_streams/change_stream.js b/jstests/change_streams/change_stream.js
index 7c745b33758..791e8fba9ac 100644
--- a/jstests/change_streams/change_stream.js
+++ b/jstests/change_streams/change_stream.js
@@ -6,33 +6,23 @@
     "use strict";
 
     load("jstests/libs/collection_drop_recreate.js");  // For assert[Drop|Create]Collection.
-    load("jstests/libs/change_stream_util.js");        // For ChangeStreamTest.
-
-    function assertValidChangeStreamNss(dbName, collName = "test") {
-        // Verify the DB/collection exists.
-        const testDb = db.getSiblingDB(dbName);
-        const res =
-            testDb.runCommand({aggregate: collName, pipeline: [{$changeStream: {}}], cursor: {}});
-        assert.commandWorked(res);
-        assert.commandWorked(testDb.runCommand({killCursors: "coll", cursors: [res.cursor.id]}));
-    }
+    load("jstests/libs/change_stream_util.js");        // For ChangeStreamTest and
+                                                       // assert[Valid|Invalid]ChangeStreamNss.
 
     const isMongos = db.runCommand({isdbgrid: 1}).isdbgrid;
 
     // Test that a change stream cannot be opened on the "admin", "config", or "local" databases.
-    // TODO SERVER-34040 Should prevent change streams on these databases.
-    assertValidChangeStreamNss("admin");
-    assertValidChangeStreamNss("config");
+    assertInvalidChangeStreamNss("admin");
+    assertInvalidChangeStreamNss("config");
     // Not allowed to access 'local' database through mongos.
     if (!isMongos) {
-        assertValidChangeStreamNss("local");
+        assertInvalidChangeStreamNss("local");
     }
 
     // Test that a change stream cannot be opened on 'system.' collections.
-    // TODO SERVER-34040 Should prevent change streams on these collections.
-    assertValidChangeStreamNss("test", "system.users");
-    assertValidChangeStreamNss("test", "system.profile");
-    assertValidChangeStreamNss("test", "system.version");
+    assertInvalidChangeStreamNss("test", "system.users");
+    assertInvalidChangeStreamNss("test", "system.profile");
+    assertInvalidChangeStreamNss("test", "system.version");
 
     // Test that a change stream can be opened on namespaces with 'system' in the name, but not
     // considered an internal 'system dot' namespace.