December 2015 - tor-commits - lists.torproject.org

[bridgedb/develop] Update CHANGELOG with entries for 0.3.4.
by isis＠torproject.org 01 Dec '15

01 Dec '15

commit fab26d0c6ca78b7d5c3292b9e87cc2b88fb0e90d Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Nov 30 21:07:09 2015 +0000 Update CHANGELOG with entries for 0.3.4. --- CHANGELOG | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index d99f3f7..33de965 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,22 @@ -Changes in version 0.3.3 - 2015-07-25 +Changes in version 0.3.4 - 2015-11-30 + + * FIXES #14685 https://bugs.torproject.org/14685 + This disables distribution of obfs2 bridges. This pluggable + transport has known distiguishers which allow adversaries to + identify client connections to obfs2 bridges, which in turn allows + these connections to be blocked/censored. With numerous obfs3 and + obfs4 bridges both readily available, users should not be + presented with an easily-configurable choice that is known to be + unsafe for the majority of users. + +And includes the following general changes: + + * ADDS error pages to BridgeDB's web interface, to provide + friendlier explanations for downtime, missing pages, and internal + server errors. For example: https://bridges.torproject.org/404 + + +Changes in version 0.3.3 - 2015-10-25 * FIXES #12029 https://bugs.torproject.org/12029 BridgeDB now has an API for creating Bridge Distributors.

1 0

[bridgedb/develop] Merge branch 'release/0.3.5'
by isis＠torproject.org 01 Dec '15

01 Dec '15

commit 7d6defe277547bcb71b67e40ed90c2dea34bfb85 Merge: 93ecf69 7931067 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Dec 1 02:45:00 2015 +0000 Merge branch 'release/0.3.5' .coveragerc | 10 +-- CHANGELOG | 120 ++++++++++++++++++++++++++++- bridgedb.conf | 2 +- setup.py | 12 +-- test/test_https.py | 213 +++++++++++++++++++++++----------------------------- 5 files changed, 225 insertions(+), 132 deletions(-)

1 0

[bridgedb/master] Fail unittests if coverage falls below 80%.
by isis＠torproject.org 01 Dec '15

01 Dec '15

commit 7ac1012b0aec147091f54dfdd0ee7def2daa879f Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jul 26 12:11:03 2015 +0000 Fail unittests if coverage falls below 80%. --- .coveragerc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.coveragerc b/.coveragerc index a6288f5..04dc0a6 100644 --- a/.coveragerc +++ b/.coveragerc @@ -27,7 +27,7 @@ exclude_lines = # Ignore source code which cannot be found: ignore_errors = True # Exit with status code 2 if under this percentage is covered: -fail_under = 10 +fail_under = 80 [html] directory = doc/coverage-html

1 0

[bridgedb/develop] Merge branch 'master' into develop
by isis＠torproject.org 01 Dec '15

01 Dec '15

commit c7d9cc4978f008fe657dd88653975248066dd1f6 Merge: 7931067 7d6defe Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Dec 1 02:45:11 2015 +0000 Merge branch 'master' into develop

1 0

[bridgedb/master] Change .coveragerc source files to new module structure.
by isis＠torproject.org 01 Dec '15

01 Dec '15

commit fb7ed7d252f030649e4b61f04e191ff8fb334df4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jul 26 12:07:13 2015 +0000 Change .coveragerc source files to new module structure. --- .coveragerc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.coveragerc b/.coveragerc index ab8753b..2e29fae 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,7 +1,5 @@ [run] -source = - bridgedb - lib/bridgedb/test/test_* +source = bridgedb branch = True #parallel = True timid = True @@ -9,11 +7,9 @@ timid = True [report] modules = bridgedb omit = - */test* */_langs* */_version* */__init__* - */Tests* */sitecustomize* # Regexes for lines to exclude from report generation: exclude_lines =

1 0

[bridgedb/develop] Update CHANGELOG to thank all the awesome translators.
by isis＠torproject.org 01 Dec '15

01 Dec '15

