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

[bridgedb/develop] Don't burn active probing-resistant PTs.
by phw＠torproject.org 04 Jun '19

04 Jun '19

commit efff3eb11dc62044ab2d64cf1a078ec913f7ae7c Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Apr 10 17:31:43 2019 -0700 Don't burn active probing-resistant PTs. The GFW used to block bridges by IP address:port but a while ago, it started to block bridges by IP address instead. This means that if a bridge runs obfs4 (which is active probing-resistant) and obfs3 (which is not active probing-resistant), and BridgeDB happens to hand out the bridge's obfs3 line, the GFW would manage to probe the bridge, and block the entire IP address, *including* obfs4. In this patch, we deal with the GFW's update by not handing out a bridge's probe-able protocols if it also runs an active probing-resistant protocol such as obfs4 or scramblesuit. The patch adds a new configuration option, PROBING_RESISTANT_TRANSPORTS, which must contain a list of active probing-resistant protocols. This fixes bug 28655: <https://bugs.torproject.org/28655> --- .test.requirements.txt | 2 +- .travis.requirements.txt | 2 +- CHANGELOG | 8 ++++++ bridgedb.conf | 8 ++++++ bridgedb/bridgerequest.py | 7 +++++ bridgedb/bridges.py | 21 +++++++++++++++ bridgedb/filters.py | 34 ++++++++++++++++++++++++ bridgedb/main.py | 8 ++++++ bridgedb/runner.py | 2 +- bridgedb/test/test_distributors_moat_request.py | 3 ++- bridgedb/test/test_filters.py | 35 +++++++++++++++++++++++++ bridgedb/test/test_https_distributor.py | 31 ++++++++++++++++++++++ bridgedb/test/test_main.py | 1 + bridgedb/test/util.py | 17 +++++++++++- doc/HACKING.md | 2 +- scripts/setup-tests | 2 +- 16 files changed, 176 insertions(+), 7 deletions(-) diff --git a/.test.requirements.txt b/.test.requirements.txt index 6a85c00..c84fb58 100644 --- a/.test.requirements.txt +++ b/.test.requirements.txt @@ -6,7 +6,7 @@ # $ make coverage # coverage==4.2 -git+https://git.torproject.org/user/isis/leekspin.git@bad0bed11a9018f65555b3c6998b26e2cb06f5b5#egg=leekspin-2.2.0.dev1-py2.7 +git+https://git.torproject.org/user/phw/leekspin.git@d34c804cd0f01af5206833e62c0dedec8565b235#egg=leekspin mechanize==0.2.5 pep8==1.5.7 # pylint must be pinned until pylint bug #203 is fixed. See diff --git a/.travis.requirements.txt b/.travis.requirements.txt index e05e643..2d56b79 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -15,7 +15,7 @@ #------------------------------------------------------------------------------ coverage==4.2 coveralls==1.2.0 -git+https://git.torproject.org/user/isis/leekspin.git@bad0bed11a9018f65555b3c6998b26e2cb06f5b5#egg=leekspin-2.2.0.dev1-py2.7 +git+https://git.torproject.org/user/phw/leekspin.git@d34c804cd0f01af5206833e62c0dedec8565b235#egg=leekspin mechanize==0.2.5 sure==1.2.2 Babel==0.9.6 diff --git a/CHANGELOG b/CHANGELOG index 9ffeac1..f45f56f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +Changes in version 0.6.X - YYYY-MM-DD + + * FIXES #28655 https://bugs.torproject.org/28655 + When a bridge supports an active probing-resistant transport, it should + not give out flavors that are vulnerable to active probing. For + example, if a bridge supports obfs4 and obfs3, it should only give out + obfs4. + Changes in version 0.6.3 - 2018-01-23 * FIXES #24432 https://bugs.torproject.org/24432 diff --git a/bridgedb.conf b/bridgedb.conf index 7700917..73b65b8 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -282,6 +282,14 @@ SUPPORTED_TRANSPORTS = { 'fte': True, } +# PROBING_RESISTANT_TRANSPORTS is a list of transports that are resistant to +# active probing attacks as pioneered by China's GFW. If a bridge supports any +# of the following transports, only these transports are distributed, and no +# others. Here's why: If we have a bridge that supports both obfs3 and obfs4, +# we don't want to hand out its obfs3 line to users because this may get the +# bridge probed and its IP address blocked, which also blocks the obfs4 PT. +PROBING_RESISTANT_TRANSPORTS = ['scramblesuit', 'obfs4'] + # DEFAULT_TRANSPORT is a string. It should be the PT methodname of the # transport which is selected by default (e.g. in the webserver dropdown # menu). diff --git a/bridgedb/bridgerequest.py b/bridgedb/bridgerequest.py index d5af05f..bf64069 100644 --- a/bridgedb/bridgerequest.py +++ b/bridgedb/bridgerequest.py @@ -28,6 +28,7 @@ from bridgedb.crypto import getHMACFunc from bridgedb.filters import byIPv from bridgedb.filters import byNotBlockedIn from bridgedb.filters import byTransport +from bridgedb.filters import byProbingResistance class IRequestBridges(Interface): @@ -238,6 +239,12 @@ class BridgeRequestBase(object): msg = ("Adding a filter to %s for %s for IPv%d" % (self.__class__.__name__, self.client, self.ipVersion)) + # If this bridge runs any active probing-resistant PTs, we should + # *only* hand out its active probing-resistant PTs. Otherwise, a + # non-resistant PT would get this bridge scanned and blocked: + # <https://bugs.torproject.org/28655> + self.addFilter(byProbingResistance(pt, self.ipVersion)) + if self.notBlockedIn: for country in self.notBlockedIn: logging.info("%s %s bridges not blocked in %s..." % diff --git a/bridgedb/bridges.py b/bridgedb/bridges.py index 8b4bc1b..cf90b3b 100644 --- a/bridgedb/bridges.py +++ b/bridgedb/bridges.py @@ -365,6 +365,9 @@ class PluggableTransport(BridgeAddressBase): {'password': 'NEQGQYLUMUQGK5TFOJ4XI2DJNZTS4LRO'} """ + # A list of PT names that are resistant to active probing attacks. + probing_resistant_transports = [] + def __init__(self, fingerprint=None, methodname=None, address=None, port=None, arguments=None): """Create a ``PluggableTransport`` describing a PT running on a bridge. @@ -529,6 +532,17 @@ class PluggableTransport(BridgeAddressBase): except (AttributeError, TypeError): raise TypeError("methodname must be a str or unicode") + def isProbingResistant(self): + """Reveal if this pluggable transport is active probing-resistant. + + :rtype: bool + :returns: ``True`` if this pluggable transport is resistant to active + probing attacks, ``False`` otherwise. + """ + + return self.methodname in PluggableTransport.probing_resistant_transports + + def getTransportLine(self, includeFingerprint=True, bridgePrefix=False): """Get a Bridge Line for this :class:`PluggableTransport`. @@ -1031,6 +1045,13 @@ class Bridge(BridgeBackwardsCompatibility): return prefix + fingerprint + separator + nickname + def hasProbingResistantPT(self): + # We want to know if this bridge runs any active probing-resistant PTs + # because if so, we should *only* hand out its active probing-resistant + # PTs. Otherwise, a non-resistant PT would get this bridge scanned and + # blocked: <https://bugs.torproject.org/28655> + return any([t.isProbingResistant() for t in self.transports]) + def _checkServerDescriptor(self, descriptor): # If we're parsing the server-descriptor, require a networkstatus # document: diff --git a/bridgedb/filters.py b/bridgedb/filters.py index cac587b..f268c83 100644 --- a/bridgedb/filters.py +++ b/bridgedb/filters.py @@ -127,6 +127,40 @@ def byIPv(ipVersion=None): byIPv4 = byIPv(4) byIPv6 = byIPv(6) +def byProbingResistance(methodname=None, ipVersion=None): + """Return ``True`` if the bridge can be given out safely without + jeopardizing a probing-resistant transport that runs on the same bridge. + + :param str methodname: A Pluggable Transport + :data:`~bridgedb.bridges.PluggableTransport.methodname`. + :param int ipVersion: Either ``4`` or ``6``. The IP version that the + ``Bridge``'s ``PluggableTransport`` + :attr:`address <bridgedb.bridges.PluggableTransport.address>` should + have. + :rtype: callable + :returns: A filter function for :class:`Bridges <bridgedb.bridges.Bridge>`. + """ + + if ipVersion not in (4, 6): + ipVersion = 4 + + methodname = "vanilla" if methodname is None else methodname.lower() + name = "by-probing-resistance-%s ipv%d" % (methodname, ipVersion) + + try: + return _cache[name] + except KeyError: + def _byProbingResistance(bridge): + if bridge.hasProbingResistantPT(): + return methodname in ('scramblesuit', 'obfs4') + return True + + setattr(_byProbingResistance, "description", "probing_resistance") + _byProbingResistance.__name__ = "byProbingResistance(%s,%s)" % (methodname, ipVersion) + _byProbingResistance.name = name + _cache[name] = _byProbingResistance + return _byProbingResistance + def byTransport(methodname=None, ipVersion=None): """Returns a filter function for a :class:`~bridgedb.bridges.Bridge`. diff --git a/bridgedb/main.py b/bridgedb/main.py index 586ed83..71ae48a 100644 --- a/bridgedb/main.py +++ b/bridgedb/main.py @@ -331,6 +331,14 @@ def run(options, reactor=reactor): pidfile.write("%s\n" % os.getpid()) pidfile.flush() + # Let our pluggable transport class know what transports are resistant to + # active probing. We need to know because we shouldn't hand out a + # probing-vulnerable transport on a bridge that supports a + # probing-resistant transport. See + # <https://bugs.torproject.org/28655> for details. + from bridgedb.bridges import PluggableTransport + PluggableTransport.probing_resistant_transports = config.PROBING_RESISTANT_TRANSPORTS + from bridgedb import persistent state = persistent.State(config=config) diff --git a/bridgedb/runner.py b/bridgedb/runner.py index 35865e5..b1a21d2 100644 --- a/bridgedb/runner.py +++ b/bridgedb/runner.py @@ -90,7 +90,7 @@ def generateDescriptors(count=None, rundir=None): descriptors, used to calculate the OR fingerprints, and sign the descriptors, among other things. - .. _Leekspin: https://gitweb.torproject.org/user/isis/leekspin.git + .. _Leekspin: https://gitweb.torproject.org/user/phw/leekspin.git :param integer count: Number of mocked bridges to generate descriptor for. (default: 3) diff --git a/bridgedb/test/test_distributors_moat_request.py b/bridgedb/test/test_distributors_moat_request.py index ed7f493..3c6ff51 100644 --- a/bridgedb/test/test_distributors_moat_request.py +++ b/bridgedb/test/test_distributors_moat_request.py @@ -32,7 +32,8 @@ class MoatBridgeRequest(unittest.TestCase): self.assertItemsEqual(['byTransportNotBlockedIn(None,us,4)', 'byTransportNotBlockedIn(None,ir,4)', - 'byTransportNotBlockedIn(None,sy,4)'], + 'byTransportNotBlockedIn(None,sy,4)', + 'byProbingResistance(vanilla,4)'], [x.__name__ for x in self.bridgeRequest.filters]) def test_withoutBlockInCountry_not_a_valid_country_code(self): diff --git a/bridgedb/test/test_filters.py b/bridgedb/test/test_filters.py index 3b9efcb..f43124c 100644 --- a/bridgedb/test/test_filters.py +++ b/bridgedb/test/test_filters.py @@ -37,6 +37,8 @@ class FiltersTests(unittest.TestCase): self.hmac = getHMACFunc('plasma') + PluggableTransport.probing_resistant_transports = ['scramblesuit', 'obfs4'] + def addIPv4VoltronPT(self): pt = PluggableTransport('a' * 40, 'voltron', '1.1.1.1', 1111, {}) self.bridge.transports.append(pt) @@ -301,6 +303,39 @@ class FiltersTests(unittest.TestCase): filtre = filters.byNotBlockedIn('cn', methodname='obfs3') self.assertFalse(filtre(self.bridge)) + def test_byProbingResistance(self): + """A bridge with probing-resistant transports must not hand out its + non-probing-resistant transports. + """ + + scramblesuitArgs = {'password': 'NEQGQYLUMUQGK5TFOJ4XI2DJNZTS4LRO'} + obfs4Args = {'cert': 'UXj/cWm0qolGrROYpkl0UyD/7PEhzkoZkZXrOpjRKwImvkpQZwmF0nSzBXfyfbT9afBZEw', + 'iat-mode': '1'} + + obfs2 = PluggableTransport('a' * 40, 'obfs2', '1.1.1.1', 1111, {}) + scramblesuit = PluggableTransport('a' * 40, 'scramblesuit', '1.1.1.1', + 1111, scramblesuitArgs) + obfs4 = PluggableTransport('a' * 40, 'obfs4', '1.1.1.1', 111, + obfs4Args) + self.bridge.transports.append(obfs2) + self.bridge.transports.append(scramblesuit) + self.bridge.transports.append(obfs4) + + filtre = filters.byProbingResistance(methodname='obfs2', ipVersion=4) + self.assertFalse(filtre(self.bridge)) + + filtre = filters.byProbingResistance(methodname="vanilla", ipVersion=4) + self.assertFalse(filtre(self.bridge)) + + filtre = filters.byProbingResistance(ipVersion=4) + self.assertFalse(filtre(self.bridge)) + + filtre = filters.byProbingResistance(methodname='scramblesuit', ipVersion=4) + self.assertTrue(filtre(self.bridge)) + + filtre = filters.byProbingResistance(methodname='obfs4', ipVersion=4) + self.assertTrue(filtre(self.bridge)) + def test_byNotBlockedIn_ipv5(self): """Calling byNotBlockedIn([…], ipVersion=5) should default to IPv4.""" self.bridge.setBlockedIn('ru') diff --git a/bridgedb/test/test_https_distributor.py b/bridgedb/test/test_https_distributor.py index 791a940..c25c598 100644 --- a/bridgedb/test/test_https_distributor.py +++ b/bridgedb/test/test_https_distributor.py @@ -19,6 +19,7 @@ import random from twisted.trial import unittest +from bridgedb.bridges import PluggableTransport from bridgedb.Bridges import BridgeRing from bridgedb.Bridges import BridgeRingParameters from bridgedb.filters import byIPv4 @@ -43,6 +44,7 @@ class HTTPSDistributorTests(unittest.TestCase): def setUp(self): self.key = 'aQpeOFIj8q20s98awfoiq23rpOIjFaqpEWFoij1X' self.bridges = BRIDGES + PluggableTransport.probing_resistant_transports = ['scramblesuit', 'obfs4'] def tearDown(self): """Reset all bridge blocks in between test method runs.""" @@ -181,6 +183,35 @@ class HTTPSDistributorTests(unittest.TestCase): b = dist.getBridges(clientRequest2, 1) self.assertEqual(len(b), 3) + def test_HTTPSDistributor_getBridges_probing_vulnerable(self): + dist = distributor.HTTPSDistributor(1, self.key) + bridges = self.bridges[:] + [dist.insert(bridge) for bridge in bridges] + + def requestTransports(bridges, transport, vulnerable): + for _ in range(len(bridges)): + request = HTTPSBridgeRequest(addClientCountryCode=False) + request.client = randomValidIPv4String() + request.isValid(True) + if transport is not None: + request.transports.append(transport) + request.generateFilters() + + obtained_bridges = dist.getBridges(request, 1) + for bridge in obtained_bridges: + if vulnerable: + self.assertFalse(bridge.hasProbingResistantPT()) + for t in bridge.transports: + self.assertTrue(t.methodname != 'obfs4' and + t.methodname != 'scramblesuit') + else: + self.assertTrue(bridge.hasProbingResistantPT()) + + requestTransports(bridges, None, True) + requestTransports(bridges, 'obfs2', True) + requestTransports(bridges, 'obfs3', True) + requestTransports(bridges, 'obfs4', False) + def test_HTTPSDistributor_getBridges_with_some_blocked_bridges(self): dist = distributor.HTTPSDistributor(1, self.key) bridges = self.bridges[:] diff --git a/bridgedb/test/test_main.py b/bridgedb/test/test_main.py index b6eae2b..52d98a2 100644 --- a/bridgedb/test/test_main.py +++ b/bridgedb/test/test_main.py @@ -403,6 +403,7 @@ BRIDGE_PURPOSE = "bridge" TASKS = {'GET_TOR_EXIT_LIST': 3 * 60 * 60,} SERVER_PUBLIC_FQDN = 'bridges.torproject.org' SERVER_PUBLIC_EXTERNAL_IP = '38.229.72.19' +PROBING_RESISTANT_TRANSPORTS = ['scramblesuit', 'obfs4'] HTTPS_DIST = True HTTPS_BIND_IP = None HTTPS_PORT = None diff --git a/bridgedb/test/util.py b/bridgedb/test/util.py index 042c92d..9fc16b8 100644 --- a/bridgedb/test/util.py +++ b/bridgedb/test/util.py @@ -196,13 +196,28 @@ def generateFakeBridges(n=500): addrs = [(randomValidIPv6(), randomHighPort(), 6)] fpr = "".join(random.choice('abcdef0123456789') for _ in xrange(40)) - # We only support the ones without PT args, because they're easier to fake. supported = ["obfs2", "obfs3", "fte"] transports = [] for j, method in zip(range(1, len(supported) + 1), supported): pt = PluggableTransport(fpr, method, addr, port - j, {}) transports.append(pt) + # Every tenth bridge supports obfs4. + if i % 10 == 0: + obfs4Args = {'iat-mode': '1', + 'node-id': '2a79f14120945873482b7823caabe2fcde848722', + 'public-key': '0a5b046d07f6f971b7776de682f57c5b9cdc8fa060db7ef59de82e721c8098f4'} + pt = PluggableTransport(fpr, "obfs4", addr, port - j, + obfs4Args) + transports.append(pt) + + # Every fifteenth bridge supports scramblesuit. + if i % 15 == 0: + scramblesuitArgs = {'password': 'NEQGQYLUMUQGK5TFOJ4XI2DJNZTS4LRO'} + pt = PluggableTransport(fpr, "scramblesuit", addr, port - j, + scramblesuitArgs) + transports.append(pt) + bridge = Bridge(nick, addr, port, fpr) bridge.flags.update("Running Stable") bridge.transports = transports diff --git a/doc/HACKING.md b/doc/HACKING.md index 22f9b2b..43e7fa1 100644 --- a/doc/HACKING.md +++ b/doc/HACKING.md @@ -13,7 +13,7 @@ with password ```writecode```. Developers wishing to test BridgeDB will need to generate mock bridge descriptors. This is accomplished through the [leekspin -script](https://gitweb.torproject.org/user/isis/leekspin.git). To generate 20 +script](https://gitweb.torproject.org/user/phw/leekspin.git). To generate 20 bridge descriptors, change to the bridgedb running directory and do: $ leekspin -n 20 diff --git a/scripts/setup-tests b/scripts/setup-tests index 18298f4..ccfd6cd 100755 --- a/scripts/setup-tests +++ b/scripts/setup-tests @@ -29,7 +29,7 @@ sed -r -i -e "s/(SERVER_PUBLIC_FQDN = )(.*)/\1'127.0.0.1:6788'/" run/bridgedb.co sed -r -i -e "s/(MOAT_HTTP_IP = )(None)/\1'127.0.0.1'/" run/bridgedb.conf sed -r -i -e "s/(MOAT_HTTP_PORT = )(None)/\16790/" run/bridgedb.conf # Create descriptors -leekspin -n 100 +leekspin -n 100 -xp 50 cp -t run/from-authority networkstatus-bridges cached-extrainfo* bridge-descriptors cp -t run/from-bifroest networkstatus-bridges cached-extrainfo* bridge-descriptors # Create TLS certificates

