summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2020-10-14 14:23:45 +0200
committerMorten Tokle <mortent@verizonmedia.com>2020-10-14 14:23:45 +0200
commit7e01a997ee5f918ce32ef2d6bddc44691cc6c530 (patch)
tree2a3e1561abe7d11a3dc8f8ae57a3df5f70820c53 /configserver
parentd27f881027a5fddeefe336da0d84f2e160c01eb1 (diff)
Set up need_auth for connector when access_control configured
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
index c55eb3dbff2..3fe90fc54a0 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
@@ -169,6 +169,7 @@ public class ModelContextImpl implements ModelContext {
private final boolean tlsUseFSync;
private final String tlsCompressionType;
private final boolean useNewRestapiHandler;
+ private final boolean useAccessControlTlsHandshakeClientAuth;
public Properties(ApplicationId applicationId,
boolean multitenantFromConfig,
@@ -238,6 +239,10 @@ public class ModelContextImpl implements ModelContext {
this.useNewRestapiHandler = Flags.USE_NEW_RESTAPI_HANDLER.bindTo(flagSource)
.with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm())
.value();
+ this.useAccessControlTlsHandshakeClientAuth =
+ Flags.USE_ACCESS_CONTROL_CLIENT_AUTHENTICATION.bindTo(flagSource)
+ .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm())
+ .value();
}
@Override
@@ -332,6 +337,8 @@ public class ModelContextImpl implements ModelContext {
@Override public Quota quota() { return quota; }
@Override public boolean useNewRestapiHandler() { return useNewRestapiHandler; }
+
+ @Override public boolean useAccessControlTlsHandshakeClientAuth() { return useAccessControlTlsHandshakeClientAuth; }
}
}