Immutable local/remote SocketAddress within a ConnectionMetaData

The local/remote SocketAddress is cached within the ConnectionMetaData or Connection instance, so that any changes are not visible during the request lifetime. Ensure that all server Connection types respect HttpConfiguration#getLocalAddress and that it is not implemented only in servlet layer Avoid DNS resolution.
jetty · Nov 10, 2023 · 72df5cb · 72df5cb
1 parent 8ae73ad
commit 72df5cb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/...cgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/ServerFCGIConnection.java b/...cgi-server/src/main/java/org/eclipse/jetty/fcgi/server/internal/ServerFCGIConnection.java
@@ -58,7 +58,7 @@ public class ServerFCGIConnection extends AbstractMetaDataConnection implements
 
     public ServerFCGIConnection(Connector connector, EndPoint endPoint, HttpConfiguration configuration, boolean sendStatus200)
     {
-        super(connector, endPoint, connector.getExecutor(), configuration);
+        super(connector, configuration, endPoint);
         this.connector = connector;
         this.networkByteBufferPool = connector.getByteBufferPool();
         this.flusher = new Flusher(endPoint);

diff --git a/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SelectableChannelEndPoint.java b/jetty-core/jetty-io/src/main/java/org/eclipse/jetty/io/SelectableChannelEndPoint.java
@@ -131,8 +131,8 @@ public SocketAddress getLocalSocketAddress()
         try
         {
             SelectableChannel channel = getChannel();
-            if (channel instanceof NetworkChannel)
-                return ((NetworkChannel)channel).getLocalAddress();
+            if (channel instanceof NetworkChannel networkChannel)
+                return networkChannel.getLocalAddress();
             return null;
         }
         catch (Throwable x)

diff --git a/...-core/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractMetaDataConnection.java b/...-core/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractMetaDataConnection.java
@@ -14,7 +14,6 @@
 package org.eclipse.jetty.server;
 
 import java.net.SocketAddress;
-import java.util.concurrent.Executor;
 
 import org.eclipse.jetty.io.AbstractConnection;
 import org.eclipse.jetty.io.Connection;
@@ -31,9 +30,9 @@ public abstract class AbstractMetaDataConnection extends AbstractConnection impl
     private final SocketAddress _localSocketAddress;
     private final SocketAddress _remoteSocketAddress;
 
-    public AbstractMetaDataConnection(Connector connector, EndPoint endPoint, Executor executor, HttpConfiguration httpConfiguration)
+    public AbstractMetaDataConnection(Connector connector, HttpConfiguration httpConfiguration, EndPoint endPoint)
     {
-        super(endPoint, executor);
+        super(endPoint, connector.getExecutor());
         _connector = connector;
         _httpConfiguration = httpConfiguration;
         _localSocketAddress = httpConfiguration.getLocalAddress() != null ? httpConfiguration.getLocalAddress() : endPoint.getLocalSocketAddress();

diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpConnection.java
@@ -135,7 +135,7 @@ protected static HttpConnection setCurrentConnection(HttpConnection connection)
 
     public HttpConnection(HttpConfiguration configuration, Connector connector, EndPoint endPoint, boolean recordComplianceViolations)
     {
-        super(connector, endPoint, connector.getExecutor(), configuration);
+        super(connector, configuration, endPoint);
         _id = __connectionIdGenerator.getAndIncrement();
         _bufferPool = connector.getByteBufferPool();
         _generator = newHttpGenerator();