Skip to content

Escape password to avoid confusing bash #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nilsnh wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Escape password to avoid confusing bash #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae8c970
make sure that database password gets escaped properly to avoid confu…
Sep 9, 2014
61f3415
escape password when uploading database to server.
Sep 9, 2014
72756cf
The db.adapt() function now also strips away password warnings from t…
Nov 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions tasks/lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ exports.init = function (grunt) {
var content = grunt.file.read(file);

var output = exports.replace_urls(old_url, new_url, content);
output = exports.remove_password_warning(output);

grunt.file.write(file, output);
};
Expand Down Expand Up @@ -136,12 +137,24 @@ exports.init = function (grunt) {
return string.replace(regexp, replace);
};

exports.remove_password_warning = function (string) {
var splitStr = string.split("\n");
if (splitStr[0].indexOf("Warning: Using a password on the command line interface can be insecure.") != -1) {
return splitStr.slice(1).join("\n");
} else {return string};
};

function escape (str) {
return str.replace(/(\(|\))/g, "\\$1");
}

/* Commands generators */
exports.mysqldump_cmd = function(config) {

var cmd = grunt.template.process(tpls.mysqldump, {
data: {
user: config.user,
pass: config.pass,
pass: escape(config.pass),
database: config.database,
host: config.host
}
Expand All @@ -167,7 +180,7 @@ exports.init = function (grunt) {
data: {
host: config.host,
user: config.user,
pass: config.pass,
pass: escape(config.pass),
database: config.database,
path: src
}
Expand Down
23 changes: 17 additions & 6 deletions test/deployments_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,23 +103,34 @@ module.exports = {
test.done();
},

remove_password_warning: function(test) {
test.expect(1);
var warningStr = "Warning: Using a password on the command line interface can be insecure." + "\n"
+ "-- MySQL dump 10.13 Distrib 5.6.17, for Linux (x86_64)" + "\n"
+ "yet another test string";
test.equal(util.remove_password_warning(warningStr),
"-- MySQL dump 10.13 Distrib 5.6.17, for Linux (x86_64)" + "\n"
+ "yet another test string");
test.done();
},

mysqldump_cmd: function(test) {
test.expect(2);

var config = {
user: 'john',
pass: 'pass',
pass: "pas(s))",
database: 'test',
host: 'localhost'
};

var cmd1 = util.mysqldump_cmd(config);
test.equal(cmd1, "mysqldump -h localhost -ujohn -ppass test", 'Local mysqldump command.');
test.equal(cmd1, "mysqldump -h localhost -ujohn -ppas\\(s\\)\\) test", 'Local mysqldump command.');

config.ssh_host = '127.0.0.1';

var cmd2 = util.mysqldump_cmd(config);
test.equal(cmd2, "ssh 127.0.0.1 'mysqldump -h localhost -ujohn -ppass test'", 'SSH remote mysqldump command.');
test.equal(cmd2, "ssh 127.0.0.1 'mysqldump -h localhost -ujohn -ppas\\(s\\)\\) test'", 'SSH remote mysqldump command.');
test.done();
},

Expand All @@ -129,19 +140,19 @@ module.exports = {
var config = {
host: 'localhost',
user: 'john',
pass: 'pass',
pass: 'pas(s))',
database: 'test',
};

var src = '/aaa/bbb';

var cmd1 = util.mysql_cmd(config, src);
test.equal(cmd1, "mysql -h localhost -u john -ppass test < /aaa/bbb", 'Local Mysql import command.');
test.equal(cmd1, "mysql -h localhost -u john -ppas\\(s\\)\\) test < /aaa/bbb", 'Local Mysql import command.');

config.ssh_host = '127.0.0.1';

var cmd2 = util.mysql_cmd(config, src);
test.equal(cmd2, "ssh 127.0.0.1 'mysql -h localhost -u john -ppass test' < /aaa/bbb", 'Remote Mysql import command.');
test.equal(cmd2, "ssh 127.0.0.1 'mysql -h localhost -u john -ppas\\(s\\)\\) test' < /aaa/bbb", 'Remote Mysql import command.');
test.done();
},

Expand Down