Download as
Browse Code »

Commit e1cb8ef004d09c9bdf8a0f01b9abab5b7f6b8494

Authored by Victor Costa
2 parents a0194228 1253d22d
Exists in fix_sign_up_form

Merge branch 'fix_template_leak' into 'master' 

Fix template params leak in mail with template

Closes #210

See merge request !992
Showing 2 changed files with 11 additions and 1 deletions   Show diff stats
app/helpers/email_template_helper.rb
  Diff comments   View file @e1cb8ef
@@ -6,7 +6,7 @@ module EmailTemplateHelper @@ -6,7 +6,7 @@ module EmailTemplateHelper
6 params[:subject] = params[:email_template].parsed_subject(params[:template_params]) 6 params[:subject] = params[:email_template].parsed_subject(params[:template_params])
7 params[:content_type] = "text/html" 7 params[:content_type] = "text/html"
8 end 8 end
9 - mail(params.except(:email_template)) 9 + mail(params.except(:email_template, :template_params))
10 end 10 end
11 11
12 end 12 end
test/unit/user_mailer_test.rb
  Diff comments   View file @e1cb8ef
@@ -44,6 +44,16 @@ fast_create(Person)) @@ -44,6 +44,16 @@ fast_create(Person))
44 assert_equal 'activation template body', mail.body.to_s 44 assert_equal 'activation template body', mail.body.to_s
45 end 45 end
46 46
  47 + should 'not leak template params into activation email' do
  48 + EmailTemplate.create!(:template_type => :user_activation, :name => 'template1', :subject => 'activation template subject', :body => 'activation template body', :owner => Environment.default)
  49 + assert_difference 'ActionMailer::Base.deliveries.size' do
  50 + u = create_user('some-user')
  51 + UserMailer.activation_code(u).deliver
  52 + end
  53 + mail = ActionMailer::Base.deliveries.last
  54 + assert_nil mail['template-params']
  55 + end
  56 +
47 private 57 private
48 58
49 def read_fixture(action) 59 def read_fixture(action)