tor-commits February 2020

tor-commits@lists.torproject.org

22 participants
1454 discussions

[bridgedb/develop] Remove outdated comment.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 777286c048f721e67b5e812929c7ca56c6ee5863 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Feb 12 16:37:33 2020 -0800 Remove outdated comment. --- bridgedb/distributors/moat/server.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bridgedb/distributors/moat/server.py b/bridgedb/distributors/moat/server.py index 10096e7..cb53b32 100644 --- a/bridgedb/distributors/moat/server.py +++ b/bridgedb/distributors/moat/server.py @@ -407,8 +407,7 @@ class CaptchaFetchResource(CaptchaResource): * "supported": ['TRANSPORT', … ] where: * TRANSPORT is a string identifying a transport, e.g. "obfs3" or - "obfs4". Currently supported transport identifiers are: - "vanilla", "fte", "obfs3", "obfs4", "scramblesuit". + "obfs4". :rtype: list :returns: The list of transports the client supports. """

1 0

[bridgedb/develop] Add CHANGELOG entry for #33299.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit fd960bdda63051985becaac8ed8ef0925c7b4a2e Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Feb 12 16:41:09 2020 -0800 Add CHANGELOG entry for #33299. --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 0233246..3f0c3de 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ + * FIXES <https://bugs.torproject.org/33299> + This patch disables the distribution of FTE, ScrambleSuit, and obfs3. + Changes in version 0.9.2 - 2020-02-04 * FIXES <https://bugs.torproject.org/31427>

1 0

[bridgedb/develop] Fix misleading comments.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 116be8e57f862dbd04e7cb760b86097719d84ee7 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Feb 18 14:12:08 2020 -0800 Fix misleading comments. --- bridgedb/bridges.py | 7 +++---- bridgedb/distributors/https/server.py | 5 +---- bridgedb/distributors/moat/server.py | 3 +-- bridgedb/i18n/templates/bridgedb.pot | 13 +++++-------- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/bridgedb/bridges.py b/bridgedb/bridges.py index cf90b3b..ca1330b 100644 --- a/bridgedb/bridges.py +++ b/bridgedb/bridges.py @@ -335,8 +335,7 @@ class PluggableTransport(BridgeAddressBase): :vartype methodname: str :ivar methodname: The canonical "name" for this pluggable transport, i.e. the one which would be specified in a torrc file. For example, - ``"obfs2"``, ``"obfs3"``, ``"scramblesuit"`` would all be pluggable - transport method names. + ``"obfs4"``. :vartype address: ``ipaddr.IPv4Address`` or ``ipaddr.IPv6Address`` :ivar address: The IP address of the transport. Currently (as of 20 March @@ -514,7 +513,7 @@ class PluggableTransport(BridgeAddressBase): :rtype: str :returns: The (lowercased) methodname of this ``PluggableTransport``, - i.e. ``"obfs3"``, ``"scramblesuit"``, etc. + e.g. ``"obfs4"``. """ return self._methodname @@ -1413,7 +1412,7 @@ class Bridge(BridgeBackwardsCompatibility): :param str countryCode: A two-character country code specifier. :param str methodname: The type of pluggable transport to check, - i.e. ``'obfs3'``. + e.g. ``'obfs4'``. :rtype: bool :returns: ``True`` if any address:port pair which this bridge is running a :class:`PluggableTransport` on is blocked in diff --git a/bridgedb/distributors/https/server.py b/bridgedb/distributors/https/server.py index 69f04a3..660d34e 100644 --- a/bridgedb/distributors/https/server.py +++ b/bridgedb/distributors/https/server.py @@ -128,10 +128,7 @@ def replaceErrorPage(request, error, template_name=None, html=True): # "BridgeDB" # "pluggable transport" # "pluggable transports" - # "obfs2" - # "obfs3" - # "scramblesuit" - # "fteproxy" + # "obfs4" # "Tor" # "Tor Browser" # diff --git a/bridgedb/distributors/moat/server.py b/bridgedb/distributors/moat/server.py index cb53b32..97dfc42 100644 --- a/bridgedb/distributors/moat/server.py +++ b/bridgedb/distributors/moat/server.py @@ -406,8 +406,7 @@ class CaptchaFetchResource(CaptchaResource): * "type": "client-transports". * "supported": ['TRANSPORT', … ] where: - * TRANSPORT is a string identifying a transport, e.g. "obfs3" or - "obfs4". + * TRANSPORT is a string identifying a transport, e.g. "obfs4". :rtype: list :returns: The list of transports the client supports. """ diff --git a/bridgedb/i18n/templates/bridgedb.pot b/bridgedb/i18n/templates/bridgedb.pot index 483abbc..be57a8b 100644 --- a/bridgedb/i18n/templates/bridgedb.pot +++ b/bridgedb/i18n/templates/bridgedb.pot @@ -5,11 +5,11 @@ # msgid "" msgstr "" -"Project-Id-Version: bridgedb 0.9.0+19.ga5fa455.dirty\n" +"Project-Id-Version: bridgedb 0.9.2+5.gfd960bd.dirty\n" "Report-Msgid-Bugs-To: " "'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…" "=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" -"POT-Creation-Date: 2020-02-04 10:59-0800\n" +"POT-Creation-Date: 2020-02-18 13:39-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -42,13 +42,10 @@ msgstr "" #. "BridgeDB" #. "pluggable transport" #. "pluggable transports" -#. "obfs2" -#. "obfs3" -#. "scramblesuit" -#. "fteproxy" +#. "obfs4" #. "Tor" #. "Tor Browser" -#: bridgedb/distributors/https/server.py:138 +#: bridgedb/distributors/https/server.py:135 msgid "Sorry! Something went wrong with your request." msgstr "" @@ -270,7 +267,7 @@ msgid "" "\n" msgstr "" -#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383 +#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356 msgid "What are bridges?" msgstr ""

