vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-04 19:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

gateway: ignore bearer-declared HTTP operator scopes (#57783)

Browse Source 
* gateway: ignore bearer-declared HTTP operator scopes

* gateway: key HTTP bearer guards to auth mode

* gateway: refresh rebased HTTP regression expectations

* gateway: honor resolved HTTP auth method

* gateway: remove duplicate openresponses owner flags
This commit is contained in:
Jacob Tomlinson
2026-03-30 12:04:33 -07:00
committed by GitHub
parent 2a75416634
commit f0af186726
16 changed files with 476 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/gateway/tools-invoke-http.test.ts
View File

@@ -7,8 +7,6 @@ type RunBeforeToolCallHook = typeof runBeforeToolCallHookType;
type RunBeforeToolCallHookArgs = Parameters<RunBeforeToolCallHook>[0];
type RunBeforeToolCallHookResult = Awaited<ReturnType<RunBeforeToolCallHook>>;
const TEST_GATEWAY_TOKEN = "test-gateway-token-1234567890";
const hookMocks = vi.hoisted(() => ({
resolveToolLoopDetectionConfig: vi.fn(() => ({ warnAt: 3 })),
runBeforeToolCallHook: vi.fn(
@@ -50,7 +48,7 @@ vi.mock("../config/sessions.js", () => ({
}));
vi.mock("./auth.js", () => ({
authorizeHttpGatewayConnect: async () => ({ ok: true }),
authorizeHttpGatewayConnect: vi.fn(async () => ({ ok: true })),
}));
vi.mock("../logger.js", () => ({
@@ -197,6 +195,7 @@ vi.mock("../agents/pi-tools.before-tool-call.js", () => ({
runBeforeToolCallHook: hookMocks.runBeforeToolCallHook,
}));
const { authorizeHttpGatewayConnect } = await import("./auth.js");
const { handleToolsInvokeHttpRequest } = await import("./tools-invoke-http.js");
let pluginHttpHandlers: Array<(req: IncomingMessage, res: ServerResponse) => Promise<boolean>> = [];
@@ -208,7 +207,7 @@ beforeAll(async () => {
sharedServer = createServer((req, res) => {
void (async () => {
const handled = await handleToolsInvokeHttpRequest(req, res, {
auth: { mode: "token", token: TEST_GATEWAY_TOKEN, allowTailscale: false },
auth: { mode: "none", allowTailscale: false },
});
if (handled) {
return;
@@ -260,17 +259,11 @@ beforeEach(() => {
params: args.params,
}),
);
vi.mocked(authorizeHttpGatewayConnect).mockResolvedValue({ ok: true });
});
const resolveGatewayToken = (): string => TEST_GATEWAY_TOKEN;
const gatewayAuthHeaders = () => ({
authorization: `Bearer ${resolveGatewayToken()}`,
"x-openclaw-scopes": "operator.write",
});
const gatewayAdminHeaders = () => ({
authorization: `Bearer ${resolveGatewayToken()}`,
"x-openclaw-scopes": "operator.admin",
});
const gatewayAuthHeaders = () => ({ "x-openclaw-scopes": "operator.write" });
const gatewayAdminHeaders = () => ({ "x-openclaw-scopes": "operator.admin" });
const allowAgentsListForMain = () => {
cfg = {
@@ -440,6 +433,36 @@ describe("POST /tools/invoke", () => {
});
});
it("blocks trusted-proxy local-direct token fallback from invoking tools over HTTP", async () => {
vi.mocked(authorizeHttpGatewayConnect).mockResolvedValueOnce({
ok: true,
method: "token",
});
const res = await postToolsInvoke({
port: sharedPort,
headers: {
authorization: "Bearer secret",
"content-type": "application/json",
},
body: {
tool: "agents_list",
action: "json",
args: {},
sessionKey: "main",
},
});
expect(res.status).toBe(403);
await expect(res.json()).resolves.toMatchObject({
ok: false,
error: {
type: "forbidden",
message: "gateway bearer auth cannot invoke tools over HTTP",
},
});
});
it("uses before_tool_call adjusted params for HTTP tool execution", async () => {
setMainAllowedTools({ allow: ["tools_invoke_test"] });
hookMocks.runBeforeToolCallHook.mockImplementationOnce(async () => ({
@@ -718,9 +741,7 @@ describe("POST /tools/invoke", () => {
const res = await invokeTool({
port: sharedPort,
headers: {
authorization: `Bearer ${resolveGatewayToken()}`,
},
headers: {},
tool: "agents_list",
sessionKey: "main",
});
@@ -735,6 +756,36 @@ describe("POST /tools/invoke", () => {
});
});
it("blocks trusted-proxy local-direct token fallback from invoking tools over HTTP", async () => {
vi.mocked(authorizeHttpGatewayConnect).mockResolvedValueOnce({
ok: true,
method: "token",
});
const res = await postToolsInvoke({
port: sharedPort,
headers: {
authorization: "Bearer secret",
"content-type": "application/json",
},
body: {
tool: "agents_list",
action: "json",
args: {},
sessionKey: "main",
},
});
expect(res.status).toBe(403);
await expect(res.json()).resolves.toMatchObject({
ok: false,
error: {
type: "forbidden",
message: "gateway bearer auth cannot invoke tools over HTTP",
},
});
});
it("applies owner-only tool policy on the HTTP path", async () => {
setMainAllowedTools({ allow: ["owner_only_test"] });