commit 793106750261803276502cd4d73cec400aa66f7d Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Nov 30 23:01:26 2015 +0000 Update CHANGELOG to thank all the awesome translators. --- CHANGELOG | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 33de965..ba128f9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -116,6 +116,106 @@ And includes the following general changes: * ADDS several improvements to the developer documentation at https://pythonhosted.org/bridgedb. + * UPDATE English (en_US) translations. + + * UPDATE English (en) translations. + + * ADD Serbian (sr) translations. + Thanks to obj.petit.a, Ivan Radeljic, and Milenko Doder. + + * UPDATE Arabic (ar) translations. + Thanks to A. Hassan, debo debo, KACIMI LAMINE, and Nudroid A. + + * UPDATE Catalan (ca) translations. + Thanks to laia_. + + * UPDATE Czech (cs) translations. + Thanks to Tomas Palik and Vlastimil Burián. + + * UPDATE Danish (da) translations. + Thanks to Mogelbjerg. + + * UPDATE German (de) translations. + Thanks to jschfr, Junge Limba, and Toralf Förster. + + * UPDATE English (en_GB) translations. + Thanks to Andi Chandler. + + * UPDATE Farsi (fa) translations. + Thanks to some awesome anonymous person for helping out. + + * UPDATE Finish (fi) translations. + Thanks to Riku Viitanen. + + * UPDATE French (fr) translations. + Thanks to elouann, Trans-fr, and Towinet. + + * UPDATE French (fr_CA) translations. + Thanks to Trans-fr. + + * UPDATE Croatian (hr_HR) translations. + Thanks to some awesome anonymous person for helping out. + + * UPDATE Hungarian (hu) translations. + Thanks to some awesome anonymous person for helping out. + + * UPDATE Indonesian (id) translations. + Thanks to Anthony Santana, Astryd Viandila Dahlan, cholif yulian, + constantius damar wicaksono, Dwi Cahyono, L1Nus, km242saya, and + Zamani Karmana. + + * UPDATE Italian (it) translations. + Thanks to Random_R. + + * UPDATE Japanese (ja) translations. + Thanks to ABE Tsunehiko. + + * UPDATE Latvian (lv) translations. + Thanks to Ojārs Balcers. + + * UPDATE Norwegian Bokmål (nb) translations. + Thanks to Erik Matson and Kristian Andre Henriksen. + + * UPDATE Dutch (nl) translations. + Thanks to Mart3000. + + * UPDATE Polish (pl) translations. + Thanks to Karol Obartuch. + + * UPDATE Portuguese (pt) translations. + Thanks to Bruno D. Rodrigues and MMSRS. + + * UPDATE Brazillian Portuguese (pt_BR) translations. + Thanks to Communia. + + * UPDATE Romanian (ro) translations. + Thanks to Ana, axel_89, and Di N. + + * UPDATE Russian (ru) translations. + Thanks to Ivan. + + * UPDATE Slovak (sk_SK) translations. + Thanks to StefanH. + + * UPDATE Albanian (sq) translations. + Thanks to some awesome unknown anonymous person who didn't add their + name to the list of translators. + + * UPDATE Swedish (sv) translations. + Thanks to Peter Michanek. + + * UPDATE Turkish (tr) translations. + Thanks to Bullgeschichte and Fomas. + + * UPDATE Ukranian (uk) translations. + Thanks to Yasha. + + * UPDATE Chinese Mandarin (zh_CN) translations. + Thanks to khi. + + * UPDATE Taiwanese Mandarin (zh_TW) translations. + Thanks to x4r. + Changes in version 0.3.2 - 2015-05-01

1 0

[bridgedb/master] Strangely, coverage timid=True is causing more strange problems.
by isis＠torproject.org 01 Dec '15

01 Dec '15

commit 3625b15c26f5bc136aa32210620f99b691634b91 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jul 26 12:09:41 2015 +0000 Strangely, coverage timid=True is causing more strange problems. Rather than eliminating strange coverage problems, like it's supposed to do. --- .coveragerc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.coveragerc b/.coveragerc index 2e29fae..a6288f5 100644 --- a/.coveragerc +++ b/.coveragerc @@ -2,7 +2,7 @@ source = bridgedb branch = True #parallel = True -timid = True +timid = False [report] modules = bridgedb

1 0

