Disable strict line parsing

Author: nicktindall

modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java

@@ -23,6 +23,7 @@
 import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.http.HttpContentCompressor;
 import io.netty.handler.codec.http.HttpContentDecompressor;
+import io.netty.handler.codec.http.HttpDecoderConfig;
 import io.netty.handler.codec.http.HttpMessage;
 import io.netty.handler.codec.http.HttpRequestDecoder;
 import io.netty.handler.codec.http.HttpResponse;
@@ -342,23 +343,19 @@ protected void initChannel(Channel ch) throws Exception {
                 ch.pipeline().addLast("read_timeout", new ReadTimeoutHandler(transport.readTimeoutMillis, TimeUnit.MILLISECONDS));
             }
             final HttpRequestDecoder decoder;
+            final HttpDecoderConfig decoderConfig = new HttpDecoderConfig().setMaxInitialLineLength(handlingSettings.maxInitialLineLength())
+                .setMaxHeaderSize(handlingSettings.maxHeaderSize())
+                .setMaxChunkSize(handlingSettings.maxChunkSize())
+                .setStrictLineParsing(false);
             if (httpValidator != null) {
-                decoder = new HttpRequestDecoder(
-                    handlingSettings.maxInitialLineLength(),
-                    handlingSettings.maxHeaderSize(),
-                    handlingSettings.maxChunkSize()
-                ) {
+                decoder = new HttpRequestDecoder(decoderConfig) {
                     @Override
                     protected HttpMessage createMessage(String[] initialLine) throws Exception {
                         return HttpHeadersAuthenticatorUtils.wrapAsMessageWithAuthenticationContext(super.createMessage(initialLine));
                     }
                 };
             } else {
-                decoder = new HttpRequestDecoder(
-                    handlingSettings.maxInitialLineLength(),
-                    handlingSettings.maxHeaderSize(),
-                    handlingSettings.maxChunkSize()
-                );
+                decoder = new HttpRequestDecoder(decoderConfig);
             }
             decoder.setCumulator(ByteToMessageDecoder.COMPOSITE_CUMULATOR);
             ch.pipeline().addLast("decoder", decoder); // parses the HTTP bytes request into HTTP message pieces

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/netty4/SecurityNetty4HttpServerTransportTests.java

@@ -800,14 +800,18 @@ public void dispatchBadRequest(final RestChannel channel, final ThreadContext th
     }
 
     /**
-     * Append a string as ASCII terminated by a CR/LF newline
+     * Append a string as ASCII terminated by a newline (sometimes CR/LF, sometimes LF)
      *
      * @param string The string to append
      * @param buf The buffer to append to
      */
     private static void appendAsciiLine(String string, ByteBuf buf) {
         ByteBufUtil.copy(AsciiString.of(string), buf);
-        appendCrLf(buf);
+        if (randomBoolean()) {
+            buf.writeByte(HttpConstants.LF);
+        } else {
+            appendCrLf(buf);
+        }
     }
 
     /**