[UNDERTOW-2576] ProxyHandler can throw NullPointerException if the source address SocketAddress has no ip address

Author: aogburn

core/src/main/java/io/undertow/server/handlers/proxy/ProxyHandler.java

@@ -482,9 +482,13 @@ public void run() {
             final String remoteHost;
             final SocketAddress address = exchange.getSourceAddress();
             if (address != null) {
-                remoteHost = ((InetSocketAddress) address).getAddress().getHostAddress();
-                if(!((InetSocketAddress) address).isUnresolved()) {
-                    request.putAttachment(ProxiedRequestAttachments.REMOTE_ADDRESS, ((InetSocketAddress) address).getAddress().getHostAddress());
+                if (((InetSocketAddress) address).getAddress() != null){
+                    remoteHost = ((InetSocketAddress) address).getAddress().getHostAddress();
+                    if(!((InetSocketAddress) address).isUnresolved()) {
+                        request.putAttachment(ProxiedRequestAttachments.REMOTE_ADDRESS, ((InetSocketAddress) address).getAddress().getHostAddress());
+                    }
+                } else {
+                    remoteHost = ((InetSocketAddress) address).getHostString();
                 }
             } else {
                 //should never happen, unless this is some form of mock request

core/src/test/java/io/undertow/server/handlers/proxy/ProxyHandlerXForwardedForTestCase.java

@@ -14,6 +14,7 @@
 import org.junit.runner.RunWith;
 import org.xnio.OptionMap;
 import org.xnio.Options;
+import io.undertow.Handlers;
 import io.undertow.Undertow;
 import io.undertow.protocols.ssl.UndertowXnioSsl;
 import io.undertow.server.HttpHandler;
@@ -70,6 +71,18 @@ public static void teardown() throws Exception {
 
     }
 
+    private static void setProxyHandlerWithPeerAddressHandler(boolean rewriteHostHeader, boolean reuseXForwarded) throws Exception {
+
+        HttpHandler rootHandler = ProxyHandler.builder().setProxyClient((new LoadBalancingProxyClient()
+                .setConnectionsPerThread(4)
+                .addHost(new URI("https", null, DefaultServer.getHostAddress("default"), handlerPort, null, null, null), "s1", ssl)))
+                .setMaxRequestTime(10000)
+                .setRewriteHostHeader(rewriteHostHeader)
+                .setReuseXForwarded(reuseXForwarded).build();
+
+        DefaultServer.setRootHandler(Handlers.proxyPeerAddress(rootHandler));
+    }
+
     private static void setProxyHandler(boolean rewriteHostHeader, boolean reuseXForwarded) throws Exception {
 
         DefaultServer.setRootHandler(ProxyHandler.builder().setProxyClient((new LoadBalancingProxyClient()
@@ -166,11 +179,37 @@ public void testRewriteHostHeader() throws Exception {
         }
     }
 
+    @Test
+    public void testWithProxyPeerAddressHandler() throws Exception {
+        setProxyHandlerWithPeerAddressHandler(false, false);
+        TestHttpClient client = new TestHttpClient();
+
+        try {
+            HttpGet get = new HttpGet(DefaultServer.getDefaultServerURL() + "/x-forwarded");
+            get.addHeader(Headers.X_FORWARDED_FOR.toString(), "localhost");
+            HttpResponse result = client.execute(get);
+            Assert.assertEquals(StatusCodes.OK, result.getStatusLine().getStatusCode());
+
+            Assert.assertEquals(port, Integer.parseInt(result.getFirstHeader(Headers.X_FORWARDED_PORT.toString()).getValue()));
+            Assert.assertEquals("http", result.getFirstHeader(Headers.X_FORWARDED_PROTO.toString()).getValue());
+            Assert.assertEquals(DefaultServer.getHostAddress(), result.getFirstHeader(Headers.X_FORWARDED_HOST.toString()).getValue());
+            Assert.assertEquals("localhost", result.getFirstHeader(Headers.X_FORWARDED_FOR.toString()).getValue());
+
+        } finally {
+            client.getConnectionManager().shutdown();
+        }
+    }
+
     protected static final class XForwardedHandler implements HttpHandler {
 
         @Override
         public void handleRequest(final HttpServerExchange exchange) throws Exception {
             // Copy the X-Fowarded* headers into the response
+            try {
+                //Thread.sleep(5000);
+            } catch (Exception e){
+               // no op
+            }
             if (exchange.getRequestHeaders().contains(Headers.X_FORWARDED_FOR))
                 exchange.getResponseHeaders().put(Headers.X_FORWARDED_FOR, exchange.getRequestHeaders().getFirst(Headers.X_FORWARDED_FOR));