don't send endSessions to cryptd + prose test

Author: baileympearson

src/mongo_client.ts

@@ -795,38 +795,42 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
       return;
     }
 
-    // If we would attempt to select a server and get nothing back we short circuit
-    // to avoid the server selection timeout.
-    const selector = readPreferenceServerSelector(ReadPreference.primaryPreferred);
     const topologyDescription = this.topology.description;
-    const serverDescriptions = Array.from(topologyDescription.servers.values());
-    const servers = selector(topologyDescription, serverDescriptions);
-    if (servers.length !== 0) {
-      const endSessions = Array.from(this.s.sessionPool.sessions, ({ id }) => id);
-      if (endSessions.length !== 0) {
-        try {
-          class EndSessionsOperation extends AbstractOperation<void> {
-            override ns = MongoDBNamespace.fromString('admin.$cmd');
-            override SERVER_COMMAND_RESPONSE_TYPE = MongoDBResponse;
-            override buildCommand(_connection: Connection, _session?: ClientSession): Document {
-              return {
-                endSessions
-              };
-            }
-            override buildOptions(timeoutContext: TimeoutContext): ServerCommandOptions {
-              return {
-                timeoutContext,
-                readPreference: ReadPreference.primaryPreferred,
-                noResponse: true
-              };
-            }
-            override get commandName(): string {
-              return 'endSessions';
+    const areSessionsSupported = topologyDescription.logicalSessionTimeoutMinutes != null;
+
+    if (areSessionsSupported) {
+      // If we would attempt to select a server and get nothing back we short circuit
+      // to avoid the server selection timeout.
+      const selector = readPreferenceServerSelector(ReadPreference.primaryPreferred);
+      const serverDescriptions = Array.from(topologyDescription.servers.values());
+      const servers = selector(topologyDescription, serverDescriptions);
+      if (servers.length !== 0) {
+        const endSessions = Array.from(this.s.sessionPool.sessions, ({ id }) => id);
+        if (endSessions.length !== 0) {
+          try {
+            class EndSessionsOperation extends AbstractOperation<void> {
+              override ns = MongoDBNamespace.fromString('admin.$cmd');
+              override SERVER_COMMAND_RESPONSE_TYPE = MongoDBResponse;
+              override buildCommand(_connection: Connection, _session?: ClientSession): Document {
+                return {
+                  endSessions
+                };
+              }
+              override buildOptions(timeoutContext: TimeoutContext): ServerCommandOptions {
+                return {
+                  timeoutContext,
+                  readPreference: ReadPreference.primaryPreferred,
+                  noResponse: true
+                };
+              }
+              override get commandName(): string {
+                return 'endSessions';
+              }
             }
+            await executeOperation(this, new EndSessionsOperation());
+          } catch (error) {
+            squashError(error);
           }
-          await executeOperation(this, new EndSessionsOperation());
-        } catch (error) {
-          squashError(error);
         }
       }
     }

test/integration/node-specific/client_close.test.ts

@@ -1,9 +1,19 @@
+import { type ChildProcess, spawn } from 'node:child_process';
 import * as events from 'node:events';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
 
 import { expect } from 'chai';
 
 import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
-import { type Collection, type FindCursor, type MongoClient } from '../../mongodb';
+import {
+  type Collection,
+  type CommandStartedEvent,
+  type FindCursor,
+  type MongoClient,
+  ObjectId
+} from '../../mongodb';
+import { filterForCommands } from '../shared';
 import { runScriptAndGetProcessInfo } from './resource_tracking_script_builder';
 
 describe('MongoClient.close() Integration', () => {
@@ -490,20 +500,68 @@ describe('MongoClient.close() Integration', () => {
     });
 
     describe('when MongoClient.close is called', function () {
-      it('sends an endSessions command', async function () {
-        await client.db('a').collection('a').insertOne({ a: 1 });
-        await client.db('a').collection('a').insertOne({ a: 1 });
-        await client.db('a').collection('a').insertOne({ a: 1 });
-        const endSessionsStarted = events.once(client, 'commandStarted');
-        const willEndSessions = events.once(client, 'commandSucceeded');
+      describe('when sessions are supported', function () {
+        it('sends an endSessions command', async function () {
+          await client.db('a').collection('a').insertOne({ a: 1 });
+          await client.db('a').collection('a').insertOne({ a: 1 });
+          await client.db('a').collection('a').insertOne({ a: 1 });
+          const endSessionsStarted = events.once(client, 'commandStarted');
+          const willEndSessions = events.once(client, 'commandSucceeded');
 
-        await client.close();
+          await client.close();
+
+          const [startedEv] = await endSessionsStarted;
+          expect(startedEv).to.have.nested.property('command.endSessions').that.has.lengthOf(1);
+
+          const [commandEv] = await willEndSessions;
+          expect(commandEv).to.have.property('commandName', 'endSessions');
+        });
+      });
 
-        const [startedEv] = await endSessionsStarted;
-        expect(startedEv).to.have.nested.property('command.endSessions').that.has.lengthOf(1);
+      describe('when sessions are not supported', function () {
+        const mongocryptdTestPort = '27022';
+        let childProcess: ChildProcess;
+        let client: MongoClient;
+        const commands: Array<CommandStartedEvent> = [];
+
+        beforeEach(async function () {
+          const pidFile = join(tmpdir(), new ObjectId().toHexString());
+          childProcess = spawn(
+            'mongocryptd',
+            ['--port', mongocryptdTestPort, '--ipv6', '--pidfilepath', pidFile],
+            {
+              stdio: 'ignore',
+              detached: true
+            }
+          );
+
+          childProcess.on('error', err => {
+            console.warn('Sessions prose mongocryptd error:', err);
+          });
+        });
 
-        const [commandEv] = await willEndSessions;
-        expect(commandEv).to.have.property('commandName', 'endSessions');
+        beforeEach('configure cryptd client and prepopulate session pool', async function () {
+          client = this.configuration.newClient(`mongodb://localhost:${mongocryptdTestPort}`, {
+            monitorCommands: true
+          });
+
+          client.on('commandStarted', filterForCommands('endSessions', commands));
+
+          // run an operation to instantiate an implicit session (which should be omitted) from the
+          // actual command but still instantiated by the client.  See session prose test 18.
+          await client.db().command({ hello: true });
+          expect(client.s.sessionPool.sessions).to.have.length.greaterThan(0);
+        });
+
+        afterEach(() => {
+          childProcess.kill();
+        });
+
+        it('does not execute endSessions', async function () {
+          await client.close();
+
+          expect(commands).to.deep.equal([]);
+        });
       });
     });
   });