April 2014 - tor-commits - lists.torproject.org

[bridgedb/develop] PEP8 for EmailServer module docstring.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit d2a7b9376309db490091f6c7b1869acb8b7f3586 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Apr 6 20:39:50 2014 +0000 PEP8 for EmailServer module docstring. --- lib/bridgedb/EmailServer.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 0242103..915f82b 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -3,9 +3,7 @@ # Copyright (c) 2007-2013, The Tor Project, Inc. # See LICENSE for licensing information -""" -This module implements the email interface to the bridge database. -""" +"""This module implements the email interface to the bridge database.""" from __future__ import unicode_literals

1 0

[bridgedb/develop] PEP8 cleanup import lines in EmailServer.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit d49fe1dcaddbaf67b98ad9b5b3e19fb68379ccf4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Apr 6 22:28:15 2014 +0000 PEP8 cleanup import lines in EmailServer. --- lib/bridgedb/EmailServer.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 915f82b..8e007de 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -16,7 +16,8 @@ import re import rfc822 import time -from ipaddr import IPv4Address, IPv6Address +from ipaddr import IPv4Address +from ipaddr import IPv6Address from twisted.internet import reactor from twisted.internet.defer import Deferred @@ -26,14 +27,15 @@ from twisted.internet.error import ConnectionRefusedError from zope.interface import implements -import bridgedb.Dist import bridgedb.util as util from bridgedb.Dist import BadEmail, TooSoonEmail, IgnoreEmail -from bridgedb.Filters import filterBridgesByIP6, filterBridgesByIP4 +from bridgedb import Dist +from bridgedb import I18n +from bridgedb.Filters import filterBridgesByIP6 +from bridgedb.Filters import filterBridgesByIP4 from bridgedb.Filters import filterBridgesByTransport from bridgedb.Filters import filterBridgesByNotBlockedIn -import bridgedb.I18n as I18n class MailFile: """A file-like object used to hand rfc822.Message a list of lines

1 0

[bridgedb/develop] PEP8: use `except … as …` syntax in EmailServer.getMailResponse().
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit 37d144d2c581b43ca73b47fb47cd1b6597a5235c Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 12 15:24:53 2014 +0000 PEP8: use `except … as …` syntax in EmailServer.getMailResponse(). --- lib/bridgedb/EmailServer.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 5fa550d..7d54b4e 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -186,9 +186,9 @@ def getMailResponse(lines, ctx): bridgeFilterRules=bridgeFilterRules) # Handle rate limited email - except TooSoonEmail, e: - logging.info("Got a mail too frequently; warning %r: %s.", - util.logSafely(clientAddr), e) + except TooSoonEmail as err: + logging.info("Got a mail too frequently; warning '%s': %s." + % (util.logSafely(clientAddr), err)) # Compose a warning email # MAX_EMAIL_RATE is in seconds, convert to hours @@ -196,14 +196,14 @@ def getMailResponse(lines, ctx): return composeEmail(ctx.fromAddr, clientAddr, subject, body, msgID, gpgContext=ctx.gpgContext) - except IgnoreEmail, e: - logging.info("Got a mail too frequently; ignoring %r: %s.", - util.logSafely(clientAddr), e) + except IgnoreEmail as err: + logging.info("Got a mail too frequently; ignoring '%s': %s." + % (util.logSafely(clientAddr), err)) return None, None - except BadEmail, e: - logging.info("Got a mail from a bad email address %r: %s.", - util.logSafely(clientAddr), e) + except BadEmail as err: + logging.info("Got a mail from a bad email address '%s': %s." + % (util.logSafely(clientAddr), err)) return None, None if bridges:

1 0

[bridgedb/develop] Use `from` import syntax for twisted.mail.smtp in EmailServer.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit 32689e0d4f83506b867dcbf793cc757717acfdb5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 00:14:41 2014 +0000 Use `from` import syntax for twisted.mail.smtp in EmailServer. --- lib/bridgedb/EmailServer.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 4ea6a7c..b22d5b6 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -22,7 +22,7 @@ from ipaddr import IPv6Address from twisted.internet import defer from twisted.internet import reactor from twisted.internet.task import LoopingCall -import twisted.mail.smtp +from twisted.mail import smtp from zope.interface import implements @@ -281,9 +281,8 @@ def replyToMail(lines, ctx): logging.info("Sending reply to %r", util.logSafely(sendToUser)) d = defer.Deferred() - factory = twisted.mail.smtp.SMTPSenderFactory(ctx.smtpFromAddr, sendToUser, - response, d, retries=0, - timeout=30) + factory = smtp.SMTPSenderFactory(ctx.smtpFromAddr, sendToUser, + response, d, retries=0, timeout=30) d.addErrback(_ebReplyToMailFailure) logging.info("Sending reply to %r", util.logSafely(sendToUser)) reactor.connectTCP(ctx.smtpServer, ctx.smtpPort, factory) @@ -346,7 +345,7 @@ class MailContext: class MailMessage: """Plugs into the Twisted Mail and receives an incoming message. Once the message is in, we reply or we don't. """ - implements(twisted.mail.smtp.IMessage) + implements(smtp.IMessage) def __init__(self, ctx): """Create a new MailMessage from a MailContext.""" @@ -376,7 +375,7 @@ class MailMessage: class MailDelivery: """Plugs into Twisted Mail and handles SMTP commands.""" - implements(twisted.mail.smtp.IMessageDelivery) + implements(smtp.IMessageDelivery) def setBridgeDBContext(self, ctx): self.ctx = ctx @@ -398,14 +397,14 @@ class MailDelivery: if idx != -1: u = u[:idx] if u != self.ctx.username: - raise twisted.mail.smtp.SMTPBadRcpt(user) + raise smtp.SMTPBadRcpt(user) return lambda: MailMessage(self.ctx) -class MailFactory(twisted.mail.smtp.SMTPFactory): +class MailFactory(smtp.SMTPFactory): """Plugs into Twisted Mail; creates a new MailDelivery whenever we get a connection on the SMTP port.""" def __init__(self, *a, **kw): - twisted.mail.smtp.SMTPFactory.__init__(self, *a, **kw) + smtp.SMTPFactory.__init__(self, *a, **kw) self.delivery = MailDelivery() def setBridgeDBContext(self, ctx): @@ -413,7 +412,7 @@ class MailFactory(twisted.mail.smtp.SMTPFactory): self.delivery.setBridgeDBContext(ctx) def buildProtocol(self, addr): - p = twisted.mail.smtp.SMTPFactory.buildProtocol(self, addr) + p = smtp.SMTPFactory.buildProtocol(self, addr) p.delivery = self.delivery return p

