Update travis nodejs version to 12 (#38)

Removing `content-length` header sanitation for GET/HEAD requests.

Author: jkyberneees

.gitignore

@@ -57,4 +57,6 @@ typings/
 # dotenv environment variables file
 .env
 
-.vscode/
+.vscode/
+
+.idea

.travis.yml

@@ -1,10 +1,9 @@
 language: node_js
 node_js:
-  - "10"
+  - "12"
 
 before_install:
-# package-lock.json was introduced in npm@5
-- '[[ $(node -v) =~ ^v9.*$ ]] || npm install -g npm@latest' # skipped when using node 9
+- npm install -g npm@latest
 - npm install -g greenkeeper-lockfile
 install: npm install
 before_script: greenkeeper-lockfile-update

index.js

@@ -9,7 +9,8 @@ const buildRequest = require('./lib/request')
 const {
   filterPseudoHeaders,
   copyHeaders,
-  stripHttp1ConnectionHeaders
+  stripHttp1ConnectionHeaders,
+  filterHeaders
 } = require('./lib/utils')
 
 function populateHeaders (headers, body, contentType) {
@@ -40,7 +41,7 @@ module.exports = (opts) => {
 
       const url = getReqUrl(source || req.url, cache, base, opts)
       const sourceHttp2 = req.httpVersionMajor === 2
-      const headers = { ...sourceHttp2 ? filterPseudoHeaders(req.headers) : req.headers }
+      let headers = { ...sourceHttp2 ? filterPseudoHeaders(req.headers) : req.headers }
       headers['x-forwarded-host'] = req.headers.host
       headers.host = url.hostname
       if (url.port) {
@@ -54,7 +55,9 @@ module.exports = (opts) => {
       // proxy should ignore message body when it's a GET or HEAD request
       // when proxy this request, we should reset the content-length to make it a valid http request
       if (req.method === 'GET' || req.method === 'HEAD') {
-        headers['content-length'] = 0
+        if (headers['content-length']) {
+          headers = filterHeaders(headers, 'content-length')
+        }
       } else {
         if (req.body) {
           if (req.body instanceof Stream) {

lib/utils.js

@@ -55,8 +55,24 @@ function stripHttp1ConnectionHeaders (headers) {
   return dest
 }
 
+function filterHeaders (headers, filter) {
+  const headersKeys = Object.keys(headers)
+  const dest = {}
+
+  let header
+  let i
+  for (i = 0; i < headersKeys.length; i++) {
+    header = headersKeys[i].toLowerCase()
+    if (header !== filter) {
+      dest[header] = headers[header]
+    }
+  }
+  return dest
+}
+
 module.exports = {
   copyHeaders,
   stripHttp1ConnectionHeaders,
-  filterPseudoHeaders
+  filterPseudoHeaders,
+  filterHeaders
 }

package.json

@@ -37,16 +37,16 @@
     "0http": "^2.5.2",
     "body-parser": "^1.19.0",
     "chai": "^4.2.0",
-    "fastify": "^2.15.1",
-    "fastify-reply-from": "^2.1.0",
-    "follow-redirects": "^1.11.0",
+    "fastify": "^3.0.3",
+    "fastify-reply-from": "^3.1.2",
+    "follow-redirects": "^1.12.1",
     "h2url": "^0.2.0",
     "http-proxy": "^1.18.1",
-    "mocha": "^7.2.0",
-    "nock": "^12.0.3",
+    "mocha": "^8.0.1",
+    "nock": "^13.0.2",
     "nyc": "^15.1.0",
     "pem": "^1.14.4",
-    "restana": "^4.6.1",
+    "restana": "^4.6.2",
     "standard": "^14.3.4",
     "supertest": "^4.0.2"
   },
@@ -55,6 +55,6 @@
     "pump": "^3.0.0",
     "semver": "^7.3.2",
     "tiny-lru": "^7.0.6",
-    "undici": "^1.0.3"
+    "undici": "^1.2.2"
   }
 }

test/5.undici.test.js

@@ -47,7 +47,7 @@ describe('undici', () => {
     })
     service.get('/service/headers', (req, res) => {
       res.setHeader('x-agent', 'fast-proxy')
-      res.send()
+      res.send(req.headers)
     })
     service.get('/service/timeout', async (req, res) => {
       await sleep(200)
@@ -78,8 +78,11 @@ describe('undici', () => {
     await request(gHttpServer)
       .get('/service/headers')
       .expect(200)
+      .set('content-length', '10')
       .then((response) => {
         expect(response.headers['x-agent']).to.equal('fast-proxy')
+        expect(response.body['content-length']).to.equal(undefined) // content-length is stripped for GET / HEAD requests
+        expect(response.body.host).to.equal('127.0.0.1:3000')
       })
   })