Skip to content

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

Check revision revert perms against the table of the restored definition (#80553)

Alexander Polyankin1fbd3380571b
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index 47ad74c053f..23c497dfc87 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -2051,6 +2051,7 @@
dashboards
events
lib
+ lib-be
models
parameters
queries
diff --git a/src/metabase/revisions/api.clj b/src/metabase/revisions/api.clj
index b7e3f550a31..537b30d634c 100644
--- a/src/metabase/revisions/api.clj
+++ b/src/metabase/revisions/api.clj
@@ -4,6 +4,8 @@
[metabase.api.common :as api]
[metabase.api.macros :as api.macros]
[metabase.collections.models.collection :as collection]
+ [metabase.lib-be.core :as lib-be]
+ [metabase.lib.core :as lib]
[metabase.models.interface :as mi]
[metabase.parameters.params :as params]
[metabase.queries.core :as queries]
@@ -127,8 +129,17 @@
;; TODO -- we should be using something like `api/read-check` for this, but unfortunately the impl for Cards
;; doesn't actually check important stuff like this.
(query-perms/check-run-permissions-for-query (dissoc (get-in revision [:object :dataset_query]) :query-permissions/perms)))
- (when (contains? #{:model/Transform :model/Segment :model/Measure} model)
+ (when (= model :model/Transform)
(api/check-403 (mi/can-write? (merge instance (:object revision)))))
+ ;; for Segments and Measures `table_id` is re-derived from `definition` on update, so when the restored definition
+ ;; specifies a source table, check write perms against that table rather than the revision's stored `table_id`
+ (when (contains? #{:model/Segment :model/Measure} model)
+ (let [table-id (some-> (get-in revision [:object :definition])
+ not-empty
+ lib-be/normalize-query
+ lib/primary-source-table-id)]
+ (api/check-403 (mi/can-write? (cond-> (merge instance (:object revision))
+ table-id (assoc :table_id table-id))))))
(when (contains? #{:model/Dashboard :model/Card} model)
(collection/check-allowed-to-change-collection instance (:object revision))
(when (api/column-will-change? :dashboard_id instance (:object revision))
diff --git a/test/metabase/revisions/api_test.clj b/test/metabase/revisions/api_test.clj
index c57248651f5..7bda96a78e2 100644
--- a/test/metabase/revisions/api_test.clj
+++ b/test/metabase/revisions/api_test.clj
@@ -4,6 +4,7 @@
[clojure.string :as str]
[clojure.test :refer :all]
[metabase.config.core :as config]
+ [metabase.lib-be.core :as lib-be]
[metabase.lib.core :as lib]
[metabase.lib.metadata :as lib.metadata]
[metabase.permissions.models.data-permissions :as data-perms]
@@ -901,6 +902,73 @@
:description "created this."}]
(mt/user-http-request :crowberto :get 200 (format "revision/segment/%d" id)))))))))
+(defn- segment-definition
+ "Build an MBQL 5 segment definition (a single-stage filtered query on `table-id`) via lib."
+ [table-id filter-field-id]
+ (let [mp (lib-be/application-database-metadata-provider (t2/select-one-fn :db_id :model/Table :id table-id))]
+ (-> (lib/query mp (lib.metadata/table mp table-id))
+ (lib/filter (lib/> (lib.metadata/field mp filter-field-id) 0)))))
+
+(defn- measure-definition
+ "Build an MBQL 5 measure definition (a count aggregation on `table-id`) via lib."
+ [table-id]
+ (let [mp (lib-be/application-database-metadata-provider (t2/select-one-fn :db_id :model/Table :id table-id))]
+ (-> (lib/query mp (lib.metadata/table mp table-id))
+ (lib/aggregate (lib/count)))))
+
+(deftest segment-revert-definition-table-permissions-test
+ (testing "POST /api/revision/revert <Segment>"
+ (mt/with-temp
+ [:model/Segment {:keys [id]} {:table_id (mt/id :venues)
+ :definition (segment-definition (mt/id :venues) (mt/id :venues :price))}
+ :model/Revision {users-revision-id :id} {:model "Segment"
+ :model_id id
+ :object {:name "Users segment"
+ :table_id (mt/id :venues)
+ :definition (segment-definition (mt/id :users) (mt/id :users :id))}}
+ :model/Revision {no-def-revision-id :id} {:model "Segment"
+ :model_id id
+ :object {:name "No definition"
+ :table_id (mt/id :users)}}]
+ (mt/with-data-analyst-role! (mt/user->id :rasta)
+ (mt/with-no-data-perms-for-all-users!
+ (mt/with-perm-for-group-and-table! (u/the-id (perms-group/all-users)) (mt/id :venues) :perms/view-data :unrestricted
+ (testing "write perms are checked against the table of the restored revision's definition, not its stored :table_id"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :post 403 "revision/revert"
+ {:id id, :entity "segment", :revision_id users-revision-id}))))
+ (testing "when the restored revision has no definition, perms fall back to its stored :table_id"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :post 403 "revision/revert"
+ {:id id, :entity "segment", :revision_id no-def-revision-id}))))))))))
+
+(deftest measure-revert-definition-table-permissions-test
+ (testing "POST /api/revision/revert <Measure>"
+ (mt/with-temp
+ [:model/Measure {:keys [id]} {:name "Venue count"
+ :table_id (mt/id :venues)
+ :definition (measure-definition (mt/id :venues))}
+ :model/Revision {users-revision-id :id} {:model "Measure"
+ :model_id id
+ :object {:name "Users count"
+ :table_id (mt/id :venues)
+ :definition (measure-definition (mt/id :users))}}
+ :model/Revision {no-def-revision-id :id} {:model "Measure"
+ :model_id id
+ :object {:name "No definition"
+ :table_id (mt/id :users)}}]
+ (mt/with-data-analyst-role! (mt/user->id :rasta)
+ (mt/with-no-data-perms-for-all-users!
+ (mt/with-perm-for-group-and-table! (u/the-id (perms-group/all-users)) (mt/id :venues) :perms/view-data :unrestricted
+ (testing "write perms are checked against the table of the restored revision's definition, not its stored :table_id"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :post 403 "revision/revert"
+ {:id id, :entity "measure", :revision_id users-revision-id}))))
+ (testing "when the restored revision has no definition, perms fall back to its stored :table_id"
+ (is (= "You don't have permissions to do that."
+ (mt/user-http-request :rasta :post 403 "revision/revert"
+ {:id id, :entity "measure", :revision_id no-def-revision-id}))))))))))
+
(deftest dashboard-double-revert-test
(testing "Reverting past an add/delete-card boundary then reverting forward again both succeed (#15237)"
(mt/with-temp [:model/Dashboard {dashboard-id :id} {}