The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
[perms] Cap perms for audit collection at `:read`, don't throw on `:write` (#74240)
Braden Shepherdsonf7acc044e460
diff --git a/enterprise/backend/src/metabase_enterprise/audit_app/permissions.clj b/enterprise/backend/src/metabase_enterprise/audit_app/permissions.cljindex 044dae31e57..20a8f905497 100644--- a/enterprise/backend/src/metabase_enterprise/audit_app/permissions.clj+++ b/enterprise/backend/src/metabase_enterprise/audit_app/permissions.clj@@ -62,18 +62,19 @@outer-query)))))))(defenterprise update-audit-collection-permissions!- "Will remove or grant audit db (AppDB) permissions, if the instance analytics collection permissions changes. This- technically isn't necessary, because we block all audit DB queries if a user doesn't have collection permissions.- But it's cleaner to keep the audit DB permission paths in the database consistent."+ "Updates audit db (AppDB) permissions when the instance analytics collection permissions change, and downgrades+ :write to :read for the audit collection (it must never be writable). Returns the (possibly modified) changes map.":feature :audit-app[group-id changes]- (let [[change-id tyype] (first (filter #(= (first %) (:id (audit/default-audit-collection))) changes))]- (when change-id+ (let [audit-collection-id (:id (audit/default-audit-collection))+ [change-id tyype] (first (filter #(= (first %) audit-collection-id) changes))]+ (if change-id(let [create-queries-value (case tyype- :read :query-builder- :none :no- :write (throw (ex-info (tru "Unable to make audit collections writable.")- {:status-code 400})))+ (:read :write) :query-builder+ :none :no)view-tables (t2/select :model/Table :db_id audit/audit-db-id :name [:in audit-db-view-names])](doseq [table view-tables]- (perms/set-table-permission! group-id table :perms/create-queries create-queries-value))))))+ (perms/set-table-permission! group-id table :perms/create-queries create-queries-value))+ (cond-> changes+ (= tyype :write) (assoc audit-collection-id :read)))+ changes)))diff --git a/enterprise/backend/test/metabase_enterprise/audit_app/permissions_test.clj b/enterprise/backend/test/metabase_enterprise/audit_app/permissions_test.cljindex f8128c6aa4c..6b4d965fde4 100644--- a/enterprise/backend/test/metabase_enterprise/audit_app/permissions_test.clj+++ b/enterprise/backend/test/metabase_enterprise/audit_app/permissions_test.clj@@ -113,11 +113,14 @@(update-graph! (assoc-in (graph :clear-revisions? true) [:groups group-id (:id collection)] :read))(is (= :unrestricted (data-perms/table-permission-for-groups #{group-id} :perms/view-data database-id (:id view-table))))(is (= :query-builder (data-perms/table-permission-for-groups #{group-id} :perms/create-queries database-id (:id view-table)))))- (testing "Unable to update instance analytics to writable"- (is (thrown-with-msg?- Exception- #"Unable to make audit collections writable."- (update-graph! (assoc-in (graph :clear-revisions? true) [:groups group-id (:id collection)] :write)))))))))+ (testing "Setting audit collection to :write downgrades to :read instead of throwing (#71300)"+ (update-graph! (assoc-in (graph :clear-revisions? true :collections [collection] :groups [group-id])+ [:groups group-id (:id collection)] :write))+ (is (= :read (get-in (graph :clear-revisions? true :collections [collection] :groups [group-id])+ [:groups group-id (:id collection)]))+ "Audit collection permission should be stored as :read, not :write")+ (is (= :unrestricted (data-perms/table-permission-for-groups #{group-id} :perms/view-data database-id (:id view-table))))+ (is (= :query-builder (data-perms/table-permission-for-groups #{group-id} :perms/create-queries database-id (:id view-table)))))))));; TODO: re-enable these tests once they're no longer flaky(defn install-audit-db-if-needed!diff --git a/src/metabase/permissions/models/collection/graph.clj b/src/metabase/permissions/models/collection/graph.cljindex e12c31aca87..7a8eb279111 100644--- a/src/metabase/permissions/models/collection/graph.clj+++ b/src/metabase/permissions/models/collection/graph.clj@@ -212,8 +212,8 @@(defenterprise update-audit-collection-permissions!"OSS implementation of `audit-db/update-audit-collection-permissions!`, which is an enterprise feature, so does nothing in the OSS- version."- metabase-enterprise.audit-app.permissions [_ _] ::noop)+ version. Returns the changes map unchanged."+ metabase-enterprise.audit-app.permissions [_ changes] changes)(defn create-perms-revision!"Increments the current revision number and writes it to the database. This lets us track the permissions graph@@ -335,8 +335,8 @@(when (seq changes)(let [revision-id (t2/with-transaction [_conn](doseq [[group-id changes] changes]- (update-audit-collection-permissions! group-id changes)- (update-group-permissions! collection-namespace group-id changes))+ (let [changes (update-audit-collection-permissions! group-id changes)]+ (update-group-permissions! collection-namespace group-id changes)))(:id (create-perms-revision! (:revision old-graph))))];; The graph is updated infrequently, but `diff-old` and `old-graph` can get huge on larger instances.(perms.u/log-permissions-changes diff-old changes)