COMPASS-4268: Use proper password for ssh (#277)

* fix: use proper password for ssh

* test: remove slow and timeout

* Use clone deep to ensure driver options remain unchanged after ssh tunnel injection

Co-authored-by: Rhys Howell <rhys@rhysh@live.com>

Author: alenakhineika

.eslintrc

@@ -1,7 +1,11 @@
 {
   "env": {
     "mocha": true,
-    es6: true
+    "es6": true
+  },
+  "parserOptions": {
+    "ecmaVersion": 2018,
+    "sourceType": "module"
   },
   "extends": ["mongodb-js/node"]
 }

lib/connect.js

@@ -4,6 +4,7 @@ const async = require('async');
 const {
   includes,
   clone,
+  cloneDeep,
   assign,
   isString,
   isFunction,
@@ -128,7 +129,7 @@ const getTasks = (model, setupListeners) => {
     }
 
     const ctx = (error, opts) => {
-      options = opts;
+      options = { ...model.driverOptions, ...opts };
 
       if (error) {
         state.emit('status', { message, error });
@@ -210,7 +211,17 @@ const getTasks = (model, setupListeners) => {
       validOptions.useNewUrlParser = true;
       validOptions.useUnifiedTopology = true;
 
-      const mongoClient = new MongoClient(model.driverUrl, validOptions);
+      const modelClone = cloneDeep(model, true);
+
+      if (model.sshTunnel !== 'NONE') {
+        // Populate the SSH Tunnel options correctly
+        modelClone.set({
+          hostname: model.sshTunnelOptions.localAddr,
+          port: model.sshTunnelOptions.localPort
+        });
+      }
+
+      const mongoClient = new MongoClient(modelClone.driverUrl, validOptions);
 
       if (setupListeners) {
         setupListeners(mongoClient);

lib/model.js

@@ -588,9 +588,7 @@ assign(derived, {
         req.query.ssl = 'false';
       }
 
-      const reqClone = clone(req);
-
-      return toURL(reqClone);
+      return toURL(req);
     }
   },
   safeUrl: {

test/connect.test.js

@@ -11,10 +11,7 @@ const setupListeners = () => {};
 const data = require('mongodb-connection-fixture');
 
 describe('connection model connector', () => {
-  describe('local', function() {
-    this.slow(2000);
-    this.timeout(10000);
-
+  describe('local', () => {
     before(
       require('mongodb-runner/mocha/before')({ port: 27018, version: '4.0.0' })
     );
@@ -67,7 +64,7 @@ describe('connection model connector', () => {
           sshTunnelHostname: 'my.ssh-server.com',
           sshTunnelPassword: 'password',
           sshTunnelUsername: 'my-user',
-          serverSelectionTimeoutMS: 1000
+          extraOptions: { serverSelectionTimeoutMS: 100 }
         });
 
         assert(model.isValid());
@@ -83,10 +80,7 @@ describe('connection model connector', () => {
     });
   });
 
-  describe('cloud #slow', function() {
-    this.slow(5000);
-    this.timeout(10000);
-
+  describe('cloud #slow', () => {
     data.MATRIX.map(d => {
       it.skip('should connect to ' + d.name, done => {
         connect(d, setupListeners, (err, client) => {