cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for specifying database connection passwords

Browse Source
This commit is contained in:
Sandro Santilli
2013-12-17 17:17:13 +01:00
parent 4f3f87fc13
commit eb51d18012
14 changed files with 98 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/carto_data.js
+5 -1
View File
@@ -141,9 +141,13 @@ module.exports = function() {
if (check_result === 1) {
// authorized by key, login as db owner
that.getId(req, function(err, user_id) {
if (err) throw err;
if (err) { callback(err); return; }
var dbuser = _.template(global.settings.postgres_auth_user, {user_id: user_id});
_.extend(req.params, {dbuser:dbuser});
if ( global.settings.postgres_auth_pass ) {
var dbpass = _.template(global.settings.postgres_auth_pass, {user_id: user_id});
_.extend(req.params, {dbpassword:dbpass});
}
callback(err, true);
});
} else {
lib/cartodb/server_options.js
+5
View File
@@ -362,6 +362,11 @@ module.exports = function(){
var dbuser = req.params.dbuser || global.settings.postgres.user;
if ( ! me.rx_dbuser ) me.rx_dbuser = /(<Parameter name="user"><!\[CDATA\[)[^\]]*(]]><\/Parameter>)/g;
xml = xml.replace(me.rx_dbuser, "$1" + dbuser + "$2");
var dbpass = req.params.dbpassword || global.settings.postgres.password;
if ( ! me.rx_dbpass ) me.rx_dbpass = /(<Parameter name="password"><!\[CDATA\[)[^\]]*(]]><\/Parameter>)/g;
xml = xml.replace(me.rx_dbpass, "$1" + dbpass + "$2");
callback(null, xml);
}