aboutsummaryrefslogtreecommitdiffstats
path: root/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2018-12-05 16:28:17 +0100
committerBjørn Christian Seime <bjorncs@oath.com>2018-12-05 16:35:35 +0100
commit6a33af1752ef731a368e4947f2afb123e8151c58 (patch)
tree6b732394ecbb9a5798f6c59b514837eaf81d6da2 /security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java
parentb3758264b1f374500408ecc8c6a5976012749574 (diff)
Use AuthorizationMode to configure behaviour of PeerAuthorizerTrustManager
Diffstat (limited to 'security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java')
-rw-r--r--security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java7
1 files changed, 7 insertions, 0 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 e93b880b085..f07924f3ce9 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
@@ -14,6 +14,7 @@ public class TransportSecurityUtils {
public static final String CONFIG_FILE_ENVIRONMENT_VARIABLE = "VESPA_TLS_CONFIG_FILE";
public static final String INSECURE_MIXED_MODE_ENVIRONMENT_VARIABLE = "VESPA_TLS_INSECURE_MIXED_MODE";
+ public static final String INSECURE_AUTHORIZATION_MODE_ENVIRONMENT_VARIABLE = "VESPA_TLS_INSECURE_AUTHORIZATION_MODE";
private TransportSecurityUtils() {}
@@ -31,6 +32,12 @@ public class TransportSecurityUtils {
.map(MixedMode::fromConfigValue);
}
+ public static Optional<AuthorizationMode> getInsecureAuthorizationMode() {
+ if (!isInsecureMixedModeEnabled()) return Optional.empty();
+ return getEnvironmentVariable(INSECURE_AUTHORIZATION_MODE_ENVIRONMENT_VARIABLE)
+ .map(AuthorizationMode::fromConfigValue);
+ }
+
public static Optional<Path> getConfigFile() {
return getEnvironmentVariable(CONFIG_FILE_ENVIRONMENT_VARIABLE).map(Paths::get);
}