From f3f6ed960c2fca5e0ce51fe19d5be1d5ce9b08de Mon Sep 17 00:00:00 2001
From: jude-jang <wkdwoos@gmail.com>
Date: Tue, 10 Dec 2024 16:19:12 +0900
Subject: [PATCH] added truststore&keystorePasword

---
 src/main/java/kafdrop/config/KafkaConfiguration.java | 8 ++++++++
 src/main/resources/application.yml                   | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/kafdrop/config/KafkaConfiguration.java b/src/main/java/kafdrop/config/KafkaConfiguration.java
index 4b4ffd5c..bd5a5f1c 100644
--- a/src/main/java/kafdrop/config/KafkaConfiguration.java
+++ b/src/main/java/kafdrop/config/KafkaConfiguration.java
@@ -29,8 +29,10 @@ public final class KafkaConfiguration {
   private String saslMechanism;
   private String securityProtocol;
   private String truststoreFile;
+  private String truststorePassword;
   private String propertiesFile;
   private String keystoreFile;
+  private String keystorePassword;
 
   public void applyCommon(Properties properties) {
     properties.setProperty(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, brokerConnect);
@@ -43,12 +45,18 @@ public void applyCommon(Properties properties) {
     if (new File(truststoreFile).isFile()) {
       LOG.info("Assigning truststore location to {}", truststoreFile);
       properties.put("ssl.truststore.location", truststoreFile);
+      if (truststorePassword != null && !truststorePassword.isEmpty()) {
+        properties.put("ssl.truststore.password", truststorePassword);
+      }
     }
 
     LOG.info("Checking keystore file {}", keystoreFile);
     if (new File(keystoreFile).isFile()) {
       LOG.info("Assigning keystore location to {}", keystoreFile);
       properties.put("ssl.keystore.location", keystoreFile);
+      if (keystorePassword != null && !keystorePassword.isEmpty()) {
+        properties.put("ssl.keystore.password", keystorePassword);
+      }
     }
 
     LOG.info("Checking properties file {}", propertiesFile);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d80ad48d..dfd59e43 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -41,5 +41,7 @@ kafka:
   saslMechanism: "PLAIN"
   securityProtocol: "SASL_PLAINTEXT"
   truststoreFile: "${KAFKA_TRUSTSTORE_FILE:kafka.truststore.jks}"
-  propertiesFile : "${KAFKA_PROPERTIES_FILE:kafka.properties}"
   keystoreFile: "${KAFKA_KEYSTORE_FILE:kafka.keystore.jks}"
+  propertiesFile: "${KAFKA_PROPERTIES_FILE:kafka.properties}"
+  truststorePassword: "${KAFKA_TRUSTSTORE_PASSWORD}"
+  keystorePassword: "${KAFKA_KEYSTORE_PASSWORD}"