diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-10-31 23:45:07 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-10-31 23:46:22 +0100 |
commit | bc97d8b0ccd40974dce1589f6bf5fbc2beaf28f9 (patch) | |
tree | d6faab0a139cd36d2432db27d843362683895227 /controller-server/src/main | |
parent | e5f23fcf991a0510d43d199701be6b4c7c50ed23 (diff) |
Use DefaultHostnameVerifier for controller zone
Diffstat (limited to 'controller-server/src/main')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/configserver/ConfigServerApiHandler.java | 3 |
1 files changed, 2 insertions, 1 deletions
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))); } } |