Skip to content
Snippets Groups Projects
Unverified Commit 2c7d0cf1 authored by John Swanson's avatar John Swanson Committed by GitHub
Browse files

Revert "Preprocess queries before data perms check (#45601)" (#46429)

This reverts commit c7a5aee1.
parent 00223821
No related branches found
No related tags found
No related merge requests found
......@@ -133,9 +133,7 @@
(try
(let [query (mbql.normalize/normalize query)]
;; if we are using a Card as our source, our perms are that Card's (i.e. that Card's Collection's) read perms
(if-let [source-card-id (if already-preprocessed?
(:qp/source-card-id query)
(qp.util/query->source-card-id query))]
(if-let [source-card-id (qp.util/query->source-card-id query)]
{:paths (source-card-read-perms source-card-id)}
;; otherwise if there's no source card then calculate perms based on the Tables referenced in the query
(let [query (cond-> query
......@@ -265,14 +263,7 @@
(mu/defn can-run-query?
"Return `true` if the current user has sufficient permissions to run `query`, and `false` otherwise."
[query]
(let [preprocessed-query (try ((requiring-resolve 'metabase.query-processor.preprocess/preprocess) query)
(catch Exception e
(log/info e "Failed to preprocess query, falling back to unprocessed")
false))
query (or preprocessed-query query)
required-perms (required-perms-for-query query
:already-preprocessed?
(boolean preprocessed-query))]
(let [required-perms (required-perms-for-query query)]
(check-data-perms query required-perms :throw-exceptions? false)))
(defn can-query-table?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment