Skip to content

Node.js based forum software built for the modern web

fix: check brand:touchIcon for correct path

Barış Soner Uşaklı56fad0be0d0d
diff --git a/src/middleware/index.js b/src/middleware/index.js
index 67d8e2faa0..14cb3138e1 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -145,12 +145,18 @@ middleware.logApiUsage = async function logApiUsage(req, res, next) {
};
middleware.routeTouchIcon = function routeTouchIcon(req, res) {
- if (meta.config['brand:touchIcon'] && validator.isURL(meta.config['brand:touchIcon'])) {
- return res.redirect(meta.config['brand:touchIcon']);
+ const brandTouchIcon = meta.config['brand:touchIcon'];
+ if (brandTouchIcon && validator.isURL(brandTouchIcon)) {
+ return res.redirect(brandTouchIcon);
}
+
let iconPath = '';
- if (meta.config['brand:touchIcon']) {
- iconPath = path.join(nconf.get('upload_path'), meta.config['brand:touchIcon'].replace(/assets\/uploads/, ''));
+ if (brandTouchIcon) {
+ const uploadPath = nconf.get('upload_path');
+ iconPath = path.join(uploadPath, brandTouchIcon.replace(/assets\/uploads/, ''));
+ if (!iconPath.startsWith(uploadPath)) {
+ return res.status(404).send('Not found');
+ }
} else {
iconPath = path.join(nconf.get('base_dir'), 'public/images/touch/512.png');
}
diff --git a/test/controllers.js b/test/controllers.js
index b2174d8cf9..5ef313a6d2 100644
--- a/test/controllers.js
+++ b/test/controllers.js
@@ -6,8 +6,8 @@ const fs = require('fs');
const path = require('path');
const util = require('util');
-const request = require('../src/request');
const db = require('./mocks/databasemock');
+const request = require('../src/request');
const api = require('../src/api');
const categories = require('../src/categories');
const topics = require('../src/topics');
@@ -692,6 +692,16 @@ describe('Controllers', () => {
assert(body);
});
+ it('should 404 if brand:touchIcon is not valid', async () => {
+ const oldValue = meta.config['brand:touchIcon'];
+ meta.config['brand:touchIcon'] = '../../not/valid';
+
+ const { response, body } = await request.get(`${nconf.get('url')}/apple-touch-icon`);
+ assert.strictEqual(response.statusCode, 404);
+ assert.strictEqual(body, 'Not found');
+ meta.config['brand:touchIcon'] = oldValue;
+ })
+
it('should error if guests do not have search privilege', async () => {
const { response, body } = await request.get(`${nconf.get('url')}/api/users?query=bar&section=sort-posts`);