Fix small bug where email domain wasn't being quoted in the regular expression

2 files changed, 5 insertions, 1 deletions

diff --git a/app/models/mail_server_log.rb b/app/models/mail_server_log.rb
index 8a978ae07..b6d80cc2f 100644
--- a/app/models/mail_server_log.rb
+++ b/app/models/mail_server_log.rb
@@ -123,7 +123,7 @@ class MailServerLog < ActiveRecord::Base
     # We also check the email prefix so that we could, for instance, separately handle a staging and production
     # instance running on the same server with different email prefixes.
     def MailServerLog.email_addresses_on_line(line)
-        line.scan(/#{Regexp::quote(Configuration::incoming_email_prefix)}request-[^\s]+@#{Configuration::incoming_email_domain}/).sort.uniq
+        line.scan(/#{Regexp::quote(Configuration::incoming_email_prefix)}request-[^\s]+@#{Regexp::quote(Configuration::incoming_email_domain)}/).sort.uniq
     end
 
     def MailServerLog.request_sent?(ir)
diff --git a/spec/models/mail_server_log_spec.rb b/spec/models/mail_server_log_spec.rb
index 3f87b76f1..d0a1d202f 100644
--- a/spec/models/mail_server_log_spec.rb
+++ b/spec/models/mail_server_log_spec.rb
@@ -85,6 +85,10 @@ describe MailServerLog do
         it "ignores an email with a different prefix" do
             MailServerLog.email_addresses_on_line("foitest+request-14-e0e09f97@example.com").should be_empty            
         end
+
+        it "ignores an email where the . is substituted for something else" do
+            MailServerLog.email_addresses_on_line("foi+request-14-e0e09f97@exampledcom").should be_empty
+        end
     end
 
     context "Postfix" do