A platform for community discussion. Free, open, simple.
FIX: prevent merging a user into themselves (#45531)
Sam9c38b95ae13b
diff --git a/app/services/user_merger.rb b/app/services/user_merger.rbindex 2a007fb2d44..49cdbef08cf 100644--- a/app/services/user_merger.rb+++ b/app/services/user_merger.rb@@ -10,6 +10,8 @@ class UserMergerenddef merge!+ raise Discourse::InvalidParameters.new(:target_user) if @source_user.id == @target_user.id+update_usernamemove_postsupdate_user_idsdiff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rbindex f8aa82f9baf..489f339b137 100644--- a/lib/guardian/user_guardian.rb+++ b/lib/guardian/user_guardian.rb@@ -130,7 +130,7 @@ module UserGuardianenddef can_merge_users?(source_user, target_user)- can_merge_user?(source_user) && !target_user.nil?+ can_merge_user?(source_user) && !target_user.nil? && source_user.id != target_user.idenddef can_see_warnings?(user)diff --git a/spec/lib/guardian/user_guardian_spec.rb b/spec/lib/guardian/user_guardian_spec.rbindex 93a629a9f05..3b11dec26cc 100644--- a/spec/lib/guardian/user_guardian_spec.rb+++ b/spec/lib/guardian/user_guardian_spec.rb@@ -711,6 +711,16 @@ RSpec.describe UserGuardian doendend+ describe "#can_merge_users?" do+ it "allows an admin to merge distinct users" do+ expect(admin.guardian.can_merge_users?(user, Fabricate(:user))).to eq(true)+ end++ it "rejects merging a user into a separately loaded instance of itself" do+ expect(admin.guardian.can_merge_users?(user, User.find(user.id))).to eq(false)+ end+ end+describe "#can_see_review_queue?" doit "returns true when the user is a staff member" doguardian = Guardian.new(moderator)diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rbindex 6163da70c09..ba35b54cfd9 100644--- a/spec/requests/admin/users_controller_spec.rb+++ b/spec/requests/admin/users_controller_spec.rb@@ -3223,6 +3223,14 @@ RSpec.describe Admin::UsersController docontext "when logged in as an admin" dobefore { sign_in(admin) }+ it "rejects self-merges without enqueueing a job" do+ expect do+ post "/admin/users/#{user.id}/merge.json", params: { target_username: user.username }+ end.not_to change { Jobs::MergeUser.jobs.size }++ expect(response.status).to eq(403)+ end+it "merges the source user into the target user" doJobs.run_immediately!post "/admin/users/#{user.id}/merge.json", params: { target_username: target_user.username }diff --git a/spec/services/user_merger_spec.rb b/spec/services/user_merger_spec.rbindex 3a12a96ad29..a2e0835edaf 100644--- a/spec/services/user_merger_spec.rb+++ b/spec/services/user_merger_spec.rb@@ -23,6 +23,37 @@ RSpec.describe UserMerger doUserMerger.new(source, target).merge!end+ describe "#merge!" do+ [false, true].each do |reload_target|+ it "rejects self-merging with #{reload_target ? "a separately loaded" : "the same"} user instance before changing data" do+ visit = Fabricate(:user_visit, user: source_user, posts_read: 12, time_read: 34)+ PostTiming.create!(+ user: source_user,+ topic: p1.topic,+ post_number: p1.post_number,+ msecs: 5678,+ )+ original_attributes = source_user.attributes+ target = reload_target ? User.find(source_user.id) : source_user++ expect { UserMerger.new(source_user, target).merge! }.to raise_error(+ Discourse::InvalidParameters,+ )++ expect(source_user.reload.attributes).to eq(original_attributes)+ expect(visit.reload.posts_read).to eq(12)+ expect(visit.time_read).to eq(34)+ expect(+ PostTiming.find_by!(+ user_id: source_user.id,+ topic_id: p1.topic_id,+ post_number: p1.post_number,+ ).msecs,+ ).to eq(5678)+ end+ end+ end+it "changes owner of topics and posts" dotopic1 = Fabricate(:topic, user: source_user)post1 = Fabricate(:post, topic: topic1, user: source_user)