1 0

[bridgedb/develop] Merge branch 'bug28655' into develop
by phw＠torproject.org 04 Jun '19

04 Jun '19

commit f279fa084f19a56bf5fce9a8a575e16c8abe9dad Merge: 978f9be efff3eb Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Jun 4 09:34:12 2019 -0700 Merge branch 'bug28655' into develop .test.requirements.txt | 2 +- .travis.requirements.txt | 2 +- CHANGELOG | 8 ++++++ bridgedb.conf | 8 ++++++ bridgedb/bridgerequest.py | 7 +++++ bridgedb/bridges.py | 21 +++++++++++++++ bridgedb/filters.py | 34 ++++++++++++++++++++++++ bridgedb/main.py | 8 ++++++ bridgedb/runner.py | 2 +- bridgedb/test/test_distributors_moat_request.py | 3 ++- bridgedb/test/test_filters.py | 35 +++++++++++++++++++++++++ bridgedb/test/test_https_distributor.py | 31 ++++++++++++++++++++++ bridgedb/test/test_main.py | 1 + bridgedb/test/util.py | 17 +++++++++++- doc/HACKING.md | 2 +- scripts/setup-tests | 2 +- 16 files changed, 176 insertions(+), 7 deletions(-)

1 0

[tor/master] Consider dir info to have changed when the bridges change
by dgoulet＠torproject.org 04 Jun '19

