fix: closes #11352, try/catch rss feeds

NodeBB · Mar 11, 2023 · cfd5027 · cfd5027
1 parent 56427e4
commit cfd5027
Showing 1 changed file with 18 additions and 17 deletions.
diff --git a/src/routes/feeds.js b/src/routes/feeds.js
@@ -9,11 +9,12 @@ const topics = require('../topics');
 const user = require('../user');
 const categories = require('../categories');
 const meta = require('../meta');
-const helpers = require('../controllers/helpers');
+const controllerHelpers = require('../controllers/helpers');
 const privileges = require('../privileges');
 const db = require('../database');
 const utils = require('../utils');
 const controllers404 = require('../controllers/404');
+const routeHelpers = require('./helpers');
 
 const terms = {
 	daily: 'day',
@@ -23,18 +24,18 @@ const terms = {
 };
 
 module.exports = function (app, middleware) {
-	app.get('/topic/:topic_id.rss', middleware.maintenanceMode, generateForTopic);
-	app.get('/category/:category_id.rss', middleware.maintenanceMode, generateForCategory);
-	app.get('/topics.rss', middleware.maintenanceMode, generateForTopics);
-	app.get('/recent.rss', middleware.maintenanceMode, generateForRecent);
-	app.get('/top.rss', middleware.maintenanceMode, generateForTop);
-	app.get('/top/:term.rss', middleware.maintenanceMode, generateForTop);
-	app.get('/popular.rss', middleware.maintenanceMode, generateForPopular);
-	app.get('/popular/:term.rss', middleware.maintenanceMode, generateForPopular);
-	app.get('/recentposts.rss', middleware.maintenanceMode, generateForRecentPosts);
-	app.get('/category/:category_id/recentposts.rss', middleware.maintenanceMode, generateForCategoryRecentPosts);
-	app.get('/user/:userslug/topics.rss', middleware.maintenanceMode, generateForUserTopics);
-	app.get('/tags/:tag.rss', middleware.maintenanceMode, generateForTag);
+	app.get('/topic/:topic_id.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForTopic));
+	app.get('/category/:category_id.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForCategory));
+	app.get('/topics.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForTopics));
+	app.get('/recent.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForRecent));
+	app.get('/top.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForTop));
+	app.get('/top/:term.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForTop));
+	app.get('/popular.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForPopular));
+	app.get('/popular/:term.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForPopular));
+	app.get('/recentposts.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForRecentPosts));
+	app.get('/category/:category_id/recentposts.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForCategoryRecentPosts));
+	app.get('/user/:userslug/topics.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForUserTopics));
+	app.get('/tags/:tag.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForTag));
 };
 
 async function validateTokenIfRequiresLogin(requiresLogin, cid, req, res) {
@@ -46,16 +47,16 @@ async function validateTokenIfRequiresLogin(requiresLogin, cid, req, res) {
 	}
 
 	if (uid <= 0 || !token) {
-		return helpers.notAllowed(req, res);
+		return controllerHelpers.notAllowed(req, res);
 	}
 	const userToken = await db.getObjectField(`user:${uid}`, 'rss_token');
 	if (userToken !== token) {
 		await user.auth.logAttempt(uid, req.ip);
-		return helpers.notAllowed(req, res);
+		return controllerHelpers.notAllowed(req, res);
 	}
 	const userPrivileges = await privileges.categories.get(cid, uid);
 	if (!userPrivileges.read) {
-		return helpers.notAllowed(req, res);
+		return controllerHelpers.notAllowed(req, res);
 	}
 	return true;
 }
@@ -230,7 +231,7 @@ async function generateSorted(options, req, res, next) {
 	const { cid } = req.query;
 	if (cid) {
 		if (!await privileges.categories.can('topics:read', cid, uid)) {
-			return helpers.notAllowed(req, res);
+			return controllerHelpers.notAllowed(req, res);
 		}
 		params.cids = [cid];
 	}