Skip to content

Fix command/config injection in logrotate -u and startup --service-name (CWE-78/CWE-22, follow-up to #6089) #6127

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
alanturing881 wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −0
Open

Fix command/config injection in logrotate -u and startup --service-name (CWE-78/CWE-22, follow-up to #6089) #6127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 lib/API/LogManagement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ module.exports = function(CLI) {

var user = opts.user || 'root';

if (!/^[a-zA-Z0-9._-]+$/.test(user)) {
Common.printError(cst.PREFIX_MSG_ERR + 'Invalid -u/--user value: only alphanumeric, dot, underscore and dash are allowed');
return cb ? cb(Common.retErr('Invalid user value')) : that.exitCli(cst.ERROR_EXIT);
}

script = script.replace(/%HOME_PATH%/g, cst.PM2_ROOT_PATH)
.replace(/%USER%/g, user);

Expand Down
12 changes: 12 additions & 0 deletions lib/API/Startup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ module.exports = function(CLI) {
var openrc_service_name = 'pm2';
var launchd_service_name = (opts.serviceName || 'pm2.' + user);

if (!/^[a-zA-Z0-9._-]+$/.test(user) ||
(opts.serviceName && !/^[a-zA-Z0-9._-]+$/.test(opts.serviceName))) {
Common.printError(cst.PREFIX_MSG_ERR + 'Invalid -u/--user or --service-name value: only alphanumeric, dot, underscore and dash are allowed');
return cb ? cb(new Error('Invalid user or service name')) : that.exitCli(cst.ERROR_EXIT);
}

if (!platform)
platform = actual_platform;
else if (actual_platform && actual_platform !== platform) {
Expand Down Expand Up @@ -203,6 +209,12 @@ module.exports = function(CLI) {
var openrc_service_name = 'pm2';
var launchd_service_name = (opts.serviceName || 'pm2.' + user);

if (!/^[a-zA-Z0-9._-]+$/.test(user) ||
(opts.serviceName && !/^[a-zA-Z0-9._-]+$/.test(opts.serviceName))) {
Common.printError(cst.PREFIX_MSG_ERR + 'Invalid -u/--user or --service-name value: only alphanumeric, dot, underscore and dash are allowed');
return cb ? cb(new Error('Invalid user or service name')) : that.exitCli(cst.ERROR_EXIT);
}

if (!platform)
platform = actual_platform;
else if (actual_platform && actual_platform !== platform) {
Expand Down