Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-29 10:06:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #4954

Browse Source
This commit is contained in:
Julian Lam
2016-08-18 10:05:52 -04:00
parent bf3b270c77
commit 093b21fc31
4 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/controllers/index.js
View File

@@ -381,6 +381,35 @@ Controllers.handle404 = function(req, res) {
}
};
Controllers.handleURIErrors = function(err, req, res, next) {
// Handle cases where malformed URIs are passed in
if (err instanceof URIError) {
var tidMatch = req.path.match(/^\/topic\/(\d+)\//);
var cidMatch = req.path.match(/^\/category\/(\d+)\//);
if (tidMatch) {
res.redirect(nconf.get('relative_path') + tidMatch[0]);
} else if (cidMatch) {
res.redirect(nconf.get('relative_path') + cidMatch[0]);
} else {
winston.warn('[controller] Bad request: ' + req.path);
if (res.locals.isAPI) {
res.status(400).json({
error: '[[global:400.title]]'
});
} else {
req.app.locals.middleware.buildHeader(req, res, function() {
res.render('400', { error: validator.escape(String(err.message)) });
});
}
}
return;
} else {
next();
}
};
Controllers.handleErrors = function(err, req, res, next) {
switch (err.code) {
case 'EBADCSRFTOKEN':
@@ -403,7 +432,7 @@ Controllers.handleErrors = function(err, req, res, next) {
res.json({path: validator.escape(path), error: err.message});
} else {
req.app.locals.middleware.buildHeader(req, res, function() {
res.render('500', {path: validator.escape(path), error: validator.escape(String(err.message))});
res.render('500', { path: validator.escape(path), error: validator.escape(String(err.message)) });
});
}
};