fix: fle

Author: nbbeeken

.evergreen/run-kms-servers.sh

@@ -2,6 +2,6 @@ cd ${DRIVERS_TOOLS}/.evergreen/csfle
 . ./activate_venv.sh
 # by default it always runs on port 5698
 ./kmstlsvenv/bin/python3 -u kms_kmip_server.py &
-./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/expired.pem --port 8000 &
-./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/wrong-host.pem --port 8001 &
-./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/server.pem --port 8002 --require_client_cert &
+./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/expired.pem --port 9000 &
+./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/wrong-host.pem --port 9001 &
+./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/server.pem --port 9002 --require_client_cert &

src/error.ts

@@ -752,6 +752,10 @@ const RETRYABLE_WRITE_ERROR_CODES = new Set<number>([
 ]);
 
 export function isRetryableWriteError(error: MongoError, maxWireVersion: number): boolean {
+  if (!(error instanceof MongoError)) {
+    return false;
+  }
+
   if (maxWireVersion >= MONGODB_WIRE_VERSION.RESUMABLE_INITIAL_SYNC) {
     // After 4.4 the error label is the only source of truth for retry writes
     return error.hasErrorLabel(MONGODB_ERROR_LABELS.RetryableWriteError);

test/integration/client-side-encryption/client_side_encryption.prose.test.js

@@ -98,12 +98,12 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
       };
       clientNoTlsOptions = {
         keyVaultNamespace,
-        kmsProviders: getKmsProviders(null, null, '127.0.0.1:8002', '127.0.0.1:8002'),
+        kmsProviders: getKmsProviders(null, null, '127.0.0.1:9002', '127.0.0.1:9002'),
         tlsOptions: tlsCaOptions
       };
       clientWithTlsOptions = {
         keyVaultNamespace,
-        kmsProviders: getKmsProviders(null, null, '127.0.0.1:8002', '127.0.0.1:8002'),
+        kmsProviders: getKmsProviders(null, null, '127.0.0.1:9002', '127.0.0.1:9002'),
         tlsOptions: {
           aws: {
             tlsCAFile: process.env.KMIP_TLS_CA_FILE,
@@ -125,12 +125,12 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
       };
       clientWithTlsExpiredOptions = {
         keyVaultNamespace,
-        kmsProviders: getKmsProviders(null, '127.0.0.1:8000', '127.0.0.1:8000', '127.0.0.1:8000'),
+        kmsProviders: getKmsProviders(null, '127.0.0.1:9000', '127.0.0.1:9000', '127.0.0.1:9000'),
         tlsOptions: tlsCaOptions
       };
       clientWithInvalidHostnameOptions = {
         keyVaultNamespace,
-        kmsProviders: getKmsProviders(null, '127.0.0.1:8001', '127.0.0.1:8001', '127.0.0.1:8001'),
+        kmsProviders: getKmsProviders(null, '127.0.0.1:9001', '127.0.0.1:9001', '127.0.0.1:9001'),
         tlsOptions: tlsCaOptions
       };
       clientNoTls = this.configuration.newClient({}, { autoEncryption: clientNoTlsOptions });
@@ -167,10 +167,10 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
       const masterKey = {
         region: 'us-east-1',
         key: 'arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0',
-        endpoint: '127.0.0.1:8002'
+        endpoint: '127.0.0.1:9002'
       };
-      const masterKeyExpired = { ...masterKey, endpoint: '127.0.0.1:8000' };
-      const masterKeyInvalidHostname = { ...masterKey, endpoint: '127.0.0.1:8001' };
+      const masterKeyExpired = { ...masterKey, endpoint: '127.0.0.1:9000' };
+      const masterKeyInvalidHostname = { ...masterKey, endpoint: '127.0.0.1:9001' };
 
       it('fails with various invalid tls options', metadata, async function () {
         try {

test/readme.md

@@ -392,9 +392,9 @@ The following steps will walk you through how to run the tests for CSFLE.
     1. This will install all the dependencies needed to run a python kms_kmip simulated server
 3. In 4 separate terminals launch the following:
     - `./kmstlsvenv/bin/python3 -u kms_kmip_server.py` # by default it always runs on port 5698
-    - `./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/expired.pem --port 8000`
-    - `./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/wrong-host.pem --port 8001`
-    - `./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/server.pem --port 8002 --require_client_cert`
+    - `./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/expired.pem --port 9000`
+    - `./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/wrong-host.pem --port 9001`
+    - `./kmstlsvenv/bin/python3 -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/server.pem --port 9002 --require_client_cert`
 4. Set the following environment variables:
     - `export KMIP_TLS_CA_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem"`
     - `export KMIP_TLS_CERT_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem"`