Allow setting size limit on line and header length

There was a slight difference in behavior between series/3.x and series/2.x where the old one's default values on lengths were higher. Those requests were marked as invalid. Now, the value is configurable.
snowplow · Mar 26, 2024 · 150ca95 · 150ca95
1 parent 63aea42
commit 150ca95
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 7 deletions.
diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf
@@ -96,6 +96,8 @@
     idleTimeout = 610 seconds
     responseHeaderTimeout = 2 seconds
     bodyReadTimeout = 500 millis
+    maxRequestLineLength = 20480
+    maxHeadersLength = 40960
   }
 
   debug {

diff --git a/core/src/main/scala/com.snowplowanalytics.snowplow.collector.core/Config.scala b/core/src/main/scala/com.snowplowanalytics.snowplow.collector.core/Config.scala
@@ -161,7 +161,9 @@ object Config {
     maxConnections: Int,
     idleTimeout: FiniteDuration,
     responseHeaderTimeout: FiniteDuration,
-    bodyReadTimeout: FiniteDuration
+    bodyReadTimeout: FiniteDuration,
+    maxRequestLineLength: Int,
+    maxHeadersLength: Int
   )
 
   case class License(

diff --git a/core/src/main/scala/com.snowplowanalytics.snowplow.collector.core/HttpServer.scala b/core/src/main/scala/com.snowplowanalytics.snowplow.collector.core/HttpServer.scala
@@ -99,6 +99,10 @@ object HttpServer {
         .withIdleTimeout(networking.idleTimeout)
         .withMaxConnections(networking.maxConnections)
         .withResponseHeaderTimeout(networking.responseHeaderTimeout)
+        .withLengthLimits(
+          maxRequestLineLen = networking.maxRequestLineLength,
+          maxHeadersLen     = networking.maxHeadersLength
+        )
         .cond(secure, _.withSslContext(SSLContext.getDefault))
         .resource
 

diff --git a/core/src/test/scala/com.snowplowanalytics.snowplow.collector.core/TestUtils.scala b/core/src/test/scala/com.snowplowanalytics.snowplow.collector.core/TestUtils.scala
@@ -121,7 +121,9 @@ object TestUtils {
       1024,
       610.seconds,
       2.second,
-      500.millis
+      500.millis,
+      20480,
+      40960
     ),
     debug = Debug.Debug(
       http = Debug.Http(enable = false, logHeaders = true, logBody = false, redactHeaders = List.empty)

diff --git a/...rc/test/scala/com.snowplowanalytics.snowplow.collectors.scalastream/KafkaConfigSpec.scala b/...rc/test/scala/com.snowplowanalytics.snowplow.collectors.scalastream/KafkaConfigSpec.scala
@@ -172,7 +172,9 @@ object KafkaConfigSpec {
       maxConnections        = 1024,
       idleTimeout           = 610.seconds,
       responseHeaderTimeout = 2.seconds,
-      bodyReadTimeout       = 500.millis
+      bodyReadTimeout       = 500.millis,
+      maxRequestLineLength  = 20480,
+      maxHeadersLength      = 40960
     ),
     license = Config.License(accept = true),
     debug = Config

diff --git a/...scala/com.snowplowanalytics.snowplow.collectors.scalastream/sinks/KinesisConfigSpec.scala b/...scala/com.snowplowanalytics.snowplow.collectors.scalastream/sinks/KinesisConfigSpec.scala
@@ -126,7 +126,9 @@ object KinesisConfigSpec {
       maxConnections        = 1024,
       idleTimeout           = 610.seconds,
       responseHeaderTimeout = 2.seconds,
-      bodyReadTimeout       = 500.millis
+      bodyReadTimeout       = 500.millis,
+      maxRequestLineLength  = 20480,
+      maxHeadersLength      = 40960
     ),
     streams = Config.Streams(
       useIpAddressAsPartitionKey = false,

diff --git a/nsq/src/test/scala/com.snowplowanalytics.snowplow.collectors.scalastream/NsqConfigSpec.scala b/nsq/src/test/scala/com.snowplowanalytics.snowplow.collectors.scalastream/NsqConfigSpec.scala
@@ -159,7 +159,9 @@ object NsqConfigSpec {
       maxConnections        = 1024,
       idleTimeout           = 610.seconds,
       responseHeaderTimeout = 2.seconds,
-      bodyReadTimeout       = 500.millis
+      bodyReadTimeout       = 500.millis,
+      maxRequestLineLength  = 20480,
+      maxHeadersLength      = 40960
     ),
     license = Config.License(accept = true),
     debug = Config

diff --git a/pubsub/src/test/scala/com.snowplowanalytics.snowplow.collectors.scalastream/ConfigSpec.scala b/pubsub/src/test/scala/com.snowplowanalytics.snowplow.collectors.scalastream/ConfigSpec.scala
@@ -115,7 +115,9 @@ object ConfigSpec {
       maxConnections        = 1024,
       idleTimeout           = 610.seconds,
       responseHeaderTimeout = 2.seconds,
-      bodyReadTimeout       = 500.millis
+      bodyReadTimeout       = 500.millis,
+      maxRequestLineLength  = 20480,
+      maxHeadersLength      = 40960
     ),
     streams = Config.Streams(
       useIpAddressAsPartitionKey = false,

diff --git a/sqs/src/test/scala/com.snowplowanalytics.snowplow.collectors.scalastream/SqsConfigSpec.scala b/sqs/src/test/scala/com.snowplowanalytics.snowplow.collectors.scalastream/SqsConfigSpec.scala
@@ -116,7 +116,9 @@ object SqsConfigSpec {
       maxConnections        = 1024,
       idleTimeout           = 610.seconds,
       responseHeaderTimeout = 2.seconds,
-      bodyReadTimeout       = 500.millis
+      bodyReadTimeout       = 500.millis,
+      maxRequestLineLength  = 20480,
+      maxHeadersLength      = 40960
     ),
     streams = Config.Streams(
       useIpAddressAsPartitionKey = false,