Skip to content

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

Reactivate user accounts if OIDC provisioning enabled (#85459)

Ethan McCuefc76e6d09ade
diff --git a/enterprise/backend/src/metabase_enterprise/sso/integrations/oidc.clj b/enterprise/backend/src/metabase_enterprise/sso/integrations/oidc.clj
index e112ace90d0..4afb449946a 100644
--- a/enterprise/backend/src/metabase_enterprise/sso/integrations/oidc.clj
+++ b/enterprise/backend/src/metabase_enterprise/sso/integrations/oidc.clj
@@ -63,7 +63,7 @@
(keyword (str "oidc-" provider-key))
redirect-url
{:browser-id (:browser-id request)})
- (throw (ex-info (or (:message auth-result) (tru "Failed to initiate OIDC authentication"))
+ (throw (ex-info (str (or (:message auth-result) (tru "Failed to initiate OIDC authentication")))
{:status-code 500})))))
(defn sso-callback
@@ -92,6 +92,6 @@
session
(t/zoned-date-time (t/zone-id "GMT")))
base-response))
- (let [error-msg (or (:message login-result) (tru "OIDC authentication failed"))]
+ (let [error-msg (str (or (:message login-result) (tru "OIDC authentication failed")))]
(log/errorf "OIDC authentication failed for provider %s: %s" provider-key error-msg)
(throw (ex-info error-msg {:status-code 401}))))))
diff --git a/enterprise/backend/src/metabase_enterprise/sso/providers/oidc.clj b/enterprise/backend/src/metabase_enterprise/sso/providers/oidc.clj
index 790e4d65e90..46b19c2ca1d 100644
--- a/enterprise/backend/src/metabase_enterprise/sso/providers/oidc.clj
+++ b/enterprise/backend/src/metabase_enterprise/sso/providers/oidc.clj
@@ -86,7 +86,14 @@
[provider {:keys [user] :as request}]
(when-not user
(sso-utils/check-user-provisioning :oidc))
- (next-method provider request))
+ (let [provisioning-enabled? (sso-settings/oidc-user-provisioning-enabled?)
+ user-was-deactivated? (and user (not (:is_active user)))
+ reactivate-user? (and user-was-deactivated?
+ provisioning-enabled?)]
+ (next-method provider (cond-> request
+ reactivate-user?
+ (-> (assoc-in [:user-data :is_active] true)
+ (assoc :user-provisioning-enabled? provisioning-enabled?))))))
(methodical/defmethod auth-identity/login! :after :provider/custom-oidc
[_provider result]
diff --git a/enterprise/backend/test/metabase_enterprise/sso/integrations/oidc_test.clj b/enterprise/backend/test/metabase_enterprise/sso/integrations/oidc_test.clj
index 9e84c3a7015..65b5bc039e3 100644
--- a/enterprise/backend/test/metabase_enterprise/sso/integrations/oidc_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/sso/integrations/oidc_test.clj
@@ -177,6 +177,47 @@
(is (sso.test-setup/successful-login? response))
(is (= "/" (get-in response [:headers "Location"])))))))))
+(defn- do-callback
+ "Initiate the OIDC flow to get a state cookie, then hit the callback, expecting `expected-status`."
+ [expected-status]
+ (let [init-response (mt/client-full-response :get 302 "/auth/sso/test-idp"
+ {:request-options {:redirect-strategy :none}}
+ :redirect "/")
+ cookie-header (->> (get-in init-response [:headers "Set-Cookie"])
+ (map #(first (str/split % #";")))
+ (str/join "; "))]
+ (mt/client-real-response :get expected-status "/auth/sso/test-idp/callback"
+ {:request-options {:redirect-strategy :none
+ :headers {"Cookie" cookie-header}}}
+ :code "test-code"
+ :state "test-state")))
+
+(deftest callback-reactivates-deactivated-user-test
+ (testing "a deactivated user is reactivated on OIDC login when user provisioning is enabled (#79412)"
+ (with-oidc-default-setup!
+ (mt/with-temporary-setting-values [oidc-user-provisioning-enabled? true]
+ (with-ensure-encryption!
+ (with-successful-oidc!
+ ;; earlier callback tests may have provisioned the mock user already
+ (t2/delete! :model/User :email "[email protected]")
+ (mt/with-temp [:model/User {user-id :id} {:email "[email protected]" :is_active false}]
+ (is (sso.test-setup/successful-login? (do-callback 302)))
+ (is (true? (t2/select-one-fn :is_active :model/User :id user-id))))))))))
+
+(deftest callback-deactivated-user-without-provisioning-test
+ (testing "a deactivated user gets a readable 401 when OIDC user provisioning is disabled (#79412)"
+ (with-oidc-default-setup!
+ (mt/with-temporary-setting-values [oidc-user-provisioning-enabled? false]
+ (with-ensure-encryption!
+ (with-successful-oidc!
+ ;; earlier callback tests may have provisioned the mock user already
+ (t2/delete! :model/User :email "[email protected]")
+ (mt/with-temp [:model/User {user-id :id} {:email "[email protected]" :is_active false}]
+ (let [response (do-callback 401)]
+ (is (str/includes? (:body response) "Your account is disabled"))
+ (is (not (str/includes? (:body response) "ClassCastException"))))
+ (is (false? (t2/select-one-fn :is_active :model/User :id user-id))))))))))
+
;;; -------------------------------------------------- Open Redirect Protection Tests --------------------------------------------------
(deftest no-open-redirect-test