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

[bridgedb/develop] Merge branch 'fix/11219-httpconnpool' into develop
by isis＠torproject.org 17 Mar '14

17 Mar '14

commit 984ea10c316d1ce4dbd38339f3157a4f9e5c1190 Merge: f523014 bd50039 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 17 01:48:32 2014 +0000 Merge branch 'fix/11219-httpconnpool' into develop lib/bridgedb/txrecaptcha.py | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-)

1 0

[bridgedb/develop] Only use `t.w.client.HTTPConnectionPool` if available.
by isis＠torproject.org 17 Mar '14

17 Mar '14

commit bd5003961479b047477124e969f9e51850249c38 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 17 00:58:20 2014 +0000 Only use `t.w.client.HTTPConnectionPool` if available. * CHANGES bridgedb.txrecaptcha to create agents using the HTTPConnectionPool, only if our Twisted version is high enough. * FIXES #11219. --- lib/bridgedb/txrecaptcha.py | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/lib/bridgedb/txrecaptcha.py b/lib/bridgedb/txrecaptcha.py index 96c813b..e1e3234 100644 --- a/lib/bridgedb/txrecaptcha.py +++ b/lib/bridgedb/txrecaptcha.py @@ -15,10 +15,12 @@ from recaptcha.client.captcha import API_SSL_SERVER from recaptcha.client.captcha import RecaptchaResponse from recaptcha.client.captcha import displayhtml +from twisted import version as _twistedversion from twisted.internet import defer from twisted.internet import protocol from twisted.internet import reactor from twisted.python import failure +from twisted.python.util import Version from twisted.web import client from twisted.web.http_headers import Headers from twisted.web.iweb import IBodyProducer @@ -31,10 +33,20 @@ from bridgedb.crypto import SSLVerifyingContextFactory API_SERVER = API_SSL_SERVER API_SSL_VERIFY_URL = "%s/verify" % API_SSL_SERVER -_pool = client.HTTPConnectionPool(reactor, persistent=False) -_pool.maxPersistentPerHost = 5 -_pool.cachedConnectionTimeout = 30 -_agent = client.Agent(reactor, pool=_pool) +# `t.w.client.HTTPConnectionPool` isn't available in Twisted-12.0.0 (see +# ticket #11219): +_connectionPoolAvailable = _twistedversion >= Version('twisted', 12, 1, 0) +if _connectionPoolAvailable: + logging.info("Using HTTPConnectionPool for reCaptcha API server.") + _pool = client.HTTPConnectionPool(reactor, persistent=False) + _pool.maxPersistentPerHost = 5 + _pool.cachedConnectionTimeout = 30 + _agent = client.Agent(reactor, pool=_pool) +else: + logging.warn("Twisted-%s is too old for HTTPConnectionPool! Disabling..." + % _twistedversion.short()) + _pool = None + _agent = client.Agent(reactor) def _setAgent(agent): @@ -45,8 +57,8 @@ def _setAgent(agent): global _agent _agent = agent -def _getAgent(reactor=reactor, url=API_SSL_VERIFY_URL, pool=_pool, - connectTimeout=30, **kwargs): +def _getAgent(reactor=reactor, url=API_SSL_VERIFY_URL, connectTimeout=30, + **kwargs): """Create a :api:`twisted.web.client.Agent` which will verify the certificate chain and hostname for the given **url**. @@ -62,11 +74,17 @@ def _getAgent(reactor=reactor, url=API_SSL_VERIFY_URL, pool=_pool, :api:`twisted.internet.reactor.connectSSL` for specifying the connection timeout. (default: ``30``) """ - return client.Agent(reactor, - contextFactory=SSLVerifyingContextFactory(url), - connectTimeout=connectTimeout, - pool=pool, - **kwargs) + if _connectionPoolAvailable: + return client.Agent(reactor, + contextFactory=SSLVerifyingContextFactory(url), + connectTimeout=connectTimeout, + pool=_pool, + **kwargs) + else: + return client.Agent(reactor, + contextFactory=SSLVerifyingContextFactory(url), + connectTimeout=connectTimeout, + **kwargs) _setAgent(_getAgent())

1 0

[bridgedb/develop] Add a real docstring to EmailServer.replyToMail().
by isis＠torproject.org 17 Mar '14

17 Mar '14

