diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-10 16:00:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-10 16:00:54 +0100 |
| commit | dbeab5a0360e24fd13e90da609d06134c727b7ca (patch) | |
| tree | b215968a49acc10208a9ea8d78a910094840115d /streaming | |
| parent | b6bc98c480348e4b9e4a57e2e4faafb1403b245f (diff) | |
Fix SSL configuration regression in streaming API (#10225)
* Fix SSL configuration regression in streaming API Fix #10223 * Fix code style issues and integrate #10219 * Fix dumb thing
Diffstat (limited to 'streaming')
| -rw-r--r-- | streaming/index.js | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/streaming/index.js b/streaming/index.js index 21a1d47ef..86a91d12b 100644 --- a/streaming/index.js +++ b/streaming/index.js @@ -24,7 +24,7 @@ const dbUrlToConfig = (dbUrl) => { return {}; } - const params = url.parse(dbUrl); + const params = url.parse(dbUrl, true); const config = {}; if (params.auth) { @@ -45,8 +45,8 @@ const dbUrlToConfig = (dbUrl) => { const ssl = params.query && params.query.ssl; - if (ssl) { - config.ssl = ssl === 'true' || ssl === '1'; + if (ssl && ssl === 'true' || ssl === '1') { + config.ssl = true; } return config; @@ -89,9 +89,7 @@ const startWorker = (workerId) => { host: process.env.DB_HOST || pg.defaults.host, port: process.env.DB_PORT || pg.defaults.port, max: 10, - ssl: { - sslmode: process.env.DB_SSLMODE || 'prefer', - }, + ssl: !!process.env.DB_SSLMODE && process.env.DB_SSLMODE !== 'disable' ? true : undefined, }, production: { @@ -101,9 +99,7 @@ const startWorker = (workerId) => { host: process.env.DB_HOST || 'localhost', port: process.env.DB_PORT || 5432, max: 10, - ssl: { - sslmode: process.env.DB_SSLMODE || 'prefer', - }, + ssl: !!process.env.DB_SSLMODE && process.env.DB_SSLMODE !== 'disable' ? true : undefined, }, }; |