@@ -1,44 +1,51 @@ module ActionMailer class Base - alias_method :deliver_without_blacklisting, :deliver! - def self.filter_blacklisted(level = nil) - self.send(:include, BouncesHandlerInstanceMethods) define_method(:blacklist_level) { level } end module BouncesHandlerInstanceMethods - def deliver!(mail = @mail) - # Cleanup all headers used for recepients specification - if mail - [ :to, :cc, :bcc ].each do |header| - blacklist_cleanup_header(mail, header) + def self.included(base) + base.class_eval do + alias_method :deliver_without_blacklisting, :deliver! + + def deliver!(mail = @mail) + return deliver_without_blacklisting(mail) unless defined? blacklist_level + + # Cleanup all headers used for recepients specification + if mail + [ :to, :cc, :bcc ].each do |header| + blacklist_cleanup_header(mail, header) + end + + # Do not send this email if the destination list is empty + return mail if !mail.destinations || mail.destinations.empty? + end + + deliver_without_blacklisting(mail) end - # Do not send this email if the destination list is empty - return mail if !mail.destinations || mail.destinations.empty? - end - - deliver_without_blacklisting(mail) - end - private - - def blacklist_cleanup_header(mail, header_name) - # Get addrs list from a header - orig_addrs = mail.send("#{header_name}_addrs".to_sym) - return unless orig_addrs - - # Clean them up (can't use delete_if for AddressGroups) - res_addrs = [] - orig_addrs.each do |addr| - next if MailingBlacklist.banned?(addr.spec, blacklist_level) - res_addrs << addr - end - - # Assign addrs list back - mail.send("#{header_name}_addrs=".to_sym, res_addrs) + private + + def blacklist_cleanup_header(mail, header_name) + # Get addrs list from a header + orig_addrs = mail.send("#{header_name}_addrs".to_sym) + return unless orig_addrs + + # Clean them up (can't use delete_if for AddressGroups) + res_addrs = [] + orig_addrs.each do |addr| + next if MailingBlacklist.banned?(addr.spec, blacklist_level) + res_addrs << addr + end + + # Assign addrs list back + mail.send("#{header_name}_addrs=".to_sym, res_addrs) + end + end end - - end + end end end + +ActionMailer::Base.send(:include, ActionMailer::Base::BouncesHandlerInstanceMethods) rails-plugin/extensions/action_mailer.rb b9bd9fdc8f4fb7f95faa5d3921d422aedae4d94c Alexey Kovyrin alexey@kovyrin.net http://github.com/kovyrin/bounces-handler/commit/938af7cec1b4f5e5c9c6c5cfb6902002f4e7ef60 938af7cec1b4f5e5c9c6c5cfb6902002f4e7ef60 2009-09-29T21:03:46-07:00 2009-09-29T21:03:46-07:00 Fix from Brian Woods: The plugin would hijack instances where someone else aliased deliver! in ActionMailer 6da45c6e5c3cef548b482ee4d43e0d1540d22857 Alexey Kovyrin alexey@kovyrin.net