Skip to content

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

Normalize instance-origin matching when filtering data-app allowed_hosts (#81106)

Timofey Kachalov8b42f492889b
diff --git a/src/metabase/server/middleware/security.clj b/src/metabase/server/middleware/security.clj
index 7ce6ae2ac74..433c5b22dfc 100644
--- a/src/metabase/server/middleware/security.clj
+++ b/src/metabase/server/middleware/security.clj
@@ -540,14 +540,48 @@
:port (let [p (.getPort uri)] (when-not (neg? p) (str p)))}))
(catch Exception _ nil))))
+(def ^:private default-ports
+ "Default port per scheme, so `https://h` and `https://h:443` compare equal — the browser's
+ CSP matcher treats them as one origin, and this filter must too or the entry leaks through."
+ {"http" "80" "https" "443"})
+
+(defn- scheme-covers-instance?
+ "Does the entry's scheme cover the instance's, like the browser's CSP matcher:
+ case-insensitive, a scheme-less entry covers http/https, and `http` also covers `https`."
+ [self-scheme entry-scheme]
+ (let [self (some-> self-scheme u/lower-case-en)
+ entry (some-> entry-scheme u/lower-case-en)]
+ (cond
+ (nil? entry) (contains? #{"http" "https"} self)
+ (= entry self) true
+ (and (= entry "http") (= self "https")) true
+ :else false)))
+
+(defn- port-covers-instance?
+ "Does the entry's port cover the instance's, like the browser's CSP matcher: `*` covers
+ any; an explicit port must equal the instance's port (or its scheme's default); a
+ port-less entry covers only a default-port instance. The default follows the instance's
+ scheme, not the entry's, so a port-less `http://h` still covers `https://h` on 443."
+ [self entry]
+ (let [self-default (default-ports (some-> (:protocol self) u/lower-case-en))
+ self-port (or (:port self) self-default)
+ entry-port (:port entry)]
+ (cond
+ (= entry-port "*") true
+ (some? entry-port) (= entry-port self-port)
+ :else (= self-port self-default))))
+
(defn- covers-instance-origin?
- "True if `allowed_hosts` entry `host` (possibly a `*.company.com` wildcard) matches the
- instance's own origin `self`, using the same host-source matching as [[approved-origin?]]."
+ "True if `allowed_hosts` entry `host` (maybe a `*.company.com` wildcard) matches the
+ instance origin `self`. Must match at least what the browser's CSP matcher does —
+ case-insensitive host, http→https upgrade, default-port equivalence — or an unrecognized
+ spelling of the instance survives into `form-action` and re-opens a native submit to it."
[self host]
- (when-let [pattern (parse-url host)]
- (and (approved-domain? (:domain self) (:domain pattern))
- (approved-protocol? (:protocol self) (:protocol pattern))
- (approved-port? (:port self) (:port pattern)))))
+ (when-let [entry (parse-url host)]
+ (and (approved-domain? (u/lower-case-en (:domain self))
+ (u/lower-case-en (:domain entry)))
+ (scheme-covers-instance? (:protocol self) (:protocol entry))
+ (port-covers-instance? self entry))))
(defn- drop-instance-origin
"Removes any `allowed_hosts` entry that would match this instance's own origin (exact or
diff --git a/test/metabase/server/middleware/security_test.clj b/test/metabase/server/middleware/security_test.clj
index 62f22e87b92..595e5704ee7 100644
--- a/test/metabase/server/middleware/security_test.clj
+++ b/test/metabase/server/middleware/security_test.clj
@@ -9,6 +9,7 @@
[metabase.server.middleware.security :as mw.security]
[metabase.server.settings :as server.settings]
[metabase.test :as mt]
+ [metabase.util :as u]
[metabase.util.json :as json]
[stencil.core :as stencil]))
@@ -230,6 +231,73 @@
(is (str/includes? value "https://api.allowed.test")
(str directive " must keep an external host")))))))))
+(deftest data-app-instance-origin-default-port-and-case-excluded-test
+ ;; `drop-instance-origin` must be at least as permissive as the browser's CSP matcher,
+ ;; or an entry it fails to recognize as the instance survives into `form-action` and the
+ ;; browser still treats it as the instance origin — reopening native `<form>` submits to
+ ;; `/api/user`. The browser applies CSP default-port equivalence (`https://h:443` matches
+ ;; a submit to `https://h/...`) and case-insensitive host matching, so an `allowed_hosts`
+ ;; entry the bundle spells with the default port or different case must be dropped too.
+ (testing "the instance origin spelled with its default port is dropped when site-url is portless"
+ (mt/with-temporary-setting-values [site-url "https://mb.company.com"]
+ (with-redefs [mw.security/data-app-connect-src-hosts
+ (constantly ["https://mb.company.com:443" ; the instance, default port -> must be dropped
+ "https://api.allowed.test"])] ; unrelated external host -> must survive
+ (let [form-action (csp-directive-for "/embed/apps/sales" "form-action")
+ frame-src (csp-directive-for "/embed/apps/sales" "frame-src")
+ connect-src (csp-directive-for "/embed/apps/sales" "connect-src")]
+ (doseq [[directive value] {"form-action" form-action
+ "frame-src" frame-src
+ "connect-src" connect-src}]
+ (is (not (str/includes? value "mb.company.com"))
+ (str directive " must not admit the instance origin spelled with its default port"))
+ (is (str/includes? value "https://api.allowed.test")
+ (str directive " must keep an external host")))))))
+ (testing "the instance origin in a different host case is dropped (DNS/CSP host matching is case-insensitive)"
+ (mt/with-temporary-setting-values [site-url "https://MB.Company.COM"]
+ (with-redefs [mw.security/data-app-connect-src-hosts
+ (constantly ["https://mb.company.com" ; the instance, lower-cased -> must be dropped
+ "https://api.allowed.test"])] ; unrelated external host -> must survive
+ (let [form-action (csp-directive-for "/embed/apps/sales" "form-action")
+ frame-src (csp-directive-for "/embed/apps/sales" "frame-src")
+ connect-src (csp-directive-for "/embed/apps/sales" "connect-src")]
+ (doseq [[directive value] {"form-action" form-action
+ "frame-src" frame-src
+ "connect-src" connect-src}]
+ (is (not (str/includes? (u/lower-case-en value) "mb.company.com"))
+ (str directive " must not admit the instance origin in a different case"))
+ (is (str/includes? value "https://api.allowed.test")
+ (str directive " must keep an external host"))))))))
+
+(deftest data-app-instance-origin-http-scheme-excluded-test
+ ;; The browser's CSP matcher applies the http→https scheme upgrade: a `form-action`
+ ;; source of `http://h` matches a native submit to `https://h/api/user`. The import gate
+ ;; (`allowed-host-re` is `https?://…`) admits an `http://` entry, so one naming the
+ ;; instance host over http must be dropped for an https instance too — otherwise it
+ ;; re-opens the admin-provisioning submit the barrier exists to block.
+ (testing "an http entry covering an https instance is dropped (CSP http→https upgrade)"
+ (mt/with-temporary-setting-values [site-url "https://mb.company.com"]
+ (with-redefs [mw.security/data-app-connect-src-hosts
+ (constantly ["http://mb.company.com" ; the instance over http -> must be dropped
+ "https://api.allowed.test"])] ; unrelated external host -> must survive
+ (let [form-action (csp-directive-for "/embed/apps/sales" "form-action")
+ frame-src (csp-directive-for "/embed/apps/sales" "frame-src")
+ connect-src (csp-directive-for "/embed/apps/sales" "connect-src")]
+ (doseq [[directive value] {"form-action" form-action
+ "frame-src" frame-src
+ "connect-src" connect-src}]
+ (is (not (str/includes? value "mb.company.com"))
+ (str directive " must not admit the instance host spelled with http://"))
+ (is (str/includes? value "https://api.allowed.test")
+ (str directive " must keep an external host")))))))
+ (testing "the reverse (https entry, http instance) is left in place — the browser has no https→http upgrade"
+ (mt/with-temporary-setting-values [site-url "http://mb.company.com"]
+ (with-redefs [mw.security/data-app-connect-src-hosts
+ (constantly ["https://mb.company.com"])]
+ (is (str/includes? (csp-directive-for "/embed/apps/sales" "form-action")
+ "https://mb.company.com")
+ "an https entry does not cover an http instance, so it must not be over-dropped")))))
+
(deftest data-app-connect-src-test
(testing "a data app's allowed_hosts are added to the iframe document's connect-src"
(with-redefs [mw.security/data-app-connect-src-hosts (constantly ["https://api.example.com"])]