[bridgedb/master] Remove setup.py message_extractors for public/**.
by isis＠torproject.org 01 Dec '15

01 Dec '15

commit cda6c56a72b2edd97a0baf4b19c936ca17cb5f49 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jul 26 12:11:56 2015 +0000 Remove setup.py message_extractors for public/**. --- setup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index e92afee..189d5b5 100644 --- a/setup.py +++ b/setup.py @@ -390,10 +390,10 @@ setuptools.setup( dependency_links=deplinks, package_data={'bridgedb': get_data_files(filesonly=True)}, exclude_package_data={'bridgedb': ['*.po', '*.pot']}, - message_extractors={pkgpath: [ - ('**.py', 'python', None), - ('https/templates/**.html', 'mako', None), - ('public/**', 'ignore', None)]}, + message_extractors={ + pkgpath: [ + ('**.py', 'python', None), + ('https/templates/**.html', 'mako', None), + ] + }, ) -# XXX I think we don't need the 'public/**' babel.messages.frontend.method_map -# anymore... 2013-10-15 --isis

1 0

[bridgedb/master] Add dynamic unittests for all translations in bridgedb/i18n/.
by isis＠torproject.org 01 Dec '15

01 Dec '15

commit 93fbdec690c3603f3a963668bf88fb29434ead57 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jul 26 12:15:07 2015 +0000 Add dynamic unittests for all translations in bridgedb/i18n/. --- test/test_https.py | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/test/test_https.py b/test/test_https.py index 090bab5..bc1890b 100644 --- a/test/test_https.py +++ b/test/test_https.py @@ -26,6 +26,7 @@ repository. from __future__ import print_function +import gettext import ipaddr import mechanize import os @@ -33,9 +34,11 @@ import os from BeautifulSoup import BeautifulSoup from twisted.trial import unittest +from twisted.trial.reporter import TestResult from twisted.trial.unittest import FailTest from twisted.trial.unittest import SkipTest +from .test_Tests import DynamicTestCaseMeta from .util import processExists from .util import getBridgeDBPID @@ -358,3 +361,77 @@ class HTTPTests(unittest.TestCase): self.assertTrue(hasNodeID, "obfs4 bridge line is missing 'node-id' PT arg.") + + +class _HTTPTranslationsTests(unittest.TestCase): + """Build a TestCase with dynamic methods which tests all HTTP rendering of + all translations in the bridgedb/i18n/ directory. + """ + i18n = os.path.join(TOPDIR, 'bridgedb', 'i18n') + + def setUp(self): + if not os.environ.get("CI"): + raise SkipTest(("The mechanize tests cannot handle self-signed " + "TLS certificates, and thus require opening " + "another port for running a plaintext HTTP-only " + "BridgeDB webserver. Because of this, these tests " + "are only run on CI servers.")) + + if not PID or not processExists(PID): + raise FailTest("Could not start BridgeDB process on CI server!") + + self.br = None + + @classmethod + def makeTestMethod(cls, locale): + """Dynamically generate a test_ method for **locale**.""" + + def test(self): + pageArgs = '/?lang=%s' % locale + language = gettext.translation("bridgedb", + localedir=self.i18n, + languages=[locale,], + fallback=True) + expected = language.gettext("What are bridges?") + + if not locale.startswith('en'): + self.assertNotEqual(expected, "What are bridges?") + + self.openBrowser() + self.br.open(HTTP_ROOT + pageArgs) + self.assertSubstring(expected, self.br.response().read()) + + test.__name__ = 'test_%s' % locale + setattr(cls, test.__name__, test) + + return test + + def tearDown(self): + self.br = None + + def openBrowser(self): + self.br = mechanize.Browser() + self.br.set_handle_robots(False) + + def test_self(self): + self.assertTrue(self) + + +def createHTTPTranslationsTestSuite(): + suite = unittest.TestSuite() + translations = os.listdir(_HTTPTranslationsTests.i18n) + translations.remove('templates') + + for locale in translations: + klass = _HTTPTranslationsTests + method = klass.makeTestMethod(locale) + case = klass() + suite.addTest(case) + + return [suite,] + + +class HTTPTranslationsTests(unittest.TestCase): + __metaclass__ = DynamicTestCaseMeta + testResult = TestResult() + testSuites = createHTTPTranslationsTestSuite()

1 0

[bridgedb/master] Cleanup duplicated code in test/test_https.py.
by isis＠torproject.org 01 Dec '15

01 Dec '15

commit a4573c4e45494f6ffab53833bec49d80abacfd26 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Jul 26 12:14:07 2015 +0000 Cleanup duplicated code in test/test_https.py. --- test/test_https.py | 124 ++++++++-------------------------------------------- 1 file changed, 19 insertions(+), 105 deletions(-) diff --git a/test/test_https.py b/test/test_https.py index c1c9772..090bab5 100644 --- a/test/test_https.py +++ b/test/test_https.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- #_____________________________________________________________________________ # # This file is part of BridgeDB, a Tor bridge distribution system. @@ -38,17 +39,30 @@ from twisted.trial.unittest import SkipTest from .util import processExists from .util import getBridgeDBPID + HTTP_ROOT = 'http://127.0.0.1:6788' CAPTCHA_RESPONSE = 'Tvx74Pmy' +TOPDIR = os.getcwd() +while not TOPDIR.endswith('bridgedb'): + TOPDIR = os.path.dirname(TOPDIR) + +PIDFILE = os.path.join(TOPDIR, 'run', 'bridgedb.pid') +PID = getBridgeDBPID(PIDFILE) + class HTTPTests(unittest.TestCase): + def setUp(self): - here = os.getcwd() - topdir = here.rstrip('_trial_temp') - self.rundir = os.path.join(topdir, 'run') - self.pidfile = os.path.join(self.rundir, 'bridgedb.pid') - self.pid = getBridgeDBPID(self.pidfile) + if not os.environ.get("CI"): + raise SkipTest(("The mechanize tests cannot handle self-signed " + "TLS certificates, and thus require opening " + "another port for running a plaintext HTTP-only " + "BridgeDB webserver. Because of this, these tests " + "are only run on CI servers.")) + if not PID or not processExists(PID): + raise FailTest("Could not start BridgeDB process on CI server!") + self.br = None def tearDown(self): @@ -152,16 +166,6 @@ class HTTPTests(unittest.TestCase): def test_content_security_policy(self): """Check that the HTTP Content-Security-Policy header is set.""" - if os.environ.get("CI"): - if not self.pid or not processExists(self.pid): - raise FailTest("Could not start BridgeDB process on CI server!") - else: - raise SkipTest(("The mechanize tests cannot handle self-signed " - "TLS certificates, and thus require opening " - "another port for running a plaintext HTTP-only " - "BridgeDB webserver. Because of this, these tests " - "are only run on CI servers.")) - self.br = mechanize.Browser() self.br.set_handle_robots(False) self.br.set_debug_http(True) @@ -182,16 +186,6 @@ class HTTPTests(unittest.TestCase): self.assertRaises(mechanize.HTTPError, self.br.open, page) def test_get_obfs2_ipv4(self): - if os.environ.get("CI"): - if not self.pid or not processExists(self.pid): - raise FailTest("Could not start BridgeDB process on CI server!") - else: - raise SkipTest(("The mechanize tests cannot handle self-signed " - "TLS certificates, and thus require opening " - "another port for running a plaintext HTTP-only " - "BridgeDB webserver. Because of this, these tests " - "are only run on CI servers.")) - self.openBrowser() self.goToOptionsPage() @@ -204,16 +198,6 @@ class HTTPTests(unittest.TestCase): self.assertEquals(PT, pt) def test_get_obfs3_ipv4(self): - if os.environ.get("CI"): - if not self.pid or not processExists(self.pid): - raise FailTest("Could not start BridgeDB process on CI server!") - else: - raise SkipTest(("The mechanize tests cannot handle self-signed " - "TLS certificates, and thus require opening " - "another port for running a plaintext HTTP-only " - "BridgeDB webserver. Because of this, these tests " - "are only run on CI servers.")) - self.openBrowser() self.goToOptionsPage() @@ -226,16 +210,6 @@ class HTTPTests(unittest.TestCase): self.assertEquals(PT, pt) def test_get_vanilla_ipv4(self): - if os.environ.get("CI"): - if not self.pid or not processExists(self.pid): - raise FailTest("Could not start BridgeDB process on CI server!") - else: - raise SkipTest(("The mechanize tests cannot handle self-signed " - "TLS certificates, and thus require opening " - "another port for running a plaintext HTTP-only " - "BridgeDB webserver. Because of this, these tests " - "are only run on CI servers.")) - self.openBrowser() self.goToOptionsPage() @@ -249,16 +223,6 @@ class HTTPTests(unittest.TestCase): self.assertIsInstance(ipaddr.IPAddress(addr), ipaddr.IPv4Address) def test_get_vanilla_ipv6(self): - if os.environ.get("CI"): - if not self.pid or not processExists(self.pid): - raise FailTest("Could not start BridgeDB process on CI server!") - else: - raise SkipTest(("The mechanize tests cannot handle self-signed " - "TLS certificates, and thus require opening " - "another port for running a plaintext HTTP-only " - "BridgeDB webserver. Because of this, these tests " - "are only run on CI servers.")) - self.openBrowser() self.goToOptionsPage() @@ -272,16 +236,6 @@ class HTTPTests(unittest.TestCase): self.assertIsInstance(ipaddr.IPAddress(addr), ipaddr.IPv6Address) def test_get_scramblesuit_ipv4(self): - if os.environ.get("CI"): - if not self.pid or not processExists(self.pid): - raise FailTest("Could not start BridgeDB process on CI server!") - else: - raise SkipTest(("The mechanize tests cannot handle self-signed " - "TLS certificates, and thus require opening " - "another port for running a plaintext HTTP-only " - "BridgeDB webserver. Because of this, these tests " - "are only run on CI servers.")) - self.openBrowser() self.goToOptionsPage() @@ -303,16 +257,6 @@ class HTTPTests(unittest.TestCase): This is a regression test for #12932, see https://bugs.torproject.org/12932. """ - if os.environ.get("CI"): - if not self.pid or not processExists(self.pid): - raise FailTest("Could not start BridgeDB process on CI server!") - else: - raise SkipTest(("The mechanize tests cannot handle self-signed " - "TLS certificates, and thus require opening " - "another port for running a plaintext HTTP-only " - "BridgeDB webserver. Because of this, these tests " - "are only run on CI servers.")) - self.openBrowser() self.goToOptionsPage() @@ -338,16 +282,6 @@ class HTTPTests(unittest.TestCase): """Ask for obfs4 bridges and check that there is an 'iat-mode' PT argument in the bridge lines. """ - if os.environ.get("CI"): - if not self.pid or not processExists(self.pid): - raise FailTest("Could not start BridgeDB process on CI server!") - else: - raise SkipTest(("The mechanize tests cannot handle self-signed " - "TLS certificates, and thus require opening " - "another port for running a plaintext HTTP-only " - "BridgeDB webserver. Because of this, these tests " - "are only run on CI servers.")) - self.openBrowser() self.goToOptionsPage() @@ -375,16 +309,6 @@ class HTTPTests(unittest.TestCase): """Ask for obfs4 bridges and check that there is an 'public-key' PT argument in the bridge lines. """ - if os.environ.get("CI"): - if not self.pid or not processExists(self.pid): - raise FailTest("Could not start BridgeDB process on CI server!") - else: - raise SkipTest(("The mechanize tests cannot handle self-signed " - "TLS certificates, and thus require opening " - "another port for running a plaintext HTTP-only " - "BridgeDB webserver. Because of this, these tests " - "are only run on CI servers.")) - self.openBrowser() self.goToOptionsPage() @@ -412,16 +336,6 @@ class HTTPTests(unittest.TestCase): """Ask for obfs4 bridges and check that there is an 'node-id' PT argument in the bridge lines. """ - if os.environ.get("CI"): - if not self.pid or not processExists(self.pid): - raise FailTest("Could not start BridgeDB process on CI server!") - else: - raise SkipTest(("The mechanize tests cannot handle self-signed " - "TLS certificates, and thus require opening " - "another port for running a plaintext HTTP-only " - "BridgeDB webserver. Because of this, these tests " - "are only run on CI servers.")) - self.openBrowser() self.goToOptionsPage()

1 0