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

[bridgedb/master] Add unittests for bridgedb.email.templates module.
by isis＠torproject.org 16 May '14

16 May '14

commit 33583300323312e36218e21f33162ca572bcf82f Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 12 15:02:03 2014 +0000 Add unittests for bridgedb.email.templates module. --- lib/bridgedb/test/test_email_templates.py | 119 +++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/lib/bridgedb/test/test_email_templates.py b/lib/bridgedb/test/test_email_templates.py new file mode 100644 index 0000000..0c74377 --- /dev/null +++ b/lib/bridgedb/test/test_email_templates.py @@ -0,0 +1,119 @@ +# -*- coding: utf-8 -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> +# please also see AUTHORS file +# :copyright: (c) 2013, Isis Lovecruft +# (c) 2007-2013, The Tor Project, Inc. +# (c) 2007-2013, all entities within the AUTHORS file +# :license: 3-Clause BSD, see LICENSE for licensing information + +"""Unittests for the :mod:`bridgedb.email.templates` module.""" + +from __future__ import print_function +from __future__ import unicode_literals + +from io import StringIO +from gettext import NullTranslations + +from twisted.mail.smtp import Address +from twisted.trial import unittest + +from bridgedb.email import templates + + +class EmailTemplatesTests(unittest.TestCase): + """Unittests for :func:`b.e.templates`.""" + + def setUp(self): + self.t = NullTranslations(StringIO(unicode('test'))) + self.client = Address('blackhole(a)torproject.org') + self.answer = 'obfs3 1.1.1.1:1111\nobfs3 2.2.2.2:2222' + # This is the fingerprint of BridgeDB's offline, certification-only + # GnuPG key. It should be present in any responses to requests for our + # public keys. + self.offlineFingerprint = '7B78437015E63DF47BB1270ACBD97AA24E8E472E' + + def shouldIncludeCommands(self, text): + self.assertSubstring('COMMANDs', text) + + def shouldIncludeInstructions(self, text): + self.assertSubstring('Tor Browser', text) + + def shouldIncludeBridges(self, text): + self.assertSubstring(self.answer, text) + self.assertSubstring('Here are your bridges:', text) + + def shouldIncludeGreeting(self, text): + self.assertSubstring('Hey, blackhole!', text) + + def shouldIncludeAutomationNotice(self, text): + self.assertSubstring('automated message', text) + + def shouldIncludeKey(self, text): + self.assertSubstring('-----BEGIN PGP PUBLIC KEY BLOCK-----', text) + + def shouldIncludeFooter(self, text): + self.assertSubstring('rainbows, unicorns, and sparkles', text) + + def test_templates_addCommands(self): + text = templates.addCommands(self.t) + self.shouldIncludeCommands(text) + + def test_templates_addGreeting(self): + text = templates.addGreeting(self.t, self.client.local) + self.shouldIncludeGreeting(text) + + def test_templates_addGreeting_noClient(self): + text = templates.addGreeting(self.t, None) + self.assertSubstring('Hello, friend!', text) + + def test_templates_addGreeting_withWelcome(self): + text = templates.addGreeting(self.t, self.client.local, welcome=True) + self.shouldIncludeGreeting(text) + self.assertSubstring('Welcome to BridgeDB!', text) + + def test_templates_addGreeting_trueClient(self): + text = templates.addGreeting(self.t, True) + self.assertSubstring('Hey', text) + + def test_templates_addGreeting_23Client(self): + text = templates.addGreeting(self.t, 23) + self.assertSubstring('Hey', text) + + def test_templates_addHowto(self): + text = templates.addHowto(self.t) + self.shouldIncludeInstructions(text) + + def test_templates_addBridgeAnswer(self): + text = templates.addBridgeAnswer(self.t, self.answer) + self.shouldIncludeBridges(text) + + def test_templates_addFooter(self): + text = templates.addFooter(self.t, self.client) + self.shouldIncludeFooter(text) + + def test_templates_buildAnswerMessage(self): + text = templates.buildAnswerMessage(self.t, self.client, self.answer) + self.assertSubstring(self.answer, text) + self.shouldIncludeAutomationNotice(text) + self.shouldIncludeCommands(text) + self.shouldIncludeFooter(text) + + def test_templates_buildKeyMessage(self): + text = templates.buildKeyMessage(self.t, self.client) + self.assertSubstring(self.offlineFingerprint, text) + + def test_templates_buildWelcomeText(self): + text = templates.buildWelcomeText(self.t, self.client) + self.shouldIncludeGreeting(text) + self.assertSubstring('Welcome to BridgeDB!', text) + self.shouldIncludeCommands(text) + self.shouldIncludeFooter(text) + + def test_templates_buildSpamWarning(self): + text = templates.buildSpamWarning(self.t, self.client) + self.shouldIncludeGreeting(text) + self.shouldIncludeAutomationNotice(text) + self.shouldIncludeFooter(text)

