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.
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
Updated body parser to handle extended content types #1663
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
ce7bc65
added name to package json
ifiok 1ac6008
updated parser to check for extended content type formats for JSON
ifiok 18ed8bd
added tests to validate change in accepting extended headers
ifiok 560b2d7
Merge branch 'master' into master
ifiok 6ede98e
updated bodyParser to treat *+json as application/json
ifiok ef5a15e
added test case to validate that */*+json content type is handled
ifiok 3b90f9e
Merge branch 'master' of https://github.com/ifiok/node-restify
ifiok c302a12
updated test name
ifiok f3517f2
added regext content type check for extend types to jsonbodyparser as…
ifiok File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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'); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This Regexp is used in two different places. Perhaps make it a |
||
var contentType = req.getContentType(); | ||
|
||
if (contentType !== 'application/json' || !req.body) { | ||
if (!jsonPatternMatcher.test(contentType)) { | ||
return next(); | ||
} | ||
} | ||
|
||
var params; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.