Skip to content

Node.js based forum software built for the modern web

fix: escape translations in /outgoing query params

Barış Soner Uşaklıd21a705aae19
diff --git a/src/controllers/index.js b/src/controllers/index.js
index 7780767450..4ee12ca75e 100644
--- a/src/controllers/index.js
+++ b/src/controllers/index.js
@@ -11,6 +11,7 @@ const plugins = require('../plugins');
const image = require('../image');
const privilegesHelpers = require('../privileges/helpers');
const helpers = require('./helpers');
+const translator = require('../translator');
const Controllers = module.exports;
@@ -416,18 +417,26 @@ Controllers.manifest = async function (req, res) {
Controllers.outgoing = function (req, res, next) {
const url = req.query.url || '';
+ let parsed;
+ try {
+ parsed = new URL(url);
+ } catch (err) {
+ return next();
+ }
+
const allowedProtocols = [
'http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher',
'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn', 'tel', 'fax', 'xmpp', 'webcal',
];
- const parsed = require('url').parse(url);
if (!url || !parsed.protocol || !allowedProtocols.includes(parsed.protocol.slice(0, -1))) {
return next();
}
+ const escapedSearch = validator.escape(translator.escape(parsed.search || ''));
+ const escapedUrl = parsed.search ? parsed.href.replace(parsed.search, escapedSearch) : parsed.href;
res.render('outgoing', {
- outgoing: validator.escape(String(url)),
+ outgoing: escapedUrl,
title: meta.config.title,
breadcrumbs: helpers.buildBreadcrumbs([{
text: '[[notifications:outgoing-link]]',
diff --git a/test/controllers.js b/test/controllers.js
index 8beb15097a..263c88883e 100644
--- a/test/controllers.js
+++ b/test/controllers.js
@@ -248,6 +248,12 @@ describe('Controllers', () => {
});
});
+ it('should properly escape outgoing url query params', async () => {
+ const { response, body } = await request.get(`${nconf.get('url')}/api/outgoing?url=https://foo.com%3Fbest=%5B%5Btopic:merged-message,%20javascript:alert(origin)%5D%5D`);
+ assert.equal(response.statusCode, 200);
+ assert.strictEqual(body.outgoing, 'https://foo.com/?best=[[topic:merged-message,%20javascript:alert(origin)]]');
+ });
+
it('should load /register/complete', async () => {
const jar = request.jar();
const csrf_token = await helpers.getCsrfToken(jar);