Skip to content

A platform for community discussion. Free, open, simple.

SECURITY: Password-reset revocation bypass via previewed ServerSession fallback (#43833)

Penar Musarajc0668a64c28d
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a3012b591f9..271a651e8d2 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2239,9 +2239,17 @@ class UsersController < ApplicationController
if @user
server_session["password-#{token}"] = @user.id
- else
- user_id = server_session["password-#{token}"].to_i
- @user = User.find(user_id) if user_id > 0
+ elsif user_id = server_session["password-#{token}"].to_i
+ confirmed_token =
+ EmailToken
+ .active
+ .where(
+ token_hash: EmailToken.hash_token(token),
+ scope: [nil, EmailToken.scopes[:password_reset]],
+ confirmed: true,
+ )
+ .find_by(user_id: user_id)
+ @user = confirmed_token&.user
end
@error = I18n.t("password_reset.no_token", base_url: Discourse.base_url) if !@user
diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 4fb13733102..0d3ca254f2a 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -471,6 +471,26 @@ RSpec.describe UsersController do
expect(UserAuthToken.where(id: user_auth_token.id).count).to eq(1)
end
+ it "rejects a password reset after a previewed token is superseded" do
+ new_password = "attacker-controlled-password"
+
+ get "/u/password-reset/#{email_token.token}.json"
+ expect(response.status).to eq(200)
+
+ post "/session/forgot_password.json", params: { login: user1.username }
+ expect(response.status).to eq(200)
+ expect(email_token.reload.expired).to eq(true)
+
+ put "/u/password-reset/#{email_token.token}.json", params: { password: new_password }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["success"]).to eq(false)
+ expect(response.parsed_body["message"]).to eq(
+ I18n.t("password_reset.no_token", base_url: Discourse.base_url),
+ )
+ expect(user1.reload.confirm_password?(new_password)).to eq(false)
+ end
+
context "with rate limiting" do
before { RateLimiter.enable }