Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix HostHeaderCustomizer and improve tests

This commit is contained in:
Joakim Erdfelt 2023-04-24 14:43:51 -05:00
parent c7c3dad498
commit 0211aa2483
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 77 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/HostHeaderCustomizer.java
View File

@ -19,6 +19,7 @@ import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpScheme;
import org.eclipse.jetty.http.HttpURI;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.util.HostPort;
/**
* Adds a missing {@code Host} header (for example, HTTP 1.0 or 2.0 requests).
@ -70,6 +71,17 @@ public class HostHeaderCustomizer implements HttpConfiguration.Customizer
builder.add(request.getHeaders());
HttpFields headers = builder.asImmutable();
ConnectionMetaData connectionMetadata = new ConnectionMetaData.Wrapper(request.getConnectionMetaData())
{
private HostPort _serverAuthority = new HostPort(host, port);
@Override
public HostPort getServerAuthority()
{
return _serverAuthority;
}
};
return new Request.Wrapper(request)
{
@Override
@ -83,6 +95,12 @@ public class HostHeaderCustomizer implements HttpConfiguration.Customizer
{
return headers;
}
@Override
public ConnectionMetaData getConnectionMetaData()
{
return connectionMetadata;
}
};
}
}

91
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/HostHeaderCustomizerTest.java
View File

@ -15,17 +15,19 @@ package org.eclipse.jetty.server;
import java.io.OutputStream;
import java.net.Socket;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpTester;
import org.junit.jupiter.api.Disabled;
import org.eclipse.jetty.http.HttpURI;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.HostPort;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@Disabled // TODO
public class HostHeaderCustomizerTest
{
@Test
@ -34,25 +36,38 @@ public class HostHeaderCustomizerTest
Server server = new Server();
HttpConfiguration httpConfig = new HttpConfiguration();
final String serverName = "test_server_name";
final int serverPort = 13;
final int serverPort = 23232;
final String redirectPath = "/redirect";
httpConfig.addCustomizer(new HostHeaderCustomizer(serverName, serverPort));
ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory(httpConfig));
server.addConnector(connector);
/* TODO
server.setHandler(new AbstractHandler()
server.setHandler(new Handler.Abstract()
{
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
baseRequest.setHandled(true);
assertEquals(serverName, request.getServerName());
assertEquals(serverPort, request.getServerPort());
assertEquals(serverName + ":" + serverPort, request.getHeader("Host"));
response.sendRedirect(redirectPath);
// Test "Host" header
assertEquals(serverName + ":" + serverPort, request.getHeaders().get(HttpHeader.HOST));
// Test "getHttpURI()"
HttpURI httpURI = request.getHttpURI();
assertEquals(serverName, httpURI.getHost());
assertEquals(serverPort, httpURI.getPort());
// Test "connectionMetaData.serverAuthority"
HostPort serverAuthority = request.getConnectionMetaData().getServerAuthority();
assertEquals(serverName, serverAuthority.getHost());
assertEquals(serverPort, serverAuthority.getPort());
// Test Request.getServerName / Request.getServerPort
assertEquals(serverName, Request.getServerName(request));
assertEquals(serverPort, Request.getServerPort(request));
// Issue redirect
Response.sendRedirect(request, response, callback, redirectPath);
return true;
}
});
*/
server.start();
try
{
@ -71,11 +86,10 @@ public class HostHeaderCustomizerTest
String location = response.get("location");
assertNotNull(location);
String schemePrefix = "http://";
assertTrue(location.startsWith(schemePrefix));
assertTrue(location.endsWith(redirectPath));
String hostPort = location.substring(schemePrefix.length(), location.length() - redirectPath.length());
assertEquals(serverName + ":" + serverPort, hostPort);
URI redirectURI = new URI(location);
assertEquals("http", redirectURI.getScheme());
assertEquals(redirectPath, redirectURI.getPath());
assertEquals(serverName + ":" + serverPort, redirectURI.getAuthority());
}
}
}
@ -95,21 +109,35 @@ public class HostHeaderCustomizerTest
httpConfig.addCustomizer(new HostHeaderCustomizer());
final ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory(httpConfig));
server.addConnector(connector);
/* TODO
server.setHandler(new AbstractHandler()
server.setHandler(new Handler.Abstract()
{
@Override
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
public boolean handle(Request request, Response response, Callback callback) throws Exception
{
baseRequest.setHandled(true);
assertEquals(serverName, request.getServerName());
assertEquals(connector.getLocalPort(), request.getServerPort());
assertEquals(serverName + ":" + connector.getLocalPort(), request.getHeader("Host"));
response.sendRedirect(redirectPath);
// Test "Host" header
assertEquals(serverName + ":" + connector.getLocalPort(), request.getHeaders().get(HttpHeader.HOST));
// Test "getHttpURI()"
HttpURI httpURI = request.getHttpURI();
assertEquals(serverName, httpURI.getHost());
assertEquals(connector.getLocalPort(), httpURI.getPort());
// Test "connectionMetaData.serverAuthority"
HostPort serverAuthority = request.getConnectionMetaData().getServerAuthority();
assertEquals(serverName, serverAuthority.getHost());
assertEquals(connector.getLocalPort(), serverAuthority.getPort());
// Test Request.getServerName / Request.getServerPort
assertEquals(serverName, Request.getServerName(request));
assertEquals(connector.getLocalPort(), Request.getServerPort(request));
// Issue redirect
Response.sendRedirect(request, response, callback, redirectPath);
return true;
}
});
*/
server.start();
try
@ -129,11 +157,10 @@ public class HostHeaderCustomizerTest
String location = response.get("location");
assertNotNull(location);
String schemePrefix = "http://";
assertTrue(location.startsWith(schemePrefix));
assertTrue(location.endsWith(redirectPath));
String hostPort = location.substring(schemePrefix.length(), location.length() - redirectPath.length());
assertEquals(serverName + ":" + connector.getLocalPort(), hostPort);
URI redirectURI = new URI(location);
assertEquals("http", redirectURI.getScheme());
assertEquals(redirectPath, redirectURI.getPath());
assertEquals(serverName + ":" + connector.getLocalPort(), redirectURI.getAuthority());
}
}
}