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

[bridgedb/master] Add unittest for checkDKIM() with `X-DKIM-Authentication-Results: dunno`.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 6ce901dfd3497ace147cc57359c669bad2cefa6f Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 5 02:59:39 2014 +0000 Add unittest for checkDKIM() with `X-DKIM-Authentication-Results: dunno`. * ADD new unittest test_checkDKIM_dunno() to test_email_dkim.py which checks that a ``X-DKIM-Authentication-Results: dunno`` header properly returns False. --- lib/bridgedb/test/test_email_dkim.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/bridgedb/test/test_email_dkim.py b/lib/bridgedb/test/test_email_dkim.py index 3407fa5..ee022b0 100644 --- a/lib/bridgedb/test/test_email_dkim.py +++ b/lib/bridgedb/test/test_email_dkim.py @@ -62,3 +62,14 @@ get bridges result = dkim.checkDKIM(message, self.domainRules.get("gmail.com")) self.assertIs(result, False) + + def test_checkDKIM_dunno(self): + """A ``X-DKIM-Authentication-Results: dunno`` header should return + False. + """ + messageList = self.badMessage.split('\n') + messageList[2] = "X-DKIM-Authentication-Results: dunno" + message = self._createMessage('\n'.join(messageList)) + result = dkim.checkDKIM(message, + self.domainRules.get("gmail.com")) + self.assertIs(result, False)

1 0

[bridgedb/master] Ensure that a default (6725) EMAIL_PORT is set.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 6fbe6f03cc1de10009047d0d1b1340742fef0f46 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 4 17:19:41 2014 +0000 Ensure that a default (6725) EMAIL_PORT is set. --- lib/bridgedb/email/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 11af8df..36dc841 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -417,7 +417,7 @@ def addServer(config, distributor, schedule): factory.setContext(context) addr = config.EMAIL_BIND_IP or "" - port = config.EMAIL_PORT + port = config.EMAIL_PORT or 6725 try: reactor.listenTCP(port, factory, interface=addr)

1 0

