Merge pull request #787 from tmiyargi/UNDERTOW-1569

fl4via · web-flow · commit 0b97ab25f9a6 · 2019-07-29T06:29:59.000-03:00
[UNDERTOW-1569] HttpServletRequest getLocalName() returns IP instead …
diff --git a/servlet/src/main/java/io/undertow/servlet/spec/HttpServletRequestImpl.java b/servlet/src/main/java/io/undertow/servlet/spec/HttpServletRequestImpl.java
@@ -981,9 +981,16 @@ public int getRemotePort() {
         return exchange.getSourceAddress().getPort();
     }
 
+    /**
+     * String java.net.InetAddress.getHostName()
+     * Gets the host name for this IP address.
+     * If this InetAddress was created with a host name, this host name will be remembered and returned; otherwise, a reverse name lookup will be performed and the result will be returned based on the system configured name lookup service. If a lookup of the name service is required, call getCanonicalHostName.
+     * If there is a security manager, its checkConnect method is first called with the hostname and -1 as its arguments to see if the operation is allowed. If the operation is not allowed, it will return the textual representation of the IP address.
+     * @see InetAddres#getHostName
+     */
     @Override
     public String getLocalName() {
-        return exchange.getDestinationAddress().getHostString();
+        return exchange.getDestinationAddress().getHostName();
     }
 
     @Override
diff --git a/servlet/src/test/java/io/undertow/servlet/test/request/HttpHostValuesTestCase.java b/servlet/src/test/java/io/undertow/servlet/test/request/HttpHostValuesTestCase.java
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2019 Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package io.undertow.servlet.test.request;
+
+import io.undertow.server.handlers.PathHandler;
+import io.undertow.servlet.api.DeploymentInfo;
+import io.undertow.servlet.api.DeploymentManager;
+import io.undertow.servlet.api.ServletContainer;
+import io.undertow.servlet.test.SimpleServletTestCase;
+import io.undertow.servlet.test.util.TestClassIntrospector;
+import io.undertow.testutils.DefaultServer;
+import io.undertow.testutils.HttpClientUtils;
+import io.undertow.testutils.TestHttpClient;
+import io.undertow.util.StatusCodes;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.servlet.ServletException;
+
+import static io.undertow.servlet.Servlets.servlet;
+
+/**
+ * Tests that ge get ip or host name depending on the method call
+ * @author tmiyar
+ *
+ */
+@RunWith(DefaultServer.class)
+public class HttpHostValuesTestCase {
+
+    @BeforeClass
+    public static void setup() throws ServletException {
+
+
+        final PathHandler pathHandler = new PathHandler();
+        final ServletContainer container = ServletContainer.Factory.newInstance();
+        DeploymentInfo builder = new DeploymentInfo()
+                .setClassLoader(SimpleServletTestCase.class.getClassLoader())
+                .setContextPath("/servletContext")
+                .setClassIntrospecter(TestClassIntrospector.INSTANCE)
+                .setDeploymentName("servletContext.war")
+                .addServlets(
+                        servlet("request", RequestHostValuesServlet.class)
+                                .addMapping("/"));
+
+        DeploymentManager manager = container.addDeployment(builder);
+        manager.deploy();
+        try {
+            pathHandler.addPrefixPath(builder.getContextPath(), manager.start());
+        } catch (ServletException e) {
+            throw new RuntimeException(e);
+        }
+        DefaultServer.setRootHandler(pathHandler);
+
+    }
+
+    @Test
+    public void testRequestSpec() throws Exception {
+        //test request values
+        TestHttpClient client = new TestHttpClient();
+        try {
+            HttpGet get = new HttpGet(DefaultServer.getDefaultServerURL() + "/servletContext/");
+            HttpResponse result = client.execute(get);
+            Assert.assertEquals(StatusCodes.OK, result.getStatusLine().getStatusCode());
+            final String response = HttpClientUtils.readResponse(result);
+
+            if(System.getProperty("os.name").toLowerCase().contains("windows") || System.getSecurityManager() != null) {
+                Assert.assertTrue(String.format("hostName: %s , response: %s", DefaultServer.getDefaultServerAddress().toString(), response), DefaultServer.getDefaultServerAddress().toString().contains(response));
+            } else {
+                Assert.assertTrue(String.format("hostName: %s , response: %s", DefaultServer.getHostAddress(), response), DefaultServer.getHostAddress().equals(response));
+            }
+
+        } finally {
+            client.close();
+        }
+    }
+
+}
diff --git a/servlet/src/test/java/io/undertow/servlet/test/request/RequestHostValuesServlet.java b/servlet/src/test/java/io/undertow/servlet/test/request/RequestHostValuesServlet.java
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2019 Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package io.undertow.servlet.test.request;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Servlet that returns hostname/ip
+ * @author tmiyar
+ *
+ */
+public class RequestHostValuesServlet extends HttpServlet {
+
+    @Override
+    protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
+
+        resp.getWriter().write(req.getLocalName());
+    }
+}
