fix: regression in header case-insensitivity (#188)

Author: erunion

src/helpers/headers.js

@@ -0,0 +1,38 @@
+module.exports = {
+  /**
+   * Given a headers object retrieve the contents of a header out of it via a case-insensitive key.
+   *
+   * @param {object} headers
+   * @param {string} name
+   * @return {string}
+   */
+  getHeader: (headers, name) => {
+    return headers[Object.keys(headers).find(k => k.toLowerCase() === name.toLowerCase())]
+  },
+
+  /**
+   * Given a headers object retrieve a specific header out of it via a case-insensitive key.
+   *
+   * @param {object} headers
+   * @param {string} name
+   * @return {string}
+   */
+  getHeaderName: (headers, name) => {
+    return Object.keys(headers).find(k => {
+      if (k.toLowerCase() === name.toLowerCase()) {
+        return k
+      }
+    })
+  },
+
+  /**
+   * Determine if a given case-insensitive header exists within a header object.
+   *
+   * @param {object} headers
+   * @param {string} name
+   * @return {(integer|boolean)}
+   */
+  hasHeader: (headers, name) => {
+    return Boolean(Object.keys(headers).find(k => k.toLowerCase() === name.toLowerCase()))
+  }
+}

src/index.js

@@ -7,6 +7,7 @@ var es = require('event-stream')
 var MultiPartForm = require('form-data')
 var qs = require('querystring')
 var reducer = require('./helpers/reducer')
+var helpers = require('./helpers/headers')
 var targets = require('./targets')
 var url = require('url')
 var validate = require('har-validator/lib/async')
@@ -165,7 +166,14 @@ HTTPSnippet.prototype.prepare = function (request) {
         }
 
         request.postData.boundary = boundary
-        request.headersObj['content-type'] = 'multipart/form-data; boundary=' + boundary
+
+        // Since headers are case-sensitive we need to see if there's an existing `Content-Type` header that we can
+        // override.
+        const contentTypeHeader = helpers.hasHeader(request.headersObj, 'content-type')
+          ? helpers.getHeaderName(request.headersObj, 'content-type')
+          : 'content-type'
+
+        request.headersObj[contentTypeHeader] = 'multipart/form-data; boundary=' + boundary
       }
       break
 

src/targets/clojure/clj_http.js

@@ -11,6 +11,7 @@
 'use strict'
 
 var CodeBuilder = require('../../helpers/code-builder')
+var helpers = require('../../helpers/headers')
 
 var Keyword = function (name) {
   this.name = name
@@ -101,15 +102,15 @@ module.exports = function (source, options) {
     case 'application/json':
       params['content-type'] = new Keyword('json')
       params['form-params'] = source.postData.jsonObj
-      delete params.headers['content-type']
+      delete params.headers[helpers.getHeaderName(params.headers, 'content-type')]
       break
     case 'application/x-www-form-urlencoded':
       params['form-params'] = source.postData.paramsObj
-      delete params.headers['content-type']
+      delete params.headers[helpers.getHeaderName(params.headers, 'content-type')]
       break
     case 'text/plain':
       params.body = source.postData.text
-      delete params.headers['content-type']
+      delete params.headers[helpers.getHeaderName(params.headers, 'content-type')]
       break
     case 'multipart/form-data':
       params.multipart = source.postData.params.map(function (x) {
@@ -121,14 +122,14 @@ module.exports = function (source, options) {
             content: x.value}
         }
       })
-      delete params.headers['content-type']
+      delete params.headers[helpers.getHeaderName(params.headers, 'content-type')]
       break
   }
 
