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
security center: only include mb email if send to all emails is on (#74334)
Nicola Momettof028436f26a9
diff --git a/enterprise/backend/src/metabase_enterprise/security_center/notification.clj b/enterprise/backend/src/metabase_enterprise/security_center/notification.cljindex 088c8944f64..75e6d4909f2 100644--- a/enterprise/backend/src/metabase_enterprise/security_center/notification.clj+++ b/enterprise/backend/src/metabase_enterprise/security_center/notification.clj@@ -6,8 +6,9 @@Rather than going through the seeded event→notification pipeline, thisnamespace constructs notifications directly so it can resolve recipientsdynamically from the `security-center-email-recipients` setting and the- `security-center-slack-channel` setting. The site admin email is always- included as a recipient when set."+ `security-center-slack-channel` setting. The site admin email is included+ as a recipient when set, but only if `security-center-email-recipients`+ targets the admin group (i.e. \"Send to all instance admins\" is on)."(:require[metabase-enterprise.security-center.settings :as settings][metabase.analytics.core :as analytics]@@ -15,6 +16,7 @@[metabase.events.core :as events][metabase.models.interface :as mi][metabase.notification.core :as notification]+ [metabase.permissions.core :as perms][metabase.settings.core :as setting][metabase.system.core :as system][metabase.util.log :as log]@@ -37,14 +39,30 @@:path "metabase/channel/email/security_advisory.hbs":recipient-type "bcc"}})+(defn- sends-to-all-admins?+ "True if the recipient list targets the admin group — i.e. \"Send to all+ instance admins\" is on. Checked against the un-hydrated recipients so we+ don't depend on hydration ordering."+ [recipients]+ (let [admin-group-id (:id (perms/admin-group))]+ (boolean+ (some (fn [{:keys [type permissions_group_id]}]+ (and (= type :notification-recipient/group)+ (= permissions_group_id admin-group-id)))+ recipients))))+(defn- email-recipients- "Resolve email recipients: configured recipients from the setting,- plus the site admin email (if set) as a raw-value recipient."+ "Resolve email recipients from the `security-center-email-recipients` setting.+ When that list targets the admin group (\"Send to all instance admins\" is on)+ and the site admin email is set, the admin email is appended as a raw-value+ recipient. When the toggle is off, only the explicitly configured recipients+ are used."[]- (let [configured (or (some-> (settings/security-center-email-recipients)- (t2/hydrate :recipients-detail))- [])]- (if-let [admin-email (system/admin-email)]+ (let [raw (or (settings/security-center-email-recipients) [])+ configured (or (some-> (not-empty raw) (t2/hydrate :recipients-detail))+ [])+ admin-email (system/admin-email)]+ (if (and admin-email (sends-to-all-admins? raw))(conj configured {:type :notification-recipient/raw-value:details {:value admin-email}})configured)))diff --git a/enterprise/backend/test/metabase_enterprise/security_center/notification_test.clj b/enterprise/backend/test/metabase_enterprise/security_center/notification_test.cljindex dace3b7731c..c00d405ef9a 100644--- a/enterprise/backend/test/metabase_enterprise/security_center/notification_test.clj+++ b/enterprise/backend/test/metabase_enterprise/security_center/notification_test.clj@@ -9,6 +9,7 @@[metabase.events.core :as events][metabase.models.interface :as mi][metabase.notification.send :as notification.send]+ [metabase.permissions.core :as perms][metabase.test :as mt][metabase.test.fixtures :as fixtures][toucan2.core :as t2]))@@ -251,42 +252,62 @@;;; -------------------------------------------- Recipient resolution -------------------------------------------------+(defn- admin-group-recipient []+ {:type :notification-recipient/group :permissions_group_id (:id (perms/admin-group))})+(deftest admin-email-included-when-set-test- (testing "site admin email is appended as a raw-value recipient"- (let [sent (atom nil)- custom-recip [{:type :notification-recipient/external-email :details {:email "[email protected]"}}]]+ (testing "site admin email is appended when recipients target the admin group"+ (let [sent (atom nil)+ recips [(admin-group-recipient)+ {:type :notification-recipient/external-email :details {:email "[email protected]"}}]](mt/with-temp [:model/SecurityAdvisory advisory(advisory-fixture {:advisory_id "SC-ADMIN-001":severity "critical":match_status "active"})](mt/with-temporary-setting-values [admin-email "[email protected]"]- (with-redefs [settings/security-center-email-recipients (constantly custom-recip)]+ (with-redefs [settings/security-center-email-recipients (constantly recips)](with-send-redef (fn [notif & _] (reset! sent notif))(notification/notify-advisory! advisory)(let [email-handler (first (filter #(= :channel/email (:channel_type %)) (:handlers @sent)))recipients (:recipients email-handler)]- (is (= 2 (count recipients)))- ;; configured recipient- (is (= :notification-recipient/external-email (:type (first recipients))))- ;; admin email appended+ ;; admin group recipient + external email + raw admin email+ (is (= 3 (count recipients)))(is (= {:type :notification-recipient/raw-value :details {:value "[email protected]"}}(last recipients))))))))))(testing "no admin email appended when admin-email setting is nil"- (let [sent (atom nil)- custom-recip [{:type :notification-recipient/external-email :details {:email "[email protected]"}}]]+ (let [sent (atom nil)+ recips [(admin-group-recipient)+ {:type :notification-recipient/external-email :details {:email "[email protected]"}}]](mt/with-temp [:model/SecurityAdvisory advisory(advisory-fixture {:advisory_id "SC-ADMIN-002":severity "high":match_status "active"})](mt/with-temporary-setting-values [admin-email nil]- (with-redefs [settings/security-center-email-recipients (constantly custom-recip)]+ (with-redefs [settings/security-center-email-recipients (constantly recips)]+ (with-send-redef (fn [notif & _] (reset! sent notif))+ (notification/notify-advisory! advisory)+ (let [email-handler (first (filter #(= :channel/email (:channel_type %)) (:handlers @sent)))+ recipients (:recipients email-handler)]+ (is (every? #(not= :notification-recipient/raw-value (:type %)) recipients))))))))))++(deftest admin-email-excluded-when-send-to-all-admins-off-test+ (testing "admin-email is NOT appended when the configured recipient list omits the admin group (GDGT-2422)"+ (let [sent (atom nil)+ recips [{:type :notification-recipient/external-email :details {:email "[email protected]"}}]]+ (mt/with-temp [:model/SecurityAdvisory advisory+ (advisory-fixture {:advisory_id "SC-ADMIN-OFF-001"+ :severity "critical"+ :match_status "active"})]+ (mt/with-temporary-setting-values [admin-email "[email protected]"]+ (with-redefs [settings/security-center-email-recipients (constantly recips)](with-send-redef (fn [notif & _] (reset! sent notif))(notification/notify-advisory! advisory)(let [email-handler (first (filter #(= :channel/email (:channel_type %)) (:handlers @sent)))recipients (:recipients email-handler)](is (= 1 (count recipients)))- (is (= :notification-recipient/external-email (:type (first recipients))))))))))))+ (is (= :notification-recipient/external-email (:type (first recipients))))+ (is (every? #(not= :notification-recipient/raw-value (:type %)) recipients))))))))))(deftest email-recipients-custom-list-test(testing "when security-center-email-recipients is set, those specific recipients are used"