1 0

[bridgedb/develop] Disable FTE, obfs3, and scramblesuit distribution.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit ab9a188996ee0c131bbe21d107bfe7caf871d0ac Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Feb 12 16:36:19 2020 -0800 Disable FTE, obfs3, and scramblesuit distribution. FTE is no longer part of Tor Browser, and obfs3 and scramblesuit don't offer anything that obfs4 doesn't already provide. This fixes <https://bugs.torproject.org/33299>. --- bridgedb.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index a0e00a8..5a8a38e 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -282,10 +282,10 @@ TASKS = { # to booleans. If ``True``, the PT is distributed; if ``False``, it isn't. SUPPORTED_TRANSPORTS = { 'obfs2': False, - 'obfs3': True, + 'obfs3': False, 'obfs4': True, - 'scramblesuit': True, - 'fte': True, + 'scramblesuit': False, + 'fte': False, } # PROBING_RESISTANT_TRANSPORTS is a list of transports that are resistant to

1 0

[bridgedb/master] Merge branch 'master' into develop
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 7f1638e1db2a36507f80b6d923baf1f62a7c4491 Merge: 74d1ec7 ae0c4eb Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Feb 4 11:28:50 2020 -0800 Merge branch 'master' into develop .test.requirements.txt | 6 +++--- .travis.requirements.txt | 20 ++++++++++---------- CHANGELOG | 2 +- requirements.txt | 16 ++++++++-------- 4 files changed, 22 insertions(+), 22 deletions(-)

1 0

[bridgedb/develop] Explicitly set conflicting requirement for attrs.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 651e442598f06cfc5ef26fd45984f2f4f50db1dc Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Feb 18 09:52:21 2020 -0800 Explicitly set conflicting requirement for attrs. This fixes an issue that just emerged in Travis CI: $ make coverage-test fatal: No names found, cannot describe anything. coverage run --rcfile=".coveragerc" -m twisted.trial ./bridgedb/test/test_*.py Traceback (most recent call last): File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/twisted/trial/__main__.py", line 9, in <module> load_entry_point('Twisted', 'console_scripts', 'trial')() File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 489, in load_entry_point return get_distribution(dist).load_entry_point(group, name) File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 2793, in load_entry_point return ep.load() File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 2410, in load self.require(*args, **kwargs) File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 2433, in require items = working_set.resolve(reqs, env, installer, extras=self.extras) File "/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages/pkg_resources/__init__.py", line 791, in resolve raise VersionConflict(dist, req).with_context(dependent_req) pkg_resources.ContextualVersionConflict: (attrs 18.2.0 (/home/travis/virtualenv/python3.7.1/lib/python3.7/site-packages), Requirement.parse('attrs>=19.2.0'), {'Automat'}) Coverage.py warning: No data was collected. (no-data-collected) Makefile:76: recipe for target 'coverage-test' failed make: *** [coverage-test] Error 1 The command "make coverage-test" exited with 2. --- .travis.requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 37a2fe5..6f3dec7 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -13,6 +13,7 @@ # $ make coverage # #------------------------------------------------------------------------------ +attrs==19.2.0 Babel==2.8.0 BeautifulSoup==3.2.2 Mako==1.1.1

