Skip to content

[UNDERTOW-1874] Revert fix so we can investigate failures #1820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fl4via merged 1 commit into from
Oct 17, 2025
Merged

[UNDERTOW-1874] Revert fix so we can investigate failures #1820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions servlet/src/test/java/io/undertow/servlet/test/ProxyForwardedTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import jakarta.servlet.ServletException;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
Expand All @@ -55,9 +56,11 @@
@RunWith(DefaultServer.class)
@ProxyIgnore
public class ProxyForwardedTestCase {
protected static int PORT;

@BeforeClass
public static void setup() throws ServletException {
PORT = DefaultServer.getHostPort("default");
final PathHandler root = new PathHandler();
final ServletContainer container = ServletContainer.Factory.newInstance();

Expand Down Expand Up @@ -95,12 +98,13 @@ public void testForwardedHandler() throws IOException {
HttpEntity entity = result.getEntity();
String results = EntityUtils.toString(entity);
Map<String, String> map = convertWithStream(results);
InetSocketAddress serverAddress = DefaultServer.getDefaultServerAddress();
Socket socket = new Socket();
socket.connect(new InetSocketAddress(DefaultServer.getHostAddress(), PORT));

Assert.assertEquals(StatusCodes.OK, result.getStatusLine().getStatusCode());
Assert.assertEquals(serverAddress.getAddress().getHostAddress(), map.get(GenericServletConstants.LOCAL_ADDR));
Assert.assertEquals(serverAddress.getAddress().getHostName(), map.get(GenericServletConstants.LOCAL_NAME));
Assert.assertEquals(serverAddress.getPort(), Integer.parseInt(map.get(GenericServletConstants.LOCAL_PORT)));
Assert.assertEquals(socket.getLocalAddress().getHostAddress(), map.get(GenericServletConstants.LOCAL_ADDR));
Assert.assertEquals(socket.getLocalAddress().getHostName(), map.get(GenericServletConstants.LOCAL_NAME));
Assert.assertEquals(PORT, Integer.parseInt(map.get(GenericServletConstants.LOCAL_PORT)));
Assert.assertEquals("192.0.2.10", map.get(GenericServletConstants.SERVER_NAME));
Assert.assertEquals("8888", map.get(GenericServletConstants.SERVER_PORT));
Assert.assertEquals("192.0.2.43", map.get(GenericServletConstants.REMOTE_ADDR));
Expand Down
12 changes: 8 additions & 4 deletions servlet/src/test/java/io/undertow/servlet/test/ProxyXForwardedTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import jakarta.servlet.ServletException;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
Expand All @@ -55,9 +56,11 @@
@RunWith(DefaultServer.class)
@ProxyIgnore
public class ProxyXForwardedTestCase {
protected static int PORT;

@BeforeClass
public static void setup() throws ServletException {
PORT = DefaultServer.getHostPort("default");
final PathHandler root = new PathHandler();
final ServletContainer container = ServletContainer.Factory.newInstance();

Expand Down Expand Up @@ -93,12 +96,13 @@ public void testProxyPeerHandler() throws IOException, ServletException {
HttpEntity entity = result.getEntity();
String results = EntityUtils.toString(entity);
Map<String, String> map = convertWithStream(results);
InetSocketAddress serverAddress = DefaultServer.getDefaultServerAddress();
Socket socket = new Socket();
socket.connect(new InetSocketAddress(DefaultServer.getHostAddress(), PORT));

Assert.assertEquals(StatusCodes.OK, result.getStatusLine().getStatusCode());
Assert.assertEquals(serverAddress.getAddress().getHostAddress(), map.get(GenericServletConstants.LOCAL_ADDR));
Assert.assertEquals(serverAddress.getAddress().getHostName(), map.get(GenericServletConstants.LOCAL_NAME));
Assert.assertEquals(serverAddress.getPort(), Integer.parseInt(map.get(GenericServletConstants.LOCAL_PORT)));
Assert.assertEquals(socket.getLocalAddress().getHostAddress(), map.get(GenericServletConstants.LOCAL_ADDR));
Assert.assertEquals(socket.getLocalAddress().getHostName(), map.get(GenericServletConstants.LOCAL_NAME));
Assert.assertEquals(PORT, Integer.parseInt(map.get(GenericServletConstants.LOCAL_PORT)));
Assert.assertEquals("192.0.2.10", map.get(GenericServletConstants.SERVER_NAME));
Assert.assertEquals("8888", map.get(GenericServletConstants.SERVER_PORT));
Assert.assertEquals("192.0.2.43", map.get(GenericServletConstants.REMOTE_ADDR));
Expand Down
Loading