fix: Do not throw NPE if KAFKA_SASL_MECHANISM is null (#50)

Fixes devshawn#81
joschi · Oct 19, 2022 · 4a89b2c · 4a89b2c
1 parent 8fd14ee
commit 4a89b2c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/main/java/com/devshawn/kafka/gitops/config/KafkaGitopsConfigLoader.java b/src/main/java/com/devshawn/kafka/gitops/config/KafkaGitopsConfigLoader.java
@@ -93,9 +93,11 @@ private static void handleAuthentication(AtomicReference<String> username, Atomi
         if (username.get() != null && password.get() != null) {
             // Do we need the Plain or SCRAM module?
             String loginModule = null;
-            if (config.get(SaslConfigs.SASL_MECHANISM).equals("PLAIN")) {
+            Object saslMechanism = config.get(SaslConfigs.SASL_MECHANISM);
+
+            if ("PLAIN".equals(saslMechanism)) {
                 loginModule = "org.apache.kafka.common.security.plain.PlainLoginModule";
-            } else if (config.get(SaslConfigs.SASL_MECHANISM).equals("SCRAM-SHA-256") || config.get(SaslConfigs.SASL_MECHANISM).equals("SCRAM-SHA-512")) {
+            } else if ("SCRAM-SHA-256".equals(saslMechanism) || "SCRAM-SHA-512".equals(saslMechanism)) {
                 loginModule = "org.apache.kafka.common.security.scram.ScramLoginModule";
             } else {
                 throw new MissingConfigurationException("KAFKA_SASL_MECHANISM");

diff --git a/src/test/groovy/com/devshawn/kafka/gitops/config/KafkaGitopsConfigLoaderSpec.groovy b/src/test/groovy/com/devshawn/kafka/gitops/config/KafkaGitopsConfigLoaderSpec.groovy
@@ -1,5 +1,6 @@
 package com.devshawn.kafka.gitops.config
 
+import com.devshawn.kafka.gitops.exception.MissingConfigurationException
 import org.apache.kafka.clients.CommonClientConfigs
 import org.apache.kafka.common.config.SaslConfigs
 import org.junit.ClassRule
@@ -59,4 +60,16 @@ class KafkaGitopsConfigLoaderSpec extends Specification {
         config.config.get(SaslConfigs.SASL_MECHANISM) == "PLAIN"
     }
 
+    void 'load() fails with MissingConfigurationException if SASL mechanism is missing'() {
+        setup:
+        environmentVariables.set("KAFKA_SASL_JAAS_USERNAME", "test")
+        environmentVariables.set("KAFKA_SASL_JAAS_PASSWORD", "test-secret")
+        environmentVariables.clear("KAFKA_SASL_MECHANISM")
+
+        when:
+        KafkaGitopsConfigLoader.load()
+
+        then:
+        thrown(MissingConfigurationException)
+    }
 }