A platform for community discussion. Free, open, simple.
SECURITY: Require reapproval after deactivated users change email (#43364)
Alan Guo Xiang Tan6417a878d2c3
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rbindex 480ab0b2f0f..3de9c3c0df2 100644--- a/app/controllers/users_controller.rb+++ b/app/controllers/users_controller.rb@@ -1240,11 +1240,15 @@ class UsersController < ApplicationControllerendUser.transaction do+ @user.lock!+ revoke_approval = SiteSetting.must_approve_users? && @user.approved? && @user.email_confirmed?+primary_email = @user.primary_emailprimary_email.email = params[:email]primary_email.skip_validate_email = falseif primary_email.save+ @user.revoke_approval! if revoke_approval@email_token =@user.email_tokens.create!(email: @user.email, scope: EmailToken.scopes[:signup])EmailToken.enqueue_signup_email(@email_token, to_address: @user.email)diff --git a/app/jobs/regular/create_user_reviewable.rb b/app/jobs/regular/create_user_reviewable.rbindex d0a40b1b6c1..1a85e4f0f63 100644--- a/app/jobs/regular/create_user_reviewable.rb+++ b/app/jobs/regular/create_user_reviewable.rb@@ -15,13 +15,19 @@ class Jobs::CreateUserReviewable < ::Jobs::Baseif user = User.find_by(id: args[:user_id])return if user.approved?- @reviewable =- ReviewableUser.needs_review!(- target: user,- created_by: Discourse.system_user,- reviewable_by_moderator: true,- payload: ReviewableUser.payload_for(user),- )+ payload = ReviewableUser.payload_for(user)++ ReviewableUser.transaction do+ @reviewable =+ ReviewableUser.needs_review!(+ target: user,+ created_by: Discourse.system_user,+ reviewable_by_moderator: true,+ payload: payload,+ )++ @reviewable.update!(payload: payload) unless @reviewable.created_new+ endif @reviewable.created_new@reviewable.add_score(diff --git a/app/models/user.rb b/app/models/user.rbindex 3db5c15445e..c170deeeb6a 100644--- a/app/models/user.rb+++ b/app/models/user.rb@@ -1525,6 +1525,10 @@ class User < ActiveRecord::Baseendend+ def revoke_approval!+ update!(approved: false, approved_by: nil, approved_at: nil)+ end+def change_trust_level!(level, opts = nil)Promotion.new(self).change_trust_level!(level, opts)enddiff --git a/spec/jobs/create_user_reviewable_spec.rb b/spec/jobs/create_user_reviewable_spec.rbindex 712ea35bf6c..4f9eb215061 100644--- a/spec/jobs/create_user_reviewable_spec.rb+++ b/spec/jobs/create_user_reviewable_spec.rb@@ -24,6 +24,20 @@ RSpec.describe Jobs::CreateUserReviewable doexpect(reviewable.reviewable_scores.size).to eq(1)end+ it "shows staff the current email when a user returns to the review queue" do+ SiteSetting.must_approve_users = true+ described_class.new.execute(user_id: user.id)+ reviewable = Reviewable.find_by(target: user)+ reviewable.update!(status: Reviewable.statuses[:approved])++ user.primary_email.update!(email: "[email protected]")+ described_class.new.execute(user_id: user.id)++ reviewable.reload+ expect(reviewable).to be_pending+ expect(reviewable.payload["email"]).to eq("[email protected]")+ end+describe "reasons" doit "does nothing if there's no reason" dodescribed_class.new.execute(user_id: user.id)diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rbindex 7495ceef4cd..636ae6a8093 100644--- a/spec/models/user_spec.rb+++ b/spec/models/user_spec.rb@@ -3055,6 +3055,20 @@ RSpec.describe User doendend+ describe "#revoke_approval!" do+ fab!(:admin)+ fab!(:user) { Fabricate(:user, approved: true, approved_by: admin, approved_at: 1.day.ago) }++ it "clears the approval and its audit fields" do+ user.revoke_approval!+ user.reload++ expect(user).not_to be_approved+ expect(user.approved_by).to be_nil+ expect(user.approved_at).to be_nil+ end+ end+def filter_by(method)username = "someuniqueusername"user.update!(username: username)diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rbindex 28c2bf8455a..3ed56cf3600 100644--- a/spec/requests/users_controller_spec.rb+++ b/spec/requests/users_controller_spec.rb@@ -5215,6 +5215,51 @@ RSpec.describe UsersController doexpect(EmailToken.find_by(id: token.id)).to eq(nil)end+ context "when the user is approved" do+ let(:approved_user) do+ Fabricate(+ :user,+ active: false,+ approved: true,+ approved_by: admin,+ approved_at: 1.day.ago,+ password: "qwerqwer123",+ )+ end++ before { SiteSetting.must_approve_users = true }++ it "preserves approval when correcting an unconfirmed email" do+ put "/u/update-activation-email.json",+ params: {+ username: approved_user.username,+ password: "qwerqwer123",+ email: "[email protected]",+ }++ expect(response.status).to eq(200)+ expect(approved_user.reload).to be_approved+ end++ it "revokes approval when changing a confirmed email" do+ approved_user.email_tokens.find_by(email: approved_user.email).update!(confirmed: true)++ put "/u/update-activation-email.json",+ params: {+ username: approved_user.username,+ password: "qwerqwer123",+ email: "[email protected]",+ }++ expect(response.status).to eq(200)++ approved_user.reload+ expect(approved_user).not_to be_approved+ expect(approved_user.approved_by).to be_nil+ expect(approved_user.approved_at).to be_nil+ end+ end+it "tells the user to slow down after many requests" doRateLimiter.enablefreeze_time