1 0

[bridgedb/develop] Import `defer` rather than `Deferred` in EmailServer.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit 85d34853512c9b8a2227e5026c9a60aa537260ef Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 00:08:56 2014 +0000 Import `defer` rather than `Deferred` in EmailServer. --- lib/bridgedb/EmailServer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 84b6804..92a93bb 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -19,8 +19,8 @@ import time from ipaddr import IPv4Address from ipaddr import IPv6Address +from twisted.internet import defer from twisted.internet import reactor -from twisted.internet.defer import Deferred from twisted.internet.task import LoopingCall import twisted.mail.smtp from twisted.internet.error import ConnectionRefusedError @@ -281,7 +281,7 @@ def replyToMail(lines, ctx): response.seek(0) logging.info("Sending reply to %r", util.logSafely(sendToUser)) - d = Deferred() + d = defer.Deferred() factory = twisted.mail.smtp.SMTPSenderFactory(ctx.smtpFromAddr, sendToUser, response, d, retries=0, timeout=30) @@ -369,7 +369,7 @@ class MailMessage: """Called when we receive the end of a message.""" if not self.ignoring: replyToMail(self.lines, self.ctx) - return twisted.internet.defer.succeed(None) + return defer.succeed(None) def connectionLost(self): """Called if we die partway through reading a message."""

1 0