commit 1e330cb61bce46f49b29474f8a031d46726ac213 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 17 02:59:08 2014 +0000 Add a real docstring to EmailServer.replyToMail(). --- lib/bridgedb/EmailServer.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index f301eb8..d442ccd 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -236,8 +236,18 @@ def buildSpamWarningTemplate(t): return msg_template def replyToMail(lines, ctx): - """Given a list of lines from an incoming email message, and a - MailContext object, possibly send a reply. + """Reply to an incoming email. Maybe. + + If no `response` is returned from :func:`getMailResponse`, then the + incoming email will not be responded to at all. This can happen for + several reasons, for example: if the DKIM signature was invalid or + missing, or if the incoming email came from an unacceptable domain, or if + there have been too many emails from this client in the allotted time + period. + + :param list lines: A list of lines from an incoming email message. + :type ctx: :class:`MailContext` + :param ctx: The configured context for the email server. """ logging.info("Got a completed email; deciding whether to reply.") sendToUser, response = getMailResponse(lines, ctx)

1 0

[bridgedb/develop] Add CHANGELOG entry for 0.1.6.
by isis＠torproject.org 17 Mar '14

17 Mar '14

commit d808f7a6de915cbb9a77f04fa6207d388225413a Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 17 02:04:59 2014 +0000 Add CHANGELOG entry for 0.1.6. --- CHANGELOG | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b8c9d71..bf895ad 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +Changes in version 0.1.6 - 2014-03-17 +BridgeDB 0.1.6 includes fixes for the following bugs: + * FIXES #11218 ReCaptchaProtectedResource.checkSolution() + doesn't expect a deferred + * FIXES #11219 BridgeDB's twisted version doesn´t have a + `t.w.client.HTTPConnectionPool` class + + Changes in version 0.1.5 - 2014-02-27 BridgeDB 0.1.5 includes fixes for the following bugs: * FIXES #9264 Problem with transport lines in BridgeDB's bridge

1 0

[bridgedb/develop] Tweak the log message strings in EmailServer.replyToMail().
by isis＠torproject.org 17 Mar '14

17 Mar '14

commit 5e40f67141201aa9f5561319b32069c130899160 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 17 03:01:14 2014 +0000 Tweak the log message strings in EmailServer.replyToMail(). --- lib/bridgedb/EmailServer.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index d442ccd..8fb0d8a 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -249,12 +249,15 @@ def replyToMail(lines, ctx): :type ctx: :class:`MailContext` :param ctx: The configured context for the email server. """ - logging.info("Got a completed email; deciding whether to reply.") + logging.info("Got an email; deciding whether to reply.") sendToUser, response = getMailResponse(lines, ctx) if response is None: - logging.debug("getMailResponse said not to reply, so I won't.") + logging.debug("getMailResponse() said not to reply to %s, so I won't." + % Util.logSafely(sendToUser)) return response.seek(0) + logging.info("Sending reply to %r", Util.logSafely(sendToUser)) + d = Deferred() factory = twisted.mail.smtp.SMTPSenderFactory( ctx.smtpFromAddr, @@ -262,7 +265,7 @@ def replyToMail(lines, ctx): response, d) reactor.connectTCP(ctx.smtpServer, ctx.smtpPort, factory) - logging.info("Sending reply to %r", Util.logSafely(sendToUser)) + return d def getLocaleFromPlusAddr(address):

1 0

[bridgedb/develop] Fix class and __init__ docstrings for EmailBasedDistributor.
by isis＠torproject.org 17 Mar '14

17 Mar '14

commit ce8604c52f4b9f1488a9676794116addccb0b78a Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 17 03:04:19 2014 +0000 Fix class and __init__ docstrings for EmailBasedDistributor. --- lib/bridgedb/Dist.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 9d3b06e..dddc84b 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -413,17 +413,25 @@ def normalizeEmail(addr, domainmap, domainrules): class EmailBasedDistributor(Distributor): """Object that hands out bridges based on the email address of an incoming - request and the current time period. + request and the current time period. + + :type splitter: :class:`~bridgedb.Bridges.BridgeRing` + :ivar splitter: A hashring to hold all the bridges we hand out. """ - ## Fields: - ## emailHmac -- an hmac function used to order email addresses within - ## a ring. - ## ring -- a BridgeRing object to hold all the bridges we hand out. - ## store -- a database object to remember what we've given to whom. - ## domainmap -- a map from lowercase domains that we support mail from - ## to their canonical forms. + def __init__(self, key, domainmap, domainrules, answerParameters=None): + """Create a bridge distributor which uses email. + + :type emailHmac: callable + :param emailHmac: An hmac function used to order email addresses + within a ring. See :func:`~bridgedb.crypto.getHMACFunc`. + :param dict domainmap: A map from lowercase domains that we support + mail from to their canonical forms. See `EMAIL_DOMAIN_MAP` option + in `bridgedb.conf`. + :param domainrules: DOCDOC + :param answerParameters: DOCDOC + """ key1 = getHMAC(key, "Map-Addresses-To-Ring") self.emailHmac = getHMACFunc(key1, hex=False)

