A platform for community discussion. Free, open, simple.
FIX: ignore_by_title should not be treated as a regex (#42556)
Michael Brown4986d4a4fecd
diff --git a/config/locales/server.en.yml b/config/locales/server.en.ymlindex 5005b65198e..731f3f5b6e7 100644--- a/config/locales/server.en.yml+++ b/config/locales/server.en.yml@@ -2539,6 +2539,7 @@ en:auto_generated_allowlist: "List of email addresses that won't be checked for auto-generated content. Example: [email protected]|[email protected]"block_auto_generated_emails: "Block incoming emails identified as being auto generated."ignore_by_title: "Ignore incoming emails based on their title."+ ignore_by_title_regex: "Ignore incoming emails based on their title using a regular expression."mailgun_api_key: "Mailgun Secret API key used to verify webhook messages."sendgrid_verification_key: "Sendgrid verification key used to verify webhook messages."aws_sns_topic_arn_allowlist: "SNS topic ARNs allowed to send Amazon SES bounce webhook notifications."diff --git a/config/site_settings.yml b/config/site_settings.ymlindex 4b57b783d17..b517d11d9d5 100644--- a/config/site_settings.yml+++ b/config/site_settings.yml@@ -2364,6 +2364,9 @@ email:list_type: simpledefault: ""area: "email"+ ignore_by_title_regex:+ default: ""+ area: "email"mailgun_api_key:default: ""regex: '^((key-)?\h{32}|\h{32}-\h{8}-\h{8})$'diff --git a/lib/email/receiver.rb b/lib/email/receiver.rbindex 10d77ca6421..724d6e71c8c 100644--- a/lib/email/receiver.rb+++ b/lib/email/receiver.rb@@ -150,8 +150,17 @@ module Emailenddef is_blocked?- return false if SiteSetting.ignore_by_title.blank?- Regexp.new(SiteSetting.ignore_by_title, Regexp::IGNORECASE) =~ @mail.subject+ if SiteSetting.ignore_by_title.present?+ escaped_regex =+ SiteSetting.ignore_by_title.split("|").map { |s| Regexp.escape(s) }.join("|")+ return true if Regexp.new(escaped_regex, Regexp::IGNORECASE) =~ @mail.subject+ end+ if SiteSetting.ignore_by_title_regex.present?+ if Regexp.new(SiteSetting.ignore_by_title_regex, Regexp::IGNORECASE) =~ @mail.subject+ return true+ end+ end+ falseenddef create_incoming_emaildiff --git a/spec/fixtures/emails/auto_generated_subject.eml b/spec/fixtures/emails/auto_generated_subject.emlnew file mode 100644index 00000000000..85bcb4ccdd9--- /dev/null+++ b/spec/fixtures/emails/auto_generated_subject.eml@@ -0,0 +1,10 @@+Return-Path: <[email protected]>+From: Foo Bar <[email protected]>+Date: Fri, 15 Jan 2016 00:12:43 +0100+Subject: [AUTO GENERATED] Some subject+Message-ID: <[email protected]>+Mime-Version: 1.0+Content-Type: text/plain+Content-Transfer-Encoding: 7bit++Some thing.diff --git a/spec/lib/email/receiver_spec.rb b/spec/lib/email/receiver_spec.rbindex 149d5ce173a..1661adde467 100644--- a/spec/lib/email/receiver_spec.rb+++ b/spec/lib/email/receiver_spec.rb@@ -932,8 +932,23 @@ RSpec.describe Email::Receiver doexpect { process(:tl4_user) }.to change(Topic, :count)end- it "ignores by case-insensitive title" do- SiteSetting.ignore_by_title = "foo"+ it "ignores by case-insensitive title (single)" do+ SiteSetting.ignore_by_title = "[auto generated]"+ expect { process(:auto_generated_subject) }.to_not change(Topic, :count)+ end++ it "does not treat ignore_by_title as a regex" do+ SiteSetting.ignore_by_title = "[auto generated]"+ expect { process(:ignored) }.to raise_error(Email::Receiver::StrangersNotAllowedError)+ end++ it "ignores by case-insensitive title (multiple)" do+ SiteSetting.ignore_by_title = "not_the_ignored_string|foo|not_the_other_ignored_string"+ expect { process(:ignored) }.to_not change(Topic, :count)+ end++ it "ignores by case-insensitive title (regex)" do+ SiteSetting.ignore_by_title_regex = "t[ah]is.is"expect { process(:ignored) }.to_not change(Topic, :count)end