diff options
author | Morten Tokle <morten.tokle@gmail.com> | 2021-03-31 08:53:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-31 08:53:35 +0200 |
commit | 6e4bfd692bace98a667d0be97b4b5a2783ac94cf (patch) | |
tree | 4084b7d32e527f30b926bea152523fbc146c2fb4 /config-model | |
parent | a8fee2a21a93fa1a8acb072c03a3cb94b0b0e87f (diff) |
Revert "Remove use of flag use-access-control-client-authentication"
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index d713ae2e016..d03246b4e8c 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -435,7 +435,8 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } EndpointCertificateSecrets endpointCertificateSecrets = deployState.endpointCertificateSecrets().get(); - boolean enforceHandshakeClientAuth = cluster.getHttp().getAccessControl() + boolean enforceHandshakeClientAuth = context.properties().featureFlags().useAccessControlTlsHandshakeClientAuth() && + cluster.getHttp().getAccessControl() .map(accessControl -> accessControl.clientAuthentication) .map(clientAuth -> clientAuth.equals(AccessControl.ClientAuthentication.need)) .orElse(false); |