Proper options normalization

porsager · porsager · commit c7b12b257a2b · 2019-11-26T20:53:17.000+01:00
diff --git a/lib/frontend.js b/lib/frontend.js
@@ -93,10 +93,10 @@ function auth(type, x, options) {
   return auths[type](type, x, options) || ''
 }
 
-function AuthenticationMD5Password(type, x, { user, password }) {
+function AuthenticationMD5Password(type, x, { user, pass }) {
   return bytes
     .p()
-    .str('md5' + md5(Buffer.concat([Buffer.from(md5(password + user)), x.slice(9)])))
+    .str('md5' + md5(Buffer.concat([Buffer.from(md5(pass + user)), x.slice(9)])))
     .z(1)
     .end()
 }
@@ -119,7 +119,7 @@ function SASLContinue(type, x, options) {
   const res = x.utf8Slice(9).split(',').reduce((acc, x) => (acc[x[0]] = x.slice(2), acc), {})
 
   const saltedPassword = crypto.pbkdf2Sync(
-    options.password,
+    options.pass,
     Buffer.from(res.s, 'base64'),
     parseInt(res.i), 32,
     'sha256'
diff --git a/lib/index.js b/lib/index.js
@@ -1,6 +1,6 @@
 import os from 'os'
 import crypto from 'crypto'
-import url from 'url'
+import Url from 'url'
 import Connection from './connection.js'
 import Queue from './queue.js'
 import {
@@ -301,7 +301,6 @@ export default function Postgres(url, options) {
     if (ended)
       return ended
 
-    let c
     let destroy
 
     if (timeout === 0)
@@ -384,53 +383,30 @@ export default function Postgres(url, options) {
   }
 }
 
-function parseOptions(url, options = {}) {
-  const env = process.env // eslint-disable-line
-
-  options = Object.assign({
-    connection: {},
-    host      : env.PGHOST || 'localhost',
-    port      : env.PGPORT || 5432,
-    database  : env.PGDATABASE || 'postgres',
-    username  : env.PGUSERNAME || os.userInfo().username,
-    password  : env.PGPASSWORD || '',
-    max       : Math.max(1, os.cpus().length - 1),
-    fifo      : false,
-    transform : x => x
-  },
-    typeof url === 'string' ? parseUrl(url) : url,
-    options,
-    {
-      ...mergeUserTypes(options.types),
-      nonce: crypto.randomBytes(18).toString('base64')
-    }
-  )
-
-  options.user = String(options.username || options.user)
-  options.pass = String(options.password || options.pass)
-  options.host = String(options.hostname || options.host)
-  options.database = options.db || options.database
-  options.port = parseInt(options.port)
-
-  if ('application_name' in options.connection === false)
-    options.connection.application_name = 'postgres.js'
-
-  if (!options.path && options.host.indexOf('/') > -1)
-    options.path = options.host + '/.s.PGSQL.' + options.port
-
-  return options
-}
-
-function parseUrl(x) {
-  x = url.parse(x)
-
-  const config = {}
-
-  x.host && (config.host = x.hostname)
-  x.port && (config.port = x.port)
-  x.path && (config.database = x.path.slice(1))
-  x.auth && (config.username = x.auth.split(':')[0])
-  x.auth && (config.password = x.auth.split(':')[1])
-
-  return config
+function parseOptions(uri, options) {
+  const o = options || uri
+      , env = process.env // eslint-disable-line
+      , url = options ? Url.parse(uri, true) : { query: {}, pathname: '' }
+      , host = o.hostname || o.host || url.hostname || env.PGHOST || 'localhost'
+      , port = o.port || url.port || env.PGPORT || 5432
+
+  return {
+    host,
+    port,
+    path        : o.path || host.indexOf('/') > -1 && host + '/.s.PGSQL.' + port,
+    database    : o.database || o.db || url.pathname.slice(1) || env.PGDATABASE || 'postgres',
+    user        : o.user || o.username || url.user || env.PGUSERNAME || os.userInfo().username,
+    pass        : o.pass || o.password || url.pass || env.PGPASSWORD || '',
+    max         : o.max || url.query.max || Math.max(1, os.cpus().length),
+    fifo        : o.fifo || url.query.fifo || false,
+    transform   : o.transform || (x => x),
+    types       : o.types || {},
+    ssl         : o.ssl || url.ssl || false,
+    none        : crypto.randomBytes(18).toString('base64'),
+    connection  : {
+      application_name: 'postgres.js',
+      ...o.connection
+    },
+    ...mergeUserTypes(o.types)
+  }
 }
