Skip to content

Commit

Permalink
Fix #6860 IPv6 Format
Browse files Browse the repository at this point in the history 
unit test and fixes

Signed-off-by: Greg Wilkins <gregw@webtide.com>
  • Loading branch information
@gregw
gregw committed Sep 19, 2021
1 parent 316b4bf commit 11720f7
Show file tree
Hide file tree
Showing 4 changed files with 91 additions and 5 deletions.
4 changes: 2 additions & 2 deletions jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
View file
Expand Up @@ -1402,7 +1402,7 @@ public String getScheme()
public String getServerName()
{
MetaData.Request metadata = _metaData;
String name = metadata == null ? null : metadata.getURI().getHost();
String name = metadata == null ? null : formatAddrOrHost(metadata.getURI().getHost());

// Return already determined host
if (name != null)
Expand All @@ -1424,7 +1424,7 @@ private String findServerName()
{
HostPortHttpField authority = (HostPortHttpField)host;
metadata.getURI().setAuthority(authority.getHost(), authority.getPort());
return authority.getHost();
return formatAddrOrHost(authority.getHost());
}
}

Expand Down
2 changes: 1 addition & 1 deletion jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
View file
Expand Up @@ -311,7 +311,7 @@ public IPV6Format getIPv6Format()

public void setIPv6Format(IPV6Format ipv6Format)
{
_ipv6Format = _ipv6Format;
_ipv6Format = ipv6Format;
}

/**
Expand Down
88 changes: 87 additions & 1 deletion jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
View file
Expand Up @@ -26,6 +26,9 @@
import java.io.InputStream;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
Expand Down Expand Up @@ -95,6 +98,7 @@ public class RequestTest
public WorkDir workDir;
private Server _server;
private LocalConnector _connector;
private ContextHandler _context;
private RequestHandler _handler;

@BeforeEach
Expand All @@ -110,8 +114,10 @@ public void init() throws Exception
_connector = new LocalConnector(_server, http);
_server.addConnector(_connector);
_connector.setIdleTimeout(500);
_context = new ContextHandler();
_server.setHandler(_context);
_handler = new RequestHandler();
_server.setHandler(_handler);
_context.setHandler(_handler);

ErrorHandler errors = new ErrorHandler();
errors.setServer(_server);
Expand Down Expand Up @@ -933,6 +939,84 @@ public boolean check(HttpServletRequest request, HttpServletResponse response)
assertEquals("8888", results.get(i++));
}


@Test
public void testIPv6() throws Exception
{
final ArrayList<String> results = new ArrayList<>();
final InetAddress local = Inet6Address.getByAddress("localIPv6", new byte[] {0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,8});
final InetSocketAddress localAddr = new InetSocketAddress(local, 32768);
_handler._checker = new RequestTester()
{
@Override
public boolean check(HttpServletRequest request, HttpServletResponse response)
{
((Request)request).setRemoteAddr(localAddr);
results.add(request.getRemoteAddr());
results.add(request.getRemoteHost());
results.add(Integer.toString(request.getRemotePort()));
results.add(request.getServerName());
results.add(Integer.toString(request.getServerPort()));
results.add(request.getLocalAddr());
results.add(Integer.toString(request.getLocalPort()));
return true;
}
};

_context.setIPv6Format(ContextHandler.IPV6Format.BRACKETED);
results.clear();
String response = _connector.getResponse(
"GET / HTTP/1.1\n" +
"Host: [::1]:8888\n" +
"Connection: close\n" +
"\n");
int i = 0;
assertThat(response, containsString("200 OK"));
assertEquals("[1:2:3:4:5:6:7:8]", results.get(i++));
assertEquals("localIPv6", results.get(i++));
assertEquals("32768", results.get(i++));
assertEquals("[::1]", results.get(i++));
assertEquals("8888", results.get(i++));
assertEquals("0.0.0.0", results.get(i++));
assertEquals("0", results.get(i++));

_context.setIPv6Format(ContextHandler.IPV6Format.UNBRACKETED);
results.clear();
response = _connector.getResponse(
"GET / HTTP/1.1\n" +
"Host: [::1]:8888\n" +
"Connection: close\n" +
"\n");
i = 0;
assertThat(response, containsString("200 OK"));
assertEquals("1:2:3:4:5:6:7:8", results.get(i++));
assertEquals("localIPv6", results.get(i++));
assertEquals("32768", results.get(i++));
assertEquals("::1", results.get(i++));
assertEquals("8888", results.get(i++));
assertEquals("0.0.0.0", results.get(i++));
assertEquals("0", results.get(i++));

_context.setIPv6Format(ContextHandler.IPV6Format.UNCHANGED);
results.clear();
response = _connector.getResponse(
"GET / HTTP/1.1\n" +
"Host: [::1]:8888\n" +
"Connection: close\n" +
"\n");
i = 0;
assertThat(response, containsString("200 OK"));
assertEquals("1:2:3:4:5:6:7:8", results.get(i++));
assertEquals("localIPv6", results.get(i++));
assertEquals("32768", results.get(i++));
assertEquals("[::1]", results.get(i++));
assertEquals("8888", results.get(i++));
assertEquals("0.0.0.0", results.get(i++));
assertEquals("0", results.get(i++));
}



@Test
public void testContent() throws Exception
{
Expand Down Expand Up @@ -1686,6 +1770,8 @@ public void testHashDOSSize() throws Exception
try (StacklessLogging stackless = new StacklessLogging(HttpChannel.class))
{
LOG.info("Expecting maxFormSize limit and too much data exceptions...");
_context.setMaxFormContentSize(3396);
_context.setMaxFormKeys(1000);
_server.setAttribute("org.eclipse.jetty.server.Request.maxFormContentSize", 3396);
_server.setAttribute("org.eclipse.jetty.server.Request.maxFormKeys", 1000);

Expand Down
2 changes: 1 addition & 1 deletion jetty-util/src/main/java/org/eclipse/jetty/util/HostPort.java
View file
Expand Up @@ -171,7 +171,7 @@ public static String denormalizeHost(String host)
return host;

// normalize with [ ]
return host.substring(1, host.length() - 2);
return host.substring(1, host.length() - 1);
}

/**
Expand Down

0 comments on commit 11720f7

Please sign in to comment.