Skip to content

Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.

fix(bot): restrict exec for user chat requests (#6344)

zhanggaoyuan87ffde99eb3a
diff --git a/bot/tests/test_openapi_auth.py b/bot/tests/test_openapi_auth.py
index 3a001b939..c2b298aaf 100644
--- a/bot/tests/test_openapi_auth.py
+++ b/bot/tests/test_openapi_auth.py
@@ -16,7 +16,7 @@ from fastapi.testclient import TestClient
from vikingbot.bus.events import OutboundEventType, OutboundMessage
from vikingbot.bus.queue import MessageBus
from vikingbot.channels.openapi import OpenAPIChannel, OpenAPIChannelConfig, PendingResponse
-from vikingbot.channels.openapi_models import ChatResponse
+from vikingbot.channels.openapi_models import ChatRequest, ChatResponse, OpenVikingConnection
from vikingbot.compile.models import CompileAccepted
from vikingbot.config.schema import BotChannelConfig, SessionKey
from vikingbot.session.manager import Session
@@ -566,6 +566,52 @@ class TestOpenAPIAuth:
assert response.status_code == 200
assert response.json()["message"] == "ok"
+ def test_user_chat_disables_exec_tool(self, message_bus, temp_workspace):
+ channel = OpenAPIChannel(
+ OpenAPIChannelConfig(),
+ message_bus,
+ workspace_path=temp_workspace,
+ )
+ request = ChatRequest(
+ message="hello",
+ disabled_tools=["read_file"],
+ openviking_connection=OpenVikingConnection(
+ api_key="user-key",
+ account_id="acct",
+ user_id="alice",
+ role="user",
+ api_key_type="user",
+ server_url="http://ov.local",
+ ),
+ )
+
+ metadata = channel._request_metadata(request)
+
+ assert metadata["disabled_tools"] == ["read_file", "message", "exec"]
+
+ def test_admin_chat_keeps_exec_tool_available(self, message_bus, temp_workspace):
+ channel = OpenAPIChannel(
+ OpenAPIChannelConfig(),
+ message_bus,
+ workspace_path=temp_workspace,
+ )
+ request = ChatRequest(
+ message="hello",
+ disabled_tools=["read_file"],
+ openviking_connection=OpenVikingConnection(
+ api_key="admin-key",
+ account_id="acct",
+ user_id="admin",
+ role="admin",
+ api_key_type="user",
+ server_url="http://ov.local",
+ ),
+ )
+
+ metadata = channel._request_metadata(request)
+
+ assert metadata["disabled_tools"] == ["read_file", "message"]
+
def test_chat_accepts_request_with_configured_valid_api_key(
self, message_bus, temp_workspace, monkeypatch
):
diff --git a/bot/vikingbot/channels/openapi.py b/bot/vikingbot/channels/openapi.py
index 7d2ec2ec9..91e38efbd 100644
--- a/bot/vikingbot/channels/openapi.py
+++ b/bot/vikingbot/channels/openapi.py
@@ -1440,6 +1440,12 @@ class OpenAPIChannel(BaseChannel):
disabled_tools = list(request.disabled_tools or [])
if "message" not in disabled_tools:
disabled_tools.append("message")
+ if (
+ request.openviking_connection
+ and request.openviking_connection.role == "user"
+ and "exec" not in disabled_tools
+ ):
+ disabled_tools.append("exec")
return {"disabled_tools": disabled_tools}
def _request_media(self, request: ChatRequest) -> list[dict[str, Any]]: