fix(ssl): Fix some issues found when testing Gate with SSL (#89)

build.gradle

@@ -34,7 +34,7 @@ allprojects {
   group = 'com.netflix.spinnaker.kork'
 
   ext {
-    spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.106.0-rc.1-springBoot154'
+    spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.106.0-rc.4-springBoot154'
   }
 
   def checkLocalVersions = [spinnakerDependenciesVersion: spinnakerDependenciesVersion]

kork-web/src/main/groovy/com/netflix/spinnaker/config/TomcatConfiguration.groovy

@@ -18,6 +18,7 @@ package com.netflix.spinnaker.config
 
 import com.netflix.spinnaker.okhttp.OkHttpClientConfigurationProperties
 import com.netflix.spinnaker.tomcat.x509.BlacklistingSSLImplementation
+import com.netflix.spinnaker.tomcat.x509.BlacklistingX509TrustManager
 import com.netflix.spinnaker.tomcat.x509.SslExtensionConfigurationProperties
 import groovy.util.logging.Slf4j
 import org.apache.catalina.connector.Connector
@@ -62,13 +63,16 @@ class TomcatConfiguration {
           def handler = connector.getProtocolHandler()
           if (handler instanceof AbstractHttp11JsseProtocol) {
             if (handler.isSSLEnabled()) {
-              SSLHostConfig sslHostConfig = new SSLHostConfig();
+              def sslConfigs = connector.findSslHostConfigs()
+              if (sslConfigs.size() != 1) {
+                throw new RuntimeException("Ssl configs: found ${sslConfigs.size()}, expected 1.")
+              }
+              handler.setSslImplementationName(BlacklistingSSLImplementation.name)
+              SSLHostConfig sslHostConfig = sslConfigs.first()
               sslHostConfig.setHonorCipherOrder("true")
               sslHostConfig.ciphers = okHttpClientConfigurationProperties.cipherSuites.join(",")
               sslHostConfig.setProtocols(okHttpClientConfigurationProperties.tlsVersions.join(","))
-              sslHostConfig.setTrustManagerClassName(BlacklistingSSLImplementation.name)
               sslHostConfig.setCertificateRevocationListFile(sslExtensionConfigurationProperties.getCrlFile())
-              handler.addSslHostConfig(sslHostConfig)
             }
           }
         }