tor-commits April 2014

tor-commits@lists.torproject.org

22 participants
2020 discussions

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

19 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/master] Fix old-style class EmailServer.MailMessage.
by isis＠torproject.org 19 Apr '14

19 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/master] Use `from` import syntax for twisted.mail.smtp in EmailServer.
by isis＠torproject.org 19 Apr '14

19 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/master] Use Dist.* instead of bridgedb.Dist.* in EmailServer.getMailResponse().
by isis＠torproject.org 19 Apr '14

19 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/master] Remove duplicate log statement from EmailServer.replyToMail().
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 3f0e105d554191878579f15ea40ca3f452cadbbc Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 02:49:21 2014 +0000 Remove duplicate log statement from EmailServer.replyToMail(). --- lib/bridgedb/EmailServer.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index eb04917..37a4a82 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -278,7 +278,6 @@ def replyToMail(lines, ctx): return response.seek(0) - logging.info("Sending reply to %r", util.logSafely(sendToUser)) d = defer.Deferred() factory = smtp.SMTPSenderFactory(ctx.smtpFromAddr, sendToUser,

1 0

[bridgedb/master] Only log incoming emails if SAFELOGGING is disabled.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 394161ce5794469602d4c6f3ac194a5646e2e9b8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 02:51:44 2014 +0000 Only log incoming emails if SAFELOGGING is disabled. --- lib/bridgedb/EmailServer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 56e6aea..a02a2fe 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -355,7 +355,8 @@ class MailMessage(object): def lineReceived(self, line): """Called when we get another line of an incoming message.""" self.nBytes += len(line) - logging.debug("> %s", line.rstrip("\r\n")) + if not util.safe_logging: + logging.debug("> %s", line.rstrip("\r\n")) if self.nBytes > self.ctx.maximumSize: self.ignoring = True else:

1 0

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

19 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

[bridgedb/master] PEP8 add newline after class docstring in EmailServer.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 75870e70da6ae81f26581e2ba70ac2924c03cb3e Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 02:55:02 2014 +0000 PEP8 add newline after class docstring in EmailServer. --- lib/bridgedb/EmailServer.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index dd0ca49..2d2158d 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -402,6 +402,7 @@ class MailDelivery(object): 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): smtp.SMTPFactory.__init__(self, *a, **kw) self.delivery = MailDelivery()

1 0

[bridgedb/master] Fix old-style class EmailServer.MailDelivery.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit 8bc8a8ee81b9a881f1c6d48539f70a4fa51f6f41 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 02:52:23 2014 +0000 Fix old-style class EmailServer.MailDelivery. --- 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 a02a2fe..dd0ca49 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -372,7 +372,7 @@ class MailMessage(object): """Called if we die partway through reading a message.""" pass -class MailDelivery: +class MailDelivery(object): """Plugs into Twisted Mail and handles SMTP commands.""" implements(smtp.IMessageDelivery)

1 0

[bridgedb/master] Fix old-style class EmailServer.MailContext.
by isis＠torproject.org 19 Apr '14

19 Apr '14

commit b0157d695ef55692de163f92eccf6d65d50bec8b Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 7 02:50:53 2014 +0000 Fix old-style class EmailServer.MailContext. --- 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 37a4a82..56e6aea 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -312,7 +312,7 @@ def getLocaleFromRequest(request): lang = lang[0] return I18n.getLang(lang) -class MailContext: +class MailContext(object): """Helper object that holds information used by email subsystem.""" def __init__(self, cfg, dist, sched):

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2014