diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-12-11 09:51:30 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-12-11 09:51:30 +0000 |
| commit | 2c9288e5cc7eb0209f185018134ec6e3ebb91eda (patch) | |
| tree | 918088c7ef4bc54cf18273af0efd2a31bf5bdbeb | |
| parent | 9cac4f2387416b5da77a4d5bbe7e21f937cf9129 (diff) | |
Remove old patch.
| -rw-r--r-- | config/initializers/alaveteli.rb | 1 | ||||
| -rw-r--r-- | lib/actionmailer_patches.rb | 15 |
2 files changed, 0 insertions, 16 deletions
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb index 631251b87..760c138a7 100644 --- a/config/initializers/alaveteli.rb +++ b/config/initializers/alaveteli.rb @@ -50,7 +50,6 @@ require 'normalize_string' require 'alaveteli_file_types' require 'alaveteli_localization' require 'message_prominence' -require 'actionmailer_patches' require 'theme' AlaveteliLocalization.set_locales(AlaveteliConfiguration::available_locales, 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 |