[tor-commits] [bridgedb/master] Straight up reject EMAIL_BLACKLIST addresses without further processing.

[isis at torproject.org]

commit d81b47626be69a3370ae687494ce5782057ecefd
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Mar 25 21:53:45 2015 +0000

    Straight up reject EMAIL_BLACKLIST addresses without further processing.
---
 lib/bridgedb/email/autoresponder.py |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py
index aba92ac..4fba40d 100644
--- a/lib/bridgedb/email/autoresponder.py
+++ b/lib/bridgedb/email/autoresponder.py
@@ -634,6 +634,10 @@ class SMTPAutoresponder(smtp.SMTPClient):
             self.incoming.canonicalFromEmail = client.domain
             logging.info("'From:' header contained whitelisted address: %s"
                          % str(client))
+        # Straight up reject addresses in the EMAIL_BLACKLIST config option:
+        elif str(client) in self.incoming.context.blacklist:
+            logging.info("'From:' header contained blacklisted address: %s")
+            return False
         else:
             logging.debug("Canonicalizing client email domain...")
             try: