[CONJS-310] enable the permitRedirect option by default only when SSL is enabled

Author: rusher

lib/config/connection-options.js

@@ -89,7 +89,6 @@ class ConnectionOptions {
     }
 
     // connection options
-    this.permitRedirect = opts.permitRedirect === undefined ? true : Boolean(opts.permitRedirect);
     this.initSql = opts.initSql;
     this.connectTimeout = opts.connectTimeout === undefined ? 1000 : Number(opts.connectTimeout);
     this.connectAttributes = opts.connectAttributes || false;
@@ -111,6 +110,10 @@ class ConnectionOptions {
         this.ssl.rejectUnauthorized = opts.ssl.rejectUnauthorized !== false;
       }
     }
+    this.permitRedirect =
+      opts.permitRedirect === undefined
+        ? !!this.ssl && this.ssl.rejectUnauthorized !== false
+        : Boolean(opts.permitRedirect);
 
     // socket
     this.queryTimeout = isNaN(opts.queryTimeout) || Number(opts.queryTimeout) < 0 ? 0 : Number(opts.queryTimeout);

test/integration/test-redirection.js

@@ -19,7 +19,7 @@ describe('redirection', () => {
     await proxy.start();
     let conn = null;
     try {
-      conn = await base.createConnection({ host: 'localhost', port: proxy.port() });
+      conn = await base.createConnection({ host: 'localhost', port: proxy.port(), permitRedirect: true });
       assert.equal(proxy.port(), conn.info.port);
       let permitRedirection = true;
       try {
@@ -58,7 +58,7 @@ describe('redirection', () => {
       this.skip();
       return;
     }
-    let conn = await base.createConnection({ host: 'localhost', port: proxy.port() });
+    let conn = await base.createConnection({ host: 'localhost', port: proxy.port(), permitRedirect: true });
     try {
       assert.equal(Conf.baseConfig.host, conn.info.host);
       assert.equal(Conf.baseConfig.port, conn.info.port);
@@ -85,7 +85,7 @@ describe('redirection', () => {
       resetAfterUse: false
     });
     await proxy.start();
-    let conn = await base.createConnection({ host: 'localhost', port: proxy.port() });
+    let conn = await base.createConnection({ host: 'localhost', port: proxy.port(), permitRedirect: true });
     try {
       assert.equal(proxy.port(), conn.info.port);
       let permitRedirection = true;
@@ -114,7 +114,7 @@ describe('redirection', () => {
       resetAfterUse: false
     });
     await proxy.start();
-    let conn = await base.createConnection({ host: 'localhost', port: proxy.port() });
+    let conn = await base.createConnection({ host: 'localhost', port: proxy.port(), permitRedirect: true });
     try {
       assert.equal(proxy.port(), conn.info.port);
       let permitRedirection = true;

test/unit/config/test-connection-options.js

@@ -271,4 +271,21 @@ describe('test connection options', () => {
       assert.equal(result.jsonStrings, true);
     });
   });
+
+  it('redirection default value', () => {
+    let result = new ConnOptions({});
+    assert.equal(result.permitRedirect, false);
+
+    result = new ConnOptions({ ssl: true });
+    assert.equal(result.permitRedirect, true);
+
+    result = new ConnOptions({ ssl: { rejectUnauthorized: false } });
+    assert.equal(result.permitRedirect, false);
+
+    result = new ConnOptions({ ssl: { rejectUnauthorized: true } });
+    assert.equal(result.permitRedirect, true);
+
+    result = new ConnOptions({ ssl: { rejectUnauthorized: true, permitRedirect: true } });
+    assert.equal(result.permitRedirect, true);
+  });
 });

test/unit/config/test-options.js

@@ -10,8 +10,8 @@ const Collations = require('../../../lib/const/collations.js');
 
 describe('test options', () => {
   it('default options', function () {
-    const defaultOpts = basePromise.defaultOptions({ timezone: '+00:00' });
-    const defaultOptsCall = baseCallback.defaultOptions({ timezone: '+00:00' });
+    const defaultOpts = basePromise.defaultOptions({ timezone: '+00:00', ssl: true });
+    const defaultOptsCall = baseCallback.defaultOptions({ timezone: '+00:00', ssl: true });
     const expected = {
       host: 'localhost',
       port: 3306,
@@ -37,7 +37,7 @@ describe('test options', () => {
       bitOneIsBoolean: true,
       socketPath: undefined,
       sessionVariables: undefined,
-      ssl: undefined,
+      ssl: true,
       infileStreamFactory: undefined,
       queryTimeout: 0,
       socketTimeout: 0,