04 Jun '19

commit 5b3c8865842f3b12d3ea35db19e8feb135bb46dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 31 11:46:58 2019 -0400 Consider dir info to have changed when the bridges change Otherwise, we won't realize that we haven't got enough bridge information to build circuits. Part of a fix for ticket 29875. --- src/app/config/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 2a504d306..7f6657db3 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2412,7 +2412,8 @@ options_act(const or_options_t *old_options) if (!bool_eq(directory_fetches_dir_info_early(options), directory_fetches_dir_info_early(old_options)) || !bool_eq(directory_fetches_dir_info_later(options), - directory_fetches_dir_info_later(old_options))) { + directory_fetches_dir_info_later(old_options)) || + !config_lines_eq(old_options->Bridges, options->Bridges)) { /* Make sure update_router_have_minimum_dir_info() gets called. */ router_dir_info_changed(); /* We might need to download a new consensus status later or sooner than

1 0

[tor/master] num_bridges_usable(): only count configured bridges.
by dgoulet＠torproject.org 04 Jun '19

04 Jun '19

commit 8015979eeba2c8b10fb058318628debf228fb023 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 31 12:19:29 2019 -0400 num_bridges_usable(): only count configured bridges. When this function was implemented, it counted all the entry guards in the bridge set. But this included previously configured bridges, as well as currently configured ones! Instead, only count the _filtered_ bridges (ones that are configured and possibly reachable) as maybe usable. Fixes bug 29875; bugfix on 0.3.0.1-alpha. --- src/feature/client/entrynodes.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index e543289ce..15ec83059 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -3300,6 +3300,9 @@ num_bridges_usable,(int use_maybe_reachable)) } SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { + /* Not a bridge, or not one we are configured to be able to use. */ + if (! guard->is_filtered_guard) + continue; /* Definitely not usable */ if (guard->is_reachable == GUARD_REACHABLE_NO) continue;

1 0

[tor/master] Practracker excpetions.
by dgoulet＠torproject.org 04 Jun '19

04 Jun '19

commit 5e594831c761626022c323e48a8df9cb9deb2291 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 31 12:41:44 2019 -0400 Practracker excpetions. --- scripts/maint/practracker/exceptions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 3a32e97be..f0c176560 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -32,7 +32,7 @@ problem file-size /src/app/config/config.c 8520 problem include-count /src/app/config/config.c 88 problem function-size /src/app/config/config.c:options_act_reversible() 296 -problem function-size /src/app/config/config.c:options_act() 588 +problem function-size /src/app/config/config.c:options_act() 590 problem function-size /src/app/config/config.c:resolve_my_address() 192 problem function-size /src/app/config/config.c:options_validate() 1220 problem function-size /src/app/config/config.c:options_init_from_torrc() 210 @@ -136,7 +136,7 @@ problem function-size /src/feature/client/addressmap.c:addressmap_rewrite() 112 problem function-size /src/feature/client/bridges.c:rewrite_node_address_for_bridge() 126 problem function-size /src/feature/client/circpathbias.c:pathbias_measure_close_rate() 108 problem function-size /src/feature/client/dnsserv.c:evdns_server_callback() 153 -problem file-size /src/feature/client/entrynodes.c 3817 +problem file-size /src/feature/client/entrynodes.c 3820 problem function-size /src/feature/client/entrynodes.c:entry_guards_upgrade_waiting_circuits() 153 problem function-size /src/feature/client/entrynodes.c:entry_guard_parse_from_state() 246 problem function-size /src/feature/client/transports.c:handle_proxy_line() 108

1 0

[tor/master] Merge branch 'bug29875_035' into bug29875_master
by dgoulet＠torproject.org 04 Jun '19

04 Jun '19

commit fd8beab4ddfa5b26da405705bed64570ceab7925 Merge: dd62cb788 c09e7a4e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 31 12:40:43 2019 -0400 Merge branch 'bug29875_035' into bug29875_master changes/bug29875 | 11 +++++++++++ src/app/config/config.c | 3 ++- src/feature/client/entrynodes.c | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-)

