Node.js based forum software built for the modern web
fix: closes #14506, only allow valid theme names in previews
Barış Soner Uşaklı298c6a091e86
diff --git a/src/controllers/admin/themes.js b/src/controllers/admin/themes.jsindex 339884c95d..2244dd1e6c 100644--- a/src/controllers/admin/themes.js+++ b/src/controllers/admin/themes.js@@ -4,13 +4,16 @@ const path = require('path');const fs = require('fs');const file = require('../../file');-const { paths } = require('../../constants');+const { paths, themeNamePattern } = require('../../constants');const themesController = module.exports;const defaultScreenshotPath = path.join(__dirname, '../../../public/images/themes/default.png');-themesController.get = async function (req, res, next) {+themesController.get = async function (req, res) {+ if (!themeNamePattern.test(req.params.theme)) {+ throw new Error('[[error:invalid-data]]');+ }const themeDir = path.join(paths.nodeModules, req.params.theme);const themeConfigPath = path.join(themeDir, 'theme.json');@@ -20,9 +23,9 @@ themesController.get = async function (req, res, next) {themeConfig = JSON.parse(themeConfig);} catch (err) {if (err.code === 'ENOENT') {- return next(Error('[[error:invalid-data]]'));+ throw new Error('[[error:invalid-data]]');}- return next(err);+ throw err;}const screenshotPath = themeConfig.screenshot ?diff --git a/src/controllers/sitemap.js b/src/controllers/sitemap.jsindex 7f1ac3dca9..0dee38f1a6 100644--- a/src/controllers/sitemap.js+++ b/src/controllers/sitemap.js@@ -15,16 +15,16 @@ sitemapController.render = async function (req, res, next) {res.send(xml);};-sitemapController.getPages = function (req, res, next) {- sendSitemap(sitemap.getPages, res, next);+sitemapController.getPages = async function (req, res, next) {+ await sendSitemap(sitemap.getPages, res, next);};-sitemapController.getCategories = function (req, res, next) {- sendSitemap(sitemap.getCategories, res, next);+sitemapController.getCategories = async function (req, res, next) {+ await sendSitemap(sitemap.getCategories, res, next);};-sitemapController.getTopicPage = function (req, res, next) {- sendSitemap(async () => await sitemap.getTopicPage(parseInt(req.params[0], 10)), res, next);+sitemapController.getTopicPage = async function (req, res, next) {+ await sendSitemap(async () => await sitemap.getTopicPage(parseInt(req.params[0], 10)), res, next);};async function sendSitemap(method, res, callback) {diff --git a/src/routes/meta.js b/src/routes/meta.jsindex 5ca94702ed..aee069d8d9 100644--- a/src/routes/meta.js+++ b/src/routes/meta.js@@ -1,13 +1,14 @@'use strict';module.exports = function (app, middleware, controllers) {- app.get('/sitemap.xml', controllers.sitemap.render);- app.get('/sitemap/pages.xml', controllers.sitemap.getPages);- app.get('/sitemap/categories.xml', controllers.sitemap.getCategories);- app.get(/\/sitemap\/topics\.(\d+)\.xml/, controllers.sitemap.getTopicPage);- app.get('/robots.txt', controllers.robots);- app.get('/manifest.webmanifest', controllers.manifest);- app.get('/css/previews/:theme', controllers.admin.themes.get);- app.get('/osd.xml', controllers.osd.handle);- app.get('/service-worker.js', controllers['service-worker'].generate);+ const routeHelpers = require('./helpers');+ app.get('/sitemap.xml', routeHelpers.tryRoute(controllers.sitemap.render));+ app.get('/sitemap/pages.xml', routeHelpers.tryRoute(controllers.sitemap.getPages));+ app.get('/sitemap/categories.xml', routeHelpers.tryRoute(controllers.sitemap.getCategories));+ app.get(/\/sitemap\/topics\.(\d+)\.xml/, routeHelpers.tryRoute(controllers.sitemap.getTopicPage));+ app.get('/robots.txt', routeHelpers.tryRoute(controllers.robots));+ app.get('/manifest.webmanifest', routeHelpers.tryRoute(controllers.manifest));+ app.get('/css/previews/:theme', routeHelpers.tryRoute(controllers.admin.themes.get));+ app.get('/osd.xml', routeHelpers.tryRoute(controllers.osd.handle));+ app.get('/service-worker.js', routeHelpers.tryRoute(controllers['service-worker'].generate));};diff --git a/test/controllers.js b/test/controllers.jsindex e2f42ceaa9..28cf152703 100644--- a/test/controllers.js+++ b/test/controllers.js@@ -225,6 +225,7 @@ describe('Controllers', () => {{ it: 'should load sitemap/categories.xml', url: `/sitemap/categories.xml` },{ it: 'should load sitemap/topics.1.xml', url: `/sitemap/topics.1.xml` },{ it: 'should load theme screenshot', url: `/css/previews/nodebb-theme-harmony` },+ { it: 'should error loading theme screenshot', url: `/css/previews/..%2Fnode_modules%2Fnodebb-theme-persona`, status: 500 },{ it: 'should load users page', url: `/users` },{ it: 'should load users page section', url: `/users?section=online` },{ it: 'should load groups page', url: `/groups` },