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

[tor/master] Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 31fb2bceb546fb84899e5c797e3f101b86dd8687 Merge: 789fdbed0 c09e7a4e7 Author: teor <teor(a)torproject.org> Date: Mon Aug 12 09:53:59 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5 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] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 6eb5a811d732f59d5cd203c966d09ac820421642 Merge: fc89397fa 20943d00f Author: teor <teor(a)torproject.org> Date: Mon Aug 12 13:10:14 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1

1 0

[tor/master] Merge branch 'maint-0.4.1'
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit c9841eb67e44fa3420eb51a69d3766dd95aeebf0 Merge: 63ec50e01 6eb5a811d Author: teor <teor(a)torproject.org> Date: Mon Aug 12 13:10:30 2019 +1000 Merge branch 'maint-0.4.1'

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit a1d8409ee28b609a7d6a1a138a53628cb214a113 Merge: bad001080 bdf685e47 Author: teor <teor(a)torproject.org> Date: Mon Aug 12 09:55:29 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0 changes/bug30614 | 4 ++++ src/lib/malloc/map_anon.c | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit d253b31cec04c35c551618b9b1ffa50ae4426303 Merge: 31fb2bceb a6399da59 Author: teor <teor(a)torproject.org> Date: Mon Aug 12 09:54:35 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5 changes/bug29034 | 5 +++++ src/core/or/circuituse.c | 6 ++++++ 2 files changed, 11 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 20943d00f10af11133d9ece90f1cbed658a21aed Merge: a1d8409ee d253b31ce Author: teor <teor(a)torproject.org> Date: Mon Aug 12 13:10:05 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug22619 | 3 +++ changes/bug29034 | 5 +++++ changes/bug29670 | 4 ++++ changes/bug29875 | 11 +++++++++++ changes/bug30148 | 4 ++++ changes/bug30190 | 3 +++ changes/ticket29617 | 4 ++++ src/app/config/config.c | 5 +++-- src/core/mainloop/connection.c | 33 +++++++++++++++++++++------------ src/core/or/circuituse.c | 6 ++++++ src/feature/client/entrynodes.c | 3 +++ src/feature/relay/dns.c | 3 ++- src/feature/relay/routerkeys.c | 2 +- src/lib/crypt_ops/crypto_openssl_mgt.c | 8 ++++++++ src/test/test_config.c | 12 +++++------- 15 files changed, 83 insertions(+), 23 deletions(-)

1 0

[bridgedb/develop] Merge branch 'fix/26542' into develop
by phw＠torproject.org 12 Aug '19

12 Aug '19

commit 081ff367458db9d9081035e63a9858df27932041 Merge: 21807e6 8894939 Author: Philipp Winter <phw(a)nymity.ch> Date: Sun Aug 11 19:30:13 2019 -0700 Merge branch 'fix/26542' into develop CHANGELOG | 5 +++++ bridgedb/bridgerequest.py | 2 +- bridgedb/filters.py | 10 +++++++++- bridgedb/test/test_distributors_moat_request.py | 6 +++--- scripts/install-dependencies | 11 +---------- 5 files changed, 19 insertions(+), 15 deletions(-)

1 0

[bridgedb/develop] Add version filters for IPv6 vanilla bridges.
by phw＠torproject.org 12 Aug '19

12 Aug '19