-  switch (params.headers.accept) {
+  switch (helpers.getHeader(params.headers, 'accept')) {
     case 'application/json':
       params.accept = new Keyword('json')
-      delete params.headers.accept
+      delete params.headers[helpers.getHeaderName(params.headers, 'accept')]
       break
   }
 

src/targets/csharp/httpclient.js

@@ -1,9 +1,10 @@
 'use strict'
 
 var CodeBuilder = require('../../helpers/code-builder')
+var helpers = require('../../helpers/headers')
 
 function getDecompressionMethods (source) {
-  var acceptEncoding = source.allHeaders['accept-encoding']
+  var acceptEncoding = helpers.getHeader(source.allHeaders, 'accept-encoding')
   if (!acceptEncoding) {
     return [] // no decompression
   }
@@ -67,7 +68,7 @@ module.exports = function (source, options) {
   code.push(1, 'RequestUri = new Uri("%s"),', source.fullUrl)
 
   var headers = Object.keys(source.allHeaders).filter(function (header) {
-    switch (header) {
+    switch (header.toLowerCase()) {
       case 'content-type':
       case 'content-length':
       case 'accept-encoding':

src/targets/csharp/restsharp.js

@@ -1,6 +1,7 @@
 'use strict'
 
 var CodeBuilder = require('../../helpers/code-builder')
+var helpers = require('../../helpers/headers')
 
 module.exports = function (source, options) {
   var code = new CodeBuilder()
@@ -31,7 +32,11 @@ module.exports = function (source, options) {
   }
 
   if (source.postData.text) {
-    code.push('request.AddParameter("%s", %s, ParameterType.RequestBody);', source.allHeaders['content-type'], JSON.stringify(source.postData.text))
+    code.push(
+      'request.AddParameter("%s", %s, ParameterType.RequestBody);',
+      helpers.getHeader(source.allHeaders, 'content-type'),
+      JSON.stringify(source.postData.text)
+    )
   }
 
   code.push('IRestResponse response = client.Execute(request);')

src/targets/javascript/jquery.js

@@ -11,6 +11,7 @@
 'use strict'
 
 var CodeBuilder = require('../../helpers/code-builder')
+var helpers = require('../../helpers/headers')
 
 module.exports = function (source, options) {
   var opts = Object.assign({
@@ -50,9 +51,12 @@ module.exports = function (source, options) {
       settings.data = '[form]'
 
       // remove the contentType header
-      if (~settings.headers['content-type'].indexOf('boundary')) {
-        delete settings.headers['content-type']
+      if (helpers.hasHeader(settings.headers, 'content-type')) {
+        if (helpers.getHeader(settings.headers, 'content-type').indexOf('boundary')) {
+          delete settings.headers[helpers.getHeaderName(settings.headers, 'content-type')]
+        }
       }
+
       code.blank()
       break
 

src/targets/javascript/xhr.js

@@ -11,6 +11,7 @@
 'use strict'
 
 var CodeBuilder = require('../../helpers/code-builder')
+var helpers = require('../../helpers/headers')
 
 module.exports = function (source, options) {
   var opts = Object.assign({
@@ -34,8 +35,10 @@ module.exports = function (source, options) {
       })
 
       // remove the contentType header
-      if (source.allHeaders['content-type'].indexOf('boundary')) {
-        delete source.allHeaders['content-type']
+      if (helpers.hasHeader(source.allHeaders, 'content-type')) {
+        if (helpers.getHeader(source.allHeaders, 'content-type').indexOf('boundary')) {
+          delete source.allHeaders[helpers.getHeaderName(source.allHeaders, 'content-type')]
+        }
       }
 
       code.blank()

src/targets/php/http2.js

@@ -11,6 +11,7 @@
 'use strict'
 
 var helpers = require('./helpers')
+var headerHelpers = require('../../helpers/headers')
 var CodeBuilder = require('../../helpers/code-builder')
 
 module.exports = function (source, options) {
@@ -65,8 +66,10 @@ module.exports = function (source, options) {
           )
 
       // remove the contentType header
-      if (~source.headersObj['content-type'].indexOf('boundary')) {
-        delete source.headersObj['content-type']
+      if (headerHelpers.hasHeader(source.headersObj, 'content-type')) {
+        if (headerHelpers.getHeader(source.headersObj, 'content-type').indexOf('boundary')) {
+          delete source.headersObj[headerHelpers.getHeaderName(source.headersObj, 'content-type')]
+        }
       }
 
       code.blank()

src/targets/powershell/common.js

@@ -1,6 +1,7 @@
 'use strict'
 
 var CodeBuilder = require('../../helpers/code-builder')
+var helpers = require('../../helpers/headers')
 
 module.exports = function (command) {
   return function (source, options) {
@@ -44,7 +45,7 @@ module.exports = function (command) {
     }
 
     if (source.postData.text) {
-      commandOptions.push("-ContentType '" + source.allHeaders['content-type'] + "'")
+      commandOptions.push("-ContentType '" + helpers.getHeader(source.allHeaders, 'content-type') + "'")
       commandOptions.push("-Body '" + source.postData.text + "'")
     }
 

src/targets/r/httr.js

@@ -93,13 +93,13 @@ module.exports = function (source, options) {
   var accept
 
   for (head in headers) {
-    if (head === 'accept') {
+    if (head.toLowerCase() === 'accept') {
       accept = ', accept("' + headers[head] + '")'
       headerCount = headerCount - 1
-    } else if (head === 'cookie') {
+    } else if (head.toLowerCase() === 'cookie') {
       cookies = ', set_cookies(`' + headers[head].replace(/;/g, '", `').replace(/` /g, '`').replace(/=/g, '` = "') + '")'
       headerCount = headerCount - 1
-    } else if (head !== 'content-type') {
+    } else if (head.toLowerCase() !== 'content-type') {
       header = header + head.replace('-', '_') + " = '" + headers[head]
       if (headerCount > 1) { header = header + "', " }
     }