cartodb/node-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ssl query string to the connection string parser

Browse Source
This commit is contained in:
Bryan Burgers 2013-02-20 18:17:18 -06:00
parent d046ffc921
commit 79f85a4a9e
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/connection-parameters.js
View File

@ -18,7 +18,7 @@ var parse = function(str) {
}
// url parse expects spaces encoded as %20
str = encodeURI(str);
var result = url.parse(str);
var result = url.parse(str, true);
var config = {};
config.host = result.hostname;
config.database = result.pathname ? result.pathname.slice(1) : null;
@ -26,6 +26,12 @@ var parse = function(str) {
config.user = auth[0];
config.password = auth[1];
config.port = result.port;
var ssl = result.query.ssl;
if (ssl === 'true' || ssl === '1') {
config.ssl = true;
}
return config;
};

22
test/unit/connection-parameters/environment-variable-tests.js
View File

@ -54,6 +54,28 @@ test('connection string parsing', function(t) {
assert.equal(subject.database, 'lala', 'string database');
});
test('connection string parsing - ssl', function(t) {
var string = 'postgres://brian:pw@boom:381/lala?ssl=true';
var subject = new ConnectionParameters(string);
assert.equal(subject.ssl, true, 'ssl');
string = 'postgres://brian:pw@boom:381/lala?ssl=1';
subject = new ConnectionParameters(string);
assert.equal(subject.ssl, true, 'ssl');
string = 'postgres://brian:pw@boom:381/lala?other&ssl=true';
subject = new ConnectionParameters(string);
assert.equal(subject.ssl, true, 'ssl');
string = 'postgres://brian:pw@boom:381/lala?ssl=0';
subject = new ConnectionParameters(string);
assert.equal(!!subject.ssl, false, 'ssl');
string = 'postgres://brian:pw@boom:381/lala';
subject = new ConnectionParameters(string);
assert.equal(!!subject.ssl, false, 'ssl');
});
//restore process.env
for(var key in realEnv) {
process.env[key] = realEnv[key];