diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-02-09 17:11:18 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-02-09 17:11:18 +0100 |
commit | 3014e3e42ce93ec638eda67d0fd0c40f68431707 (patch) | |
tree | cbc4b587293c97e8d88dcc6bdf3bc0407693404b /logserver/src | |
parent | cf2673c4494f233c086dc54d747a377474801fb9 (diff) |
Define required capabilities for existing JRT RPC methods
Diffstat (limited to 'logserver/src')
-rw-r--r-- | logserver/src/main/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethod.java | 2 | ||||
-rw-r--r-- | logserver/src/main/java/com/yahoo/logserver/Server.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/logserver/src/main/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethod.java b/logserver/src/main/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethod.java index b0657877b1f..86a2d6efda8 100644 --- a/logserver/src/main/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethod.java +++ b/logserver/src/main/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethod.java @@ -8,6 +8,7 @@ import com.yahoo.jrt.Int8Value; import com.yahoo.jrt.Method; import com.yahoo.jrt.Request; import com.yahoo.logserver.LogDispatcher; +import com.yahoo.security.tls.Capability; import java.util.concurrent.Executor; import java.util.concurrent.Executors; @@ -32,6 +33,7 @@ public class ArchiveLogMessagesMethod { public ArchiveLogMessagesMethod(LogDispatcher logDispatcher) { this.logDispatcher = logDispatcher; this.method = new Method(METHOD_NAME, "bix", "bix", this::log) + .requireCapabilities(Capability.LOGSERVER_API) .methodDesc("Archive log messages") .paramDesc(0, "compressionType", "Compression type (0=raw)") .paramDesc(1, "uncompressedSize", "Uncompressed size") diff --git a/logserver/src/main/java/com/yahoo/logserver/Server.java b/logserver/src/main/java/com/yahoo/logserver/Server.java index cfe2bcf0776..da3059a6490 100644 --- a/logserver/src/main/java/com/yahoo/logserver/Server.java +++ b/logserver/src/main/java/com/yahoo/logserver/Server.java @@ -8,6 +8,7 @@ import com.yahoo.log.LogSetup; import com.yahoo.log.event.Event; import com.yahoo.logserver.handlers.HandlerThread; import com.yahoo.logserver.handlers.LogHandler; +import com.yahoo.security.tls.Capability; import com.yahoo.yolean.system.CatchSignals; import java.util.HashMap; @@ -108,7 +109,8 @@ public class Server implements Runnable { registerPluginLoader(new BuiltinPluginLoader()); rpcServer = new RpcServer(rpcListenPort); - rpcServer.addMethod(new ArchiveLogMessagesMethod(dispatch).methodDefinition()); + rpcServer.addMethod(new ArchiveLogMessagesMethod(dispatch).methodDefinition() + .requireCapabilities(Capability.LOGSERVER_API)); } /** |