fixes #977 change request body validation (#978)

* fix #977 change request body validation * Formatting * Dont attempt to write when no body * Add test for function with no body Co-authored-by: Raees Iqbal <[email protected]>
netlify · Jul 6, 2020 · e9c3c6b · e9c3c6b
1 parent efe3c5f
commit e9c3c6b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/utils/serve-functions.js b/src/utils/serve-functions.js
@@ -52,7 +52,7 @@ function createCallback(response) {
       )
       return handleErr('Incorrect function response statusCode', response)
     }
-    if (typeof lambdaResponse.body !== 'string') {
+    if (lambdaResponse.body && typeof lambdaResponse.body !== 'string') {
       console.log(`${NETLIFYDEVERR} Your function response must have a string body. You gave:`, lambdaResponse.body)
       return handleErr('Incorrect function response body', response)
     }
@@ -66,7 +66,9 @@ function createCallback(response) {
       const items = lambdaResponse.multiValueHeaders[key]
       response.setHeader(key, items)
     }
-    response.write(lambdaResponse.isBase64Encoded ? Buffer.from(lambdaResponse.body, 'base64') : lambdaResponse.body)
+    if (lambdaResponse.body) {
+      response.write(lambdaResponse.isBase64Encoded ? Buffer.from(lambdaResponse.body, 'base64') : lambdaResponse.body)
+    }
     response.end()
   }
 }

diff --git a/tests/dev.test.js b/tests/dev.test.js
@@ -105,6 +105,16 @@ test('functions rewrite echo with body', async t => {
   t.deepEqual(response.queryStringParameters, { ding: 'dong' })
 })
 
+test('functions: no body', async t => {
+  const response = await fetch(`http://${host}/api/no-body?ding=dong`, {
+    method: 'POST',
+    body: 'some=thing',
+  })
+
+  t.is(await response.text(), '')
+  t.is(response.status, 200)
+})
+
 test('functions rewrite echo with Form body', async t => {
   const form = new FormData()
   form.append('some', 'thing')

diff --git a/tests/dummy-site/functions/no-body.js b/tests/dummy-site/functions/no-body.js
@@ -0,0 +1,5 @@
+exports.handler = async (event, context) => {
+  return {
+    statusCode: 200,
+  }
+}