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
Don't log user names or emails on authentication (#75539)
Nathan Voxlandbfec5d9f2623
diff --git a/enterprise/backend/src/metabase_enterprise/sso/integrations/oidc.clj b/enterprise/backend/src/metabase_enterprise/sso/integrations/oidc.cljindex 2602d66ea73..e112ace90d0 100644--- a/enterprise/backend/src/metabase_enterprise/sso/integrations/oidc.clj+++ b/enterprise/backend/src/metabase_enterprise/sso/integrations/oidc.clj@@ -84,8 +84,8 @@(let [final-redirect (or (:redirect-url login-result) "/")base-response (-> (response/redirect final-redirect)(sso/clear-oidc-state-cookie))]- (log/infof "OIDC authentication successful for provider %s, user %s"- provider-key (get-in login-result [:user :email]))+ (log/infof "OIDC authentication successful for provider %s, user ID: %s"+ provider-key (get-in login-result [:user :id]))(if-let [session (:session login-result)](request/set-session-cookies requestbase-responsediff --git a/enterprise/backend/src/metabase_enterprise/sso/providers/jwt.clj b/enterprise/backend/src/metabase_enterprise/sso/providers/jwt.cljindex b3950e49f52..ec221847ef7 100644--- a/enterprise/backend/src/metabase_enterprise/sso/providers/jwt.clj+++ b/enterprise/backend/src/metabase_enterprise/sso/providers/jwt.clj@@ -108,7 +108,7 @@(throw (ex-info (tru "JWT token missing email claim"){:status-code 400:error :missing-email})))- (log/infof "Successfully authenticated JWT token for: %s %s" first-name last-name)+ (log/debug "Successfully authenticated JWT token"){:success? true:tenant-slug (some-> tenant-slug str):tenant-attributes tenant-attributesdiff --git a/enterprise/backend/src/metabase_enterprise/sso/providers/saml.clj b/enterprise/backend/src/metabase_enterprise/sso/providers/saml.cljindex 15fc53f50d1..df8576eace9 100644--- a/enterprise/backend/src/metabase_enterprise/sso/providers/saml.clj+++ b/enterprise/backend/src/metabase_enterprise/sso/providers/saml.clj@@ -129,7 +129,7 @@(sso-settings/saml-attribute-email))){:status-code 400:user-attributes (keys user-attributes)})))- (log/infof "Successfully authenticated SAML assertion for: %s %s" first-name last-name)+ (log/debug "Successfully authenticated SAML assertion"){:success? true:user-data {:email email:first_name first-namediff --git a/enterprise/backend/test/metabase_enterprise/sso/integrations/jwt_test.clj b/enterprise/backend/test/metabase_enterprise/sso/integrations/jwt_test.cljindex 3818666b505..8d93418e940 100644--- a/enterprise/backend/test/metabase_enterprise/sso/integrations/jwt_test.clj+++ b/enterprise/backend/test/metabase_enterprise/sso/integrations/jwt_test.clj@@ -1375,3 +1375,21 @@(is (some? tenant))(testing "tenant created but with no attributes since the value wasn't a map"(is (nil? (:attributes tenant))))))))))))))++(deftest successful-jwt-login-does-not-log-pii-test+ (testing "Successful JWT authentication should not log user's first or last name"+ (with-jwt-default-setup!+ (mt/with-log-messages-for-level [log-messages [metabase-enterprise.sso.providers.jwt :info]]+ ;; client-full-response uses mock client (in-process, future) so dynamic bindings are conveyed+ (let [response (client/client-full-response :get 302 "/auth/sso"+ {:request-options {:redirect-strategy :none}}+ :return_to default-redirect-uri+ :jwt+ (jwt/sign+ {:email "[email protected]"+ :first_name "Rasta"+ :last_name "Toucan"}+ default-jwt-secret))]+ (is (sso.test-setup/successful-login? response))+ (is (not-any? #(re-find #"Rasta|Toucan" (:message %)) (log-messages))+ "Log messages should not contain user's first or last name"))))))diff --git a/enterprise/backend/test/metabase_enterprise/sso/integrations/oidc_test.clj b/enterprise/backend/test/metabase_enterprise/sso/integrations/oidc_test.cljindex 8c785334d16..ad4f6ce1fe6 100644--- a/enterprise/backend/test/metabase_enterprise/sso/integrations/oidc_test.clj+++ b/enterprise/backend/test/metabase_enterprise/sso/integrations/oidc_test.clj@@ -2,6 +2,7 @@(:require[clojure.string :as str][clojure.test :refer :all]+ [metabase-enterprise.sso.integrations.oidc :as oidc-integration][metabase-enterprise.sso.test-setup :as sso.test-setup][metabase.auth-identity.core :as auth-identity][metabase.server.instance :as server.instance]@@ -389,3 +390,17 @@(is (contains?(t2/select-fn-set :group_id :model/PermissionsGroupMembership :user_id (:id user))group-id))))))))))++(deftest successful-oidc-callback-does-not-log-pii-test+ (testing "Successful OIDC callback should not log user's email address"+ (mt/with-additional-premium-features #{:sso-oidc}+ (mt/with-log-messages-for-level [log-messages [metabase-enterprise.sso.integrations.oidc :info]]+ ;; Mock login! to return a successful result with user email, in-thread so log capture works+ (with-redefs [auth-identity/login! (constantly {:success? true+ :redirect-url "/"+ :user {:email "[email protected]"}})]+ (oidc-integration/sso-callback+ "test-idp"+ {:params {:code "test-code" :state "test-state"}})+ (is (not-any? #(re-find #"[email protected]" (:message %)) (log-messages))+ "Log messages should not contain user's email address"))))))diff --git a/enterprise/backend/test/metabase_enterprise/sso/integrations/saml_test.clj b/enterprise/backend/test/metabase_enterprise/sso/integrations/saml_test.cljindex f32020a0cc3..79d9be0d636 100644--- a/enterprise/backend/test/metabase_enterprise/sso/integrations/saml_test.clj+++ b/enterprise/backend/test/metabase_enterprise/sso/integrations/saml_test.clj@@ -10,6 +10,7 @@[metabase-enterprise.sso.test-setup :as sso.test-setup][metabase-enterprise.tenants.auth-provider] ;; make sure the auth provider is actually registered[metabase.appearance.settings :as appearance.settings]+ [metabase.auth-identity.core :as auth-identity][metabase.premium-features.token-check :as token-check][metabase.request.core :as request][metabase.session.core :as session]@@ -1225,6 +1226,21 @@(testing "Header nonce matches body script nonce"(is (= header-nonce body-nonce))))))))))+(deftest successful-saml-login-does-not-log-pii-test+ (testing "Successful SAML authentication should not log user's first or last name"+ (with-saml-default-setup!+ (mt/with-model-cleanup [:model/User]+ (mt/with-log-messages-for-level [log-messages [metabase-enterprise.sso.providers.saml :info]]+ ;; Mock SAML validation to run in-thread so log capture works (real HTTP calls don't convey dynamic bindings)+ (with-redefs [saml/validate-response (constantly ::mock-response)+ saml/assertions (constantly [{:attrs {"http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" ["[email protected]"]+ "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" ["John"]+ "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" ["Doe"]}}])]+ (let [result (auth-identity/authenticate :provider/saml {:request-method :post})]+ (is (:success? result) "Authentication should succeed")+ (is (not-any? #(re-find #"John|Doe" (:message %)) (log-messages))+ "Log messages should not contain user's first or last name"))))))))+(deftest popup-csp-nonce-per-request-unique-test(testing "Each `/auth/sso` popup response carries a freshly generated nonce (no static reuse)."(with-other-sso-types-disabled!