Ignore case and h2 pseudo headers when filtering headers

gatling · Jul 23, 2018 · dfc7413 · dfc7413
1 parent 405246f
commit dfc7413
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/gatling-recorder/src/main/scala/io/gatling/recorder/scenario/ScenarioExporter.scala b/gatling-recorder/src/main/scala/io/gatling/recorder/scenario/ScenarioExporter.scala
@@ -31,6 +31,7 @@ import io.gatling.http.{ HeaderNames, HeaderValues }
 import io.gatling.recorder.config.RecorderConfiguration
 import io.gatling.recorder.har._
 import io.gatling.recorder.scenario.template.SimulationTemplate
+import io.gatling.recorder.util.HttpUtils._
 
 import com.dongxiguo.fastring.Fastring.Implicits._
 import com.typesafe.scalalogging.StrictLogging
@@ -127,8 +128,8 @@ private[recorder] object ScenarioExporter extends StrictLogging {
           val acceptedHeaders = element.headers.entries.asScala.map(e => e.getKey -> e.getValue).toList
             .filterNot {
               case (headerName, headerValue) =>
-                val isFiltered = filteredHeaders.contains(headerName)
-                val isAlreadyInBaseHeaders = Option(baseHeaders.get(headerName)).contains(headerValue)
+                val isFiltered = containsIgnoreCase(filteredHeaders, headerName) || isHttp2PseudoHeader(headerName)
+                val isAlreadyInBaseHeaders = getIgnoreCase(baseHeaders, headerName).contains(headerValue)
                 val isPostWithFormParams = element.method == HttpMethod.POST.name() && headerValue.toLowerCase(Locale.ROOT).contains(HeaderValues.ApplicationFormUrlEncoded)
                 val isEmptyContentLength = headerName.equalsIgnoreCase(HeaderNames.ContentLength) && headerValue == "0"
                 isFiltered || isAlreadyInBaseHeaders || isPostWithFormParams || isEmptyContentLength

diff --git a/gatling-recorder/src/main/scala/io/gatling/recorder/util/HttpUtils.scala b/gatling-recorder/src/main/scala/io/gatling/recorder/util/HttpUtils.scala
@@ -18,7 +18,10 @@ package io.gatling.recorder.util
 
 import java.util.Locale
 
+import scala.collection.JavaConverters._
+
 import io.netty.handler.codec.http.HttpHeaderValues._
+import io.netty.handler.codec.http.HttpHeaders
 
 object HttpUtils {
   val SupportedEncodings = Set(GZIP.toString, DEFLATE.toString)
@@ -28,4 +31,12 @@ object HttpUtils {
       .split(",")
       .filter(encoding => SupportedEncodings.contains(encoding.trim.toLowerCase(Locale.US)))
       .mkString(",")
+
+  def containsIgnoreCase(headers: Iterable[String], header: String): Boolean =
+    headers.exists(_.equalsIgnoreCase(header))
+
+  def getIgnoreCase(httpHeaders: HttpHeaders, header: String): Option[String] =
+    httpHeaders.asScala.find(_.getKey.equalsIgnoreCase(header)).map(_.getValue)
+
+  def isHttp2PseudoHeader(header: String): Boolean = header.startsWith(":")
 }