[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [bridgedb/develop] Revert check for SMTP/email header canonical hostname equivalence.
commit 422410756a7752d6af5b881776fb107fd5e6335e
Author: Matthew Finkel <sysrqb@xxxxxxxxxxxxxx>
Date: Sat Jul 19 03:33:56 2014 +0000
Revert check for SMTP/email header canonical hostname equivalence.
Signed-off-by: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
For now, we need to revert this check to get the email distributor to
function. We should look into this issue in order to get BridgeDB in a
state where instances of it are runnable by other organisations to hand
out their own bridges. [OTHER_ORG]
Fixing this is essential for #12086.
---
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 7e5f900..3674702 100644
--- a/lib/bridgedb/email/autoresponder.py
+++ b/lib/bridgedb/email/autoresponder.py
@@ -631,12 +631,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())
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits