A platform for community discussion. Free, open, simple.
FIX: Enforce invite redemption limits under the row lock (#44011)
Arpit Jalan25d481f53d01
diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rbindex d30e7de02e9..d2a1c39f5ac 100644--- a/app/models/invite_redeemer.rb+++ b/app/models/invite_redeemer.rb@@ -291,16 +291,16 @@ class InviteRedeemerenddef mark_invite_redeemed- @invited_user_record = InvitedUser.create!(invite_id: invite.id, redeemed_at: Time.zone.now)+ invite.with_lock("FOR UPDATE NOWAIT") do+ return false if !can_redeem_invite?- if @invited_user_record.present?- invite.with_lock("FOR UPDATE NOWAIT") do- Invite.increment_counter(:redemption_count, invite.id)- invite.save!- end- delete_duplicate_invites+ @invited_user_record = InvitedUser.create!(invite_id: invite.id, redeemed_at: Time.zone.now)+ Invite.increment_counter(:redemption_count, invite.id)+ invite.save!end+ delete_duplicate_invites if @invited_user_record.present?+@invited_user_record.present?enddiff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rbindex 5ce03d935f4..76b52a4bf5e 100644--- a/spec/requests/invites_controller_spec.rb+++ b/spec/requests/invites_controller_spec.rb@@ -1764,6 +1764,41 @@ RSpec.describe InvitesController doexpect(User.count).to eq(user_count + 1)end+ it "does not grant a bounded invite after another request has consumed its capacity" do+ group = Fabricate(:group)+ invite.update!(invited_by: admin)+ InvitedGroup.create!(invite: invite, group: group)+ stale_invite = Invite.find(invite.id)++ put "/invites/show/#{invite.invite_key}.json",+ params: {+ email: "[email protected]",+ password: "verystrongpassword",+ }+ expect(response.status).to eq(200)+ expect(response.parsed_body["message"]).to eq(I18n.t("invite.confirm_email"))++ allow(Invite).to receive(:find_by).with(invite_key: invite.invite_key).and_return(+ stale_invite,+ )++ expect {+ put "/invites/show/#{invite.invite_key}.json",+ params: {+ email: "[email protected]",+ password: "verystrongpassword",+ }+ }.not_to change { User.count }++ expect(response.status).to eq(404)+ expect(response.parsed_body["message"]).to eq(I18n.t("invite.not_found_json"))+ expect(invite.reload.redemption_count).to eq(1)+ expect(invite.invited_users.count).to eq(1)+ expect(+ GroupUser.where(group: group, user_id: invite.invited_users.select(:user_id)).count,+ ).to eq(1)+ end+it "sends an activation email and does not activate the user" doexpect {put "/invites/show/#{invite.invite_key}.json",