romtuck/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: apply sandbox tools denials in /tools/invoke

Browse Source
This commit is contained in:
David Bors 2026-01-29 16:50:41 +02:00
parent 5f4715acfc
commit 2c2959451e
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gateway/http-common.ts
View File

@ -25,6 +25,12 @@ export function sendUnauthorized(res: ServerResponse) {
});
}
export function sendForbidden(res: ServerResponse, message: string) {
sendJson(res, 403, {
error: { message, type: "forbidden" },
});
}
export function sendInvalidRequest(res: ServerResponse, message: string) {
sendJson(res, 400, {
error: { message, type: "invalid_request_error" },

15
src/gateway/tools-invoke-http.ts
View File

@ -7,6 +7,8 @@ import {
resolveGroupToolPolicy,
resolveSubagentToolPolicy,
} from "../agents/pi-tools.policy.js";
import { resolveSandboxRuntimeStatus } from "../agents/sandbox.js";
import { isToolAllowed } from "../agents/sandbox/tool-policy.js";
import {
buildPluginToolGroups,
collectExplicitAllowlist,
@ -26,6 +28,7 @@ import { authorizeGatewayConnect, type ResolvedGatewayAuth } from "./auth.js";
import { getBearerToken, getHeader } from "./http-utils.js";
import {
readJsonBodyOrError,
sendForbidden,
sendInvalidRequest,
sendJson,
sendMethodNotAllowed,
@ -116,6 +119,18 @@ export async function handleToolsInvokeHttpRequest(
const sessionKey =
!rawSessionKey || rawSessionKey === "main" ? resolveMainSessionKey(cfg) : rawSessionKey;
// Check sandbox policy before proceeding. Sandboxed sessions have restricted tool access.
const sandboxRuntime = resolveSandboxRuntimeStatus({ cfg, sessionKey });
if (sandboxRuntime.sandboxed) {
if (!isToolAllowed(sandboxRuntime.toolPolicy, toolName)) {
sendForbidden(
res,
`Tool "${toolName}" is blocked by sandbox policy (mode=${sandboxRuntime.mode}, session=${sessionKey})`,
);
return true;
}
}
// Resolve message channel/account hints (optional headers) for policy inheritance.
const messageChannel = normalizeMessageChannel(getHeader(req, "x-moltbot-message-channel") ?? "");
const accountId = getHeader(req, "x-moltbot-account-id")?.trim() || undefined;