Skip to content

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

chore: Remove unused column-level middleware (#64326)

Edward Paget6631ed53899d
diff --git a/enterprise/backend/src/metabase_enterprise/sandbox/query_processor/middleware/column_level_perms_check.clj b/enterprise/backend/src/metabase_enterprise/sandbox/query_processor/middleware/column_level_perms_check.clj
deleted file mode 100644
index 67985ca1bd8..00000000000
--- a/enterprise/backend/src/metabase_enterprise/sandbox/query_processor/middleware/column_level_perms_check.clj
+++ /dev/null
@@ -1,47 +0,0 @@
-(ns metabase-enterprise.sandbox.query-processor.middleware.column-level-perms-check
- (:require
- [medley.core :as m]
- [metabase.api.common :refer [*current-user-id*]]
- ;; legacy usage -- don't use Legacy MBQL utils in QP code going forward, prefer Lib. This will be updated to use
- ;; Lib only soon
- ^{:clj-kondo/ignore [:discouraged-namespace]}
- [metabase.legacy-mbql.schema :as mbql.s]
- [metabase.lib.core :as lib]
- [metabase.lib.schema :as lib.schema]
- [metabase.lib.util.match :as lib.util.match]
- [metabase.premium-features.core :refer [defenterprise-schema]]
- [metabase.query-processor.schema :as qp.schema]
- [metabase.util.i18n :refer [tru]]
- [metabase.util.log :as log]
- [metabase.util.malli :as mu]))
-
-(defn- field-ids [form]
- (set (lib.util.match/match form
- [:field (id :guard integer?) _]
- id)))
-
-(def ^:private ^:dynamic *gtap-perms*
- "TODO: these used to be passed as a `:gtap-perms` key as part of QP context... not sure where this used to get passed
- in."
- nil)
-
-(mu/defn- maybe-apply-column-level-perms-check*
- [{{{source-query-fields :fields} :source-query} :query, :as query} :- ::mbql.s/Query]
- (let [restricted-field-ids (and *gtap-perms*
- (field-ids source-query-fields))]
- (when (seq restricted-field-ids)
- (let [fields-ids-in-query (field-ids (m/dissoc-in query [:query :source-query]))]
- (when-not (every? restricted-field-ids fields-ids-in-query)
- (log/warnf "User '%s' attempted to access an inaccessible field. Accessible fields %s, fields in query %s"
- *current-user-id* (pr-str restricted-field-ids) (pr-str fields-ids-in-query))
- (throw (ex-info (str (tru "User not able to query field")) {:status 403})))))))
-
-(defenterprise-schema maybe-apply-column-level-perms-check :- ::qp.schema/qp
- "Check column-level permissions if applicable."
- :feature :sandboxes
- [qp :- ::qp.schema/qp]
- (mu/fn [query :- ::lib.schema/query
- rff :- ::qp.schema/rff]
- ;; TODO (Cam 9/11/25) -- update this middleware to use Lib/MBQL 5
- (maybe-apply-column-level-perms-check* (lib/->legacy-MBQL query))
- (qp query rff)))
diff --git a/src/metabase/permissions/models/permissions.clj b/src/metabase/permissions/models/permissions.clj
index fa5a9f6b963..97318effc16 100644
--- a/src/metabase/permissions/models/permissions.clj
+++ b/src/metabase/permissions/models/permissions.clj
@@ -77,7 +77,6 @@
* Segmented permissions can also be used to enforce column-level permissions -- any column not returned by the
underlying GTAP query is not allowed to be referenced by the parent query thru other means such as filter clauses.
- See [[metabase-enterprise.sandbox.query-processor.middleware.column-level-perms-check]].
* GTAPs are not allowed to add columns not present in the original Table, or change their effective type to
something incompatible (this constraint is in place so we other things continue to work transparently regardless
diff --git a/src/metabase/query_processor/execute.clj b/src/metabase/query_processor/execute.clj
index 42321f072a1..df4ae9aa5dd 100644
--- a/src/metabase/query_processor/execute.clj
+++ b/src/metabase/query_processor/execute.clj
@@ -55,9 +55,7 @@
#'add-preprocessed-query-to-result-metadata-for-userland-query
#'cache/maybe-return-cached-results
#'qp.perms/check-query-permissions
- #'qp.middleware.enterprise/check-download-permissions-middleware
- ;; TODO (Cam 9/11/25) -- update this middleware to use Lib/MBQL 5. Does a [[lib/->legacy]] call under the hood.
- #'qp.middleware.enterprise/maybe-apply-column-level-perms-check-middleware])
+ #'qp.middleware.enterprise/check-download-permissions-middleware])
(def ^:private execute* nil)
diff --git a/src/metabase/query_processor/middleware/enterprise.clj b/src/metabase/query_processor/middleware/enterprise.clj
index 4bdf61535ae..f65293dfb26 100644
--- a/src/metabase/query_processor/middleware/enterprise.clj
+++ b/src/metabase/query_processor/middleware/enterprise.clj
@@ -91,19 +91,6 @@
(fn [query rff]
((check-download-permissions qp) query rff)))
-(defenterprise maybe-apply-column-level-perms-check
- "Execution middleware. Check column-level permissions if applicable."
- metabase-enterprise.sandbox.query-processor.middleware.column-level-perms-check
- [qp]
- qp)
-
-(defn maybe-apply-column-level-perms-check-middleware
- "Helper middleware wrapper for [[maybe-apply-column-level-perms-check]] to make sure we do [[defenterprise]] dispatch
- correctly on each QP run rather than just once when we combine all of the QP middleware."
- [qp]
- (fn [query rff]
- ((maybe-apply-column-level-perms-check qp) query rff)))
-
;;;; Post-processing middleware
;;; (f query rff) => rff