[tor-commits] [bridgedb/master] Log when canonicalFromSMTP doesn't match canonicalFromEmail.

[isis at torproject.org]

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

    Log when canonicalFromSMTP doesn't match canonicalFromEmail.
    
     * ADDS more logging, in order to debug #12627.
       https://bugs.torproject.org/12627
---
 lib/bridgedb/email/autoresponder.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py
index 4fba40d..0eeb14a 100644
--- a/lib/bridgedb/email/autoresponder.py
+++ b/lib/bridgedb/email/autoresponder.py
@@ -656,12 +656,12 @@ class SMTPAutoresponder(smtp.SMTPClient):
 
         # The canonical domains from the SMTP ``MAIL FROM:`` and the email
         # ``From:`` header should match:
-        #if self.incoming.canonicalFromSMTP != self.incoming.canonicalFromEmail:
-        #    logging.error("SMTP/Email canonical domain mismatch!")
-        #    logging.debug("Canonical domain mismatch: %s != %s"
-        #                  % (self.incoming.canonicalFromSMTP,
-        #                     self.incoming.canonicalFromEmail))
-        #    return False
+        if self.incoming.canonicalFromSMTP != self.incoming.canonicalFromEmail:
+            logging.error("SMTP/Email canonical domain mismatch!")
+            logging.debug("Canonical domain mismatch: %s != %s"
+                          % (self.incoming.canonicalFromSMTP,
+                             self.incoming.canonicalFromEmail))
+            #return False
 
         self.incoming.domainRules = self.incoming.context.domainRules.get(
             self.incoming.canonicalFromEmail, list())