Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated body parser to handle extended content types #1663

Merged
merged 9 commits into from May 27, 2018
Merged

Updated body parser to handle extended content types #1663

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ce7bc65
added name to package json
ifiok May 21, 2018
1ac6008
updated parser to check for extended content type formats for JSON
ifiok May 21, 2018
18ed8bd
added tests to validate change in accepting extended headers
ifiok May 21, 2018
560b2d7
Merge branch 'master' into master
ifiok May 24, 2018
6ede98e
updated bodyParser to treat *+json as application/json
ifiok May 24, 2018
ef5a15e
added test case to validate that */*+json content type is handled
ifiok May 24, 2018
3b90f9e
Merge branch 'master' of https://github.com/ifiok/node-restify
ifiok May 24, 2018
c302a12
updated test name
ifiok May 24, 2018
f3517f2
added regext content type check for extend types to jsonbodyparser as…
ifiok May 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 17 additions & 8 deletions lib/plugins/bodyParser.js
View file
Open in desktop
Expand Up @@ -160,25 +160,34 @@ function bodyParser(options) {
}

var parser;
var type = req.contentType().toLowerCase();
//var type = req.contentType().toLowerCase();
var type = req
.contentType()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

req.contentType() should already support handling ;, did you find out otherwise?

re: https://github.com/restify/node-restify/blob/master/lib/request.js#L210

.toLowerCase()
.split(';')[0];

switch (type) {
case 'application/json':
var jsonPatternMatcher = new RegExp('^application/[a-zA-Z.]+\\+json');

switch (true) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switching on a constant is kind of uncommon - I think I would prefer we do something like map any +json type into application/json (if we find a match) and keep the existing switch statement as is.

case jsonPatternMatcher.test(type):
parser = parseJson[0];
break;
case type === 'application/json':
parser = parseJson[0];
break;
case 'application/x-www-form-urlencoded':
case type === 'application/x-www-form-urlencoded':
parser = parseForm[0];
break;
case 'multipart/form-data':
case type === 'multipart/form-data':
parser = parseMultipart;
break;
case 'text/tsv':
case type === 'text/tsv':
parser = parseFieldedText;
break;
case 'text/tab-separated-values':
case type === 'text/tab-separated-values':
parser = parseFieldedText;
break;
case 'text/csv':
case type === 'text/csv':
parser = parseFieldedText;
break;

Expand Down
9 changes: 7 additions & 2 deletions lib/plugins/jsonBodyParser.js
View file
Open in desktop
Expand Up @@ -28,8 +28,13 @@ function jsonBodyParser(options) {
// save original body on req.rawBody and req._body
req.rawBody = req._body = req.body;

if (req.getContentType() !== 'application/json' || !req.body) {
return next();
var jsonPatternMatcher = new RegExp('^application/[a-zA-Z.]+\\+json');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're already doing this match here before we call into it jsonBodyParser, we can remove this content type check entirely.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This Regexp is used in two different places. Perhaps make it a const and share?

var contentType = req.getContentType().split(';')[0];

if (contentType !== 'application/json' || !req.body) {
if (!jsonPatternMatcher.test(contentType)) {
return next();
}
}

var params;
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Expand Up @@ -32,6 +32,7 @@
"Falco Nogatz",
"Gergely Nemeth",
"Guillaume Chauvet",
"Ifiok Idiang",
"Isaac Schlueter",
"Jacob Quatier",
"James O'Cull",
Expand Down