@@ -4,6 +4,9 @@ class MailingBlacklist < ActiveRecord::Base belongs_to :mailing_domain, :foreign_key => :domain_id def self.listings_for_email(email, level = nil) + # Reject invalid emails + return [] unless valid_email?(email) + parsed_email = parse_email(email) domain = MailingDomain.find_by_name_crc(parsed_email[:domain]) @@ -47,6 +50,9 @@ class MailingBlacklist < ActiveRecord::Base end def self.unban!(email) + # Reject invalid emails + return unless valid_email?(email) + parsed_email = parse_email(email) domain = MailingDomain.find_by_name_crc(parsed_email[:domain]) @@ -60,6 +66,9 @@ class MailingBlacklist < ActiveRecord::Base end def self.ban!(email, level, reason, source = :other) + # Reject invalid emails + return unless valid_email?(email) + parsed_email = parse_email(email) domain = MailingDomain.find_by_name_crc(parsed_email[:domain]) || MailingDomain.create(:name => parsed_email[:domain]) rails-plugin/models/mailing_blacklist.rb @@ -70,4 +70,12 @@ describe MailingBlacklist, "banning/unbanning features" do MailingBlacklist.ban!('test@yahoo.ca', :hard, 'test reason').should be_valid MailingBlacklist.banned?('test@yahoo.ca').should be_true end + + it "should not fail to ban an invalid email address" do + lambda { MailingBlacklist.ban!('test', :hard, 'test reason') }.should_not raise_error + end + + it "should not fail to unban an invalid email address" do + lambda { MailingBlacklist.unban!('test') }.should_not raise_error + end end rails-plugin/spec/models/mailing_blacklist_spec.rb a32475bab324b89bbe249e95a8406b3e8677f991 Alexey Kovyrin alexey@kovyrin.net http://github.com/kovyrin/bounces-handler/commit/b9bd9fdc8f4fb7f95faa5d3921d422aedae4d94c b9bd9fdc8f4fb7f95faa5d3921d422aedae4d94c 2008-08-13T20:50:04-07:00 2008-08-13T20:50:04-07:00 reject invalid emails in ban/unban methods e07f3976dee9a329fa889dda998d3bce5ef781e9 Alexey Kovyrin alexey@kovyrin.net