1 0

[tor/master] changes file for bug 29875.
by dgoulet＠torproject.org 04 Jun '19

04 Jun '19

commit c09e7a4e715d8266517896cfbc8fc80f19feba85 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 31 12:39:52 2019 -0400 changes file for bug 29875. --- changes/bug29875 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/changes/bug29875 b/changes/bug29875 new file mode 100644 index 000000000..58a1c871c --- /dev/null +++ b/changes/bug29875 @@ -0,0 +1,11 @@ + o Major bugfixes (bridges): + - Do not count previously configured working bridges towards our total of + working bridges. Previously, when Tor's list of bridges changed, it + would think that the old bridges were still usable, and delay fetching + router descriptors for the new ones. Fixes part of bug 29875; bugfix + on 0.3.0.1-alpha. + - Consider our directory information to have changed when our list of + bridges changes. Previously, Tor would not re-compute the status of its + directory information when bridges changed, and therefore would not + realize that it was no longer able to build circuits. Fixes part of bug + 29875.

1 0

[tor/master] Merge branch 'tor-github/pr/1067'
by dgoulet＠torproject.org 04 Jun '19

04 Jun '19

commit a63c5f844bcf022f6c83897d111b01344f67b40b Merge: 33382184b 5e594831c Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 4 09:57:03 2019 -0400 Merge branch 'tor-github/pr/1067' changes/bug29875 | 11 +++++++++++ scripts/maint/practracker/exceptions.txt | 4 ++-- src/app/config/config.c | 3 ++- src/feature/client/entrynodes.c | 3 +++ 4 files changed, 18 insertions(+), 3 deletions(-)

1 0

[tor/master] sendme: Do not decrement window in a log_debug()
by asn＠torproject.org 04 Jun '19

04 Jun '19

commit 33382184b67d43b859de2f50d24cc7955b9f0db7 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Jun 3 14:31:51 2019 -0400 sendme: Do not decrement window in a log_debug() If "Log debug ..." is not set, the decrement never happens. This lead to the package/deliver window to be out of sync at the stream level and thus breaking the connection after 50+ cells. Fixes #30628 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket30628 | 5 +++++ src/core/or/sendme.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/ticket30628 b/changes/ticket30628 new file mode 100644 index 000000000..7128c5acf --- /dev/null +++ b/changes/ticket30628 @@ -0,0 +1,5 @@ + o Major bugfixes (Flow Control, SENDME): + - The decrement of the stream-level package window was done in a log_debug() + statement meaning that if the debug logs were not enabled, the decrement + would never happen and thus the window would be out of sync with the other + end point. Fixes bug 30628; bugfix on 0.4.1.1-alpha. diff --git a/src/core/or/sendme.c b/src/core/or/sendme.c index 7d409a16a..47ac95f3c 100644 --- a/src/core/or/sendme.c +++ b/src/core/or/sendme.c @@ -619,7 +619,9 @@ int sendme_note_stream_data_packaged(edge_connection_t *conn) { tor_assert(conn); - log_debug(LD_APP, "Stream package_window now %d.", --conn->package_window); + + --conn->package_window; + log_debug(LD_APP, "Stream package_window now %d.", conn->package_window); return conn->package_window; }

