diff options
Diffstat (limited to 'security-utils')
| -rw-r--r-- | security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java index f07924f3ce9..afa95d5b1b8 100644 --- a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java +++ b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java @@ -22,20 +22,16 @@ public class TransportSecurityUtils { return getConfigFile().isPresent(); } - public static boolean isInsecureMixedModeEnabled() { - return getInsecureMixedMode().isPresent(); - } - - public static Optional<MixedMode> getInsecureMixedMode() { - if (!isTransportSecurityEnabled()) return Optional.empty(); + public static MixedMode getInsecureMixedMode() { return getEnvironmentVariable(INSECURE_MIXED_MODE_ENVIRONMENT_VARIABLE) - .map(MixedMode::fromConfigValue); + .map(MixedMode::fromConfigValue) + .orElse(MixedMode.defaultValue()); } - public static Optional<AuthorizationMode> getInsecureAuthorizationMode() { - if (!isInsecureMixedModeEnabled()) return Optional.empty(); + public static AuthorizationMode getInsecureAuthorizationMode() { return getEnvironmentVariable(INSECURE_AUTHORIZATION_MODE_ENVIRONMENT_VARIABLE) - .map(AuthorizationMode::fromConfigValue); + .map(AuthorizationMode::fromConfigValue) + .orElse(AuthorizationMode.defaultValue()); } public static Optional<Path> getConfigFile() { |