Skip to content

fix the storing of request bodies #1059

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
BMartinos merged 1 commit into from
Nov 7, 2019
Merged

fix the storing of request bodies #1059

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions src/middleware/streamingReceiver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,11 @@ function streamingReceiver (ctx, statusEvents) {
* custom header (the GridFS fileId of the body for this transaction)
*/
const bodyId = ctx.request.headers['x-body-id']
const requestHasBody = (['POST', 'PUT', 'PATCH'].includes(ctx.req.method)) && (bodyId == null)

if (['POST', 'PUT', 'PATCH'].includes(ctx.req.method)) {
if (requestHasBody) {
const storeRequestBody = (['POST', 'PUT', 'PATCH'].includes(ctx.req.method)) && ctx.authorisedChannel.requestBody

if (storeRequestBody) {
if (!bodyId) {
/*
* Request has a body, so stream it into GridFs
*/
Expand Down Expand Up @@ -86,7 +87,7 @@ function streamingReceiver (ctx, statusEvents) {
}
} else {
/*
* GET and DELETE come in here to persist the intial request transaction
* GET and DELETE come in here to persist the initial request transaction
*/
ctx.state.requestPromise = messageStore.initiateRequest(ctx)
}
Expand All @@ -98,14 +99,14 @@ function streamingReceiver (ctx, statusEvents) {
logger.info(`Read request CHUNK # ${counter} [ Total size ${size}]`)

// Write chunk to GridFS & downstream
if (requestHasBody) {
if (storeRequestBody && !bodyId) {
gridFsStream.write(chunk)
}

ctx.state.downstream.push(chunk)
})
.on('end', () => {
if (requestHasBody) {
if (storeRequestBody && !bodyId) {
// Close streams to gridFS and downstream
gridFsStream.end()
if (statusEvents && statusEvents.finishGridFs) {
Expand Down