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
Add CSP configuration to make images load in MCP Apps (#74741)
Phoomparin Manodeddaa08f3b2
diff --git a/resources/frontend_client/mcp_apps_template.html b/resources/frontend_client/mcp_apps_template.htmlindex f43a3808546..e1bcfdd4b0a 100644--- a/resources/frontend_client/mcp_apps_template.html+++ b/resources/frontend_client/mcp_apps_template.html@@ -3,6 +3,7 @@<head><meta charset="UTF-8" /><meta name="robots" content="noindex" />+ <base href="{{{instanceUrlRaw}}}/" /><title>Metabase</title>diff --git a/src/metabase/mcp/resources.clj b/src/metabase/mcp/resources.cljindex 853edbb4540..a63e35e965d 100644--- a/src/metabase/mcp/resources.clj+++ b/src/metabase/mcp/resources.clj@@ -11,8 +11,10 @@(:require[clojure.java.io :as io][clojure.string :as str]+ [environ.core :as env][metabase.api.common :as api][metabase.api.macros.defendpoint.tools-manifest :as tools-manifest]+ [metabase.config.core :as config][metabase.mcp.scope :as mcp.scope][metabase.mcp.session :as mcp.session][metabase.request.core :as request]@@ -32,7 +34,7 @@;; during the frontend build. Backend-only test runs (e.g. CI app-db tests) don't produce;; it, so tests install a minimal inline template via `with-fallback-template`.(def ^:private test-fallback-template- (str "<!doctype html><html><body><script>"+ (str "<!doctype html><html><head><base href=\"{{{instanceUrlRaw}}}/\"></head><body><script>""window.metabaseConfig = {""instanceUrl: {{{instanceUrl}}},""sessionToken: {{{sessionToken}}}"@@ -111,6 +113,11 @@(cond-> (str scheme "://" host)(not (neg? port)) (str ":" port)))))+(defn- resource-domains+ [url]+ (cond-> [url]+ config/is-dev? (conj (str "http://localhost:" (or (env/env :mb-frontend-dev-port) "8080")))))+(defn- ui-meta"MCP `_meta.ui` block returned alongside UI resources.Hosts that render the resource in a sandboxed iframe (notably ChatGPT's MCP app surface) use this@@ -121,6 +128,8 @@Claude validates this against its own namespace(`*.claudemcpcontent.com`) and rejects anything else,so we emit it only for ChatGPT (gated by [[chatgpt-client?]]).+ - `csp.baseUriDomains` — hosts the iframe may use in its document `<base>` tag+ (relative bundle assets resolve against the Metabase instance)- `csp.connectDomains` — hosts the iframe may XHR/fetch/WebSocket to(the embedded SDK calls back to this Metabase instance)- `csp.resourceDomains` — hosts the iframe may load scripts/styles/images from@@ -130,8 +139,9 @@it out narrows the CSP for security review."[resource](let [url (site-origin)]- {:ui (cond-> {:csp {:connectDomains [url]- :resourceDomains [url]}}+ {:ui (cond-> {:csp {:baseUriDomains [url]+ :connectDomains [url]+ :resourceDomains (resource-domains url)}}(contains? resource :prefersBorder)(assoc :prefersBorder (:prefersBorder resource))diff --git a/test/metabase/mcp/resources_test.clj b/test/metabase/mcp/resources_test.cljindex 60a636669fc..7af97378b3c 100644--- a/test/metabase/mcp/resources_test.clj+++ b/test/metabase/mcp/resources_test.clj@@ -1,10 +1,13 @@(ns metabase.mcp.resources-test(:require+ [clojure.string :as str][clojure.test :refer :all][metabase.api.macros.scope :as scope]+ [metabase.config.core :as config][metabase.mcp.resources :as mcp.resources][metabase.request.core :as request]- [metabase.system.core :as system]))+ [metabase.system.core :as system]+ [stencil.core :as stencil]))(set! *warn-on-reflection* true)@@ -105,23 +108,44 @@(mcp.resources/read-resource uri #{"agent:visualize"} {})))](with-redefs [system/site-url (constantly site-url)](testing "no request bound → CSP origins still emitted, :domain suppressed"- (let [ui-meta (-> (read-ui) :contents first :_meta :ui)]- (is (=? {:prefersBorder true- :csp {:connectDomains [origin]- :resourceDomains [origin]}}- ui-meta))- (is (not (contains? ui-meta :domain)))))- (testing "non-ChatGPT User-Agent → :domain suppressed"- (request/with-current-request {:headers {"user-agent" "claude-ai/0.1.0"}}+ (with-redefs [config/is-dev? false](let [ui-meta (-> (read-ui) :contents first :_meta :ui)]+ (is (=? {:prefersBorder true+ :csp {:baseUriDomains [origin]+ :connectDomains [origin]+ :resourceDomains [origin]}}+ ui-meta))(is (not (contains? ui-meta :domain))))))+ (testing "development metadata allows resources from the frontend dev server"+ (with-redefs [config/is-dev? true]+ (is (=? {:csp {:baseUriDomains [origin]+ :resourceDomains [origin "http://localhost:8080"]}}+ (-> (read-ui) :contents first :_meta :ui)))))+ (testing "non-ChatGPT User-Agent → :domain suppressed"+ (with-redefs [config/is-dev? false]+ (request/with-current-request {:headers {"user-agent" "claude-ai/0.1.0"}}+ (let [ui-meta (-> (read-ui) :contents first :_meta :ui)]+ (is (not (contains? ui-meta :domain)))))))(testing "ChatGPT User-Agent (`openai-mcp/...`) → :domain = origin"- (request/with-current-request {:headers {"user-agent" "openai-mcp/1.0.0 (ChatGPT)"}}- (is (=? {:status :ok- :contents [{:uri uri- :mimeType "text/html;profile=mcp-app"- :_meta {:ui {:prefersBorder true- :domain origin- :csp {:connectDomains [origin]- :resourceDomains [origin]}}}}]}- (read-ui)))))))))+ (with-redefs [config/is-dev? false]+ (request/with-current-request {:headers {"user-agent" "openai-mcp/1.0.0 (ChatGPT)"}}+ (is (=? {:status :ok+ :contents [{:uri uri+ :mimeType "text/html;profile=mcp-app"+ :_meta {:ui {:prefersBorder true+ :domain origin+ :csp {:baseUriDomains [origin]+ :connectDomains [origin]+ :resourceDomains [origin]}}}}]}+ (read-ui))))))))))++(deftest embed-mcp-template-base-url-test+ (testing "the MCP iframe document resolves relative bundle assets from the Metabase instance"+ (let [site-url "https://metabase.example.com/sub/path"+ html (stencil/render-file+ "frontend_client/mcp_apps_template.html"+ {:instanceUrl "\"https://metabase.example.com/sub/path\""+ :instanceUrlRaw site-url+ :sessionToken nil+ :mcpSessionId nil})]+ (is (str/includes? html "<base href=\"https://metabase.example.com/sub/path/\"")))))