Skip to content
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

fix(lib): fixed command injection vulnerability according to Issue #60 #61

Closed
wants to merge 2 commits into from
Closed

fix(lib): fixed command injection vulnerability according to Issue #60 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9f6ea2
fix(lib): fixed command injection vulnerability according to Issue #60
Sep 5, 2016
679cdd4
Removed unnecessary dependency by using child_process spawn() method
Sep 7, 2016
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
5 changes: 5 additions & 0 deletions History.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@

1.9.3 / 2016-09-05
==================

* fixed command injection vulnerability

1.7.0 / 2012-12-30
==================

Expand Down
51 changes: 25 additions & 26 deletions lib/growl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
* Module dependencies.
*/

var exec = require('child_process').exec
var spawn = require('child_process').spawn
, fs = require('fs')
, path = require('path')
, exists = fs.existsSync || path.existsSync
, os = require('os')
, quote = JSON.stringify
, cmd;

function which(name) {
Expand Down Expand Up @@ -127,7 +126,7 @@ exports = module.exports = growl;
* Node-growl version.
*/

exports.version = '1.4.1'
exports.version = '1.9.3'

/**
* Send growl notification _msg_ with _options_.
Expand Down Expand Up @@ -189,18 +188,18 @@ function growl(msg, options, fn) {
flag = flag || /^png|gif|jpe?g$/.test(ext) && 'image'
flag = flag || ext && (image = ext) && 'icon'
flag = flag || 'icon'
args.push('--' + flag, quote(image))
args.push('--' + flag, image)
break;
case 'Darwin-NotificationCenter':
args.push(cmd.icon, quote(image));
args.push(cmd.icon, image);
break;
case 'Linux':
args.push(cmd.icon, quote(image));
args.push(cmd.icon, image);
// libnotify defaults to sticky, set a hint for transient notifications
if (!options.sticky) args.push('--hint=int:transient:1');
break;
case 'Windows':
args.push(cmd.icon + quote(image));
args.push(cmd.icon + image);
break;
}
}
Expand Down Expand Up @@ -230,61 +229,61 @@ function growl(msg, options, fn) {
switch(cmd.type) {
case 'Darwin-Growl':
args.push(cmd.msg);
args.push(quote(msg).replace(/\\n/g, '\n'));
if (options.title) args.push(quote(options.title));
args.push(msg.replace(/\\n/g, '\n'));
if (options.title) args.push(options.title);
break;
case 'Darwin-NotificationCenter':
args.push(cmd.msg);
var stringifiedMsg = quote(msg);
var stringifiedMsg = msg;
var escapedMsg = stringifiedMsg.replace(/\\n/g, '\n');
args.push(escapedMsg);
if (options.title) {
args.push(cmd.title);
args.push(quote(options.title));
args.push(options.title);
}
if (options.subtitle) {
args.push(cmd.subtitle);
args.push(quote(options.subtitle));
args.push(options.subtitle);
}
if (options.url) {
args.push(cmd.url);
args.push(quote(options.url));
args.push(options.url);
}
break;
case 'Linux-Growl':
args.push(cmd.msg);
args.push(quote(msg).replace(/\\n/g, '\n'));
if (options.title) args.push(quote(options.title));
args.push(msg.replace(/\\n/g, '\n'));
if (options.title) args.push(options.title);
if (cmd.host) {
args.push(cmd.host.cmd, cmd.host.hostname)
}
break;
case 'Linux':
if (options.title) {
args.push(quote(options.title));
args.push(options.title);
args.push(cmd.msg);
args.push(quote(msg).replace(/\\n/g, '\n'));
args.push(msg.replace(/\\n/g, '\n'));
} else {
args.push(quote(msg).replace(/\\n/g, '\n'));
args.push(msg.replace(/\\n/g, '\n'));
}
break;
case 'Windows':
args.push(quote(msg).replace(/\\n/g, '\n'));
if (options.title) args.push(cmd.title + quote(options.title));
if (options.url) args.push(cmd.url + quote(options.url));
args.push(msg.replace(/\\n/g, '\n'));
if (options.title) args.push(cmd.title + options.title);
if (options.url) args.push(cmd.url + options.url);
break;
case 'Custom':
args[0] = (function(origCommand) {
var message = options.title
? options.title + ': ' + msg
: msg;
var command = origCommand.replace(/(^|[^%])%s/g, '$1' + quote(message));
if (command === origCommand) args.push(quote(message));
var command = origCommand.replace(/(^|[^%])%s/g, '$1' + message);
if (command === origCommand) args.push(message);
return command;
})(args[0]);
break;
}

// execute
exec(args.join(' '), fn);
var cmd_to_exec = args[0];
args.shift();
spawn(cmd_to_exec, args);
};
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "growl",
"version": "1.9.2",
"version": "1.9.3",
"description": "Growl unobtrusive notifications",
"author": "TJ Holowaychuk <tj@vision-media.ca>",
"maintainers": [
Expand Down