Make change less invasive and fully backwards compatible for native binding config

Author: brianc

packages/pg/lib/connection-parameters.js

@@ -25,29 +25,15 @@ var val = function (key, config, envVar) {
   return config[key] || envVar || defaults[key]
 }
 
-var normalizeSSLConfig = function (modeFromConfig) {
-  // if the ssl parameter passed to config is not a string, just return it
-  // directly (it will be passed directly to tls.connect)
-  // this way you can pass all the ssl params in via constructor:
-  // new Client({ ssl: { minDHSize: 1024 } }) etc
-  if (modeFromConfig !== undefined && typeof modeFromConfig !== 'string') {
-    return modeFromConfig
-  }
-  const mode = modeFromConfig || process.env.PGSSLMODE
-
-  switch (mode) {
+var readSSLConfigFromEnvironment = function () {
+  switch (process.env.PGSSLMODE) {
     case 'disable':
       return false
     case 'prefer':
     case 'require':
     case 'verify-ca':
     case 'verify-full':
       return true
-    // no-verify is not standard to libpq but allows specifying
-    // you require ssl but want to bypass server certificate validation.
-    // this is a very common way to connect in heroku so we support it
-    // vai both environment variables (PGSSLMODE=no-verify) as well
-    // as in connection string params ?ssl=no-verify
     case 'no-verify':
       return { rejectUnauthorized: false }
   }
@@ -85,7 +71,13 @@ var ConnectionParameters = function (config) {
 
   this.binary = val('binary', config)
 
-  this.ssl = normalizeSSLConfig(config.ssl)
+  this.ssl = typeof config.ssl === 'undefined' ? readSSLConfigFromEnvironment() : config.ssl
+
+  // support passing in ssl=no-verify via connection string
+  if (this.ssl === 'no-verify') {
+    this.ssl = { rejectUnauthorized: false }
+  }
+
   this.client_encoding = val('client_encoding', config)
   this.replication = val('replication', config)
   // a domain socket begins with '/'

packages/pg/test/unit/client/configuration-tests.js

@@ -44,11 +44,6 @@ test('client settings', function () {
     assert.equal(client.ssl, true)
   })
 
-  test('ssl no-verify', function () {
-    var client = new Client({ ssl: 'no-verify' })
-    assert.deepStrictEqual(client.ssl, { rejectUnauthorized: false })
-  })
-
   test('custom ssl force off', function () {
     var old = process.env.PGSSLMODE
     process.env.PGSSLMODE = 'prefer'