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
Route OSS advanced permissions through defenterprise (#83612)
Chris Truterd505490e2861
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.ednindex d34501a962a..60a6f720756 100644--- a/.clj-kondo/config/modules/config.edn+++ b/.clj-kondo/config/modules/config.edn@@ -2010,8 +2010,7 @@utilutil.configwarehouses- warehouses.schema- enterprise/permissions}+ warehouses.schema}:model-exports #{:model/ApplicationPermissionsRevision:model/CollectionPermissionGraphRevision:model/DataPermissions@@ -2163,10 +2162,7 @@task.historytracingutil- util.classloader- util.config- enterprise/permissions- enterprise/permissions.sandbox}+ util.config}:model-exports #{:model/Pulse:model/PulseCard:model/PulseChannel@@ -3250,8 +3246,7 @@users.schemausers.tenantsutil- util.config- enterprise/permissions}+ util.config}:model-exports #{:model/User :model/UserParameterValue}:model-imports #{:model/Dashboard:model/Database@@ -3281,8 +3276,7 @@users.schemausers.tenantsutil- util.config- enterprise/permissions}+ util.config}:model-imports #{:model/Card:model/Collection:model/Dashboard@@ -4194,7 +4188,7 @@:module-exports #{enterprise/permissions.debugenterprise/permissions.impersonationenterprise/permissions.sandbox}- :api #{metabase-enterprise.advanced-permissions.api.routes metabase-enterprise.advanced-permissions.common metabase-enterprise.advanced-permissions.models.permissions.group-manager}+ :api #{metabase-enterprise.advanced-permissions.api.routes}:uses #{apiaudit-applibdiff --git a/enterprise/backend/src/metabase_enterprise/advanced_permissions/oss_hooks.clj b/enterprise/backend/src/metabase_enterprise/advanced_permissions/oss_hooks.cljnew file mode 100644index 00000000000..6a7146526cc--- /dev/null+++ b/enterprise/backend/src/metabase_enterprise/advanced_permissions/oss_hooks.clj@@ -0,0 +1,24 @@+(ns metabase-enterprise.advanced-permissions.oss-hooks+ "Advanced-permissions implementations of the `defenterprise` hooks that OSS modules call."+ (:require+ [metabase-enterprise.advanced-permissions.common :as advanced-permissions.common]+ [metabase-enterprise.advanced-permissions.models.permissions.group-manager :as group-manager]+ [metabase.premium-features.core :refer [defenterprise]]))++(defenterprise current-user-manages-group?+ "Whether `*current-user*` is a manager of `group-or-id`."+ :feature :advanced-permissions+ [group-or-id]+ (advanced-permissions.common/current-user-is-manager-of-group? group-or-id))++(defenterprise set-group-memberships!+ "Set the group memberships of `user-or-id`, including whether the user manages each group."+ :feature :advanced-permissions+ [user-or-id new-user-group-memberships]+ (group-manager/set-user-group-memberships! user-or-id new-user-group-memberships))++(defenterprise maybe-add-advanced-permissions+ "Add the advanced-permissions map to `user`."+ :feature :advanced-permissions+ [user]+ (advanced-permissions.common/with-advanced-permissions user))diff --git a/src/metabase/permissions/validation.clj b/src/metabase/permissions/validation.cljindex 1684ab37ad1..32d6e315c1c 100644--- a/src/metabase/permissions/validation.clj+++ b/src/metabase/permissions/validation.clj@@ -4,7 +4,7 @@[metabase.api.common :as api][metabase.config.core :as config][metabase.permissions.models.permissions :as perms]- [metabase.premium-features.core :as premium-features]+ [metabase.premium-features.core :as premium-features :refer [defenterprise]][metabase.util.i18n :refer [tru]]))(defn check-has-application-permission@@ -39,6 +39,12 @@(when require-superuser?(api/check-superuser)))))+(defenterprise current-user-manages-group?+ "Whether `*current-user*` is a manager of `group-or-id`. Group managers are an advanced-permissions feature."+ metabase-enterprise.advanced-permissions.oss-hooks+ [_group-or-id]+ false)+(defn check-manager-of-group"If `advanced-permissions` is enabled, check is `*current-user*` is manager of `group-or-id`.Set `require-superuser?` to `false` to disable superuser checks if `advanced-permissions` is not enabled."@@ -46,9 +52,8 @@(check-manager-of-group group-or-id true))([group-or-id require-superuser?]- (if-let [f (and (premium-features/enable-advanced-permissions?)- config/ee-available?- (requiring-resolve 'metabase-enterprise.advanced-permissions.common/current-user-is-manager-of-group?))]- (api/check-403 (or api/*is-superuser?* (f group-or-id)))+ (if (and (premium-features/enable-advanced-permissions?)+ config/ee-available?)+ (api/check-403 (or api/*is-superuser?* (current-user-manages-group? group-or-id)))(when require-superuser?(api/check-superuser)))))diff --git a/src/metabase/pulse/api/alert.clj b/src/metabase/pulse/api/alert.cljindex fa7ff68983a..56e513218be 100644--- a/src/metabase/pulse/api/alert.clj+++ b/src/metabase/pulse/api/alert.clj@@ -6,8 +6,6 @@[clojure.set :as set][metabase.api.common :as api][metabase.api.macros :as api.macros]- [metabase.classloader.core :as classloader]- [metabase.config.core :as config][metabase.notification.api :as notification.api][metabase.pulse.db :as pulse.db][metabase.util.cron :as u.cron]@@ -15,9 +13,6 @@(set! *warn-on-reflection* true)-(when config/ee-available?- (classloader/require 'metabase-enterprise.advanced-permissions.common))-(defn- notification->pulse"Convert a notification to the legacy pulse structure for backward compatibility."[notification]diff --git a/src/metabase/pulse/api/pulse.clj b/src/metabase/pulse/api/pulse.cljindex a31c9fda14e..76f422858a6 100644--- a/src/metabase/pulse/api/pulse.clj+++ b/src/metabase/pulse/api/pulse.clj@@ -10,9 +10,7 @@[metabase.api.macros :as api.macros][metabase.channel.settings :as channel.settings][metabase.channel.slack :as channel.slack]- [metabase.classloader.core :as classloader][metabase.collections.models.collection :as collection]- [metabase.config.core :as config][metabase.embedding.util :as embed.util][metabase.events.core :as events][metabase.models.interface :as mi]@@ -33,10 +31,6 @@(set! *warn-on-reflection* true)-(when config/ee-available?- (classloader/require 'metabase-enterprise.sandbox.api.util- 'metabase-enterprise.advanced-permissions.common))-(defn email-channel"Get email channel from an alert."[alert]@@ -274,12 +268,7 @@(let [recipient-key (some-fn :id :email)to-add-recipients (difference (set (keep recipient-key (:recipients (email-channel pulse-updates))))(set (keep recipient-key (:recipients (email-channel pulse-before-update)))))- current-user-has-application-permissions?- (and (premium-features/enable-advanced-permissions?)- (resolve 'metabase-enterprise.advanced-permissions.common/current-user-has-application-permissions?))- has-subscription-perms?- (and current-user-has-application-permissions?- (current-user-has-application-permissions? :subscription))]+ has-subscription-perms? (perms/current-user-has-application-permissions? :subscription)](api/check (or api/*is-superuser?*has-subscription-perms?(empty? to-add-recipients))diff --git a/src/metabase/users/util.clj b/src/metabase/users/util.cljindex 9cff8bbdda9..be5f18320e2 100644--- a/src/metabase/users/util.clj+++ b/src/metabase/users/util.clj@@ -4,11 +4,10 @@[metabase.analytics.core :as analytics][metabase.api.common :as api][metabase.auth-identity.core :as auth-identity]- [metabase.config.core :as config][metabase.lib.schema.id :as lib.schema.id][metabase.notification.core :as notification][metabase.permissions.core :as perms]- [metabase.premium-features.core :as premium-features]+ [metabase.premium-features.core :refer [defenterprise]][metabase.settings.core :as setting][metabase.users.db :as users.db][metabase.users.models.user :as user]@@ -36,6 +35,13 @@(api/check-superuser)(user/set-permissions-groups! user-or-id new-groups-or-ids)))+(defenterprise set-group-memberships!+ "Set the group memberships of `user-or-id`. Without advanced permissions only the group IDs count, and changing them+ requires a superuser."+ metabase-enterprise.advanced-permissions.oss-hooks+ [user-or-id new-user-group-memberships]+ (maybe-set-user-permissions-groups! user-or-id (map :id new-user-group-memberships)))+(mu/defn maybe-set-user-group-memberships!"Implementation for `POST /api/user` and friends; set the PermissionsGroupMemberships for a `user-or-id`."[user-or-id :- ::lib.schema.id/user@@ -47,11 +53,7 @@(when (some? is-superuser?)(api/checkp (= is-superuser? (contains? (set (map :id new-user-group-memberships)) (u/the-id (perms/admin-group))))"is_superuser" (tru "Value of is_superuser must correspond to presence of Admin group ID in group_ids.")))- (if-let [f (and (premium-features/enable-advanced-permissions?)- config/ee-available?- (requiring-resolve 'metabase-enterprise.advanced-permissions.models.permissions.group-manager/set-user-group-memberships!))]- (f user-or-id new-user-group-memberships)- (maybe-set-user-permissions-groups! user-or-id (map :id new-user-group-memberships)))))+ (set-group-memberships! user-or-id new-user-group-memberships)))(defn fetch-user"Implementation for `/api/user` endpoints; fetch a User from the app DB by `:id`, optionally requiring `:type`diff --git a/src/metabase/users_rest/api.clj b/src/metabase/users_rest/api.cljindex 25241dae0c1..b5ca59cb7a4 100644--- a/src/metabase/users_rest/api.clj+++ b/src/metabase/users_rest/api.clj@@ -13,7 +13,7 @@[metabase.events.core :as events][metabase.models.interface :as mi][metabase.permissions.core :as perms]- [metabase.premium-features.core :as premium-features]+ [metabase.premium-features.core :as premium-features :refer [defenterprise]][metabase.request.core :as request][metabase.session.core :as session][metabase.sso.core :as sso]@@ -291,15 +291,11 @@:can_create_queries can-create-queries:can_create_native_queries can-create-native-queries)))-(defn- maybe-add-advanced-permissions+(defenterprise maybe-add-advanced-permissions"If `advanced-permissions` is enabled, add to `user` a permissions map."+ metabase-enterprise.advanced-permissions.oss-hooks[user]- (if-let [with-advanced-permissions- (and (premium-features/enable-advanced-permissions?)- config/ee-available?- (requiring-resolve 'metabase-enterprise.advanced-permissions.common/with-advanced-permissions))]- (with-advanced-permissions user)- user))+ user)(defn- maybe-add-sso-source"Adds `sso_source` key to the `User`, so FE could determine if the user is logged in via SSO."