Skip to content

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

Custom headers (#67502)

Roman Abdulmanov101fc34a371b
diff --git a/src/metabase/server/middleware/security.clj b/src/metabase/server/middleware/security.clj
index 984baf7500d..29b75625f4d 100644
--- a/src/metabase/server/middleware/security.clj
+++ b/src/metabase/server/middleware/security.clj
@@ -291,7 +291,12 @@
;; Prevent Flash / PDF files from including content from site.
"X-Permitted-Cross-Domain-Policies" "none"
;; Tell browser not to use MIME sniffing to guess types of files -- protect against MIME type confusion attacks
- "X-Content-Type-Options" "nosniff"}))
+ "X-Content-Type-Options" "nosniff"}
+ ;; Add Cross-Origin headers from environment variables if set
+ (when-let [corp (env/env :mb-cross-origin-resource-policy)]
+ {"Cross-Origin-Resource-Policy" corp})
+ (when-let [coep (env/env :mb-cross-origin-embedder-policy)]
+ {"Cross-Origin-Embedder-Policy" coep})))
(defn- always-allow-cors?
"Returns true if the request/response should have CORS headers added."
diff --git a/test/metabase/server/middleware/security_test.clj b/test/metabase/server/middleware/security_test.clj
index 63e78cf4ff8..df142789080 100644
--- a/test/metabase/server/middleware/security_test.clj
+++ b/test/metabase/server/middleware/security_test.clj
@@ -3,6 +3,7 @@
[clj-http.client :as http]
[clojure.string :as str]
[clojure.test :refer :all]
+ [environ.core :as env]
[metabase.config.core :as config]
[metabase.embedding.settings :as embed.settings]
[metabase.server.middleware.security :as mw.security]
@@ -524,3 +525,65 @@
identity)]
(is (nil? (get-in response [:headers "Access-Control-Allow-Origin"]))
(format "Should not set CORS headers for /auth/sso with %d status" status))))))
+
+(deftest cross-origin-headers-test
+ (testing "Cross-Origin-Resource-Policy header from environment variable"
+ (testing "Should add header when MB_CROSS_ORIGIN_RESOURCE_POLICY is set"
+ (with-redefs [env/env {:mb-cross-origin-resource-policy "cross-origin"}]
+ (let [headers (mw.security/security-headers)]
+ (is (= "cross-origin" (get headers "Cross-Origin-Resource-Policy"))
+ "Should include Cross-Origin-Resource-Policy header when env var is set"))))
+
+ (testing "Should not add header when MB_CROSS_ORIGIN_RESOURCE_POLICY is not set"
+ (with-redefs [env/env {}]
+ (let [headers (mw.security/security-headers)]
+ (is (nil? (get headers "Cross-Origin-Resource-Policy"))
+ "Should not include Cross-Origin-Resource-Policy header when env var is not set")))))
+
+ (testing "Cross-Origin-Embedder-Policy header from environment variable"
+ (testing "Should add header when MB_CROSS_ORIGIN_EMBEDDER_POLICY is set"
+ (with-redefs [env/env {:mb-cross-origin-embedder-policy "require-corp"}]
+ (let [headers (mw.security/security-headers)]
+ (is (= "require-corp" (get headers "Cross-Origin-Embedder-Policy"))
+ "Should include Cross-Origin-Embedder-Policy header when env var is set"))))
+
+ (testing "Should not add header when MB_CROSS_ORIGIN_EMBEDDER_POLICY is not set"
+ (with-redefs [env/env {}]
+ (let [headers (mw.security/security-headers)]
+ (is (nil? (get headers "Cross-Origin-Embedder-Policy"))
+ "Should not include Cross-Origin-Embedder-Policy header when env var is not set")))))
+
+ (testing "Both Cross-Origin headers can be set independently"
+ (testing "Only CORP set"
+ (with-redefs [env/env {:mb-cross-origin-resource-policy "same-origin"}]
+ (let [headers (mw.security/security-headers)]
+ (is (= "same-origin" (get headers "Cross-Origin-Resource-Policy")))
+ (is (nil? (get headers "Cross-Origin-Embedder-Policy"))))))
+
+ (testing "Only COEP set"
+ (with-redefs [env/env {:mb-cross-origin-embedder-policy "credentialless"}]
+ (let [headers (mw.security/security-headers)]
+ (is (nil? (get headers "Cross-Origin-Resource-Policy")))
+ (is (= "credentialless" (get headers "Cross-Origin-Embedder-Policy"))))))
+
+ (testing "Both set"
+ (with-redefs [env/env {:mb-cross-origin-resource-policy "same-site"
+ :mb-cross-origin-embedder-policy "require-corp"}]
+ (let [headers (mw.security/security-headers)]
+ (is (= "same-site" (get headers "Cross-Origin-Resource-Policy")))
+ (is (= "require-corp" (get headers "Cross-Origin-Embedder-Policy")))))))
+
+ (testing "Cross-Origin headers are included in middleware response"
+ (testing "Headers are present in actual HTTP response"
+ (with-redefs [env/env {:mb-cross-origin-resource-policy "cross-origin"
+ :mb-cross-origin-embedder-policy "require-corp"}]
+ (let [wrapped-handler (mw.security/add-security-headers
+ (fn [_request respond _raise]
+ (respond {:status 200 :headers {} :body "ok"})))
+ response (wrapped-handler {:headers {} :uri "/"}
+ identity
+ identity)]
+ (is (= "cross-origin" (get-in response [:headers "Cross-Origin-Resource-Policy"]))
+ "Cross-Origin-Resource-Policy should be in the response")
+ (is (= "require-corp" (get-in response [:headers "Cross-Origin-Embedder-Policy"]))
+ "Cross-Origin-Embedder-Policy should be in the response"))))))