Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Validate request headers also

This commit is contained in:
Alan Plum 2016-06-14 16:20:37 +02:00
parent 4466925398
commit 0867e8aa87
No known key found for this signature in database
GPG Key ID: 8ED72A9A323B6EFD
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/server/modules/@arangodb/foxx/router/tree.js
View File

@ -209,6 +209,7 @@ function applyPathParams(route) {
function dispatch(route, req, res) { function dispatch(route, req, res) {
let pathParams = {}; let pathParams = {};
let queryParams = Object.assign({}, req.queryParams); let queryParams = Object.assign({}, req.queryParams);
let headers = Object.assign({}, req.headers);
{ {
let basePath = []; let basePath = [];
@ -283,8 +284,24 @@ function dispatch(route, req, res) {
} }
} }
if (context._headers.size) {
try {
item.headers = validation.validateParams(
context._headers,
req.headers,
'header'
);
} catch (e) {
throw Object.assign(
new httperr.BadRequest(e.message),
{cause: e}
);
}
}
let tempPathParams = req.pathParams; let tempPathParams = req.pathParams;
let tempQueryParams = req.queryParams; let tempQueryParams = req.queryParams;
let tempHeaders = req.headers;
let tempSuffix = req.suffix; let tempSuffix = req.suffix;
let tempPath = req.path; let tempPath = req.path;
let tempReverse = req.reverse; let tempReverse = req.reverse;
@ -353,11 +370,14 @@ function dispatch(route, req, res) {
if (item.endpoint || item.router) { if (item.endpoint || item.router) {
pathParams = Object.assign(pathParams, item.pathParams); pathParams = Object.assign(pathParams, item.pathParams);
queryParams = Object.assign(queryParams, item.queryParams); queryParams = Object.assign(queryParams, item.queryParams);
headers = Object.assign(headers, item.headers);
req.pathParams = pathParams; req.pathParams = pathParams;
req.queryParams = queryParams; req.queryParams = queryParams;
req.headers = headers;
} else { } else {
req.pathParams = Object.assign({}, pathParams, item.pathParams); req.pathParams = Object.assign({}, pathParams, item.pathParams);
req.queryParams = Object.assign({}, queryParams, item.queryParams); req.queryParams = Object.assign({}, queryParams, item.queryParams);
req.headers = Object.assign({}, headers, item.headers);
} }
if (!context._handler) { if (!context._handler) {
@ -372,6 +392,7 @@ function dispatch(route, req, res) {
req.reverse = tempReverse; req.reverse = tempReverse;
req.path = tempPath; req.path = tempPath;
req.suffix = tempSuffix; req.suffix = tempSuffix;
req.headers = tempHeaders;
req.queryParams = tempQueryParams; req.queryParams = tempQueryParams;
req.pathParams = tempPathParams; req.pathParams = tempPathParams;
} }