The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Fix MCP tool dispatch to pass query params correctly per Ring spec (#71502)
Edward Pagetcb9c042404dc
diff --git a/src/metabase/mcp/tools.clj b/src/metabase/mcp/tools.cljindex 774c32d7869..69e6bb03416 100644--- a/src/metabase/mcp/tools.clj+++ b/src/metabase/mcp/tools.clj@@ -110,14 +110,17 @@(defn- deliver-agent-api-response"Dispatch to agent API routes and deliver response to promise.+ For POST requests, `params` is sent as the request body.+ For GET/DELETE requests, `params` is sent as parsed query params.Materializes StreamingResponse bodies in-process before delivering."- [result method path token-scopes body]+ [result method path token-scopes params](agent-api/routes(cond-> {:request-method method:uri path:metabase-user-id api/*current-user-id*:token-scopes token-scopes}- body (assoc :body body))+ (and (seq params) (= :post method)) (assoc :body params)+ (and (seq params) (not= :post method)) (assoc :query-params params))(fn [{resp-body :body :as response}](deliver result (if (instance? StreamingResponse resp-body)(capture-streaming-response resp-body)@@ -127,12 +130,13 @@(defn- invoke-agent-api"Invoke an Agent API endpoint with a synthetic Ring request.Returns MCP content (text-content on success, error-content on failure).+ For POST, `params` becomes the request body; for GET/DELETE, `params` becomes query-params.Propagates `token-scopes` from the original MCP request so that scope restrictionsare preserved through the synthetic request."- [method path token-scopes & [body]]+ [method path token-scopes params](let [result (promise)]- (deliver-agent-api-response result method path token-scopes body)+ (deliver-agent-api-response result method path token-scopes params)(let [response (deref result 30000 {:status 504 :body {:message "Timeout"}})](cond;; Already materialized from a StreamingResponse@@ -169,17 +173,6 @@[path](str/replace-first path #"^/api/agent" ""))-(defn- invoke-agent-api-with-params- "Invoke an Agent API endpoint with query parameters for GET/DELETE requests.- Appends `params` as a query string to `path`."- [method path token-scopes params]- (if (and (seq params) (not= :post method))- (let [query-string (->> params- (map (fn [[k v]] (str (name k) "=" (URLEncoder/encode (str v) "UTF-8"))))- (str/join "&"))]- (invoke-agent-api method (str path "?" query-string) token-scopes))- (invoke-agent-api method path token-scopes (when (= :post method) params))))-(defn- dispatch-via-agent-api"Generic dispatch for tools whose responseFormat is \"json\".Looks up method/path from the tool definition, interpolates path params,@@ -191,7 +184,7 @@[resolved-pathremaining-args] (interpolate-path path arguments)api-path (strip-api-prefix resolved-path)]- (invoke-agent-api-with-params method api-path token-scopes remaining-args)))+ (invoke-agent-api method api-path token-scopes remaining-args)))(defn call-tool"Dispatch an MCP `tools/call` request to the appropriate handler.diff --git a/test/metabase/mcp/api_test.clj b/test/metabase/mcp/api_test.cljindex 6c807470539..a413fa6393b 100644--- a/test/metabase/mcp/api_test.clj+++ b/test/metabase/mcp/api_test.clj@@ -361,6 +361,22 @@(is (= "object" (:type schema))(str (:name tool) " root type should be object")))))))))+(deftest tools-call-get-table-query-params-test+ (testing "get_table passes query params correctly (with-fields default true)"+ (let [result (mt/with-current-user (mt/user->id :crowberto)+ (mcp.tools/call-tool nil "get_table" {:id (mt/id :orders)}))]+ (is (not (:isError result)))+ (let [table-data (json/decode+kw (:text (first (:content result))))]+ (is (seq (:fields table-data))+ "with-fields defaults to true, so fields should be present"))))+ (testing "get_table with with-fields=false omits fields"+ (let [result (mt/with-current-user (mt/user->id :crowberto)+ (mcp.tools/call-tool nil "get_table" {:id (mt/id :orders) :with-fields false}))]+ (is (not (:isError result)))+ (let [table-data (json/decode+kw (:text (first (:content result))))]+ (is (empty? (:fields table-data))+ "with-fields=false should return no fields")))))+(deftest tools-call-execute-query-test(testing "execute_query returns a streaming response captured as MCP text content"(let [streamed? (atom false)@@ -488,16 +504,16 @@(let [result (mt/with-current-user (mt/user->id :crowberto);; Bypass the MCP scope check by calling invoke-agent-api directly;; with scopes that don't match the endpoint's required scope (agent:table:read)- (#'mcp.tools/invoke-agent-api :get (str "/v1/table/" (mt/id :orders)) #{"agent:search"}))]+ (#'mcp.tools/invoke-agent-api :get (str "/v1/table/" (mt/id :orders)) #{"agent:search"} nil))](is (=? {:isError true} result)"Agent API should reject when token scopes don't include the required scope")))(testing "matching scopes are accepted by Agent API"(let [result (mt/with-current-user (mt/user->id :crowberto)- (#'mcp.tools/invoke-agent-api :get (str "/v1/table/" (mt/id :orders)) #{"agent:table:read"}))]+ (#'mcp.tools/invoke-agent-api :get (str "/v1/table/" (mt/id :orders)) #{"agent:table:read"} nil))](is (not (:isError result))"Agent API should accept when token scopes include the required scope")))(testing "unrestricted scopes are accepted by Agent API"(let [result (mt/with-current-user (mt/user->id :crowberto)- (#'mcp.tools/invoke-agent-api :get (str "/v1/table/" (mt/id :orders)) #{::scope/unrestricted}))]+ (#'mcp.tools/invoke-agent-api :get (str "/v1/table/" (mt/id :orders)) #{::scope/unrestricted} nil))](is (not (:isError result))"Agent API should accept unrestricted scopes")))))