[bridgedb/develop] PEP8 whitespace fixes for EmailServer.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit 6d3686f31dbe94a7d5de19b2f81b9bd8c0f49b79 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Apr 6 22:40:24 2014 +0000 PEP8 whitespace fixes for EmailServer. --- lib/bridgedb/EmailServer.py | 80 ++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 36 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 8e007de..84b6804 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -102,21 +102,27 @@ def getMailResponse(lines, ctx): _, addrdomain = bridgedb.Dist.extractAddrSpec(clientAddr.lower()) except BadEmail: logging.info("Ignoring bad address on incoming email.") - return None,None + return None, None + if not addrdomain: logging.info("Couldn't parse domain from %r", util.logSafely(clientAddr)) + if addrdomain and ctx.cfg.EMAIL_DOMAIN_MAP: addrdomain = ctx.cfg.EMAIL_DOMAIN_MAP.get(addrdomain, addrdomain) + if addrdomain not in ctx.cfg.EMAIL_DOMAINS: logging.info("Unrecognized email domain %r", util.logSafely(addrdomain)) - return None,None + return None, None + rules = ctx.cfg.EMAIL_DOMAIN_RULES.get(addrdomain, []) + if 'dkim' in rules: # getheader() returns the last of a given kind of header; we want # to get the first, so we use getheaders() instead. dkimHeaders = msg.getheaders("X-DKIM-Authentication-Results") dkimHeader = "<no header>" - if dkimHeaders: dkimHeader = dkimHeaders[0] + if dkimHeaders: + dkimHeader = dkimHeaders[0] if not dkimHeader.startswith("pass"): logging.info("Got a bad dkim header (%r) on an incoming mail; " "rejecting it.", dkimHeader) @@ -139,7 +145,8 @@ def getMailResponse(lines, ctx): # ignore all lines before the subject header if "subject" in ln.strip().lower(): skippedheaders = True - if not skippedheaders: continue + if not skippedheaders: + continue if "ipv6" in ln.strip().lower(): ipv6 = True @@ -169,7 +176,8 @@ def getMailResponse(lines, ctx): if unblocked: rules.append(filterBridgesByNotBlockedIn(unblocked, - addressClass, transport)) + addressClass, + transport)) try: interval = ctx.schedule.getInterval(time.time()) @@ -185,59 +193,57 @@ def getMailResponse(lines, ctx): # Compose a warning email # MAX_EMAIL_RATE is in seconds, convert to hours - body = buildSpamWarningTemplate(t) % (bridgedb.Dist.MAX_EMAIL_RATE / 3600) + body = buildSpamWarningTemplate(t) % (Dist.MAX_EMAIL_RATE / 3600) return composeEmail(ctx.fromAddr, clientAddr, subject, body, msgID, gpgContext=ctx.gpgContext) except IgnoreEmail, e: logging.info("Got a mail too frequently; ignoring %r: %s.", util.logSafely(clientAddr), e) - return None, None + return None, None except BadEmail, e: logging.info("Got a mail from a bad email address %r: %s.", util.logSafely(clientAddr), e) - return None, None + return None, None if bridges: with_fp = ctx.cfg.EMAIL_INCLUDE_FINGERPRINTS - answer = "".join(" %s\n" %b.getConfigLine( + answer = "".join(" %s\n" % b.getConfigLine( includeFingerprint=with_fp, addressClass=addressClass, transport=transport, - request=clientAddr - ) for b in bridges) + request=clientAddr) for b in bridges) else: answer = "(no bridges currently available)" body = buildMessageTemplate(t) % answer # Generate the message. return composeEmail(ctx.fromAddr, clientAddr, subject, body, msgID, - gpgContext=ctx.gpgContext) - + gpgContext=ctx.gpgContext) def buildMessageTemplate(t): - msg_template = t.gettext(I18n.BRIDGEDB_TEXT[5]) + "\n\n" \ - + t.gettext(I18n.BRIDGEDB_TEXT[0]) + "\n\n" \ - + "%s\n" \ - + t.gettext(I18n.BRIDGEDB_TEXT[1]) + "\n\n" \ - + t.gettext(I18n.BRIDGEDB_TEXT[2]) + "\n\n" \ - + t.gettext(I18n.BRIDGEDB_TEXT[3]) + "\n\n" \ - + t.gettext(I18n.BRIDGEDB_TEXT[17])+ "\n\n" - # list supported commands, e.g. ipv6, transport + msg_template = t.gettext(I18n.BRIDGEDB_TEXT[5]) + "\n\n" \ + + t.gettext(I18n.BRIDGEDB_TEXT[0]) + "\n\n" \ + + "%s\n" \ + + t.gettext(I18n.BRIDGEDB_TEXT[1]) + "\n\n" \ + + t.gettext(I18n.BRIDGEDB_TEXT[2]) + "\n\n" \ + + t.gettext(I18n.BRIDGEDB_TEXT[3]) + "\n\n" \ + + t.gettext(I18n.BRIDGEDB_TEXT[17])+ "\n\n" + # list supported commands, e.g. ipv6, transport msg_template = msg_template \ - + " " + t.gettext(I18n.BRIDGEDB_TEXT[18])+ "\n" \ - + " " + t.gettext(I18n.BRIDGEDB_TEXT[19])+ "\n\n" \ - + t.gettext(I18n.BRIDGEDB_TEXT[6]) + "\n\n" + + " " + t.gettext(I18n.BRIDGEDB_TEXT[18])+ "\n" \ + + " " + t.gettext(I18n.BRIDGEDB_TEXT[19])+ "\n\n" \ + + t.gettext(I18n.BRIDGEDB_TEXT[6]) + "\n\n" return msg_template def buildSpamWarningTemplate(t): - msg_template = t.gettext(I18n.BRIDGEDB_TEXT[5]) + "\n\n" \ - + t.gettext(I18n.BRIDGEDB_TEXT[10]) + "\n\n" \ - + "%s " \ - + t.gettext(I18n.BRIDGEDB_TEXT[11]) + "\n\n" \ - + t.gettext(I18n.BRIDGEDB_TEXT[12]) + "\n\n" - return msg_template + msg_template = t.gettext(I18n.BRIDGEDB_TEXT[5]) + "\n\n" \ + + t.gettext(I18n.BRIDGEDB_TEXT[10]) + "\n\n" \ + + "%s " \ + + t.gettext(I18n.BRIDGEDB_TEXT[11]) + "\n\n" \ + + t.gettext(I18n.BRIDGEDB_TEXT[12]) + "\n\n" + return msg_template def _ebReplyToMailFailure(fail): """Errback for a :api:`twisted.mail.smtp.SMTPSenderFactory`. @@ -282,7 +288,6 @@ def replyToMail(lines, ctx): d.addErrback(_ebReplyToMailFailure) logging.info("Sending reply to %r", util.logSafely(sendToUser)) reactor.connectTCP(ctx.smtpServer, ctx.smtpPort, factory) - return d def getLocaleFromPlusAddr(address): @@ -312,10 +317,10 @@ def getLocaleFromRequest(request): class MailContext: """Helper object that holds information used by email subsystem.""" + def __init__(self, cfg, dist, sched): # Reject any RCPT TO lines that aren't to this user. - self.username = (cfg.EMAIL_USERNAME or - "bridges") + self.username = (cfg.EMAIL_USERNAME or "bridges") # Reject any mail longer than this. self.maximumSize = 32*1024 # Use this server for outgoing mail. @@ -373,17 +378,20 @@ class MailMessage: class MailDelivery: """Plugs into Twisted Mail and handles SMTP commands.""" implements(twisted.mail.smtp.IMessageDelivery) + def setBridgeDBContext(self, ctx): self.ctx = ctx + def receivedHeader(self, helo, origin, recipients): #XXXX what is this for? what should it be? return "Received: BridgeDB" def validateFrom(self, helo, origin): return origin + def validateTo(self, user): - """If the local user that was addressed isn't our configured local - user or doesn't contain a '+' with a prefix matching the local - configured user: Yell + """If the local user that was addressed isn't our configured local user + or doesn't contain a '+' with a prefix matching the local configured + user: Yell. """ u = user.dest.local # Hasplus? If yes, strip '+foo'

