diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-12-11 14:45:39 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-12-11 14:45:39 +0000 |
| commit | 38b21c1f091f78adc3cba8bea93467a0adf3bc42 (patch) | |
| tree | 57a9e8077237900919467b466c29d9098f290f9e /lib/actionmailer_patches.rb | |
| parent | 833b2d1cde3c621199b9e5d6344c299fb38e5fd2 (diff) | |
| parent | 2c9288e5cc7eb0209f185018134ec6e3ebb91eda (diff) | |
Merge branch 'rails-3-develop' into release/0.16
Diffstat (limited to 'lib/actionmailer_patches.rb')
| -rw-r--r-- | lib/actionmailer_patches.rb | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/lib/actionmailer_patches.rb b/lib/actionmailer_patches.rb deleted file mode 100644 index 600d3c8cc..000000000 --- a/lib/actionmailer_patches.rb +++ /dev/null @@ -1,15 +0,0 @@ -# Monkey patch for CVE-2013-4389 -# derived from http://seclists.org/oss-sec/2013/q4/118 to fix -# a possible DoS vulnerability in the log subscriber component of -# Action Mailer. - -require 'action_mailer' -module ActionMailer - class LogSubscriber < ActiveSupport::LogSubscriber - def deliver(event) - recipients = Array.wrap(event.payload[:to]).join(', ') - info("\nSent mail to #{recipients} (#{event.duration.round(1)}ms)") - debug(event.payload[:mail]) - end - end -end |