Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Expose Mcp-Session-Id header for CORS requests (#75838)

Rodrigo López Dato80520be19e6c
diff --git a/src/metabase/server/middleware/security.clj b/src/metabase/server/middleware/security.clj
index aebc47c581b..2d6287cf1d6 100644
--- a/src/metabase/server/middleware/security.clj
+++ b/src/metabase/server/middleware/security.clj
@@ -338,7 +338,7 @@
"Vary" "Origin"})
{"Access-Control-Allow-Headers" "*"
"Access-Control-Allow-Methods" "*"
- "Access-Control-Expose-Headers" "Content-Disposition, X-Metabase-Anti-CSRF-Token, X-Metabase-Version"
+ "Access-Control-Expose-Headers" "Content-Disposition, X-Metabase-Anti-CSRF-Token, X-Metabase-Version, Mcp-Session-Id"
;; Needed for Embedding SDK. Should cache preflight requests for the specified number of seconds.
"Access-Control-Max-Age" "60"}))))
diff --git a/test/metabase/server/middleware/security_mcp_test.clj b/test/metabase/server/middleware/security_mcp_test.clj
index f42c2a4677b..69d46061980 100644
--- a/test/metabase/server/middleware/security_mcp_test.clj
+++ b/test/metabase/server/middleware/security_mcp_test.clj
@@ -27,6 +27,17 @@
[origin]
(is (nil? (get-cors-origin-header origin))))
+(defn- get-cors-expose-headers
+ "Returns the Access-Control-Expose-Headers value for a given request origin."
+ [request-origin]
+ (let [wrapped-handler (mw.security/add-security-headers
+ (fn [_request respond _raise]
+ (respond {:status 200 :headers {} :body "ok"})))
+ response (wrapped-handler {:headers {"origin" request-origin}
+ :uri "/api/metabase-mcp"}
+ identity identity)]
+ (get-in response [:headers "Access-Control-Expose-Headers"])))
+
(deftest test-mcp-common-cors-origins
(testing "Claude sandbox origins should be allowed when claude is enabled"
(mt/with-temporary-setting-values [mcp-apps-cors-enabled-clients ["claude"]]
@@ -67,6 +78,16 @@
(assert-cors-allowed! "https://my-app.example.com")
(assert-cors-allowed! "https://abc.claudemcpcontent.com"))))
+(deftest test-mcp-session-id-exposed-to-browser
+ (testing "Mcp-Session-Id is listed in Access-Control-Expose-Headers so browser-based MCP clients"
+ (testing "can read the session ID issued by the initialize response"
+ (mt/with-temporary-setting-values [mcp-apps-cors-custom-origins "https://my-librechat.example.com"]
+ (is (str/includes? (get-cors-expose-headers "https://my-librechat.example.com")
+ "Mcp-Session-Id"))))
+ (testing "including localhost origins, e.g. MCP Inspector"
+ (is (str/includes? (get-cors-expose-headers "http://localhost:6274")
+ "Mcp-Session-Id")))))
+
(deftest test-mcp-settings-helper
(testing "mcp-apps-cors-origins returns space-separated origins for enabled clients"
(mt/with-temporary-setting-values [mcp-apps-cors-enabled-clients ["claude" "chatgpt"]]