Revert "Revert to NoopRpcAuthorizer"

This reverts commit 75832a48d0aeb700a4960cd56e76abdcf588c087.

1 files changed, 5 insertions, 4 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/DefaultRpcAuthorizerProvider.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/DefaultRpcAuthorizerProvider.java
index 17c32857a7a..bdcd293357d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/DefaultRpcAuthorizerProvider.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/DefaultRpcAuthorizerProvider.java
@@ -5,6 +5,7 @@ import com.google.inject.Inject;
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.config.provision.security.NodeIdentifier;
 import com.yahoo.container.di.componentgraph.Provider;
+import com.yahoo.security.tls.TransportSecurityUtils;
 import com.yahoo.vespa.config.server.host.HostRegistries;
 import com.yahoo.vespa.config.server.rpc.RequestHandlerProvider;
 
@@ -22,10 +23,10 @@ public class DefaultRpcAuthorizerProvider implements Provider<RpcAuthorizer> {
                                         NodeIdentifier nodeIdentifier,
                                         HostRegistries hostRegistries,
                                         RequestHandlerProvider handlerProvider) {
-        this.rpcAuthorizer = new NoopRpcAuthorizer();
-//                TransportSecurityUtils.isTransportSecurityEnabled() && config.multitenant()
-//                        ? new MultiTenantRpcAuthorizer(nodeIdentifier, hostRegistries, handlerProvider)
-//                        : new NoopRpcAuthorizer();
+        this.rpcAuthorizer =
+                TransportSecurityUtils.isTransportSecurityEnabled() && config.multitenant()
+                        ? new MultiTenantRpcAuthorizer(nodeIdentifier, hostRegistries, handlerProvider)
+                        : new NoopRpcAuthorizer();
     }
 
     @Override