From bc97d8b0ccd40974dce1589f6bf5fbc2beaf28f9 Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Thu, 31 Oct 2019 23:45:07 +0100 Subject: Use DefaultHostnameVerifier for controller zone --- .../hosted/controller/restapi/configserver/ConfigServerApiHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java index b047fd7a87a..0fcf705a7ce 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java @@ -18,6 +18,7 @@ import com.yahoo.vespa.hosted.controller.proxy.ConfigServerRestExecutor; import com.yahoo.vespa.hosted.controller.proxy.ProxyException; import com.yahoo.vespa.hosted.controller.proxy.ProxyRequest; import com.yahoo.yolean.Exceptions; +import org.apache.http.conn.ssl.DefaultHostnameVerifier; import javax.net.ssl.HostnameVerifier; import java.net.URI; @@ -129,7 +130,7 @@ public class ConfigServerApiHandler extends AuditLoggingRequestHandler { } private HostnameVerifier createHostnameVerifier(ZoneId zoneId) { - if (CONTROLLER_ZONE.equals(zoneId)) return null; + if (CONTROLLER_ZONE.equals(zoneId)) return new DefaultHostnameVerifier(); return new AthenzIdentityVerifier(Set.of(zoneRegistry.getConfigServerHttpsIdentity(zoneId))); } } -- cgit v1.2.3