mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-03-06 12:31:33 +01:00
fix: 403/400/500 page not generating csrf_token
This commit is contained in:
@@ -55,10 +55,6 @@ exports.send404 = async function (req, res) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (req.method === 'GET') {
|
|
||||||
await middleware.applyCSRFasync(req, res);
|
|
||||||
}
|
|
||||||
|
|
||||||
await middleware.buildHeaderAsync(req, res);
|
await middleware.buildHeaderAsync(req, res);
|
||||||
await res.render('404', {
|
await res.render('404', {
|
||||||
path: validator.escape(path),
|
path: validator.escape(path),
|
||||||
|
|||||||
@@ -79,9 +79,6 @@ exports.handleErrors = async function handleErrors(err, req, res, next) { // esl
|
|||||||
if (res.locals.isAPI) {
|
if (res.locals.isAPI) {
|
||||||
res.json(data);
|
res.json(data);
|
||||||
} else {
|
} else {
|
||||||
if (req.method === 'GET') {
|
|
||||||
await middleware.applyCSRFasync(req, res);
|
|
||||||
}
|
|
||||||
await middleware.buildHeaderAsync(req, res);
|
await middleware.buildHeaderAsync(req, res);
|
||||||
res.render('500', data);
|
res.render('500', data);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,9 @@ const middleware = module.exports;
|
|||||||
|
|
||||||
middleware.buildHeader = helpers.try(async (req, res, next) => {
|
middleware.buildHeader = helpers.try(async (req, res, next) => {
|
||||||
res.locals.renderAdminHeader = true;
|
res.locals.renderAdminHeader = true;
|
||||||
|
if (req.method === 'GET') {
|
||||||
|
await require('./index').applyCSRFasync(req, res);
|
||||||
|
}
|
||||||
res.locals.config = await controllers.api.loadConfig(req);
|
res.locals.config = await controllers.api.loadConfig(req);
|
||||||
next();
|
next();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -31,6 +31,9 @@ const relative_path = nconf.get('relative_path');
|
|||||||
middleware.buildHeader = helpers.try(async (req, res, next) => {
|
middleware.buildHeader = helpers.try(async (req, res, next) => {
|
||||||
res.locals.renderHeader = true;
|
res.locals.renderHeader = true;
|
||||||
res.locals.isAPI = false;
|
res.locals.isAPI = false;
|
||||||
|
if (req.method === 'GET') {
|
||||||
|
await require('./index').applyCSRFasync(req, res);
|
||||||
|
}
|
||||||
const [config, canLoginIfBanned] = await Promise.all([
|
const [config, canLoginIfBanned] = await Promise.all([
|
||||||
controllers.api.loadConfig(req),
|
controllers.api.loadConfig(req),
|
||||||
user.bans.canLoginIfBanned(req.uid),
|
user.bans.canLoginIfBanned(req.uid),
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ helpers.setupPageRoute = function (router, name, middleware, middlewares, contro
|
|||||||
router.get(
|
router.get(
|
||||||
name,
|
name,
|
||||||
middleware.busyCheck,
|
middleware.busyCheck,
|
||||||
middleware.applyCSRF,
|
|
||||||
middlewares,
|
middlewares,
|
||||||
middleware.buildHeader,
|
middleware.buildHeader,
|
||||||
helpers.tryRoute(controller)
|
helpers.tryRoute(controller)
|
||||||
|
|||||||
Reference in New Issue
Block a user