diff options
author | Morten Tokle <mortent@oath.com> | 2018-09-13 08:59:20 +0200 |
---|---|---|
committer | Morten Tokle <mortent@oath.com> | 2018-09-13 08:59:20 +0200 |
commit | e973d1bf118edf48b34d3aaefe610cefde924d72 (patch) | |
tree | 51b365b4f867a0b85895b853c8192c11d5cb5960 /jdisc_http_service/src/main | |
parent | 0df48c76c68742a82ae0cccda62f0f30e6ca7944 (diff) |
Validate new ssl config
Diffstat (limited to 'jdisc_http_service/src/main')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/DefaultSslContextFactoryProvider.java | 10 |
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); |