Skip to content

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

Code improvements for data app group assignments and warnings (#84075)

Phoomparin Mano6ee72dabca39
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.edn
index 21cfc2604f6..52249076383 100644
--- a/.clj-kondo/config/modules/config.edn
+++ b/.clj-kondo/config/modules/config.edn
@@ -3834,6 +3834,7 @@
request
settings
system
+ users
util
warehouse-schema-overlay
enterprise/serialization}
diff --git a/enterprise/backend/src/metabase_enterprise/data_apps/access.clj b/enterprise/backend/src/metabase_enterprise/data_apps/access.clj
deleted file mode 100644
index 62bd7aa7650..00000000000
--- a/enterprise/backend/src/metabase_enterprise/data_apps/access.clj
+++ /dev/null
@@ -1,20 +0,0 @@
-(ns metabase-enterprise.data-apps.access
- "Read access through group assignments."
- (:require
- [metabase-enterprise.data-apps.db :as data-apps.db]))
-
-(defn- read-scope
- [{:keys [user-id superuser?]}]
- (if superuser? :all {:user-id user-id}))
-
-(defn readable-apps
- "List of apps the user can view."
- [user available?]
- (data-apps.db/non-blob-data-apps (read-scope user) available?))
-
-(defn can-read?
- "Whether the user can view the app through an assignment or admin access."
- [user app-id]
- (let [scope (read-scope user)]
- (or (= scope :all)
- (data-apps.db/readable-data-app? scope app-id))))
diff --git a/enterprise/backend/src/metabase_enterprise/data_apps/api.clj b/enterprise/backend/src/metabase_enterprise/data_apps/api.clj
index f5f9d4f14a4..11a786581d1 100644
--- a/enterprise/backend/src/metabase_enterprise/data_apps/api.clj
+++ b/enterprise/backend/src/metabase_enterprise/data_apps/api.clj
@@ -7,7 +7,6 @@
`metabase.server.routes/static-files-handler`)."
(:require
[clojure.string :as str]
- [metabase-enterprise.data-apps.access :as data-app.access]
[metabase-enterprise.data-apps.apps :as data-apps.apps]
[metabase-enterprise.data-apps.config :as data-app.config]
[metabase-enterprise.data-apps.db :as data-apps.db]
@@ -20,6 +19,7 @@
[metabase.api.macros :as api.macros]
[metabase.api.routes.common :refer [+auth]]
[metabase.events.core :as events]
+ [metabase.models.interface :as mi]
[metabase.remote-sync.core :as remote-sync]
[metabase.util.i18n :refer [tru]]
[metabase.util.json :as json]
@@ -109,13 +109,8 @@
[:url [:maybe :string]]])
(def ^:private AddGroupsRequest
- [:map {:closed true
- :decode/api (fn [body]
- (when (map? body)
- (api/check-400 (every? #{:group_ids} (keys body))
- (tru "Only group_ids can be specified.")))
- body)}
- [:group_ids [:sequential {:min 1 :max 100 :distinct true} ms/PositiveInt]]])
+ [:map {:closed true}
+ [:group_ids [:sequential {:min 1 :max 100} ms/PositiveInt]]])
;;; --------------------------------------------- Repo status ---------------------------------------------
@@ -198,7 +193,8 @@
available, and otherwise listed only to superusers, who see it badged."
[_route-params
{:keys [available]} :- [:map {:closed true} [:available {:optional true} [:maybe :boolean]]]]
- (->> (data-app.access/readable-apps {:user-id api/*current-user-id* :superuser? api/*is-superuser?*} available)
+ (->> (data-apps.db/data-apps available)
+ (filter mi/can-read?)
(remove #(and (or available (not api/*is-superuser?*))
(data-app.config/outdated? %)))
(mapv data-app-response)))
diff --git a/enterprise/backend/src/metabase_enterprise/data_apps/core.clj b/enterprise/backend/src/metabase_enterprise/data_apps/core.clj
index 35a3ee7be7c..7403401fd0f 100644
--- a/enterprise/backend/src/metabase_enterprise/data_apps/core.clj
+++ b/enterprise/backend/src/metabase_enterprise/data_apps/core.clj
@@ -2,11 +2,11 @@
"What other modules may ask the data-apps module: what the files of an app's collection may hold, and the tables
those read."
(:require
- [metabase-enterprise.data-apps.access :as data-app.access]
[metabase-enterprise.data-apps.db :as data-apps.db]
[metabase-enterprise.data-apps.resource-tables :as resource-tables]
[metabase-enterprise.data-apps.resource-validation :as resource-validation]
[metabase.api.common :as api]
+ [metabase.models.interface :as mi]
[metabase.premium-features.core :refer [defenterprise]]
[potemkin :as p]))
@@ -22,6 +22,4 @@
:feature :data-apps
[request]
(let [app (api/check-404 (data-apps.db/enabled-data-app-by-slug (get-in request [:route-params :name])))]
- (api/check-403 (data-app.access/can-read? {:user-id (:metabase-user-id request)
- :superuser? (:is-superuser? request)}
- (:id app)))))
+ (api/check-403 (mi/can-read? app))))
diff --git a/enterprise/backend/src/metabase_enterprise/data_apps/db.clj b/enterprise/backend/src/metabase_enterprise/data_apps/db.clj
index 84055b183d1..7ec8c32c162 100644
--- a/enterprise/backend/src/metabase_enterprise/data_apps/db.clj
+++ b/enterprise/backend/src/metabase_enterprise/data_apps/db.clj
@@ -41,31 +41,6 @@
(cond-> {:order-by [[:display_name :asc]]}
available? (assoc :where [:= :enabled true]))))
-(defn- read-scope-clause
- [scope]
- (if (= scope :all)
- [:= 1 1]
- [:in :id ^:allow-subquery
- {:select [:assignment.data_app_id]
- :from [[:data_app_group_assignment :assignment]]
- :join [[:permissions_group_membership :pgm] [:= :pgm.group_id :assignment.permission_group_id]
- [:core_user :u] [:= :u.id :pgm.user_id]]
- :where [:and [:= :u.id (:user-id scope)] [:= :u.tenant_id nil]]}]))
-
-(mu/defn non-blob-data-apps
- "DataApps in the read scope without bundles, ordered by display name. Optionally restrict to enabled apps."
- [scope :- [:or [:= :all] [:map {:closed true} [:user-id ms/PositiveInt]]]
- available? :- [:maybe :boolean]]
- (t2/select non-blob-model
- {:order-by [[:display_name :asc]]
- :where (cond-> [:and (read-scope-clause scope)]
- available? (conj [:= :enabled true]))}))
-
-(defn readable-data-app?
- "Whether the app exists in the read scope."
- [scope app-id]
- (t2/exists? :model/DataApp :id app-id {:where (read-scope-clause scope)}))
-
(mu/defn data-app-bundle
"The bundle bytes of the DataApp with `data-app-id`."
[data-app-id :- ms/PositiveInt]
@@ -257,33 +232,23 @@
(t2/insert! :model/DataAppGroupAssignment
(mapv (fn [group-id] {:data_app_id app-id :permission_group_id group-id}) group-ids)))
-(defn delete-assignment!
- "Remove one group assignment."
- [app-id group-id]
- (t2/delete! :model/DataAppGroupAssignment :data_app_id app-id :permission_group_id group-id))
+(defn delete-assignments!
+ "Remove the requested group assignments from an app."
+ [app-id group-ids]
+ (if (seq group-ids)
+ (t2/delete! :model/DataAppGroupAssignment :data_app_id app-id :permission_group_id [:in group-ids])
+ 0))
(defn permissions-for-warnings
"View-data permission rows for the warning tables and their databases."
[group-ids database-ids table-ids]
- (t2/select [:model/DataPermissions :group_id :db_id :perm_type :table_id :perm_value]
- :group_id [:in group-ids]
- :db_id [:in database-ids]
- :perm_type :perms/view-data
- {:where [:or [:in :table_id table-ids] [:= :table_id nil]]}))
-
-(defn table-details
- "Names and database details for the active tables in `table-ids`."
- [table-ids]
- (t2/select :model/Table
- {:select [:t.id
- [:t.display_name :name]
- :t.schema
- [:t.db_id :database_id]
- [:d.name :database_name]]
- :from [(warehouse-schema-overlay/table-query {:alias :t})]
- :join [[(t2/table-name :model/Database) :d] [:= :d.id :t.db_id]]
- :where [:and [:in :t.id table-ids] [:= :t.active true]]
- :order-by [[:d.name :asc] [:t.schema :asc] [:t.display_name :asc]]}))
+ (if (and (seq group-ids) (seq database-ids) (seq table-ids))
+ (t2/select [:model/DataPermissions :group_id :db_id :perm_type :table_id :perm_value]
+ :group_id [:in group-ids]
+ :db_id [:in database-ids]
+ :perm_type :perms/view-data
+ {:where [:or [:in :table_id table-ids] [:= :table_id nil]]})
+ []))
(mu/defn metric-cards-in-collections
"The non-archived metric Cards in `collection-ids`, in name then id order."
diff --git a/enterprise/backend/src/metabase_enterprise/data_apps/group_access.clj b/enterprise/backend/src/metabase_enterprise/data_apps/group_access.clj
index a602fa72e0c..ed1ac22d51e 100644
--- a/enterprise/backend/src/metabase_enterprise/data_apps/group_access.clj
+++ b/enterprise/backend/src/metabase_enterprise/data_apps/group_access.clj
@@ -8,21 +8,6 @@
[metabase.util.i18n :refer [tru]]
[toucan2.core :as t2]))
-(defn- check-groups-for-app-assignment
- "Reject missing groups, tenant groups and admin groups. Those cannot be assigned to data apps."
- [group-ids]
- (api/check-400 (= (count group-ids) (count (distinct group-ids)))
- (tru "Group IDs must be unique."))
-
- (let [group-tenant-flags (perms/group-tenant-flags (set group-ids))
- admin-group-id (:id (perms/admin-group))]
- ; every specified groups must exist
- (api/check-404 (= (count group-tenant-flags) (count group-ids)))
- (api/check-400 (every? (fn [[group-id tenant?]]
- (and (not tenant?) (not= group-id admin-group-id)))
- group-tenant-flags)
- (tru "Tenant groups and admins cannot be assigned to data apps."))))
-
(defn assigned-groups
"Assigned groups with their member counts."
[app]
@@ -35,13 +20,13 @@
(defn add-groups!
"Assign groups to app and update app collection grants."
[app group-ids]
- (perms/with-global-permissions-lock
- (t2/with-transaction [_conn]
- (check-groups-for-app-assignment group-ids)
- (let [assigned (into #{} (map :permission_group_id) (data-apps.db/app-assignments [(:id app)]))]
- (api/check-400 (not-any? assigned group-ids) (tru "One or more groups already have access to this data app.")))
- (data-apps.db/insert-assignments! (:id app) group-ids)
- (resources/reconcile-existing-collection-permissions! app)))
+ (let [group-ids (vec (distinct group-ids))]
+ (perms/with-global-permissions-lock
+ (t2/with-transaction [_conn]
+ (let [assigned (into #{} (map :permission_group_id) (data-apps.db/app-assignments [(:id app)]))]
+ (api/check-400 (not-any? assigned group-ids) (tru "One or more groups already have access to this data app.")))
+ (data-apps.db/insert-assignments! (:id app) group-ids)
+ (resources/reconcile-existing-collection-permissions! app))))
(assigned-groups app))
(defn remove-group!
@@ -49,7 +34,7 @@
[app group-id]
(perms/with-global-permissions-lock
(t2/with-transaction [_conn]
- (api/check-404 (pos? (data-apps.db/delete-assignment! (:id app) group-id)))
+ (api/check-404 (pos? (data-apps.db/delete-assignments! (:id app) [group-id])))
(when-not (= group-id (:id (perms/admin-group)))
(when-let [collection (some-> (:id app) data-apps.db/data-app :resource_collection_id
data-apps.db/resource-collection)]
@@ -71,12 +56,24 @@
{:permissions (group-by (juxt :group_id :db_id :perm_type)
(data-apps.db/permissions-for-warnings group-ids database-ids table-ids))})))
+(defn- table-details
+ [table-ids]
+ (->> (t2/hydrate (data-apps.db/active-tables (set table-ids)) :db)
+ (map (fn [{:keys [id schema db] table-name :display_name database-id :db_id}]
+ {:id id
+ :name table-name
+ :schema schema
+ :database_id database-id
+ :database_name (:name db)}))
+ (sort-by (juxt :database_name :schema :name))
+ vec))
+
(defn permission-warnings
"Missing table access for assigned groups, including access inherited from All Users."
[{app-id :id table-ids :table_ids}]
(let [assigned-ids (mapv :permission_group_id (data-apps.db/app-assignments [app-id]))]
(if (and (seq assigned-ids) (seq table-ids))
- (let [tables (data-apps.db/table-details table-ids)
+ (let [tables (table-details table-ids)
all-users-id (:id (perms/all-users-group))
access (group-table-access (conj (set assigned-ids) all-users-id) tables)]
(into []
diff --git a/enterprise/backend/src/metabase_enterprise/data_apps/models/data_app.clj b/enterprise/backend/src/metabase_enterprise/data_apps/models/data_app.clj
index 3e26c998cd8..e9d8dbb20b1 100644
--- a/enterprise/backend/src/metabase_enterprise/data_apps/models/data_app.clj
+++ b/enterprise/backend/src/metabase_enterprise/data_apps/models/data_app.clj
@@ -1,6 +1,5 @@
(ns metabase-enterprise.data-apps.models.data-app
(:require
- [metabase-enterprise.data-apps.access :as data-app.access]
[metabase-enterprise.data-apps.config :as data-app.config]
[metabase-enterprise.data-apps.db :as data-apps.db]
[metabase-enterprise.data-apps.resources :as data-app.resources]
@@ -11,6 +10,7 @@
[metabase.models.interface :as mi]
[metabase.models.serialization :as serdes]
[metabase.premium-features.core :refer [defenterprise]]
+ [metabase.users.models.user :as user]
[metabase.util.i18n :refer [tru]]
[metabase.util.malli :as mu]
[methodical.core :as methodical]
@@ -106,7 +106,12 @@
(defmethod mi/can-read? :model/DataApp
([app] (mi/can-read? :model/DataApp (:id app)))
([_model pk]
- (data-app.access/can-read? {:user-id api/*current-user-id* :superuser? api/*is-superuser?*} pk)))
+ (or api/*is-superuser?*
+ (and api/*current-user-id*
+ (nil? (:tenant_id @api/*current-user*))
+ (let [group-ids (user/group-ids api/*current-user-id*)]
+ (boolean (some (comp group-ids :permission_group_id)
+ (data-apps.db/app-assignments [pk]))))))))
(defmethod mi/can-write? :model/DataApp
([_instance] api/*is-superuser?*)
diff --git a/enterprise/backend/src/metabase_enterprise/data_apps/models/data_app_group_assignment.clj b/enterprise/backend/src/metabase_enterprise/data_apps/models/data_app_group_assignment.clj
index 6bd3b94d3b2..1a5bde10f1a 100644
--- a/enterprise/backend/src/metabase_enterprise/data_apps/models/data_app_group_assignment.clj
+++ b/enterprise/backend/src/metabase_enterprise/data_apps/models/data_app_group_assignment.clj
@@ -1,8 +1,41 @@
(ns metabase-enterprise.data-apps.models.data-app-group-assignment
(:require
+ [metabase.api.common :as api]
+ [metabase.models.interface :as mi]
+ [metabase.permissions.core :as perms]
+ [metabase.util.i18n :refer [tru]]
[methodical.core :as methodical]
[toucan2.core :as t2]))
(methodical/defmethod t2/table-name :model/DataAppGroupAssignment [_model] :data_app_group_assignment)
(derive :model/DataAppGroupAssignment :metabase/model)
+
+(defn- check-group-for-app-assignment
+ [{group-id :permission_group_id :as assignment}]
+ (let [group-tenant-flags (perms/group-tenant-flags #{group-id})]
+ (api/check-404 (contains? group-tenant-flags group-id))
+ (api/check-400 (and (not (get group-tenant-flags group-id))
+ (not= group-id (:id (perms/admin-group))))
+ (tru "Tenant groups and admins cannot be assigned to data apps.")))
+ assignment)
+
+(t2/define-before-insert :model/DataAppGroupAssignment
+ [assignment]
+ (check-group-for-app-assignment assignment))
+
+(t2/define-before-update :model/DataAppGroupAssignment
+ [assignment]
+ (check-group-for-app-assignment assignment))
+
+(defmethod mi/can-read? :model/DataAppGroupAssignment
+ ([_instance] (mi/superuser?))
+ ([_model _pk] (mi/superuser?)))
+
+(defmethod mi/can-write? :model/DataAppGroupAssignment
+ ([_instance] (mi/superuser?))
+ ([_model _pk] (mi/superuser?)))
+
+(defmethod mi/can-create? :model/DataAppGroupAssignment
+ [_model _instance]
+ (mi/superuser?))
diff --git a/enterprise/backend/test/metabase_enterprise/data_apps/db_test.clj b/enterprise/backend/test/metabase_enterprise/data_apps/db_test.clj
new file mode 100644
index 00000000000..dbff5a3e081
--- /dev/null
+++ b/enterprise/backend/test/metabase_enterprise/data_apps/db_test.clj
@@ -0,0 +1,36 @@
+(ns metabase-enterprise.data-apps.db-test
+ (:require
+ [clojure.test :refer :all]
+ [metabase-enterprise.data-apps.db :as data-apps.db]
+ [metabase.test :as mt]
+ [toucan2.core :as t2]))
+
+(deftest delete-assignments-test
+ (mt/with-temp [:model/DataApp app {:name "birds" :display_name "Birds" :bundle_path "birds.js"}
+ :model/DataApp other-app {:name "owls" :display_name "Owls" :bundle_path "owls.js"}
+ :model/PermissionsGroup finches {}
+ :model/PermissionsGroup robins {}
+ :model/PermissionsGroup sparrows {}]
+ (data-apps.db/insert-assignments! (:id app) [(:id finches) (:id robins) (:id sparrows)])
+ (data-apps.db/insert-assignments! (:id other-app) [(:id finches)])
+ (let [assignments (fn []
+ (into #{}
+ (map (juxt :data_app_id :permission_group_id))
+ (data-apps.db/app-assignments [(:id app) (:id other-app)])))
+ before (assignments)]
+ (testing "empty input preserves all assignments"
+ (is (= 0 (data-apps.db/delete-assignments! (:id app) [])))
+ (is (= before (assignments))))
+ (testing "bulk deletion retains other groups and other apps' assignments"
+ (data-apps.db/delete-assignments! (:id app) [(:id finches) (:id robins)])
+ (is (= #{[(:id app) (:id sparrows)]
+ [(:id other-app) (:id finches)]}
+ (assignments)))))))
+
+(deftest warning-queries-with-empty-ids-test
+ (mt/with-temp [:model/PermissionsGroup group {}]
+ (doseq [[group-ids database-ids table-ids] [[[] [1] [1]] [[(:id group)] [] [1]] [[(:id group)] [1] []]]]
+ (testing (str "empty warning IDs " [group-ids database-ids table-ids])
+ (t2/with-call-count [calls]
+ (is (= [] (data-apps.db/permissions-for-warnings group-ids database-ids table-ids)))
+ (is (zero? (calls))))))))
diff --git a/enterprise/backend/test/metabase_enterprise/data_apps/group_access_test.clj b/enterprise/backend/test/metabase_enterprise/data_apps/group_access_test.clj
index 5c3abaab24c..37fd9379663 100644
--- a/enterprise/backend/test/metabase_enterprise/data_apps/group_access_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/data_apps/group_access_test.clj
@@ -30,7 +30,7 @@
(mt/with-current-user (mt/user->id :crowberto)
(is (mi/can-read? app)))))
-(deftest app-list-authorizes-in-one-query-test
+(deftest app-list-filters-readable-apps-test
(mt/with-temp [:model/DataApp app {:name "birds" :display_name "Birds" :bundle_path "birds.js"}
:model/DataApp disabled {:name "disabled" :display_name "Disabled" :bundle_path "disabled.js"
:enabled false}
@@ -50,9 +50,7 @@
:resource_collection_id (:resource_collection_id disabled)}]]
[{:available true} [{:name "birds" :display_name "Birds"
:resource_collection_id (:resource_collection_id app)}]]]]
- (t2/with-call-count [call-count]
- (is (= expected (list-apps {} query)))
- (is (= 1 (call-count)))))))))
+ (is (= expected (list-apps {} query))))))))
(deftest read-access-agrees-across-entry-points-test
(mt/with-premium-features #{:data-apps :tenants}
@@ -61,14 +59,15 @@
:model/User tenant-user {:tenant_id (:id tenant)}
:model/DataApp app {:name "birds" :display_name "Birds" :bundle_path "birds.js"
:bundle (.getBytes "BUNDLE" "UTF-8")}
- :model/PermissionsGroup tenant-group {:is_tenant_group true}
+ :model/PermissionsGroup tenant-group {}
:model/PermissionsGroup group {}]
(resources/ensure-resources! app)
(group-access/add-groups! app [(:id group)])
(perms/add-user-to-group! (mt/user->id :rasta) (:id group))
;; A stale assignment must not admit tenant users.
- (perms/add-user-to-group! (:id tenant-user) (:id tenant-group))
(t2/insert! :model/DataAppGroupAssignment {:data_app_id (:id app) :permission_group_id (:id tenant-group)})
+ (t2/update! :model/PermissionsGroup (:id tenant-group) {:is_tenant_group true})
+ (perms/add-user-to-group! (:id tenant-user) (:id tenant-group))
(doseq [[user-id admin? allowed?] [[(mt/user->id :crowberto) true true]
[(mt/user->id :rasta) false true]
[(mt/user->id :lucky) false false]
@@ -80,11 +79,12 @@
(mt/user-http-request user-id :get (if allowed? 200 403) "apps/birds/bundle")
(mt/with-current-user user-id
(is (= allowed? (boolean (mi/can-read? app)))))
- (let [request {:route-params {:name "birds"} :metabase-user-id user-id :is-superuser? admin?}]
- (if allowed?
- (is (true? (data-apps/check-data-app-access! request)))
- (is (thrown-with-msg? clojure.lang.ExceptionInfo #"permissions"
- (data-apps/check-data-app-access! request)))))))))))
+ (mt/with-current-user user-id
+ (let [request {:route-params {:name "birds"} :metabase-user-id user-id :is-superuser? admin?}]
+ (if allowed?
+ (is (true? (data-apps/check-data-app-access! request)))
+ (is (thrown-with-msg? clojure.lang.ExceptionInfo #"permissions"
+ (data-apps/check-data-app-access! request))))))))))))
(deftest group-api-test
(mt/with-premium-features #{:data-apps}
@@ -95,7 +95,6 @@
(is (= [] (mt/user-http-request :crowberto :get 200 "apps/birds/groups")))
(doseq [ids [[(:id finches) (:id (perms/admin-group))]
[(:id finches) (:id tenant)]
- [(:id finches) (:id finches)]
[]
(vec (range 1 102))]]
(mt/user-http-request :crowberto :post 400 "apps/birds/groups" {:group_ids ids})
@@ -104,7 +103,9 @@
(is (=? [{:id (:id finches) :name "Finches" :member_count 0}
{:id (:id owls) :name "Owls" :member_count 0}]
(mt/user-http-request :crowberto :post 200 "apps/birds/groups"
- {:group_ids [(:id finches) (:id owls)]})))
+ {:group_ids [(:id finches) (:id finches) (:id owls)]})))
+ (is (= #{(:id finches) (:id owls)}
+ (t2/select-fn-set :permission_group_id :model/DataAppGroupAssignment :data_app_id (:id app))))
(mt/user-http-request :crowberto :post 400 "apps/birds/groups" {:group_ids [(:id finches)]})
(mt/user-http-request :crowberto :delete 204 (str "apps/birds/groups/" (:id finches)))
(is (= [(:id owls)] (mapv :id (mt/user-http-request :crowberto :get 200 "apps/birds/groups"))))
@@ -113,15 +114,20 @@
[:delete (str "groups/" (:id owls)) nil]]]
(apply mt/user-http-request :rasta method 403 (str "apps/birds/" path) (when body [body]))))))
-(deftest group-api-rejects-unknown-fields-test
+(deftest group-api-ignores-unknown-fields-test
(mt/with-premium-features #{:data-apps}
(mt/with-temp [:model/DataApp app {:name "birds" :display_name "Birds" :bundle_path "birds.js"}
- :model/PermissionsGroup group {}]
- (mt/user-http-request :crowberto :post 400 "apps/birds/groups"
- {:group_ids [(:id group)] :user_ids [(mt/user->id :rasta)]})
- (is (empty? (t2/select :model/DataAppGroupAssignment :data_app_id (:id app))))
- (is (= (:resource_collection_id app)
- (t2/select-one-fn :resource_collection_id :model/DataApp :id (:id app)))))))
+ :model/PermissionsGroup group {}
+ :model/PermissionsGroup ignored-group {}]
+ (is (=? [{:id (:id group)}]
+ (mt/user-http-request :crowberto :post 200 "apps/birds/groups"
+ {:group_ids [(:id group)]
+ :user_ids [(mt/user->id :rasta)]
+ :permission_group_ids [(:id ignored-group)]})))
+ (is (= [(:id group)]
+ (t2/select-fn-vec :permission_group_id :model/DataAppGroupAssignment :data_app_id (:id app))))
+ (mt/with-current-user (mt/user->id :rasta)
+ (is (not (mi/can-read? app)))))))
(deftest assignment-does-not-recreate-deleted-collection-test
(mt/with-premium-features #{:data-apps}
@@ -206,8 +212,9 @@
(group-access/add-groups! app [(:id (perms/all-users-group))])
(mt/with-current-user (mt/user->id :rasta)
(is (mi/can-read? app)))
- (is (true? (data-apps/check-data-app-access!
- {:route-params {:name "birds"} :metabase-user-id (mt/user->id :rasta)}))))))
+ (mt/with-current-user (mt/user->id :rasta)
+ (is (true? (data-apps/check-data-app-access!
+ {:route-params {:name "birds"} :metabase-user-id (mt/user->id :rasta)})))))))
(deftest group-endpoints-require-feature-test
(mt/with-premium-features #{:data-apps}
@@ -257,7 +264,9 @@
(resources/ensure-resources! app)
(let [admin-id (:id (perms/admin-group))
permissions (t2/select :model/Permissions :group_id admin-id)]
- (t2/insert! :model/DataAppGroupAssignment {:data_app_id (:id app) :permission_group_id admin-id})
+ ;; Insert a legacy assignment without the model hooks that now reject it.
+ (t2/query {:insert-into (t2/table-name :model/DataAppGroupAssignment)
+ :values [{:data_app_id (:id app) :permission_group_id admin-id}]})
(mt/user-http-request :crowberto :delete 204 (str "apps/birds/groups/" admin-id))
(is (= [] (mt/user-http-request :crowberto :get 200 "apps/birds/groups")))
(is (= permissions (t2/select :model/Permissions :group_id admin-id)))))))
diff --git a/enterprise/backend/test/metabase_enterprise/data_apps/group_access_warnings_test.clj b/enterprise/backend/test/metabase_enterprise/data_apps/group_access_warnings_test.clj
index 613c889da18..c788bd6d305 100644
--- a/enterprise/backend/test/metabase_enterprise/data_apps/group_access_warnings_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/data_apps/group_access_warnings_test.clj
@@ -209,3 +209,29 @@
;; exclude loading permission rows that the data access warning check does not need
(is (= #{table-permission database-permission}
(into #{} (map #(select-keys % (keys table-permission))) permission-rows)))))))
+
+(deftest group-permission-warnings-preserve-table-details-test
+ (mt/with-premium-features #{:data-apps :advanced-permissions}
+ (mt/with-no-data-perms-for-all-users!
+ (mt/with-temp [:model/Database aviary {:name "Aviary"}
+ :model/Database zoo {:name "Zoo"}
+ :model/Table finches {:db_id (:id aviary) :name "finches" :display_name "Zebra" :schema "PUBLIC"}
+ :model/Table owls {:db_id (:id aviary) :name "owls" :display_name "Owls" :schema "PUBLIC"}
+ :model/Table albatrosses {:db_id (:id zoo) :name "albatrosses"
+ :display_name "Albatrosses" :schema nil}
+ :model/TableUserSettings _ {:table_id (:id finches) :display_name "Finches"}
+ :model/DataApp app {:name "birds" :display_name "Birds" :bundle_path "birds.js"
+ :table_ids [(:id albatrosses) (:id owls) (:id finches)]}
+ :model/PermissionsGroup group {}]
+ (doseq [group-id [(:id (perms/all-users-group)) (:id group)]
+ database-id [(:id aviary) (:id zoo)]]
+ (perms/set-database-permission! group-id database-id :perms/view-data :blocked))
+ (group-access/add-groups! app [(:id group)])
+ (is (= [{:group_id (:id group)
+ :missing_tables [{:id (:id finches) :name "Finches" :schema "PUBLIC"
+ :database_id (:id aviary) :database_name "Aviary"}
+ {:id (:id owls) :name "Owls" :schema "PUBLIC"
+ :database_id (:id aviary) :database_name "Aviary"}
+ {:id (:id albatrosses) :name "Albatrosses" :schema nil
+ :database_id (:id zoo) :database_name "Zoo"}]}]
+ (mt/user-http-request :crowberto :get 200 "apps/birds/group-permission-warnings")))))))
diff --git a/enterprise/backend/test/metabase_enterprise/data_apps/models/data_app_group_assignment_test.clj b/enterprise/backend/test/metabase_enterprise/data_apps/models/data_app_group_assignment_test.clj
new file mode 100644
index 00000000000..f5dcb5c6380
--- /dev/null
+++ b/enterprise/backend/test/metabase_enterprise/data_apps/models/data_app_group_assignment_test.clj
@@ -0,0 +1,56 @@
+(ns metabase-enterprise.data-apps.models.data-app-group-assignment-test
+ (:require
+ [clojure.test :refer :all]
+ [metabase-enterprise.data-apps.group-access :as group-access]
+ [metabase.models.interface :as mi]
+ [metabase.permissions.core :as perms]
+ [metabase.test :as mt]
+ [toucan2.core :as t2]))
+
+(deftest permissions-test
+ (mt/with-temp [:model/DataApp app {:name "birds" :display_name "Birds" :bundle_path "birds.js"}
+ :model/PermissionsGroup group {}]
+ (group-access/add-groups! app [(:id group)])
+ (perms/add-user-to-group! (mt/user->id :rasta) (:id group))
+ (let [assignment (t2/select-one :model/DataAppGroupAssignment :data_app_id (:id app))]
+ ; crowberto is an admin. rasta is a member of the group. lucky is neither.
+ (doseq [[user allowed?] [[:crowberto true] [:rasta false] [:lucky false]]]
+ (testing (str "assignment permissions for " user)
+ (mt/with-current-user (mt/user->id user)
+ (is (= allowed? (mi/can-read? assignment)))
+ (is (= allowed? (mi/can-read? :model/DataAppGroupAssignment (:id assignment))))
+ (is (= allowed? (mi/can-write? assignment)))
+ (is (= allowed? (mi/can-write? :model/DataAppGroupAssignment (:id assignment))))
+ (is (= allowed? (mi/can-create? :model/DataAppGroupAssignment
+ {:data_app_id (:id app) :permission_group_id (:id group)})))))))))
+
+(deftest insert-validates-group-test
+ (mt/with-temp [:model/DataApp app {:name "birds" :display_name "Birds" :bundle_path "birds.js"}
+ :model/PermissionsGroup tenant-group {:is_tenant_group true}]
+ ; admins, tenant groups and non-existent groups can't be assigned
+ (doseq [group-id [(:id (perms/admin-group)) (:id tenant-group) Integer/MAX_VALUE]]
+ (testing (str "cannot assign group " group-id)
+ (is (thrown? clojure.lang.ExceptionInfo
+ (t2/with-transaction [_conn]
+ (t2/insert! :model/DataAppGroupAssignment
+ {:data_app_id (:id app) :permission_group_id group-id}))))
+ (is (empty? (t2/select :model/DataAppGroupAssignment :data_app_id (:id app))))))))
+
+(deftest update-validates-group-test
+ (mt/with-temp [:model/DataApp app {:name "birds" :display_name "Birds" :bundle_path "birds.js"}
+ :model/PermissionsGroup group {}
+ :model/PermissionsGroup replacement-group {}
+ :model/PermissionsGroup tenant-group {:is_tenant_group true}
+ :model/DataAppGroupAssignment assignment {:data_app_id (:id app) :permission_group_id (:id group)}]
+ ; admins, tenant groups and non-existent groups can't be assigned
+ (doseq [group-id [(:id (perms/admin-group)) (:id tenant-group) Integer/MAX_VALUE]]
+ (testing (str "cannot change an assignment to group " group-id)
+ (is (thrown? clojure.lang.ExceptionInfo
+ (t2/with-transaction [_conn]
+ (t2/update! :model/DataAppGroupAssignment (:id assignment) {:permission_group_id group-id}))))
+ (is (= (:id group)
+ (t2/select-one-fn :permission_group_id :model/DataAppGroupAssignment :id (:id assignment))))))
+ (testing "an assignment can move to another eligible group"
+ (t2/update! :model/DataAppGroupAssignment (:id assignment) {:permission_group_id (:id replacement-group)})
+ (is (= (:id replacement-group)
+ (t2/select-one-fn :permission_group_id :model/DataAppGroupAssignment :id (:id assignment)))))))