Issue #11253 - Cleanup ComplianceViolation behavior to allow Cookie / URI / MultiPart compliance to also receive listener events.

jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/ComplianceViolation.java

@@ -143,7 +143,7 @@ default void onComplianceViolation(Event event)
          * @param details the details
          * @deprecated use {@link #onComplianceViolation(Event)} instead.  Will be removed in Jetty 12.1.0
          */
-        @Deprecated(since = "12.0.5", forRemoval = true)
+        @Deprecated(since = "12.0.6", forRemoval = true)
         default void onComplianceViolation(Mode mode, ComplianceViolation violation, String details)
         {
         }

jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/HttpCompliance.java

@@ -163,7 +163,7 @@ public String getDescription()
      *   Also make sure that a {@link ComplianceViolation.CapturingListener} has been added as a bean to
      *   either the {@code Connector} or {@code Server} for the Attribute to be created.)
      */
-    @Deprecated(since = "12.0.5", forRemoval = true)
+    @Deprecated(since = "12.0.6", forRemoval = true)
     public static final String VIOLATIONS_ATTR = ComplianceViolation.CapturingListener.VIOLATIONS_ATTR_KEY;
 
     /**
@@ -370,6 +370,9 @@ public static void checkHttpCompliance(MetaData.Request request, HttpCompliance
         HttpFields fields = request.getHttpFields();
         for (HttpField httpField: fields)
         {
+            if (httpField.getHeader() == null)
+                continue;
+
             switch (httpField.getHeader())
             {
                 case CONTENT_LENGTH ->

jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormData.java

@@ -77,13 +77,22 @@ private MultiPartFormData()
     {
     }
 
+    /**
+     * @deprecated use {@link #from(Attributes, ComplianceViolation.Listener, String, Function)} instead.  This method will be removed in Jetty 12.1.0
+     */
+    @Deprecated(since = "12.0.6", forRemoval = true)
     public static CompletableFuture<Parts> from(Attributes attributes, String boundary, Function<Parser, CompletableFuture<Parts>> parse)