[bridgedb/master] Add timeout to SMTPAutoresponder unittests.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit d5ca5f67d8e78ae0134985f7a0e6f36b6a8be7f0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 5 03:08:06 2014 +0000 Add timeout to SMTPAutoresponder unittests. Some of them were taking a *really* long time on some hosts, particularly these two: - test_SMTPAutoresponder_reply_transport_invalid - test_SMTPAutoresponder_reply_transport_valid --- lib/bridgedb/test/test_email_autoresponder.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/test/test_email_autoresponder.py b/lib/bridgedb/test/test_email_autoresponder.py index 880afa6..3cc802b 100644 --- a/lib/bridgedb/test/test_email_autoresponder.py +++ b/lib/bridgedb/test/test_email_autoresponder.py @@ -290,6 +290,8 @@ a ball of timey-wimey, wibbly-warbly... stuff.""" class SMTPAutoresponderTests(unittest.TestCase): """Unittests for :class:`bridgedb.email.autoresponder.SMTPAutoresponder`.""" + timeout = 10 + def setUp(self): self.config = _createConfig() self.context = _createMailServerContext(self.config)

1 0

[bridgedb/master] Add unittest for checkDKIM() with two `X-DKIM-Authentication-Results:` headers.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 712f11699ad799e5df9d21fe5e63c8d73652eb05 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 5 03:01:42 2014 +0000 Add unittest for checkDKIM() with two `X-DKIM-Authentication-Results:` headers. * ADD a new unittest, test_checkDKIM_good_dunno(), to test_email_dkim.py, which checks that a received email with two ``X-DKIM-Authentication-Results:`` headers (the first one good, the second ``dunno``) properly returns False. * FIXES #12091. Actually, it doesn't. It just proves that the changes in my `fix/9874-automate-email-tests` branch fix #12091. Either way, it's fixed, these unittests prove it. --- lib/bridgedb/test/test_email_dkim.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/bridgedb/test/test_email_dkim.py b/lib/bridgedb/test/test_email_dkim.py index ee022b0..499a3c1 100644 --- a/lib/bridgedb/test/test_email_dkim.py +++ b/lib/bridgedb/test/test_email_dkim.py @@ -73,3 +73,14 @@ get bridges result = dkim.checkDKIM(message, self.domainRules.get("gmail.com")) self.assertIs(result, False) + + def test_checkDKIM_good_dunno(self): + """A good DKIM verification header, *plus* an + ``X-DKIM-Authentication-Results: dunno`` header should return False. + """ + messageList = self.badMessage.split('\n') + messageList.insert(2, "X-DKIM-Authentication-Results: dunno") + message = self._createMessage('\n'.join(messageList)) + result = dkim.checkDKIM(message, + self.domainRules.get("gmail.com")) + self.assertIs(result, False)

1 0

[bridgedb/master] Add _createMessage() utility to test_email_dkim.py.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 7d7606a94cfc9a6c069aacf237d6fe28ad708b98 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 5 02:58:40 2014 +0000 Add _createMessage() utility to test_email_dkim.py. --- lib/bridgedb/test/test_email_dkim.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/test/test_email_dkim.py b/lib/bridgedb/test/test_email_dkim.py index 3350d19..3407fa5 100644 --- a/lib/bridgedb/test/test_email_dkim.py +++ b/lib/bridgedb/test/test_email_dkim.py @@ -24,36 +24,41 @@ class CheckDKIMTests(unittest.TestCase): def setUp(self): """Create fake email, distributor, and associated context data.""" - self.goodMessage = io.StringIO(unicode("""\ + self.goodMessage = """\ From: user(a)gmail.com To: bridges@localhost X-DKIM-Authentication-Results: pass Subject: testing get bridges -""")) - self.badMessage = io.StringIO(unicode("""\ +""" + self.badMessage = """\ From: user(a)gmail.com To: bridges@localhost Subject: testing get bridges -""")) +""" self.domainRules = { 'gmail.com': ["ignore_dots", "dkim"], 'example.com': [], 'localhost': [], } + def _createMessage(self, messageString): + """Create an ``rfc822.Message`` from a string.""" + messageIO = io.StringIO(unicode(messageString)) + return rfc822.Message(messageIO) + def test_checkDKIM_good(self): - message = rfc822.Message(self.goodMessage) + message = self._createMessage(self.goodMessage) result = dkim.checkDKIM(message, self.domainRules.get("gmail.com")) self.assertTrue(result) def test_checkDKIM_bad(self): - message = rfc822.Message(self.badMessage) + message = self._createMessage(self.badMessage) result = dkim.checkDKIM(message, self.domainRules.get("gmail.com")) self.assertIs(result, False)

1 0

[bridgedb/master] Merge branch 'fix/12091-dkim-dunno' into fix/9874-automate-email-tests
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 862b996d9fdec8f0d2b33be9eab065d4e0abd715 Merge: 6fbe6f0 712f116 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 5 03:07:45 2014 +0000 Merge branch 'fix/12091-dkim-dunno' into fix/9874-automate-email-tests lib/bridgedb/test/test_email_autoresponder.py | 21 ++++++++++--- lib/bridgedb/test/test_email_dkim.py | 39 +++++++++++++++++++++---- 2 files changed, 50 insertions(+), 10 deletions(-)

1 0

[bridgedb/master] Add `pragma: no cover` directive to b.e.server.addServer.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit a78d22c3d65d6ceddbd902b04861b04641acd6fb Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 5 03:11:44 2014 +0000 Add `pragma: no cover` directive to b.e.server.addServer. We don't need to test for conditions which might raise a ``twisted.protocols.tcp.CannotListenError``, we just need to ensure that we exit if we can't bind to the port for the email server. --- lib/bridgedb/email/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 36dc841..94405ea 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -421,7 +421,7 @@ def addServer(config, distributor, schedule): try: reactor.listenTCP(port, factory, interface=addr) - except CannotListenError as error: + except CannotListenError as error: # pragma: no cover logging.fatal(error) raise SystemExit(error.message)

1 0

[bridgedb/master] Add translator notes about how to translate "plain-ol'-vanilla bridges".
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 7a8e0cfd30270320c324391e1569967423cab4e0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 17:44:10 2014 +0000 Add translator notes about how to translate "plain-ol'-vanilla bridges". * FIXES part of #12122. --- lib/bridgedb/strings.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/bridgedb/strings.py b/lib/bridgedb/strings.py index cfd682f..4137621 100644 --- a/lib/bridgedb/strings.py +++ b/lib/bridgedb/strings.py @@ -49,6 +49,10 @@ using Tor.\n\n"""), Some bridges with IPv6 addresses are also available, though some Pluggable Transports aren't IPv6 compatible.\n\n"""), +# TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, regular, +# or unexciting". Like vanilla ice cream. It refers to bridges which do not +# have Pluggable Transports, and only speak the regular, boring Tor +# protocol. Translate it as you see fit. Have fun with it. 2: _("""\ Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any Pluggable Transports %s which maybe doesn't sound as cool, but they can still @@ -120,6 +124,9 @@ button in the 'Tor Network Settings' wizard for further assistance."""), EMAIL_COMMANDS = { "get help": _("Displays this message."), +# TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +# same non-Pluggable Transport bridges described above as being +# "plain-ol'-vanilla" bridges. "get bridges": _("Request vanilla bridges."), "get ipv6": _("Request IPv6 bridges."), # TRANSLATORS: Please DO NOT translate the word the word "TYPE".

1 0

[bridgedb/master] Add #9874 #12086 #12089 #12090 #12091 and #12147 to CHANGELOG for 0.2.2.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit e7b3d6e7b973ad107aa0779f492b40123e69ed88 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 17:26:36 2014 +0000 Add #9874 #12086 #12089 #12090 #12091 and #12147 to CHANGELOG for 0.2.2. --- CHANGELOG | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 76fe023..3b07e5b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,82 @@ +Changes in version 0.2.2 - 2014-06-XXX + + * FIXES #9874 https://trac.torproject.org/projects/tor/ticket/9874 + BridgeDB's email and HTTPS distributors were written in a manner + that makes them largely impossible to write unittests for. Since + the recent rewrite of BridgeDB's email distributor server backends + for version 0.2.1, BridgeDB email distributor is now testable and + has near 100% code coverage, see + https://coveralls.io/r/isislovecruft/bridgedb + + * FIXES #12086 https://trac.torproject.org/projects/tor/ticket/12086 + BridgeDB was found to accept incoming emails sent to any email + address whose local part included the word bridges, e.g. emails + sent to 'givemebridges(a)serious.ly' would be responded to as if + they were destined for BridgeDB's real email address. + - BridgeDB now strictly checks that the local part of the email + address that an incoming email was sent to (after removing plus + aliases, i.e. '+es_ES', '+fa', etc.) exactly matches BridgeDB + configured email address username. + - BridgeDB now checks that the domain name portion of the email + address that an incoming email was sent to either matches the + domain name portion of BridgeDB's configured email address, or + is a subdomain of that domain. + + * FIXES #12089 https://trac.torproject.org/projects/tor/ticket/12089 + There has been a bug for quite some time now where BridgeDB could + be used to email arbitrary email addresses (as long as these + addresses were ones which BridgeDB allows, i.e. Gmail or Yahoo + email addresses). This was due to BridgeDB not checking that the + email address used in the SMTP 'MAIL FROM:' command on an incoming + message matched the one used in that email's 'From:' + header. + - BridgeDB now checks that the email addresses in the SMTP 'MAIL + FROM:' and the 'From:' header on that incoming email match, in + addition to the previous checks that the email address' domain + is in the set of allowed domains. + + * FIXES #12090 https://trac.torproject.org/projects/tor/ticket/12090 + BridgeDB has been replying with an empty email. I don't actually + know for sure if this one is fixed. Before deploying version + 0.2.1, the continuous integration tests showed email responses + being correctly generated, and I was also able to receive + correctly formed email responses from BridgeDB on a local testing + instance on my laptop. It appears that this bug occurs only on the + deployment server at ponticum.torproject.org, possibly due to the + outdated Python version in Debian Wheezy. I have not been able to + reproduce this bug on any other machine. + + * FIXES #12091 https://trac.torproject.org/projects/tor/ticket/12091 + BridgeDB wasn't properly ignoring emails whose DKIM signature + verification header read "X-DKIM-Authentication-Results: dunno". + - Bridgedb now marks incoming emails which have a + "X-DKIM-Authentication-Results: dunno" header as invalid and + ignores them. + + * FIXES #12147 https://trac.torproject.org/projects/tor/ticket/12147 + If a user refreshed https://bridges.torproject.org/bridges after + successfully solving a CAPTCHA, BridgeDB would reply with a new + set of bridges for each page refresh. This was due to the use of + `getIterval()` in `IPBasedDistributor.getBridgesForIP()`.The + correct function to use is `getIntervalStart()`. This had been + noted in a "XXX FIXME" comment above the call for quite some time, + however, when the `bridgedb.schedule` (previously called + `bridgedb.Time`) module was revised to support CAPTCHA timeouts + (#11215), the call to `getInterval()` was mistakenly not replaced + with the correct function. + - BridgeDB CAPTCHAs must be solved within 10 minutes. + - Hashring rotation for bridges in BridgeDB HTTPS distributor + occurs every 3 hours. Refreshing the page with bridges on it + will return these same bridges for that time period, and + afterwards redirect back to the CAPTCHA page. + THANKS TO francisco on IRC and arma for reporting the bug. + +And include the following general changes: + * FIXES an issue where, when verifying GnuPG signatures made by + BridgeDB's email distributor, GnuPG would error, saying, "invalid + armor header". + + Changes in version 0.2.1 - 2014-05-16 * FIXES #5463 https://trac.torproject.org/projects/tor/ticket/5463 Emails sent from BridgeDB's email distributor should now be signed.

1 0

[bridgedb/master] Merge branch 'fix/9874-automate-email-tests' into develop
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 9ba031fc944082e6da6c298bff50c2fcb54f92a7 Merge: e2de6af a78d22c Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Jun 6 04:30:23 2014 +0000 Merge branch 'fix/9874-automate-email-tests' into develop .travis.requirements.txt | 9 + .travis.yml | 43 +- doc/sphinx/source/bridgedb.EmailServer.rst | 8 - doc/sphinx/source/bridgedb.email.autoresponder.rst | 8 + doc/sphinx/source/bridgedb.email.dkim.rst | 8 + doc/sphinx/source/bridgedb.email.request.rst | 8 + doc/sphinx/source/bridgedb.email.server.rst | 8 + doc/sphinx/source/bridgedb.email.templates.rst | 8 + doc/sphinx/source/bridgedb.rst | 7 +- doc/sphinx/source/conf.py | 7 +- lib/bridgedb/email/__init__.py | 1 + lib/bridgedb/email/autoresponder.py | 646 +++++++++++++++ lib/bridgedb/email/dkim.py | 55 ++ lib/bridgedb/email/server.py | 734 +++++------------ lib/bridgedb/test/email_helpers.py | 160 ++++ lib/bridgedb/test/test_email_autoresponder.py | 562 +++++++++++++ lib/bridgedb/test/test_email_dkim.py | 86 ++ lib/bridgedb/test/test_email_server.py | 845 +++++++++++--------- lib/bridgedb/test/util.py | 10 + requirements.txt | 4 +- setup.py | 2 +- 21 files changed, 2276 insertions(+), 943 deletions(-)

1 0