fix(node-runtime-worker-thread): properly pass through FLE2 options C…

…OMPASS-5647 (#1288)
mongodb-js · May 17, 2022 · 7daf54d · 7daf54d
1 parent 6d3d912
commit 7daf54d
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 7 deletions.
diff --git a/packages/node-runtime-worker-thread/src/serializer.spec.ts b/packages/node-runtime-worker-thread/src/serializer.spec.ts
@@ -1,6 +1,6 @@
 import { DevtoolsConnectOptions } from '@mongosh/service-provider-server/lib/cli-service-provider';
 import { expect } from 'chai';
-import { UUID } from 'bson';
+import { UUID, Long } from 'bson';
 import {
   serializeError,
   deserializeError,
@@ -141,7 +141,7 @@ describe('serializer', () => {
   });
 
   describe('connection options', () => {
-    it('should serialize and deserialize connection options', () => {
+    it('should serialize and deserialize FLE1 connection options', () => {
       const options: DevtoolsConnectOptions = {
         autoEncryption: {
           schemaMap: {
@@ -184,5 +184,41 @@ describe('serializer', () => {
 
       expect(deserializeConnectOptions(serialized)).to.deep.equal(options);
     });
+
+    it('should serialize and deserialize FLE2 connection options', () => {
+      const options: DevtoolsConnectOptions = {
+        autoEncryption: {
+          encryptedFieldsMap: {
+            'hr.employees': {
+              fields: [{
+                path: 'phoneNumber',
+                keyId: new UUID('fd6275d7-9260-4e6c-a86b-68ec5240814a').toBinary(),
+                bsonType: 'string',
+                queries: { queryType: 'equality', contention: new Long(0) }
+              }]
+            }
+          }
+        }
+      };
+
+      const serialized = serializeConnectOptions(options);
+
+      expect(serialized).to.deep.equal({
+        autoEncryption: {
+          encryptedFieldsMap: {
+            'hr.employees': {
+              fields: [{
+                path: 'phoneNumber',
+                keyId: { $binary: { base64: '/WJ115JgTmyoa2jsUkCBSg==', subType: '04' } },
+                bsonType: 'string',
+                queries: { queryType: 'equality', contention: { $numberLong: '0' } }
+              }]
+            }
+          }
+        }
+      });
+
+      expect(deserializeConnectOptions(serialized)).to.deep.equal(options);
+    });
   });
 });
diff --git a/packages/node-runtime-worker-thread/src/serializer.ts b/packages/node-runtime-worker-thread/src/serializer.ts
@@ -114,9 +114,7 @@ export function deserializeEvaluationResult({
 
 const autoEncryptionBSONOptions = [
   'schemaMap',
-  // Note: This is an educated guess for what the name of this option will be.
-  // This may need to be adjusted later.
-  'encryptedFieldConfigMap'
+  'encryptedFieldsMap'
 ] as const;
 
 export function serializeConnectOptions(options: Readonly<DevtoolsConnectOptions> = {}): DevtoolsConnectOptions {
@@ -125,7 +123,7 @@ export function serializeConnectOptions(options: Readonly<DevtoolsConnectOptions
     if (serializedOptions.autoEncryption?.[autoEncryptionOption]) {
       serializedOptions.autoEncryption = {
         ...serializedOptions.autoEncryption,
-        [autoEncryptionOption]: EJSON.serialize(serializedOptions.autoEncryption[autoEncryptionOption])
+        [autoEncryptionOption]: EJSON.serialize(serializedOptions.autoEncryption[autoEncryptionOption], { relaxed: false })
       };
     }
   }
@@ -138,7 +136,7 @@ export function deserializeConnectOptions(options: Readonly<DevtoolsConnectOptio
     if (deserializedOptions.autoEncryption?.[autoEncryptionOption]) {
       deserializedOptions.autoEncryption = {
         ...deserializedOptions.autoEncryption,
-        [autoEncryptionOption]: EJSON.deserialize(deserializedOptions.autoEncryption[autoEncryptionOption])
+        [autoEncryptionOption]: EJSON.deserialize(deserializedOptions.autoEncryption[autoEncryptionOption], { relaxed: false })
       };
     }
   }