1 0

[bridgedb/master] Add unittest for email signing with expired testing keys.
by isis＠torproject.org 16 May '14

16 May '14

commit 363e2ccae77d5697e1e89630f3f1f48b10fd2f39 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 23 04:22:38 2014 +0000 Add unittest for email signing with expired testing keys. --- gnupghome/TESTING.subkeys.sec.EXPIRED-2013-09-11 | Bin 0 -> 6505 bytes lib/bridgedb/test/test_crypto.py | 9 ++++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gnupghome/TESTING.subkeys.sec.EXPIRED-2013-09-11 b/gnupghome/TESTING.subkeys.sec.EXPIRED-2013-09-11 new file mode 100644 index 0000000..ae13a98 Binary files /dev/null and b/gnupghome/TESTING.subkeys.sec.EXPIRED-2013-09-11 differ diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py index e610d03..aca5d2c 100644 --- a/lib/bridgedb/test/test_crypto.py +++ b/lib/bridgedb/test/test_crypto.py @@ -171,7 +171,8 @@ class GPGContextTests(unittest.TestCase): topDir = here.rstrip('_trial_temp') self.runDir = os.path.join(here, 'rundir') self.gpgFile = os.path.join(topDir, 'gnupghome', 'TESTING.subkeys.sec') - self.gpgMoved = os.path.join(here, 'TESTING.subkeys.sec') + self.gpgExpr = os.path.join(topDir, 'gnupghome', + 'TESTING.subkeys.sec.EXPIRED-2013-09-11') if not os.path.isdir(self.runDir): os.makedirs(self.runDir) @@ -199,6 +200,12 @@ class GPGContextTests(unittest.TestCase): ctx = crypto.getGPGContext(self.config) self.assertTrue(ctx is None) + def test_getGPGContext_expired_keyfile(self): + """getGPGContext() with an expired key should return None.""" + self.setKey(self.gpgExpr) + ctx = crypto.getGPGContext(self.config) + self.assertTrue(ctx is None) + def test_getGPGContext_signing_disabled(self): """getGPGContext() with signing disabled should return None.""" self.setKey(self.gpgFile)

1 0

[bridgedb/master] Merge branch 'fix/5463-7547-7550-8241-11475-11753-email-rewrite' into develop
by isis＠torproject.org 16 May '14

16 May '14

commit 94a348c9593d2c3b120d9de1eff6910a9a9aef53 Merge: 25be173 363606c Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 03:21:56 2014 +0000 Merge branch 'fix/5463-7547-7550-8241-11475-11753-email-rewrite' into develop lib/bridgedb/Dist.py | 49 +- lib/bridgedb/EmailServer.py | 483 ------------------ lib/bridgedb/HTTPServer.py | 86 ++-- lib/bridgedb/Main.py | 6 +- lib/bridgedb/bridgerequest.py | 128 +++++ lib/bridgedb/email/request.py | 153 ++++++ lib/bridgedb/email/server.py | 746 ++++++++++++++++++++++++++++ lib/bridgedb/email/templates.py | 123 +++++ lib/bridgedb/strings.py | 21 +- lib/bridgedb/templates/base.html | 53 +- lib/bridgedb/templates/bridgedb.asc | 300 +++++++++++ lib/bridgedb/templates/bridges.html | 34 +- lib/bridgedb/templates/captcha.html | 80 +-- lib/bridgedb/templates/howto.html | 26 +- lib/bridgedb/templates/index.html | 9 +- lib/bridgedb/templates/options.html | 52 +- lib/bridgedb/templates/static/bridgedb.asc | 274 ---------- lib/bridgedb/test/test_EmailServer.py | 344 ------------- lib/bridgedb/test/test_HTTPServer.py | 3 +- lib/bridgedb/test/test_crypto.py | 68 +++ lib/bridgedb/test/test_email_request.py | 276 ++++++++++ lib/bridgedb/test/test_email_server.py | 429 ++++++++++++++++ setup.py | 1 + 23 files changed, 2447 insertions(+), 1297 deletions(-)

