fix: use a real password for driver url with ssh (#281)

Author: alenakhineika

lib/model.js

@@ -3,7 +3,7 @@ const URL = require('url');
 const toURL = URL.format;
 const { format } = require('util');
 const fs = require('fs');
-const { assign, defaults, clone, includes, unescape } = require('lodash');
+const { assign, defaults, clone, cloneDeep, includes, unescape } = require('lodash');
 const AmpersandModel = require('ampersand-model');
 const AmpersandCollection = require('ampersand-rest-collection');
 const { ReadPreference } = require('mongodb');
@@ -595,15 +595,15 @@ assign(derived, {
   driverUrlWithSsh: {
     cache: false,
     fn() {
-      const req = clone(prepareRequest(this));
+      const req = cloneDeep(prepareRequest(this));
 
       if (this.sshTunnel !== 'NONE') {
         // Populate the SSH Tunnel options correctly.
         req.hostname = this.sshTunnelOptions.localAddr;
         req.port = this.sshTunnelOptions.localPort;
       }
 
-      return addAuthToUrl.call(this, { url: toURL(req), isPasswordProtected: true });
+      return addAuthToUrl.call(this, { url: toURL(req), isPasswordProtected: false });
     }
   },
   /**

test/build-uri.test.js

@@ -632,6 +632,18 @@ describe('Connection model builder', () => {
         });
       });
 
+      it('should add a real password to driver url', () => {
+        const c = new Connection({
+          mongodbUsername: 'arlo',
+          mongodbPassword: 'woof'
+        });
+
+        expect(c.driverUrl).to.be.equal(
+          'mongodb://arlo:woof@localhost:27017/?authSource=admin&readPreference=primary&ssl=false'
+        );
+        expect(c.driverUrl).to.be.equal(c.driverUrlWithSsh);
+      });
+
       it('should set authStrategy to LDAP', (done) => {
         const c = new Connection({ ldapUsername: 'arlo', ldapPassword: 'w@of'});
 

test/ssh-tunnel.test.js

@@ -298,6 +298,26 @@ describe('sshTunnel', function() {
         assert(c.isValid());
       });
 
+      it('should inject ssh tunnel port', (done) => {
+        assert.equal(
+          c.driverUrl,
+          'mongodb://mongodb.my-internal-host.com:27000/?readPreference=primary&ssl=false'
+        );
+
+        Connection.from(c.driverUrlWithSsh, (error, sshModel) => {
+          assert(!error);
+          assert.equal(
+            sshModel.hostname,
+            '127.0.0.1'
+          );
+          assert.notEqual(
+            c.port,
+            sshModel.port
+          );
+          done();
+        });
+      });
+
       describe('sshTunnelOptions', () => {
         const options = c.sshTunnelOptions;