1 0

[bridgedb/develop] PEP8 whitespace fixes for EmailServer.replyToMail().
by isis＠torproject.org 17 Mar '14

17 Mar '14

commit cae8198956404771b3467581a5db5758df89ce59 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 17 03:02:24 2014 +0000 PEP8 whitespace fixes for EmailServer.replyToMail(). --- lib/bridgedb/EmailServer.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 8fb0d8a..79239c7 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -251,19 +251,18 @@ def replyToMail(lines, ctx): """ logging.info("Got an email; deciding whether to reply.") sendToUser, response = getMailResponse(lines, ctx) + if response is None: logging.debug("getMailResponse() said not to reply to %s, so I won't." % Util.logSafely(sendToUser)) return + response.seek(0) logging.info("Sending reply to %r", Util.logSafely(sendToUser)) d = Deferred() - factory = twisted.mail.smtp.SMTPSenderFactory( - ctx.smtpFromAddr, - sendToUser, - response, - d) + factory = twisted.mail.smtp.SMTPSenderFactory(ctx.smtpFromAddr, sendToUser, + response, d) reactor.connectTCP(ctx.smtpServer, ctx.smtpPort, factory) return d

1 0

[bridgedb/develop] Change Contact link on webserver to go to support desk.
by isis＠torproject.org 17 Mar '14

17 Mar '14

commit 2912ffc17f262cedb37452effee59eb48c31fdd8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 17 05:15:55 2014 +0000 Change Contact link on webserver to go to support desk. --- lib/bridgedb/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index 4eea5a5..228078e 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -112,7 +112,7 @@ ${self.body()} &middot <a href="https://gitweb.torproject.org/bridgedb.git">${_("Source Code")}</a> &middot - <a href="mailto:isis@torproject.org">${_("Contact")}</a> + <a href="mailto:help@rt.torproject.org">${_("Contact")}</a> </p> </div>

1 0

[bridgedb/develop] Make webserver Tor logo link to torproject.org.
by isis＠torproject.org 17 Mar '14

17 Mar '14

commit bc0f1d1b72a2e34277209ce97b2cbc6ce4d1b103 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 17 05:14:09 2014 +0000 Make webserver Tor logo link to torproject.org. --- lib/bridgedb/templates/base.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index 441f3b6..55044e6 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -34,7 +34,8 @@ span { <ul class="nav nav-pills pull-right"> <h3 class="muted">BridgeDB</h3> </ul> - <img src="/assets/tor.svg" height="10%" width="15%"/> + <a href="https://www.torproject.org"><img src="/assets/tor.svg" + height="10%" width="15%"/></a> </div>

1 0

[bridgedb/develop] Add link to CHANGELOG from webserver.
by isis＠torproject.org 17 Mar '14

17 Mar '14

commit f30cc6d2f2eabc5129a2e572707f6fc53c005e75 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 17 05:15:29 2014 +0000 Add link to CHANGELOG from webserver. --- lib/bridgedb/templates/base.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html index 55044e6..4eea5a5 100644 --- a/lib/bridgedb/templates/base.html +++ b/lib/bridgedb/templates/base.html @@ -105,10 +105,13 @@ ${self.body()} <div class="footer"> <p>© The Tor Project</p> <p> - <a href="https://gitweb.torproject.org/bridgedb.git">${_("Source Code")}</a> - &middot <a href="https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…">${_("Report a Bug")}</a> &middot + <a href="https://gitweb.torproject.org/bridgedb.git/blob_plain/HEAD:/CHANGELOG"> + ${_("Change Log")}</a> + &middot + <a href="https://gitweb.torproject.org/bridgedb.git">${_("Source Code")}</a> + &middot <a href="mailto:isis@torproject.org">${_("Contact")}</a> </p> </div>

1 0