1 0

[bridgedb/master] Merge branch 'fix/5463-gpgme-homedir' into develop
by isis＠torproject.org 16 May '14

16 May '14

commit a391323e5c8ecd47f1d6ef9a9d37c2b589ea6406 Merge: 94a348c 363e2cc Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed May 14 03:23:19 2014 +0000 Merge branch 'fix/5463-gpgme-homedir' into develop gnupghome/TESTING.subkeys.sec | Bin 6505 -> 7304 bytes gnupghome/TESTING.subkeys.sec.EXPIRED-2013-09-11 | Bin 0 -> 6505 bytes lib/bridgedb/crypto.py | 23 ++++ lib/bridgedb/test/test_crypto.py | 146 +++++++++++++++++++++- 4 files changed, 165 insertions(+), 4 deletions(-)

1 0

[bridgedb/master] Remove password from gnupghome/TESTING.subkeys.sec key.
by isis＠torproject.org 16 May '14

16 May '14

commit 1040ffa74d85ef86bed8d1cded3fbce113a8e35d Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 12 18:15:47 2014 +0000 Remove password from gnupghome/TESTING.subkeys.sec key. --- gnupghome/TESTING.subkeys.sec | Bin 7304 -> 7212 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gnupghome/TESTING.subkeys.sec b/gnupghome/TESTING.subkeys.sec index 3adba09..688f7e9 100644 Binary files a/gnupghome/TESTING.subkeys.sec and b/gnupghome/TESTING.subkeys.sec differ

1 0

[bridgedb/develop] Merge branch 'fix/11664-email-buffer-interface'
by isis＠torproject.org 16 May '14

16 May '14

commit 8316a92ce1837cba385a01aa11f93dd8b394d422 Merge: b758227 e829417 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 1 01:03:35 2014 +0000 Merge branch 'fix/11664-email-buffer-interface' lib/bridgedb/EmailServer.py | 19 +++++++++++++------ lib/bridgedb/crypto.py | 27 +++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 8 deletions(-)

1 0

[bridgedb/develop] Merge branch 'master' into develop
by isis＠torproject.org 16 May '14

16 May '14

commit 6fe6c6538b0284b70e78c2df2f0c289c6f93a792 Merge: b0f56a6 f848aa9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri May 16 18:48:38 2014 +0000 Merge branch 'master' into develop

1 0

[bridgedb/develop] Merge branch 'release-0.2.1'
by isis＠torproject.org 16 May '14

16 May '14

1 0

[bridgedb/master] Update licensing header and module docstring for bridgedb.Time.
by isis＠torproject.org 16 May '14

16 May '14

commit b98f0808c53996c8425a1e1d4822367524f36766 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 21 16:52:13 2014 +0000 Update licensing header and module docstring for bridgedb.Time. --- lib/bridgedb/Time.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/Time.py b/lib/bridgedb/Time.py index 794db9d..2b7b02b 100644 --- a/lib/bridgedb/Time.py +++ b/lib/bridgedb/Time.py @@ -1,10 +1,13 @@ -# BridgeDB by Nick Mathewson. -# Copyright (c) 2007-2009, The Tor Project, Inc. -# See LICENSE for licensing information +# -*- coding: utf-8 ; test-case-name: bridgedb.test.test_Time -*- +# +# This file is part of BridgeDB, a Tor bridge distribution system. +# +# :authors: Nick Mathewson +# :copyright: (c) 2007-2014, The Tor Project, Inc. +# :license: see LICENSE for licensing information -""" -This module implements functions for dividing time into chunks. -""" + +"""This module implements functions for dividing time into chunks.""" import calendar import time

1 0

[bridgedb/master] Merge branch 'master' into develop
by isis＠torproject.org 16 May '14

16 May '14

commit b76a543f82f364c7fa2b343cbbeba35fd66a666c Merge: 073d5c8 10dd852 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Apr 19 16:59:32 2014 +0000 Merge branch 'master' into develop

1 0