A platform for community discussion. Free, open, simple.
FIX: Prevent unauthorized access via email alias normalization (#41034)
Keegan Georgeba984e4d8b74
diff --git a/app/services/email_login_code/redeem.rb b/app/services/email_login_code/redeem.rbindex 57f2250af55..a97f5466f64 100644--- a/app/services/email_login_code/redeem.rb+++ b/app/services/email_login_code/redeem.rb@@ -22,7 +22,7 @@ class EmailLoginCode::Redeemenddef fetch_user(params:)- User::Action::FindByEmail.call(email: params.email)+ User.real.where(staged: false).with_email(params.email).firstenddef consume_code(login_code:)diff --git a/app/services/email_login_code/request.rb b/app/services/email_login_code/request.rbindex 87a6a85be02..5e34af565e7 100644--- a/app/services/email_login_code/request.rb+++ b/app/services/email_login_code/request.rb@@ -33,7 +33,7 @@ class EmailLoginCode::Requestprivatedef fetch_user(params:)- User::Action::FindByEmail.call(email: params.email)+ User.real.where(staged: false).with_email(params.email).firstenddef existing_account?(user:)diff --git a/app/services/email_login_code/verify.rb b/app/services/email_login_code/verify.rbindex 264c60cabc5..c3e22da91cf 100644--- a/app/services/email_login_code/verify.rb+++ b/app/services/email_login_code/verify.rb@@ -31,6 +31,6 @@ class EmailLoginCode::Verifyenddef fetch_user(params:)- User::Action::FindByEmail.call(email: params.email)+ User.real.where(staged: false).with_email(params.email).firstendenddiff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rbindex 80e1e02baa1..8a4e31b009a 100644--- a/spec/requests/session_controller_spec.rb+++ b/spec/requests/session_controller_spec.rb@@ -622,6 +622,20 @@ RSpec.describe SessionController doexpect(EmailLoginCode.for_email(user.email).count).to eq(1)end+ it "does not generate a code for an address that only matches after normalization" do+ SiteSetting.normalize_emails = true+ user.update!(email: "[email protected]")+ alias_email = "[email protected]"++ expect_not_enqueued_with(job: :send_email_login_code, args: { to_address: alias_email }) do+ post "/session/login-code.json", params: honeypot_magic(email: alias_email)+ end++ expect(response.status).to eq(200)+ expect(response.parsed_body["success"]).to eq("OK")+ expect(EmailLoginCode.for_email(alias_email)).to be_empty+ end+it "renders the same response for existing and unknown emails" dopost "/session/login-code.json", params: honeypot_magic(email: user.email)expect(response.status).to eq(200)@@ -752,6 +766,24 @@ RSpec.describe SessionController doexpect(EmailLoginCode.active.for_email(user.email)).to be_emptyend+ it "does not log in with a code issued for a normalized email alias" do+ SiteSetting.normalize_emails = true+ user.update!(email: "[email protected]")+ alias_email = "[email protected]"+ alias_login_code = EmailLoginCode.generate!(email: alias_email)++ post "/session/login-code/verify.json",+ params: {+ email: alias_email,+ code: alias_login_code.code,+ }++ expect(response.status).to eq(200)+ expect(response.parsed_body["error"]).to eq(I18n.t("email_login_code.invalid_code"))+ expect(session[:current_user_id]).to be_nil+ expect(alias_login_code.reload.consumed_at).to be_nil+ end+it "does not log in a suspended user" douser.update!(suspended_till: 2.days.from_now, suspended_at: Time.zone.now)diff --git a/spec/services/email_login_code/request_spec.rb b/spec/services/email_login_code/request_spec.rbindex 63ba6b9c9af..e1df2adbc47 100644--- a/spec/services/email_login_code/request_spec.rb+++ b/spec/services/email_login_code/request_spec.rb@@ -43,7 +43,7 @@ RSpec.describe EmailLoginCode::Request doendend- context "when the email matches an existing user after normalization" do+ context "when the email only matches an existing user after normalization" dolet(:email) { "[email protected]" }before do@@ -53,11 +53,15 @@ RSpec.describe EmailLoginCode::Request doit { is_expected.to run_successfully }- it "treats it as an existing account" do- events = DiscourseEvent.track_events(:before_email_login) { result }+ it "does not treat it as an existing account" do+ events = nil- expect(events).to contain_exactly(event_name: :before_email_login, params: [user])- expect(EmailLoginCode.for_email(email).count).to eq(1)+ expect_not_enqueued_with(job: :send_email_login_code) do+ events = DiscourseEvent.track_events(:before_email_login) { result }+ end++ expect(events).to be_empty+ expect(EmailLoginCode.count).to eq(0)endend