Skip to content

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

Don't allow reset password for deactivated accounts (#78699)

Nathan Voxland393086c44a9f
diff --git a/src/metabase/cmd/reset_password.clj b/src/metabase/cmd/reset_password.clj
index ad016a3cae1..3d46044c32c 100644
--- a/src/metabase/cmd/reset_password.clj
+++ b/src/metabase/cmd/reset_password.clj
@@ -11,9 +11,13 @@
(defn- set-reset-token!
"Set and return a new `reset_token` for the user with EMAIL-ADDRESS."
[email-address]
- (let [user-id (or (t2/select-one-pk :model/User, :%lower.email (u/lower-case-en email-address))
- (throw (Exception. (str (deferred-trs "No user found with email address ''{0}''. " email-address)
- (deferred-trs "Please check the spelling and try again.")))))]
+ (let [{user-id :id, active? :is_active}
+ (or (t2/select-one [:model/User :id :is_active], :%lower.email (u/lower-case-en email-address))
+ (throw (Exception. (str (deferred-trs "No user found with email address ''{0}''. " email-address)
+ (deferred-trs "Please check the spelling and try again.")))))]
+ (when-not active?
+ (throw (Exception. (str (deferred-trs "Cannot reset the password for the deactivated user ''{0}''. Please reactivate the account and try again."
+ email-address)))))
(auth-identity/create-password-reset! user-id)))
(defn reset-password!
diff --git a/test/metabase/cmd/reset_password_test.clj b/test/metabase/cmd/reset_password_test.clj
index c30618c02ca..618782dfb06 100644
--- a/test/metabase/cmd/reset_password_test.clj
+++ b/test/metabase/cmd/reset_password_test.clj
@@ -3,7 +3,8 @@
[clojure.test :refer :all]
[metabase.cmd.reset-password :as reset-password]
[metabase.test :as mt]
- [metabase.util :as u]))
+ [metabase.util :as u]
+ [toucan2.core :as t2]))
(deftest reset-password-test
(testing "set reset token throws exception on unknown email"
@@ -15,3 +16,17 @@
(is (instance?
String
(#'reset-password/set-reset-token! email)))))))
+
+(deftest reset-password-deactivated-user-test
+ (testing "set reset token throws exception for a deactivated user"
+ (let [email "[email protected]"]
+ (mt/with-temp [:model/User {user-id :id} {:email email, :is_active false}]
+ (is (thrown-with-msg?
+ Exception
+ #"deactivated"
+ (#'reset-password/set-reset-token! email)))
+ (testing "and leaves no reset token behind"
+ (is (not (t2/exists? :model/AuthIdentity
+ :user_id user-id
+ :provider "emailed-secret-password-reset")))
+ (is (nil? (t2/select-one-fn :reset_token :model/User :id user-id))))))))