diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-02-20 15:09:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-20 15:09:47 +0100 |
| commit | c4ddd4bd951d319437a38ead21037d9c17f1b70d (patch) | |
| tree | f0e3818e518ed833f79309526b26e0391250974a | |
| parent | 50456d18a169ba8f3497568903d7721687643367 (diff) | |
| parent | b91b554e9620045857653fe396737cf7944c1dd8 (diff) | |
Merge pull request #26114 from vespa-engine/bjorncs/capabilities
Bjorncs/capabilities
3 files changed, 6 insertions, 1 deletions
diff --git a/jrt/src/com/yahoo/jrt/MandatoryMethods.java b/jrt/src/com/yahoo/jrt/MandatoryMethods.java index b1355c0fb1e..a73e2bfc6dd 100644 --- a/jrt/src/com/yahoo/jrt/MandatoryMethods.java +++ b/jrt/src/com/yahoo/jrt/MandatoryMethods.java @@ -23,6 +23,7 @@ class MandatoryMethods { parent.addMethod(m); //--------------------------------------------------------------------- m = new Method("frt.rpc.getMethodList", "", "SSS", this::getMethodList); + m.requireCapabilities(CapabilitySet.none()); m.methodDesc("Obtain a list of all available methods"); m.returnDesc(0, "names", "Method names"); m.returnDesc(1, "params", "Method parameter types"); @@ -30,6 +31,7 @@ class MandatoryMethods { parent.addMethod(m); //--------------------------------------------------------------------- m = new Method("frt.rpc.getMethodInfo", "s", "sssSSSS", this::getMethodInfo); + m.requireCapabilities(CapabilitySet.none()); m.methodDesc("Obtain detailed information about a single method"); m.paramDesc (0, "methodName", "The method we want information about"); m.returnDesc(0, "desc", "Description of what the method does"); diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java index b4fa7d8f887..6afc2039c38 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java @@ -29,6 +29,7 @@ import com.yahoo.messagebus.network.NetworkOwner; import com.yahoo.messagebus.routing.Hop; import com.yahoo.messagebus.routing.Route; import com.yahoo.messagebus.routing.RoutingNode; +import com.yahoo.security.tls.CapabilitySet; import java.io.PrintWriter; import java.io.StringWriter; @@ -100,6 +101,7 @@ public class RPCNetwork implements Network, MethodHandler { servicePool = new RPCServicePool(this, 4096); Method method = new Method("mbus.getVersion", "", "s", this); + method.requireCapabilities(CapabilitySet.none()); method.methodDesc("Retrieves the message bus version."); method.returnDesc(0, "version", "The message bus version."); orb.addMethod(method); diff --git a/security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java b/security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java index 8fa077027a9..010b8a5b228 100644 --- a/security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java +++ b/security-utils/src/main/java/com/yahoo/security/tls/CapabilitySet.java @@ -44,7 +44,8 @@ public class CapabilitySet implements ToCapabilitySet { SHARED_CAPABILITIES_APP_NODE); public static final CapabilitySet CONTAINER_NODE = predefined( "vespa.container_node", - Capability.CONTENT__DOCUMENT_API, Capability.CONTENT__SEARCH_API, SHARED_CAPABILITIES_APP_NODE); + Capability.CONTAINER__DOCUMENT_API, Capability.CONTENT__DOCUMENT_API, Capability.CONTENT__SEARCH_API, + SHARED_CAPABILITIES_APP_NODE); public static final CapabilitySet CLUSTER_CONTROLLER_NODE = predefined( "vespa.cluster_controller_node", Capability.CONTENT__CLUSTER_CONTROLLER__INTERNAL_STATE_API, |