A platform for community discussion. Free, open, simple.
FIX: Handle mail when in archive mode (#44907)
David Taylore5d0a69389a7
diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rbindex bc935a7acdc..47372043f18 100644--- a/app/controllers/admin/email_controller.rb+++ b/app/controllers/admin/email_controller.rb@@ -1,6 +1,8 @@# frozen_string_literal: trueclass Admin::EmailController < Admin::AdminController+ allow_when_archived :handle_mail+def indexenddiff --git a/app/controllers/admin/email_templates_controller.rb b/app/controllers/admin/email_templates_controller.rbindex b0a033f7408..a7573cb4497 100644--- a/app/controllers/admin/email_templates_controller.rb+++ b/app/controllers/admin/email_templates_controller.rb@@ -52,6 +52,7 @@ class Admin::EmailTemplatesController < Admin::AdminControllersystem_messages.email_reject_reply_user_not_matchingsystem_messages.email_reject_screened_emailsystem_messages.email_reject_silenced_user+ system_messages.email_reject_site_archivedsystem_messages.email_reject_strangers_not_allowedsystem_messages.email_reject_too_many_recipientssystem_messages.email_reject_topic_closeddiff --git a/config/locales/server.en.yml b/config/locales/server.en.ymlindex 424d4c76400..f86f368a041 100644--- a/config/locales/server.en.yml+++ b/config/locales/server.en.yml@@ -509,6 +509,7 @@ en:unsubscribe_not_allowed: "Happens when unsubscribing via email is not allowed for this user."email_not_allowed: "Happens when the email address is not on the allowlist or is on the blocklist."email_alias_not_allowed: "Happens when the sender's address is an alias of an address already registered to an account, and normalized emails are required to be unique."+ site_archived_error: "Happens when the site is in archive mode."unrecognized_error: "Unrecognized Error"secure_uploads_placeholder: "Redacted: This site has secure uploads enabled, visit the topic or click View Media to see the attached uploads."view_redacted_media: "View Media"@@ -4621,6 +4622,15 @@ en:If you believe this is an error, [contact a staff member](%{base_url}/about).+ email_reject_site_archived:+ title: "Email Reject Site Archived"+ subject_template: "[%{email_prefix}] Email issue -- Site Archived"+ subject_template_improved: "%{email_prefix}: Email issue -- site archived"+ text_body_template: |+ We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work.++ This site is archived and doesn't accept new posts.+email_error_notification:title: "Email Error Notification"subject_template: "[%{email_prefix}] Email issue -- POP authentication error"diff --git a/lib/email/processor.rb b/lib/email/processor.rbindex f445e3fe05b..c99cd031c4c 100644--- a/lib/email/processor.rb+++ b/lib/email/processor.rb@@ -101,6 +101,8 @@ module Email:email_reject_reply_to_digestwhen Email::Receiver::TooManyRecipientsError:email_reject_too_many_recipients+ when Email::Receiver::SiteArchivedError+ :email_reject_site_archivedelse:email_reject_unrecognized_errorenddiff --git a/lib/email/receiver.rb b/lib/email/receiver.rbindex 57319cefa85..b6e1b371aa2 100644--- a/lib/email/receiver.rb+++ b/lib/email/receiver.rb@@ -85,6 +85,9 @@ module Emailclass ReplyToDigestError < ProcessingErrorend+ class SiteArchivedError < ProcessingError+ end+class TooManyRecipientsError < ProcessingErrorattr_reader :recipients_count@@ -182,6 +185,7 @@ module Emailraise NoSenderDetectedError if @from_email.blank?raise FromReplyByAddressError if is_from_reply_by_email_address?raise ScreenedEmailError if ScreenedEmail.should_block?(@from_email)+ raise SiteArchivedError if SiteSetting.site_archiveduser = @from_userdiff --git a/spec/lib/email/processor_spec.rb b/spec/lib/email/processor_spec.rbindex db44c73dbbd..235665a5c40 100644--- a/spec/lib/email/processor_spec.rb+++ b/spec/lib/email/processor_spec.rb@@ -206,6 +206,27 @@ RSpec.describe Email::Processor doendend+ describe "when the site is archived" do+ let(:mail) { file_from_fixtures("new_user.eml", "emails").read }++ before { SiteSetting.site_archived = true }++ it "rejects the email and tells the sender the site is archived" do+ processor = Email::Processor.new(mail)+ processor.process!++ expect(IncomingEmail.last.error).to eq("Email::Receiver::SiteArchivedError")+ expect(EmailLog.last.email_type).to eq("email_reject_site_archived")+ expect(ActionMailer::Base.deliveries.first.body.to_s).to eq(+ I18n.t(+ "system_messages.email_reject_site_archived.text_body_template",+ destination: processor.receiver.mail.to,+ former_title: processor.receiver.mail.subject,+ ),+ )+ end+ end+describe "when group email recipients exceeds maximum_recipients_per_new_group_email site setting" dolet(:mail) { file_from_fixtures("cc.eml", "emails").read }diff --git a/spec/lib/email/receiver_spec.rb b/spec/lib/email/receiver_spec.rbindex f699fdfb50d..1add045cfa1 100644--- a/spec/lib/email/receiver_spec.rb+++ b/spec/lib/email/receiver_spec.rb@@ -25,6 +25,11 @@ RSpec.describe Email::Receiver doexpect { process(:screened_email) }.to raise_error(Email::Receiver::ScreenedEmailError)end+ it "raises a SiteArchivedError when the site is archived" do+ SiteSetting.site_archived = true+ expect { process(:new_user) }.to raise_error(Email::Receiver::SiteArchivedError)+ end+it "raises EmailNotAllowed when email address is not on allowlist" doSiteSetting.allowed_email_domains = "example.com|bar.com"Fabricate(:group, incoming_email: "[email protected]")diff --git a/spec/requests/admin/email_controller_spec.rb b/spec/requests/admin/email_controller_spec.rbindex 4b07f36769c..6fe62f0fd95 100644--- a/spec/requests/admin/email_controller_spec.rb+++ b/spec/requests/admin/email_controller_spec.rb@@ -343,6 +343,18 @@ RSpec.describe Admin::EmailController doexpect(response.status).to eq(200)expect(response.body).to eq("email has been received and is queued for processing")end++ it "enqueues the email job when the site is archived" do+ SiteSetting.site_archived = true++ expect_enqueued_with(job: :process_email, args: { mail: email("cc") }) do+ post "/admin/email/handle_mail.json",+ params: {+ email_encoded: Base64.strict_encode64(email("cc")),+ }+ end+ expect(response.status).to eq(200)+ endendshared_examples "email handling not allowed" do