Skip to content

[security][backport 24.05] Fortify-flagged path traversal, XSS, and info-leak fixes #7555

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

Merged
ar2rsawseen merged 2 commits into from
May 11, 2026
Merged

[security][backport 24.05] Fortify-flagged path traversal, XSS, and info-leak fixes #7555

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
fa1a2b5
[security] Backport Fortify-flagged path traversal, XSS, and info-lea…
ar2rsawseen May 11, 2026
d9c9dcb
[security] Address PR review comments on theme handler
ar2rsawseen May 11, 2026
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
15 changes: 12 additions & 3 deletions api/utils/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,10 @@ common.returnRaw = function(params, returnCode, body, heads) {
else {
console.error("Output already closed, can't write more");
console.trace();
console.log(params);
// Don't dump the full params object — req.body/req.headers can
// contain credentials, session cookies, or other secrets. Log
// only the pathname (query string can carry api_key/auth_token).
console.log({pathname: params.urlParts && params.urlParts.pathname, apiPath: params.apiPath, qstringKeys: params.qstring && Object.keys(params.qstring)});
}
}
};
Expand Down Expand Up @@ -1625,7 +1628,10 @@ common.returnMessage = function(params, returnCode, message, heads, noResult = f
else {
console.error("Output already closed, can't write more");
console.trace();
console.log(params);
// Don't dump the full params object — req.body/req.headers can
// contain credentials, session cookies, or other secrets. Log
// only the pathname (query string can carry api_key/auth_token).
console.log({pathname: params.urlParts && params.urlParts.pathname, apiPath: params.apiPath, qstringKeys: params.qstring && Object.keys(params.qstring)});
}
}
};
Expand Down Expand Up @@ -1703,7 +1709,10 @@ common.returnOutput = function(params, output, noescape, heads) {
else {
console.error("Output already closed, can't write more");
console.trace();
console.log(params);
// Don't dump the full params object — req.body/req.headers can
// contain credentials, session cookies, or other secrets. Log
// only the pathname (query string can carry api_key/auth_token).
console.log({pathname: params.urlParts && params.urlParts.pathname, apiPath: params.apiPath, qstringKeys: params.qstring && Object.keys(params.qstring)});
}
}
};
Expand Down
27 changes: 21 additions & 6 deletions frontend/express/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,14 +439,29 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
app.use(cookieParser());
//server theme images
app.use(function(req, res, next) {
var urlPath = req.url.replace(countlyConfig.path, "");
var urlPath = req.path.replace(countlyConfig.path, "");
var theme = req.cookies.theme || curTheme;
if (theme && theme.length && (req.url.indexOf(countlyConfig.path + '/images/') === 0 || req.url.indexOf(countlyConfig.path + '/geodata/') === 0)) {
fs.exists(__dirname + '/public/themes/' + theme + urlPath, function(exists) {
if (exists) {
res.sendFile(__dirname + '/public/themes/' + theme + urlPath);
if (theme && theme.length && (req.path.indexOf(countlyConfig.path + '/images/') === 0 || req.path.indexOf(countlyConfig.path + '/geodata/') === 0)) {
// The `theme` cookie is user-controlled. Restrict it to a plain
// filename (no separators, no leading dots, no nulls) before
// building the path. This is defense-in-depth on top of the
// `root` option below; reject anything that doesn't survive
// sanitizeFilename unchanged.
if (common.sanitizeFilename(theme) !== theme) {
next();
return;
}
// Hand the relative path to res.sendFile with `root` set to
// /public/themes — express normalizes the path and rejects any
// `..` traversal before touching the filesystem. Missing files
// and traversal-blocked requests fall through to next(); other
// errors are logged server-side but still fall through so a
// theme misconfiguration doesn't 500 the page.
res.sendFile(theme + urlPath, {root: path.resolve(__dirname, 'public/themes')}, function(err) {
Comment thread
ar2rsawseen marked this conversation as resolved.
if (err && err.code !== 'ENOENT' && err.statusCode !== 403 && err.statusCode !== 404) {
log.e('Error serving theme image %j: %s', req.path, err.message);
}
else {
if (err) {
next();
Comment thread
ar2rsawseen marked this conversation as resolved.
}
});
Expand Down
6 changes: 4 additions & 2 deletions plugins/sdk/api/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ plugins.register("/permissions/features", function(ob) {
common.returnOutput(params, config);
})
.catch(function(err) {
common.returnMessage(params, 400, 'Error: ' + err);
console.error("Error retrieving SDK config", err);
common.returnMessage(params, 400, 'Error retrieving SDK config');
})
.finally(function() {
resolve();
Expand Down Expand Up @@ -72,7 +73,8 @@ plugins.register("/permissions/features", function(ob) {
common.returnOutput(params, res.config || {});
})
.catch(function(err) {
common.returnMessage(params, 400, 'Error: ' + err);
console.error("Error retrieving SDK config", err);
common.returnMessage(params, 400, 'Error retrieving SDK config');
});
});

Expand Down
4 changes: 2 additions & 2 deletions plugins/two-factor-auth/frontend/public/templates/enter2fa_login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@
<%- inject_template.form %>
<% } %>
<div>
<input type="hidden" value="<%- username %>" name="username"/>
<input type="hidden" value="<%- password %>" name="password"/>
<input type="hidden" value="<%= username %>" name="username"/>
<input type="hidden" value="<%= password %>" name="password"/>
<input type="hidden" value="<%= csrf %>" name="_csrf" />
<input type="hidden" value="en" name="lang" id="form-lang" />
<input id="login-button" value="Continue" type="submit" data-localize="two-factor-auth.continue"/>
Expand Down
4 changes: 2 additions & 2 deletions plugins/two-factor-auth/frontend/public/templates/setup2fa.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@
<% } %>
<div>
<input type="hidden" value="<%= secret_token %>" name="secret_token"/>
<input type="hidden" value="<%- username %>" name="username"/>
<input type="hidden" value="<%- password %>" name="password"/>
<input type="hidden" value="<%= username %>" name="username"/>
<input type="hidden" value="<%= password %>" name="password"/>
<input type="hidden" value="<%= csrf %>" name="_csrf" />
<input type="hidden" value="en" name="lang" id="form-lang" />
</div>
Expand Down
Loading