commit 594589ec2e7e1893c5e4dc48385f573c09de6f0d Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Aug 6 11:19:41 2019 -0700 Add version filters for IPv6 vanilla bridges. So far, BridgeDB's distribution of vanilla IPv6 bridges was broken. When a user would request one, BridgeDB would use the following two filters to select bridges: * byTransportNotBlockedIn(None,us,6) * byProbingResistance(vanilla,6) Neither filter (correctly) filtered for IPv6. It is not enough to check bridge.address because it's the bridge's IPv4 address. We need to check bridge.allVanillaAddresses because a bridge's IPv6 address is advertised in its "a" consensus line. Note that this patch only fixes IPv6 distribution for *vanilla* bridges. Pluggable transports bridges are currently unable to have dual-stack support for both IPv4 and IPv6. See the following ticket for more details: <https://bugs.torproject.org/11211> This fixes <https://bugs.torproject.org/26542>. --- CHANGELOG | 5 +++++ bridgedb/bridgerequest.py | 2 +- bridgedb/filters.py | 10 +++++++++- bridgedb/test/test_distributors_moat_request.py | 6 +++--- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1ebd47e..1229578 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +Changes in version 0.7.2 - YYYY-MM-DD + + * FIXES #26542 https://bugs.torproject.org/26542 + Make BridgeDB distribute vanilla IPv6 bridges again. + Changes in version 0.7.1 - 2019-06-07 * FIXES #28496 https://bugs.torproject.org/28496 diff --git a/bridgedb/bridgerequest.py b/bridgedb/bridgerequest.py index bf64069..7bd7b64 100644 --- a/bridgedb/bridgerequest.py +++ b/bridgedb/bridgerequest.py @@ -249,7 +249,7 @@ class BridgeRequestBase(object): for country in self.notBlockedIn: logging.info("%s %s bridges not blocked in %s..." % (msg, pt or "vanilla", country)) - self.addFilter(byNotBlockedIn(country, pt, self.ipVersion)) + self.addFilter(byNotBlockedIn(country, pt or "vanilla", self.ipVersion)) elif pt: logging.info("%s %s bridges..." % (msg, pt)) self.addFilter(byTransport(pt, self.ipVersion)) diff --git a/bridgedb/filters.py b/bridgedb/filters.py index f268c83..a02661e 100644 --- a/bridgedb/filters.py +++ b/bridgedb/filters.py @@ -151,6 +151,13 @@ def byProbingResistance(methodname=None, ipVersion=None): return _cache[name] except KeyError: def _byProbingResistance(bridge): + # If we're dealing with a vanilla bridge, make sure that the bridge + # has the correct IP version. + if methodname == "vanilla": + validVersion = byIPv(ipVersion) + if not validVersion(bridge): + return False + if bridge.hasProbingResistantPT(): return methodname in ('scramblesuit', 'obfs4') return True @@ -262,7 +269,8 @@ def byNotBlockedIn(countryCode=None, methodname=None, ipVersion=4): if not methodname: return not bridge.isBlockedIn(countryCode) elif methodname == "vanilla": - if bridge.address.version == ipVersion: + validVersion = byIPv(ipVersion) + if validVersion(bridge): if not bridge.addressIsBlockedIn(countryCode, bridge.address, bridge.orPort): diff --git a/bridgedb/test/test_distributors_moat_request.py b/bridgedb/test/test_distributors_moat_request.py index 3c6ff51..555b3eb 100644 --- a/bridgedb/test/test_distributors_moat_request.py +++ b/bridgedb/test/test_distributors_moat_request.py @@ -30,9 +30,9 @@ class MoatBridgeRequest(unittest.TestCase): self.bridgeRequest.withoutBlockInCountry(data) self.bridgeRequest.generateFilters() - self.assertItemsEqual(['byTransportNotBlockedIn(None,us,4)', - 'byTransportNotBlockedIn(None,ir,4)', - 'byTransportNotBlockedIn(None,sy,4)', + self.assertItemsEqual(['byTransportNotBlockedIn(vanilla,us,4)', + 'byTransportNotBlockedIn(vanilla,ir,4)', + 'byTransportNotBlockedIn(vanilla,sy,4)', 'byProbingResistance(vanilla,4)'], [x.__name__ for x in self.bridgeRequest.filters])

1 0

[bridgedb/develop] Remove outdated documentation.
by phw＠torproject.org 12 Aug '19

12 Aug '19

commit 21807e6e45cb99821c56d5c19755dd5813bce57b Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Jul 24 10:40:16 2019 -0700 Remove outdated documentation. BridgeDB no longer has a single handler for SIGUSR1. It was removed in commit f4d55919. As a result, if you now send a SIGUSR1 to BridgeDB, it reacts with the default action, which is termination. --- README.rst | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/README.rst b/README.rst index df90903..ee1c979 100644 --- a/README.rst +++ b/README.rst @@ -362,16 +362,6 @@ Or just give it a SIGHUP:: kill -s SIGHUP `cat .../run/bridgedb.pid` ----------------------------------- -To extract all bridge assignments: ----------------------------------- - -To dump all bridge assignments to files, send BridgeDB a ``SIGUSR1`` -signal by doing:: - - kill -s SIGUSR1 `cat .../run/bridgedb.pid` - - ========================= Using a BridgeDB Instance =========================

1 0

[bridgedb/develop] Add debug message.
by phw＠torproject.org 12 Aug '19

12 Aug '19

commit 4302c6792b07ae1fef4886ec9765d13425864037 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Jun 26 10:49:45 2019 -0700 Add debug message. This helps with debugging <https://bugs.torproject.org/30441>. --- bridgedb/Bridges.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bridgedb/Bridges.py b/bridgedb/Bridges.py index 3b1e5b5..3c94fdf 100644 --- a/bridgedb/Bridges.py +++ b/bridgedb/Bridges.py @@ -344,6 +344,8 @@ class BridgeRing(object): bridges = [self.bridges[k] for k in keys] bridges = bridges[:N] + logging.debug("Caller asked for N=%d, filterBySubnet=%s bridges. " + "Returning %d bridges." % (N, filterBySubnet, len(bridges))) return bridges

1 0