+    {
+        return from(attributes, ComplianceViolation.Listener.NOOP, boundary, parse);
+    }
+
+    public static CompletableFuture<Parts> from(Attributes attributes, ComplianceViolation.Listener listener, String boundary, Function<Parser, CompletableFuture<Parts>> parse)
     {
         @SuppressWarnings("unchecked")
         CompletableFuture<Parts> futureParts = (CompletableFuture<Parts>)attributes.getAttribute(MultiPartFormData.class.getName());
         if (futureParts == null)
         {
-            futureParts = parse.apply(new Parser(boundary));
+            futureParts = parse.apply(new Parser(boundary, listener));
             attributes.setAttribute(MultiPartFormData.class.getName(), futureParts);
         }
         return futureParts;
@@ -200,9 +209,6 @@ public static class Parser
     {
         private final PartsListener listener = new PartsListener();
         private final MultiPart.Parser parser;
-        // TODO: it's a bit odd to hang onto a ComplianceViolation.Listener here.
-        // as that would require the user to pass it in.  Maybe a List<Event> violations instead?
-        // that the ee10 layer could use?
         private ComplianceViolation.Listener complianceViolationListener;
         private boolean useFilesForPartsWithoutFileName;
         private Path filesDirectory;
@@ -213,8 +219,14 @@ public static class Parser
         private Parts parts;
 
         public Parser(String boundary)
+        {
+            this(boundary, null);
+        }
+
+        public Parser(String boundary, ComplianceViolation.Listener complianceViolationListener)
         {
             parser = new MultiPart.Parser(Objects.requireNonNull(boundary), listener);
+            this.complianceViolationListener = complianceViolationListener != null ? complianceViolationListener : ComplianceViolation.Listener.NOOP;
         }
 
         public CompletableFuture<Parts> parse(Content.Source content)

jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HTTP2ServerConnection.java

@@ -258,7 +258,7 @@ private HttpChannel pollHttpChannel()
             httpChannel = httpChannels.poll();
         if (httpChannel == null)
             httpChannel = httpChannelFactory.newHttpChannel(this);
-        httpChannel.init();
+        httpChannel.initialize();
         return httpChannel;
     }
 

jetty-core/jetty-http2/jetty-http2-server/src/main/java/org/eclipse/jetty/http2/server/internal/HttpStreamOverHTTP2.java

@@ -86,7 +86,7 @@ public Runnable onRequest(HeadersFrame frame)
             _requestMetaData = (MetaData.Request)frame.getMetaData();
 
             // Grab freshly initialized ComplianceViolation.Listener here, no need to reinitialize.
-            ComplianceViolation.Listener listener = _httpChannel.getComponents().getComplianceViolationListener();
+            ComplianceViolation.Listener listener = _httpChannel.getComplianceViolationListener();
             Runnable handler = _httpChannel.onRequest(_requestMetaData);
             Request request = _httpChannel.getRequest();
             listener.onRequestBegin(request);

jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpStreamOverHTTP3.java

@@ -76,7 +76,7 @@ public Runnable onRequest(HeadersFrame frame)
             requestMetaData = (MetaData.Request)frame.getMetaData();
 
             // Grab freshly initialized ComplianceViolation.Listener here, no need to reinitialize.
-            ComplianceViolation.Listener listener = httpChannel.getComponents().getComplianceViolationListener();
+            ComplianceViolation.Listener listener = httpChannel.getComplianceViolationListener();
             Runnable handler = httpChannel.onRequest(requestMetaData);
             Request request = this.httpChannel.getRequest();
             listener.onRequestBegin(request);

jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3StreamConnection.java

@@ -53,7 +53,7 @@ public Runnable onRequest(HTTP3StreamServer stream, HeadersFrame frame)
     {
         // Create new metadata for every request as the local or remote address may have changed.
         HttpChannel httpChannel = httpChannelFactory.newHttpChannel(new MetaData());
-        httpChannel.init();
+        httpChannel.initialize();
         HttpStreamOverHTTP3 httpStream = new HttpStreamOverHTTP3(this, httpChannel, stream);
         httpChannel.setHttpStream(httpStream);
         stream.setAttachment(httpStream);

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Components.java

@@ -13,7 +13,6 @@
 
 package org.eclipse.jetty.server;
 
-import org.eclipse.jetty.http.ComplianceViolation;
 import org.eclipse.jetty.io.ByteBufferPool;
 import org.eclipse.jetty.util.Attributes;
 import org.eclipse.jetty.util.thread.Scheduler;
@@ -44,11 +43,4 @@ public interface Components
      * @return A Map, which may be an empty map that discards all items.
      */
     Attributes getCache();
-
-    /**
-     * @return A {@link ComplianceViolation.Listener} instance that has been
-     * {@link ComplianceViolation.Listener#initialize() initialized}
-     * for the current request cycle.
-     */
-    ComplianceViolation.Listener getComplianceViolationListener();
 }

jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java

@@ -17,6 +17,7 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
+import org.eclipse.jetty.http.ComplianceViolation;
 import org.eclipse.jetty.http.MetaData;
 import org.eclipse.jetty.server.internal.HttpChannelState;
 import org.eclipse.jetty.util.thread.Invocable;
@@ -37,13 +38,7 @@ public interface HttpChannel extends Invocable
     ConnectionMetaData getConnectionMetaData();
 
     /**
-     * @return the {@link Components} associated with this {@code HttpChannel}.
-     * @see Request#getComponents()
-     */
-    Components getComponents();
-
-    /**
-     * Set the {@link HttpStream} to associate to this channel.
+     * Set the {@link HttpStream} to associate to this channel..
      * @param httpStream the {@link HttpStream} to associate to this channel.
      */
     void setHttpStream(HttpStream httpStream);
@@ -106,15 +101,41 @@ public interface HttpChannel extends Invocable
     /**
      * Recycle the HttpChannel, so that a new cycle of calling {@link #setHttpStream(HttpStream)},
      * {@link #onRequest(MetaData.Request)} etc. may be performed on the channel.
-     * @see #init()
+     * @see #initialize()
      */
     void recycle();
 
     /**
      * Initialize the HttpChannel when a new cycle of request handling begins.
      * @see #recycle()
      */
-    void init();
+    void initialize();
+
+    /**
+     * @return the active {@link ComplianceViolation.Listener}
+     */
+    ComplianceViolation.Listener getComplianceViolationListener();
+
+    /**
+     * @param request attempt to resolve the HttpChannel from the provided request
+     * @return the HttpChannel if found
+     * @throws IllegalStateException if unable to find HttpChannel
+     */
+    static HttpChannel from(Request request)
+    {
+        while (true)
+        {
+            if (request instanceof Request.Wrapper wrapper)
+                request = wrapper.getWrapped();
+            else
+                break;
+        }
+
+        if (request.getComponents() instanceof HttpChannel httpChannel)
+            return httpChannel;
+
+        throw new IllegalStateException("Unable to find HttpChannel from " + request);
+    }
 
     /**
      * <p>A factory for {@link HttpChannel} instances.</p>