Validate new ssl config

1 files changed, 10 insertions, 0 deletions

diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/DefaultSslContextFactoryProvider.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/DefaultSslContextFactoryProvider.java
index dd38bdd94f9..39dfef480f3 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/DefaultSslContextFactoryProvider.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/DefaultSslContextFactoryProvider.java
@@ -119,6 +119,16 @@ public class DefaultSslContextFactoryProvider implements SslContextFactoryProvid
 
     private static void validateConfig(ConnectorConfig.Ssl config) {
         if (!config.enabled()) return;
+        if (!config.privateKeyFile().isEmpty()) {
+            if (config.certificateFile().isEmpty()) {
+                throw new IllegalArgumentException("Missing certificate file.");
+            }
+        } else {
+            validateConfigUsingDeprecatedConnectorConfig(config);
+        }
+    }
+
+    private static void validateConfigUsingDeprecatedConnectorConfig(ConnectorConfig.Ssl config) {
         switch (config.keyStoreType()) {
             case JKS:
                 validateJksConfig(config);