diff options
author | Harald Musum <musum@verizonmedia.com> | 2022-10-06 13:11:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-06 13:11:54 +0200 |
commit | 878e46f2d9c59b368b4f88da9dc5920b465eda19 (patch) | |
tree | 78fc20852c57dfce4102f5ad675016067584d8b6 /container-core/src/test/java/com/yahoo/jdisc/http | |
parent | bbb47ccadb603a84b3a9d4e695aa098ea46a25ad (diff) |
Revert "Restrict server names accepted per connector"
Diffstat (limited to 'container-core/src/test/java/com/yahoo/jdisc/http')
-rw-r--r-- | container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java index 318067ac634..2c5d36bd776 100644 --- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java +++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java @@ -743,7 +743,7 @@ public class HttpServerTest { } @Test - void fallbackServerNameCanBeOverridden() throws Exception { + void requestThatFallbackServerNameCanBeOverridden() throws Exception { String fallbackHostname = "myhostname"; JettyTestDriver driver = JettyTestDriver.newConfiguredInstance( new UriRequestHandler(), @@ -752,29 +752,13 @@ public class HttpServerTest { .serverName(new ConnectorConfig.ServerName.Builder().fallback(fallbackHostname))); int listenPort = driver.server().getListenPort(); HttpGet req = new HttpGet("http://localhost:" + listenPort + "/"); - req.setHeader("Host", null); + req.addHeader("Host", null); driver.client().execute(req) .expectStatusCode(is(OK)) .expectContent(containsString("http://" + fallbackHostname + ":" + listenPort + "/")); assertTrue(driver.close()); } - @Test - void acceptedServerNamesCanBeRestricted() throws Exception { - String requiredServerName = "myhostname"; - JettyTestDriver driver = JettyTestDriver.newConfiguredInstance( - new EchoRequestHandler(), - new ServerConfig.Builder(), - new ConnectorConfig.Builder() - .serverName(new ConnectorConfig.ServerName.Builder().allowed(requiredServerName))); - int listenPort = driver.server().getListenPort(); - HttpGet req = new HttpGet("http://localhost:" + listenPort + "/"); - req.setHeader("Host", requiredServerName); - driver.client().execute(req).expectStatusCode(is(OK)); - driver.client().get("/").expectStatusCode(is(NOT_FOUND)); - assertTrue(driver.close()); - } - private static JettyTestDriver createSslWithTlsClientAuthenticationEnforcer(Path certificateFile, Path privateKeyFile) { ConnectorConfig.Builder connectorConfig = new ConnectorConfig.Builder() .tlsClientAuthEnforcer( |