stacklok / toolhive / 30798655671

70%

Build Type

push

github

Committed by web-flow

Commit Message

Authorize and accept call_tool with nested tool_name (#6150)

* Authorize call_tool when tool_name is nested

Authorization read the call_tool target from the top level of the request
arguments only. A caller that nested tool_name inside parameters missed that
lookup and fell through the pass-through branch, reaching the backend with no
policy check performed.

Resolve the target through a shared helper so authorization and dispatch agree
on which tool a request names.

Signed-off-by: Tanguille <91473554+Tanguille@users.noreply.github.com>

* Accept nested tool_name in call_tool input

LLMs frequently nest tool_name inside parameters rather than alongside it.
These calls were rejected with a bare "tool_name is required", which gave the
model no indication of the expected shape, so retries reproduced the same
payload and the turn was lost.

Decode such calls by resolving the target the same way authorization does, and
report the expected shape and the parameter keys received when the name really
is absent. Keys are listed without values so tool arguments stay out of logs.

Fixes #5891

Signed-off-by: Tanguille <91473554+Tanguille@users.noreply.github.com>

* Cover the nested tool_name path in the optimizer e2e

The find->call round-trip only exercised the flat payload, so nothing verified
that a nested tool_name dispatches through a real vMCP server rather than only
through the decode unit tests.

Signed-off-by: Tanguille <91473554+Tanguille@users.noreply.github.com>

---------

Signed-off-by: Tanguille <91473554+Tanguille@users.noreply.github.com>

Coverage Stats

28 of 30 new or added lines in 2 files covered. (93.33%)

66 existing lines in 3 files now uncovered.

82669 of 118139 relevant lines covered (69.98%)

97.1 hits per line