jro_apps/redmine Commit - r12851:53deb6ca880d

Mailer.token_for generates invalid message_id when using from address with full name (#16619)....

Jean-Philippe Lang -

r12851:53deb6ca880d

parent child

Context file:

r12851:53deb6ca880d

app/models/mailer.rb +1 -1

                 if rand
                   hash << Redmine::Utils.random_hex(8)
                 end
-                host = Setting.mail_from.to_s.gsub(%r{^.*@}, '')
+                host = Setting.mail_from.to_s.strip.gsub(%r{^.*@|>}, '')
                 host = "#{::Socket.gethostname}.redmine" if host.empty?
                 "#{hash.join('.')}@#{host}"
               end

test/unit/mailer_test.rb +6 0

                 assert ActionMailer::Base.perform_deliveries
               end
+              def test_token_for_should_strip_trailing_gt_from_address_with_full_name
+                with_settings :mail_from => "Redmine Mailer<no-reply@redmine.org>" do
+                  assert_match /\Aredmine.issue-\d+\.\d+\.[0-9a-f]+@redmine.org\z/, Mailer.token_for(Issue.generate!)
+                end
+              end
               def test_layout_should_include_the_emails_header
                 with_settings :emails_header => "*Header content*" do
                   with_settings :plain_text_mail => 0 do

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages