From 7809e2a0d4b68779c03ffd3ce7fd3dab7162d4a4 Mon Sep 17 00:00:00 2001
From: Morten Tokle <morten.tokle@gmail.com>
Date: Fri, 21 Jun 2019 14:50:28 +0200
Subject: tls config from deploy params

---
 .../impl/ConfiguredSslContextFactoryProvider.java  | 34 +++++++++++++++++-----
 .../configdefinitions/jdisc.http.connector.def     | 10 +++++--
 2 files changed, 34 insertions(+), 10 deletions(-)

(limited to 'jdisc_http_service/src')

diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java
index facb54bc37a..2021105fc52 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java
@@ -60,15 +60,23 @@ public class ConfiguredSslContextFactoryProvider implements SslContextFactoryPro
 
     private static void validateConfig(ConnectorConfig.Ssl config) {
         if (!config.enabled()) return;
-        if (config.certificateFile().isEmpty()) {
-            throw new IllegalArgumentException("Missing certificate file.");
-        }
-        if (config.privateKeyFile().isEmpty()) {
-            throw new IllegalArgumentException("Missing private key file.");
-        }
 
+        if(hasBoth(config.certificate(), config.certificateFile()))
+            throw new IllegalArgumentException("Specified both certificate and certificate file.");
+
+        if(hasBoth(config.privateKey(), config.privateKeyFile()))
+            throw new IllegalArgumentException("Specified both private key and private key file.");
+
+        if(hasNeither(config.certificate(), config.certificateFile()))
+            throw new IllegalArgumentException("Specified neither certificate or certificate file.");
+
+        if(hasNeither(config.privateKey(), config.privateKeyFile()))
+            throw new IllegalArgumentException("Specified neither private key or private key file.");
     }
 
+    private static boolean hasBoth(String a, String b) { return !a.isBlank() && !b.isBlank(); }
+    private static boolean hasNeither(String a, String b) { return a.isBlank() && b.isBlank(); }
+
     private static KeyStore createTruststore(ConnectorConfig.Ssl sslConfig) {
         List<X509Certificate> caCertificates = X509CertificateUtils.certificateListFromPem(readToString(sslConfig.caCertificateFile()));
         return KeyStoreBuilder.withType(KeyStoreType.JKS)
@@ -77,11 +85,21 @@ public class ConfiguredSslContextFactoryProvider implements SslContextFactoryPro
     }
 
     private static KeyStore createKeystore(ConnectorConfig.Ssl sslConfig) {
-        PrivateKey privateKey = KeyUtils.fromPemEncodedPrivateKey(readToString(sslConfig.privateKeyFile()));
-        List<X509Certificate> certificates = X509CertificateUtils.certificateListFromPem(readToString(sslConfig.certificateFile()));
+        PrivateKey privateKey = KeyUtils.fromPemEncodedPrivateKey(getPrivateKey(sslConfig));
+        List<X509Certificate> certificates = X509CertificateUtils.certificateListFromPem(getCertificate(sslConfig));
         return KeyStoreBuilder.withType(KeyStoreType.JKS).withKeyEntry("default", privateKey, certificates).build();
     }
 
+    private static String getPrivateKey(ConnectorConfig.Ssl config) {
+        if(!config.privateKey().isBlank()) return config.privateKey();
+        return readToString(config.privateKeyFile());
+    }
+
+    private static String getCertificate(ConnectorConfig.Ssl config) {
+        if(!config.certificate().isBlank()) return config.certificate();
+        return readToString(config.certificateFile());
+    }
+
     private static String readToString(String filename) {
         try {
             return Files.readString(Paths.get(filename), StandardCharsets.UTF_8);
diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def
index 7735420d803..c6c6fad345b 100644
--- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def
+++ b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def
@@ -56,12 +56,18 @@ throttling.idleTimeout              double   default=-1.0
 # Whether to enable SSL for this connector.
 ssl.enabled                         bool     default=false
 
-# File with private key in PEM format
+# File with private key in PEM format. Specify either this or privateKey, but not both
 ssl.privateKeyFile                  string   default=""
 
-# File with certificate in PEM format
+# Private key in PEM format. Specify either this or privateKeyFile, but not both
+ssl.privateKey                      string   default=""
+
+# File with certificate in PEM format. Specify either this or certificate, but not both
 ssl.certificateFile                 string   default=""
 
+# Certificate in PEM format. Specify either this or certificateFile, but not both
+ssl.certificate                     string   default=""
+
 # with trusted CA certificates in PEM format. Used to verify clients
 ssl.caCertificateFile               string default=""
 
-- 
cgit v1.2.3