Skip to content

fix: body parser behaviour when multiple Content-Type present in HTTP request #562

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

Merged
merged 2 commits into from
Mar 29, 2025
Merged

fix: body parser behaviour when multiple Content-Type present in HTTP request #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe0e18c
Fix body parser to handle borked content type
mmrwoods Jul 8, 2024
a2fb8f1
add extra comment, linting
filmaj Mar 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/http/helpers/body-parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ module.exports = function parseBody (req) {
// Paranoid deep copy
let request = JSON.parse(JSON.stringify(req))
let headers = request.headers
// Note: content-type header may have multiple, comma-separated values. matching w/ includes may match to multiple different types
let contentType = type => headers?.['content-type']?.includes(type) || headers?.['Content-Type']?.includes(type)

let isString = typeof request.body === 'string'
Expand All @@ -39,17 +40,14 @@ module.exports = function parseBody (req) {
throw Error('Invalid request body encoding or invalid JSON')
}
}

if (isPlainText || isXml) {
else if (isPlainText || isXml) {
request.body = new Buffer.from(request.body, 'base64').toString()
}

if (isFormURLEncoded) {
else if (isFormURLEncoded) {
let data = new Buffer.from(request.body, 'base64').toString()
request.body = qs.parse(data)
}

if (isMultiPartFormData || isOctetStream) {
else if (isMultiPartFormData || isOctetStream) {
request.body = request.body.base64
? request.body
: { base64: request.body }
Expand Down
13 changes: 13 additions & 0 deletions test/unit/src/http/helpers/body-parser-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,19 @@ let octetStream = { 'Content-Type': 'application/octet-stream' }
let text = { 'Content-Type': 'text/plain' }
let xmlText = { 'Content-Type': 'text/xml' }
let xmlApp = { 'Content-Type': 'application/xml' }
let multipleTypes = { 'Content-Type': 'application/json, text/plain' }

test('Borked requests', t => {
t.plan(1)

let req = {
body: str(hi),
headers: multipleTypes,
isBase64Encoded: false,
}
t.equals(str(parseBody(req)), str(hi), `body matches ${str(req.body)}`)

})

test('Architect v10+ requests', t => {
t.plan(6)
Expand Down