1 0

[bridgedb/develop] Remove unused import ConnectionRefusedError in EmailServer.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit ff8c8cd30ca214b9e4050f998a1e09809241f8b8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 00:10:21 2014 +0000 Remove unused import ConnectionRefusedError in EmailServer. --- lib/bridgedb/EmailServer.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 92a93bb..4ea6a7c 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -23,7 +23,6 @@ from twisted.internet import defer from twisted.internet import reactor from twisted.internet.task import LoopingCall import twisted.mail.smtp -from twisted.internet.error import ConnectionRefusedError from zope.interface import implements

1 0

[bridgedb/develop] Use Dist.* instead of bridgedb.Dist.* in EmailServer.getMailResponse().
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit b21fc1dad202f300314fb84347da356c5bfac195 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 12 15:24:53 2014 +0000 Use Dist.* instead of bridgedb.Dist.* in EmailServer.getMailResponse(). --- lib/bridgedb/EmailServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index b22d5b6..5fa550d 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -98,7 +98,7 @@ def getMailResponse(lines, ctx): t = I18n.getLang(lang) try: - _, addrdomain = bridgedb.Dist.extractAddrSpec(clientAddr.lower()) + _, addrdomain = Dist.extractAddrSpec(clientAddr.lower()) except BadEmail: logging.info("Ignoring bad address on incoming email.") return None, None

1 0

[bridgedb/develop] Fix old-style class EmailServer.MailMessage.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit ceb050f7aa5576b838621164f658d9d8a0f4ca4a Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 02:45:16 2014 +0000 Fix old-style class EmailServer.MailMessage. --- lib/bridgedb/EmailServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 7d54b4e..cba7ed1 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -342,7 +342,7 @@ class MailContext: self.cfg = cfg -class MailMessage: +class MailMessage(object): """Plugs into the Twisted Mail and receives an incoming message. Once the message is in, we reply or we don't. """ implements(smtp.IMessage)

1 0

[bridgedb/develop] Remove banal truism from EmailServer.MailMessage docstring.
by isis＠torproject.org 08 Apr '14

08 Apr '14

commit 0eecc001dc6f00a90108385bd01b541638d464a0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 02:47:40 2014 +0000 Remove banal truism from EmailServer.MailMessage docstring. --- lib/bridgedb/EmailServer.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index cba7ed1..eb04917 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -343,8 +343,7 @@ class MailContext: self.cfg = cfg class MailMessage(object): - """Plugs into the Twisted Mail and receives an incoming message. - Once the message is in, we reply or we don't. """ + """Plugs into the Twisted Mail and receives an incoming message.""" implements(smtp.IMessage) def __init__(self, ctx):

1 0