1 0

[community/master] replace user-testing with user-research
by hiro＠torproject.org 04 Jun '19

04 Jun '19

commit b4edbc0bb483da391c03e7fdd2cf62ba6f0c4503 Author: Antonela <hola(a)antonela.me> Date: Mon Jun 3 10:54:25 2019 -0300 replace user-testing with user-research we are not testing users! --- .../png/{user-testing.png => user-research.png} | Bin .../{user-testing => user-research}/contents.lr | 8 +++---- .../current/contents.lr | 6 +++--- .../signup/contents.lr | 6 +++--- content/user-testing/contents+en.lr | 23 --------------------- content/user-testing/contents+es.lr | 23 --------------------- content/user-testing/contents+fr.lr | 23 --------------------- databags/pagenav+en.ini | 6 +++--- .../{user-testing.html => user-research.html} | 0 9 files changed, 13 insertions(+), 82 deletions(-) diff --git a/assets/static/images/home/png/user-testing.png b/assets/static/images/home/png/user-research.png similarity index 100% rename from assets/static/images/home/png/user-testing.png rename to assets/static/images/home/png/user-research.png diff --git a/content/user-testing/contents.lr b/content/user-research/contents.lr similarity index 80% rename from content/user-testing/contents.lr rename to content/user-research/contents.lr index 6c5a2f1..83858c8 100644 --- a/content/user-testing/contents.lr +++ b/content/user-research/contents.lr @@ -1,12 +1,12 @@ -section: user testing +section: user research --- -section_id: user-testing +section_id: user-research --- color: primary --- _template: layout.html --- -title: User Testing +title: User Research --- subtitle: We conduct user research while also respecting user privacy. --- @@ -14,7 +14,7 @@ cta: Learn how you can help --- key: 2 --- -html: user-testing.html +html: user-research.html --- body: diff --git a/content/user-testing/current/contents.lr b/content/user-research/current/contents.lr similarity index 82% rename from content/user-testing/current/contents.lr rename to content/user-research/current/contents.lr index 1d10937..1283e37 100644 --- a/content/user-testing/current/contents.lr +++ b/content/user-research/current/contents.lr @@ -1,6 +1,6 @@ -section: user testing +section: user research --- -section_id: user-testing +section_id: user-research --- color: primary --- @@ -14,6 +14,6 @@ subtitle: Link to somewhere we csan update more than this webpage, even banners --- key: 1 --- -html: user-testing.html +html: user-research.html --- body: diff --git a/content/user-testing/signup/contents.lr b/content/user-research/signup/contents.lr similarity index 81% rename from content/user-testing/signup/contents.lr rename to content/user-research/signup/contents.lr index e238096..06cd047 100644 --- a/content/user-testing/signup/contents.lr +++ b/content/user-research/signup/contents.lr @@ -1,6 +1,6 @@ -section: user testing +section: user research --- -section_id: user-testing +section_id: user-research --- color: primary --- @@ -14,6 +14,6 @@ subtitle: Will you help us by becoming a Tor tester? Sign up for the user testin --- key: 2 --- -html: user-testing.html +html: user-research.html --- body: diff --git a/content/user-testing/contents+en.lr b/content/user-testing/contents+en.lr deleted file mode 100644 index 6c5a2f1..0000000 --- a/content/user-testing/contents+en.lr +++ /dev/null @@ -1,23 +0,0 @@ -section: user testing ---- -section_id: user-testing ---- -color: primary ---- -_template: layout.html ---- -title: User Testing ---- -subtitle: We conduct user research while also respecting user privacy. ---- -cta: Learn how you can help ---- -key: 2 ---- -html: user-testing.html ---- -body: - -Protecting privacy is what we do at Tor. -So how do we collect meaningful user feedback without violating user consent? -We conduct all of our user research through in-person studies that users explicitly opt into. diff --git a/content/user-testing/contents+es.lr b/content/user-testing/contents+es.lr deleted file mode 100644 index 6c5a2f1..0000000 --- a/content/user-testing/contents+es.lr +++ /dev/null @@ -1,23 +0,0 @@ -section: user testing ---- -section_id: user-testing ---- -color: primary ---- -_template: layout.html ---- -title: User Testing ---- -subtitle: We conduct user research while also respecting user privacy. ---- -cta: Learn how you can help ---- -key: 2 ---- -html: user-testing.html ---- -body: - -Protecting privacy is what we do at Tor. -So how do we collect meaningful user feedback without violating user consent? -We conduct all of our user research through in-person studies that users explicitly opt into. diff --git a/content/user-testing/contents+fr.lr b/content/user-testing/contents+fr.lr deleted file mode 100644 index 6c5a2f1..0000000 --- a/content/user-testing/contents+fr.lr +++ /dev/null @@ -1,23 +0,0 @@ -section: user testing ---- -section_id: user-testing ---- -color: primary ---- -_template: layout.html ---- -title: User Testing ---- -subtitle: We conduct user research while also respecting user privacy. ---- -cta: Learn how you can help ---- -key: 2 ---- -html: user-testing.html ---- -body: - -Protecting privacy is what we do at Tor. -So how do we collect meaningful user feedback without violating user consent? -We conduct all of our user research through in-person studies that users explicitly opt into. diff --git a/databags/pagenav+en.ini b/databags/pagenav+en.ini index 1f4097c..1be3fa3 100644 --- a/databags/pagenav+en.ini +++ b/databags/pagenav+en.ini @@ -2,9 +2,9 @@ path = relay-operations label = Relay Operations -[user-testing] -path = user-testing -label = User Testing +[user-research] +path = user-research +label = User Research [training] path = training diff --git a/templates/user-testing.html b/templates/user-research.html similarity index 100% rename from templates/user-testing.html rename to templates/user-research.html

1 0