Add 'tls_client_tls_server' as tls mixed mode option

Also introduce default value for mixed mode.

1 files changed, 9 insertions, 1 deletions

diff --git a/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java b/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java
index 1365a81cf10..2db0e35bcba 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java
@@ -8,7 +8,8 @@ import java.util.Arrays;
  */
 public enum MixedMode {
     PLAINTEXT_CLIENT_MIXED_SERVER("plaintext_client_mixed_server"),
-    TLS_CLIENT_MIXED_SERVER("tls_client_mixed_server");
+    TLS_CLIENT_MIXED_SERVER("tls_client_mixed_server"),
+    DISABLED("tls_client_tls_server");
 
     final String configValue;
 
@@ -20,6 +21,13 @@ public enum MixedMode {
         return configValue;
     }
 
+    /**
+     * @return Default value when mixed mode is not explicitly specified
+     */
+    public static MixedMode defaultValue() {
+        return DISABLED;
+    }
+
     static MixedMode fromConfigValue(String configValue) {
         return Arrays.stream(values())
                 .filter(v -> v.configValue.equals(configValue))