1 0

[bridgedb/develop] Merge branch 'task/33299' into develop
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit eb12be54ef672bd874b7e85ea0ee5f8dc7282a96 Merge: 7f1638e 651e442 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Feb 18 16:05:23 2020 -0800 Merge branch 'task/33299' into develop .travis.requirements.txt | 1 + CHANGELOG | 3 +++ bridgedb.conf | 6 +++--- bridgedb/bridges.py | 7 +++---- bridgedb/distributors/https/server.py | 5 +---- bridgedb/distributors/moat/server.py | 4 +--- bridgedb/i18n/templates/bridgedb.pot | 13 +++++-------- bridgedb/test/test_https.py | 27 --------------------------- 8 files changed, 17 insertions(+), 49 deletions(-)

1 0

[bridgedb/develop] Merge branch 'release-0.9.3'
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 0f2349d1355584cca65c7c7a45a78aea39203b35 Merge: ae0c4eb 0594e98 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Feb 18 16:07:48 2020 -0800 Merge branch 'release-0.9.3' .travis.requirements.txt | 1 + CHANGELOG | 5 +++++ bridgedb.conf | 6 +++--- bridgedb/bridges.py | 7 +++---- bridgedb/distributors/https/server.py | 5 +---- bridgedb/distributors/moat/server.py | 4 +--- bridgedb/i18n/templates/bridgedb.pot | 13 +++++-------- bridgedb/test/test_https.py | 27 --------------------------- 8 files changed, 19 insertions(+), 49 deletions(-)

1 0

[bridgedb/develop] Merge branch 'master' into develop
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 7b142b899766dea9c503fa3bdf999421ee4b7f37 Merge: eb12be5 0f2349d Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Feb 18 16:15:44 2020 -0800 Merge branch 'master' into develop CHANGELOG | 2 ++ 1 file changed, 2 insertions(+)

1 0

[bridgedb/master] Remove obfs3 and scramblesuit unit test.
by phw＠torproject.org 19 Feb '20

19 Feb '20

commit 9c273d00d5c7ece846146abfd842ad56ddc20602 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Feb 12 17:02:30 2020 -0800 Remove obfs3 and scramblesuit unit test. --- bridgedb/test/test_https.py | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/bridgedb/test/test_https.py b/bridgedb/test/test_https.py index 8432c20..ffd7281 100644 --- a/bridgedb/test/test_https.py +++ b/bridgedb/test/test_https.py @@ -188,18 +188,6 @@ class HTTPTests(unittest.TestCase): self.openBrowser() self.assertRaises(mechanize.HTTPError, self.br.open, page) - def test_get_obfs3_ipv4(self): - self.openBrowser() - self.goToOptionsPage() - - PT = 'obfs3' - soup = self.submitOptions(transport=PT, ipv6=False, - captchaResponse=CAPTCHA_RESPONSE) - bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=3) - for bridge in bridges: - pt = bridge[0] - self.assertEquals(PT, pt) - def test_get_vanilla_ipv4(self): self.openBrowser() self.goToOptionsPage() @@ -226,21 +214,6 @@ class HTTPTests(unittest.TestCase): addr = bridge[0].rsplit(':', 1)[0].strip('[]') self.assertIsInstance(ipaddr.IPAddress(addr), ipaddr.IPv6Address) - def test_get_scramblesuit_ipv4(self): - self.openBrowser() - self.goToOptionsPage() - - PT = 'scramblesuit' - soup = self.submitOptions(transport=PT, ipv6=False, - captchaResponse=CAPTCHA_RESPONSE) - bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=4) - for bridge in bridges: - pt = bridge[0] - password = bridge[-1] - self.assertEquals(PT, pt) - self.assertTrue(password.find("password=") != -1, - "Password field missing expected text") - def test_get_obfs4_ipv4(self): """Try asking for obfs4 bridges, and check that the PT arguments in the returned bridge lines were space-separated.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2020