Skip to content

Commit

Permalink
Revert check for SMTP/email header canonical hostname equivalence.
Browse files Browse the repository at this point in the history
Signed-off-by: Isis Lovecruft <isis@torproject.org>

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.
  • Loading branch information
Matthew Finkel authored and isislovecruft committed Jul 22, 2014
1 parent 48bb5fd commit 4224107
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions lib/bridgedb/email/autoresponder.py
Expand Up @@ -631,12 +631,12 @@ def runChecks(self, client):

# 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())
Expand Down

0 comments on commit 4224107

Please sign in to comment.