July 2018 - tor-commits - lists.torproject.org

[onionoo/master] Prepare for 6.1-1.15.0 release.
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit eee9cf8e12523b2baa0b6d3e30736b4b1ca12eb9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 16 15:27:36 2018 +0200 Prepare for 6.1-1.15.0 release. --- CHANGELOG.md | 2 +- build.xml | 4 ++-- src/main/java/org/torproject/onionoo/server/ResponseBuilder.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9f21b6..cd11502 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 6.?-1.??.0 - 2018-??-?? +# Changes in version 6.1-1.15.0 - 2018-07-16 * Medium changes - Provide more accurate DNS results in "verified_host_names" and diff --git a/build.xml b/build.xml index e1fb1ab..1f3fa1d 100644 --- a/build.xml +++ b/build.xml @@ -8,9 +8,9 @@ <property name="javadoc-title" value="Onionoo API Documentation"/> <property name="implementation-title" value="Onionoo" /> - <property name="onionoo.protocol.version" value="6.0"/> + <property name="onionoo.protocol.version" value="6.1"/> <property name="release.version" - value="${onionoo.protocol.version}-1.14.0-dev"/> + value="${onionoo.protocol.version}-1.15.0"/> <property name="metricslibversion" value="2.4.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index dff9899..decf559 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -132,7 +132,7 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "6.0"; + private static final String PROTOCOL_VERSION = "6.1"; private static final String NEXT_MAJOR_VERSION_SCHEDULED = null;

1 0

[metrics-web/master] Update news.json to version 278 of doc/MetricsTimeline.
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit 99a3cc515e2e9b4f46ec66328b8e83978f942fb6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 16 12:19:50 2018 +0200 Update news.json to version 278 of doc/MetricsTimeline. --- src/main/resources/web/json/news.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/resources/web/json/news.json b/src/main/resources/web/json/news.json index 55285ff..198197a 100644 --- a/src/main/resources/web/json/news.json +++ b/src/main/resources/web/json/news.json @@ -3140,6 +3140,15 @@ "target" : "https://bugs.torproject.org/26771" } ] }, { + "start" : "2018-07-15", + "protocols" : [ "snowflake" ], + "short_description" : "Made the Snowflake bridge report to the new Serge bridge authority.", + "description" : "Made the Snowflake bridge report to the new Serge bridge authority.", + "links" : [ { + "label" : "comment", + "target" : "https://bugs.torproject.org/26783#comment:1" + } ] +}, { "start" : "2016-02-24", "places" : [ "tm" ], "protocols" : [ "<OR>" ],

1 0

[metrics-web/master] Update to latest metrics-lib.
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit a5df8ebcc92a13c2dba80422a199aeb16f935c9b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 16 12:20:06 2018 +0200 Update to latest metrics-lib. --- src/submods/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submods/metrics-lib b/src/submods/metrics-lib index a67a471..f6c7e0e 160000 --- a/src/submods/metrics-lib +++ b/src/submods/metrics-lib @@ -1 +1 @@ -Subproject commit a67a4713f64dca654928d10d6f5ff469540a47cf +Subproject commit f6c7e0e4d9c69f889206687f23ca7dadd23a4e99

1 0

[tor/master] Avoid a use-after-null-check in proto_socks.c
by nickm＠torproject.org 16 Jul '18

16 Jul '18

commit 8505522e508c8d2379afbd86154a910948cf8c70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 16 07:51:11 2018 -0400 Avoid a use-after-null-check in proto_socks.c Coverity rightly complains that early in the function we're checking whether username is NULL, and later we're passing it unconditionally to strlen(). Fixes CID 1437967. Bug not in any released Tor. --- src/core/proto/proto_socks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/proto/proto_socks.c b/src/core/proto/proto_socks.c index 9cc9568a4..ccf96f781 100644 --- a/src/core/proto/proto_socks.c +++ b/src/core/proto/proto_socks.c @@ -166,7 +166,7 @@ parse_socks4_request(const uint8_t *raw_data, socks_request_t *req, *is_socks4a = (dest_ip >> 8) == 0; const char *username = socks4_client_request_get_username(trunnel_req); - size_t usernamelen = username ? strlen(username) : 0; + const size_t usernamelen = username ? strlen(username) : 0; if (username && usernamelen) { if (usernamelen > MAX_SOCKS_MESSAGE_LEN) { log_warn(LD_APP, "Socks4 user name too long; rejecting."); @@ -184,7 +184,7 @@ parse_socks4_request(const uint8_t *raw_data, socks_request_t *req, // We cannot rely on trunnel here, as we want to detect if // we have abnormally long hostname field. const char *hostname = (char *)raw_data + SOCKS4_NETWORK_LEN + - strlen(username) + 1; + usernamelen + 1; size_t hostname_len = (char *)raw_data + datalen - hostname; if (hostname_len <= sizeof(req->address)) {

1 0

[metrics-web/master] Recognize new bridge authority Serge.
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit 7744458f33f5b257d20cba89ce5cdc4819b8ed85 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 16 12:16:42 2018 +0200 Recognize new bridge authority Serge. --- .../torproject/metrics/stats/servers/ConsensusStatsFileHandler.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java index 8ccb3b5..c736496 100644 --- a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java +++ b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java @@ -202,6 +202,9 @@ public class ConsensusStatsFileHandler { } else if (descriptorFileName.contains( "1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1")) { authority = "Bifroest"; + } else if (descriptorFileName.contains( + "BA44A889E64B93FAA2B114E02C2A279A8555C533")) { + authority = "Serge"; } if (authority == null) { this.logger.warning("Did not recognize the bridge authority "

1 0

[metrics-web/master] Update news.json to version 277 of doc/MetricsTimeline.
by karsten＠torproject.org 16 Jul '18

16 Jul '18

commit 518b6489373590f2f183fa53292a98dda3eb2823 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jul 15 09:17:11 2018 +0200 Update news.json to version 277 of doc/MetricsTimeline. --- src/main/resources/web/json/news.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/resources/web/json/news.json b/src/main/resources/web/json/news.json index 63db2d2..55285ff 100644 --- a/src/main/resources/web/json/news.json +++ b/src/main/resources/web/json/news.json @@ -3128,6 +3128,18 @@ "target" : "https://bugs.torproject.org/26661" } ] }, { + "start" : "2018-07-14", + "protocols" : [ "bridge" ], + "short_description" : "Release of Tor 0.3.3.9, switches bridge authority Bifroest to Serge.", + "description" : "Release of Tor 0.3.3.9, switches bridge authority Bifroest to <a href=\"https://metrics.torproject.org/rs.html#details/BA44A889E64B93FAA2B114E02C2A…">Serge</a>.", + "links" : [ { + "label" : "announcement", + "target" : "https://lists.torproject.org/pipermail/tor-announce/2018-July/000162.html" + }, { + "label" : "ticket", + "target" : "https://bugs.torproject.org/26771" + } ] +}, { "start" : "2016-02-24", "places" : [ "tm" ], "protocols" : [ "<OR>" ],

1 0

[chutney/master] Add a minimal bwfile network with V3BandwidthsFile /tmp/bwfile
by teor＠torproject.org 16 Jul '18

16 Jul '18

commit 0d2f884aa1643a09eae95bf57157664b36f0ebbb Author: teor <teor2345(a)gmail.com> Date: Mon Jul 16 15:22:00 2018 +1000 Add a minimal bwfile network with V3BandwidthsFile /tmp/bwfile Closes 26801. --- README | 7 +++++++ networks/bwfile | 9 +++++++++ torrc_templates/authority-bwfile.tmpl | 2 ++ 3 files changed, 18 insertions(+) diff --git a/README b/README index 8d4bb72..7df2ef5 100644 --- a/README +++ b/README @@ -118,6 +118,13 @@ HS Connection Tests: # Default behavior is one client connects to each HS ./chutney stop networks/hs-025 +Bandwidth File Tests: + ./tools/test-network.sh --flavour bwfile + # Warning: Can't open bandwidth file at configured location: /tmp/bwfile + # Create a bwfile with no bandwidths, that is valid for a few days + date +%s > /tmp/bwfile + ./tools/test-network.sh --flavour bwfile + Waiting for the network: The tools/test-network.sh script waits CHUTNEY_START_TIME seconds diff --git a/networks/bwfile b/networks/bwfile new file mode 100644 index 0000000..43fdf19 --- /dev/null +++ b/networks/bwfile @@ -0,0 +1,9 @@ +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority-bwfile.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") + +# The minimum number of authorities/relays/exits is 3, the minimum path length +NODES = Authority.getN(2) + ExitRelay.getN(1) + Client.getN(1) + +ConfigureNodes(NODES) diff --git a/torrc_templates/authority-bwfile.tmpl b/torrc_templates/authority-bwfile.tmpl new file mode 100644 index 0000000..1411773 --- /dev/null +++ b/torrc_templates/authority-bwfile.tmpl @@ -0,0 +1,2 @@ +${include:authority.tmpl} +V3BandwidthsFile /tmp/bwfile

1 0

[chutney/master] Remove all comment references to obsolete tor versions
by teor＠torproject.org 16 Jul '18

16 Jul '18

commit 74e87ead493bdbe2ee1dd12f776085858feccc58 Author: teor <teor2345(a)gmail.com> Date: Mon Jul 16 15:34:41 2018 +1000 Remove all comment references to obsolete tor versions --- README | 4 ---- lib/chutney/TorNet.py | 9 ++------- networks/basic | 2 -- networks/bridges | 2 -- networks/bridges+hs | 2 -- networks/bridges+hs-v23 | 2 -- networks/bridges+ipv6 | 2 -- networks/bridges+ipv6+hs | 2 -- networks/bridges+ipv6+hs-v23 | 2 -- networks/hs | 2 -- networks/hs-exit-min | 2 -- networks/hs-v3 | 2 -- networks/middle | 2 -- networks/mixed | 2 -- networks/mixed+hs-v2 | 2 -- networks/mixed+hs-v23 | 2 -- networks/mixed+hs-v3 | 2 -- tools/ignore.warnings | 2 +- tools/test-network.sh | 3 --- torrc_templates/authority.i | 11 ----------- 20 files changed, 3 insertions(+), 56 deletions(-) diff --git a/README b/README index 7df2ef5..d845e6b 100644 --- a/README +++ b/README @@ -105,10 +105,6 @@ Connection Tests: # Run 5 sequential verification rounds CHUTNEY_ROUNDS=5 ./tools/test-network.sh --flavour basic -Note: If you create 7 or more connections to a hidden service from a single -Tor 0.2.7 client, you'll likely get a verification failure due to #15937. -This is fixed in 0.2.8. - HS Connection Tests: ./chutney configure networks/hs-025 ./chutney start networks/hs-025 diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index ceed4ee..91ebb6b 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -291,8 +291,6 @@ class LocalNodeBuilder(NodeBuilder): tor = self._env['tor'] # find the options the current tor binary supports, and cache them if tor not in _TORRC_OPTIONS: - # Note: some versions of tor (e.g. 0.2.4.23) require - # --list-torrc-options to be the first argument cmdline = [ tor, "--list-torrc-options", @@ -315,9 +313,7 @@ class LocalNodeBuilder(NodeBuilder): else: torrc_opts = _TORRC_OPTIONS[tor] # check if each option is supported before writing it - # TODO: what about unsupported values? - # e.g. tor 0.2.4.23 doesn't support TestingV3AuthInitialVoteDelay 2 - # but later version do. I say throw this one to the user. + # Unsupported option values may need special handling. with open(fn_out, 'w') as f: # we need to do case-insensitive option comparison # even if this is a static whitelist, @@ -728,8 +724,7 @@ DEFAULTS = { 'tor-gencert': os.environ.get('CHUTNEY_TOR_GENCERT', None), 'auth_cert_lifetime': 12, 'ip': os.environ.get('CHUTNEY_LISTEN_ADDRESS', '127.0.0.1'), - # Pre-0.2.8 clients will fail to parse ipv6 auth lines, - # so we default to ipv6_addr None + # we default to ipv6_addr None to support IPv4-only systems 'ipv6_addr': os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', None), 'dirserver_flags': 'no-v2', 'chutney_dir': get_absolute_chutney_path(), diff --git a/networks/basic b/networks/basic index 703f5fc..2ff8dee 100644 --- a/networks/basic +++ b/networks/basic @@ -3,8 +3,6 @@ Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", client=1, torrc="client.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 NODES = Authority.getN(3) + ExitRelay.getN(5) + Client.getN(2) ConfigureNodes(NODES) diff --git a/networks/bridges b/networks/bridges index 2557c0f..c5f6076 100644 --- a/networks/bridges +++ b/networks/bridges @@ -8,8 +8,6 @@ BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 NODES = Authority.getN(3) + BridgeAuthority.getN(1) + ExitRelay.getN(4) + \ Bridge.getN(1) + Client.getN(1) + BridgeClient.getN(1) diff --git a/networks/bridges+hs b/networks/bridges+hs index 3d01cfa..f240bcb 100644 --- a/networks/bridges+hs +++ b/networks/bridges+hs @@ -9,8 +9,6 @@ Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 # We need 5 authorities/relays/exits to ensure we can build HS connections NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ ExitRelay.getN(4) + \ diff --git a/networks/bridges+hs-v23 b/networks/bridges+hs-v23 index e2ac4cd..1afd75e 100644 --- a/networks/bridges+hs-v23 +++ b/networks/bridges+hs-v23 @@ -10,8 +10,6 @@ BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") HSv3 = Node(tag="h", hs=1, torrc="hs-.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 # We need 5 authorities/relays/exits to ensure we can build HS connections NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ ExitRelay.getN(4) + \ diff --git a/networks/bridges+ipv6 b/networks/bridges+ipv6 index 92c9e22..4638c82 100644 --- a/networks/bridges+ipv6 +++ b/networks/bridges+ipv6 @@ -9,8 +9,6 @@ Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-v6.tmpl") BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 # We put the IPv6 bridge first to ensure that clients try IPv6 before IPv4 # Unfortunately, this does not prevent clients falling back to IPv4 # bridges+ipv6-min only has IPv6 bridges diff --git a/networks/bridges+ipv6+hs b/networks/bridges+ipv6+hs index 8cd3d71..16bc6ed 100644 --- a/networks/bridges+ipv6+hs +++ b/networks/bridges+ipv6+hs @@ -10,8 +10,6 @@ BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge- BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 # We need 5 authorities/relays/exits to ensure we can build HS connections # We put the IPv6 bridge first to ensure that clients try IPv6 before IPv4 # Unfortunately, this does not prevent clients falling back to IPv4 diff --git a/networks/bridges+ipv6+hs-v23 b/networks/bridges+ipv6+hs-v23 index 4e60a9a..3147085 100644 --- a/networks/bridges+ipv6+hs-v23 +++ b/networks/bridges+ipv6+hs-v23 @@ -11,8 +11,6 @@ BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 # We need 5 authorities/relays/exits to ensure we can build HS connections # We put the IPv6 bridge first to ensure that clients try IPv6 before IPv4 # Unfortunately, this does not prevent clients falling back to IPv4 diff --git a/networks/hs b/networks/hs index b08879e..2e27b76 100644 --- a/networks/hs +++ b/networks/hs @@ -4,8 +4,6 @@ ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 # We need 5 authorities/relays/exits to ensure we can build HS connections NODES = Authority.getN(3) + ExitRelay.getN(5) + \ Client.getN(1) + HS.getN(1) diff --git a/networks/hs-exit-min b/networks/hs-exit-min index 609561a..2d94d5b 100644 --- a/networks/hs-exit-min +++ b/networks/hs-exit-min @@ -4,8 +4,6 @@ ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 # We need 5 authorities/relays/exits to ensure we can build HS connections NODES = Authority.getN(2) + ExitRelay.getN(3) + \ Client.getN(1) + HS.getN(1) diff --git a/networks/hs-v3 b/networks/hs-v3 index ee440dd..6367c41 100644 --- a/networks/hs-v3 +++ b/networks/hs-v3 @@ -6,8 +6,6 @@ ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 # We need 5 authorities/relays/exits to ensure we can build HS connections NODES = Authority.getN(3) + ExitRelay.getN(5) + \ Client.getN(1) + HS.getN(1) diff --git a/networks/middle b/networks/middle index 1dc49aa..10a1720 100644 --- a/networks/middle +++ b/networks/middle @@ -4,8 +4,6 @@ NonExitRelay = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl") ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") Client = Node(tag="c", client=1, torrc="client.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 NODES = Authority.getN(3) + \ NonExitRelay.getN(2) + ExitRelay.getN(3) + \ Client.getN(2) diff --git a/networks/mixed b/networks/mixed index 2c016eb..a0c126e 100644 --- a/networks/mixed +++ b/networks/mixed @@ -9,8 +9,6 @@ OldRelay = Node(tag="rOLD", relay=1, exit=1, torrc="relay.tmpl", Client = Node(tag="c", client=1, torrc="client.tmpl") OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR) -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 NODES = Authority.getN(2) + OldAuthority.getN(2) + \ Relay.getN(2) + OldRelay.getN(2) + \ Client.getN(2) + OldClient.getN(2) diff --git a/networks/mixed+hs-v2 b/networks/mixed+hs-v2 index a03d1d8..5d901ed 100644 --- a/networks/mixed+hs-v2 +++ b/networks/mixed+hs-v2 @@ -11,8 +11,6 @@ OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR) HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") OldHSv2 = Node(tag="hOLD", hs=1, torrc="hs.tmpl", tor=OLD_TOR) -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 NODES = Authority.getN(2) + OldAuthority.getN(2) + \ Relay.getN(2) + OldRelay.getN(2) + \ Client.getN(1) + OldClient.getN(1) + \ diff --git a/networks/mixed+hs-v23 b/networks/mixed+hs-v23 index eab43e9..fd180bf 100644 --- a/networks/mixed+hs-v23 +++ b/networks/mixed+hs-v23 @@ -15,8 +15,6 @@ OldHSv2 = Node(tag="hOLD", hs=1, torrc="hs.tmpl", tor=OLD_TOR) # See 23498 #HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 NODES = Authority.getN(2) + OldAuthority.getN(2) + \ Relay.getN(2) + OldRelay.getN(2) + \ Client.getN(1) + OldClient.getN(1) + \ diff --git a/networks/mixed+hs-v3 b/networks/mixed+hs-v3 index ec9b593..e2e9aa5 100644 --- a/networks/mixed+hs-v3 +++ b/networks/mixed+hs-v3 @@ -11,8 +11,6 @@ OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR) # Old tor versions don't have HSv3 support yet HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") -# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag -# in 0.2.6 NODES = Authority.getN(2) + OldAuthority.getN(2) + \ Relay.getN(2) + OldRelay.getN(2) + \ Client.getN(1) + OldClient.getN(1) + \ diff --git a/tools/ignore.warnings b/tools/ignore.warnings index 48c7570..d0f4667 100644 --- a/tools/ignore.warnings +++ b/tools/ignore.warnings @@ -24,7 +24,7 @@ Couldn't set up any working nameservers. Network not up yet Currently, sandboxing is only implemented on Linux # We ignore consensus failure warnings Error publishing .* consensus -# Tor 23078, fixed in 0.3.0.11 and 0.3.1.6-rc +# Tor 23078, fixed in 0.3.2 and later Established prop224 intro point on circuit Every hidden service on this tor instance is NON-ANONYMOUS # We ignore consensus failure warnings diff --git a/tools/test-network.sh b/tools/test-network.sh index e893e80..97a7374 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -86,9 +86,6 @@ do shift ;; # Make this many simultaneous connections per client (1) - # Note: If you create 7 or more connections to a hidden service from - # a single Tor 0.2.7 client, you'll likely get a verification failure due - # to #15937. This is fixed in 0.2.8. --connections|--connection|--connection-count|--count) export CHUTNEY_CONNECTIONS="$2" shift diff --git a/torrc_templates/authority.i b/torrc_templates/authority.i index 1c7ca45..c2a425f 100644 --- a/torrc_templates/authority.i +++ b/torrc_templates/authority.i @@ -19,14 +19,3 @@ TestingV3AuthInitialDistDelay 2 V3AuthDistDelay 2 # This is autoconfigured by chutney, so you probably don't want to use it #TestingV3AuthVotingStartOffset 0 - -# Work around situations where the Exit, Guard and HSDir flags aren't being set -# These flags are all set eventually, but it takes Guard up to ~30 minutes -# We could be more precise here, but it's easiest just to vote everything -# Clients are sensible enough to filter out Exits without any exit ports, -# and Guards and HSDirs without ORPorts -# If your tor doesn't recognise TestingDirAuthVoteExit/HSDir, -# either update your chutney to a 2015 version, -# or update your tor to a later version, most likely 0.2.6.2-final - -# See common.i in the Comprehensive/Rapid sections for the relevant options

1 0

[stem/master] Replace Bifroest bridge authority with Serge
by atagar＠torproject.org 16 Jul '18

16 Jul '18

commit cb74dbdf3ffd44261693e2014a17a4206b6654ce Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 15 15:08:50 2018 -0700 Replace Bifroest bridge authority with Serge --- docs/change_log.rst | 1 + stem/directory.py | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 88558374..09237cba 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -76,6 +76,7 @@ The following are only available within Stem's `git repository * Reduced maximum descriptors fetched by the remote module to match tor's new limit (:trac:`24743`) * Consensus **shared_randomness_*_reveal_count** attributes undocumented, and unavailable if retrieved before their corresponding shared_randomness_*_value attribute (:trac:`25046`) * Allow 'proto' line to have blank values (:spec:`a8455f4`) + * Replaced Bifroest bridge authority with Serge (:trac:`26771`) * **Utilities** diff --git a/stem/directory.py b/stem/directory.py index ba0ef702..efd37641 100644 --- a/stem/directory.py +++ b/stem/directory.py @@ -647,12 +647,12 @@ DIRECTORY_AUTHORITIES = { orport_v6 = ('2620:13:4000:6000::1000:118', 443), v3ident = '27102BC123E7AF1D4741AE047E160C91ADC76B21', ), - 'Bifroest': Authority( - nickname = 'Bifroest', - address = '37.218.247.217', - or_port = 443, - dir_port = 80, - fingerprint = '1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1', + 'Serge': Authority( + nickname = 'Serge', + address = '66.111.2.131', + or_port = 9001, + dir_port = 9030, + fingerprint = 'BA44A889E64B93FAA2B114E02C2A279A8555C533', v3ident = None, # does not vote in the consensus ), }

1 0

[stem/master] Add or_addresses to RouterStatusEntryMicroV3
by atagar＠torproject.org 16 Jul '18

16 Jul '18

commit d5d5e2afe922c2e7c94c27208c5fca2bac4fbd4c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 15 17:40:42 2018 -0700 Add or_addresses to RouterStatusEntryMicroV3 Router status entry 'a' lines previously only appeared in the standard consensus but now they appear in the microdescriptor consensus as well... https://trac.torproject.org/projects/tor/ticket/26405 https://trac.torproject.org/projects/tor/ticket/23826 --- docs/change_log.rst | 1 + stem/descriptor/router_status_entry.py | 7 ++++ test/unit/descriptor/router_status_entry.py | 53 +++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index 09237cba..16f54773 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -67,6 +67,7 @@ The following are only available within Stem's `git repository * Added the *orport_v6* attribute to the :class:`~stem.directory.Authority` class * Added server descriptor's new is_hidden_service_dir attribute * Added the network status vote's new bandwidth_file attribute (:spec:`84591df`) + * Added the microdescriptor router status entry's new or_addresses attribute (:trac:`26405`, :spec:`fdc8f3e8`) * Don't retry downloading descriptors when we've timed out * Don't download from tor26 and Bifroest, which are authorities that frequently timeout * `stem.descriptor.remote <api/descriptor/remote.html>`_ now consistently defaults **fall_back_to_authority** to false diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 5b99ba0c..b4cd506a 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -662,6 +662,8 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): Information about an individual router stored within a microdescriptor flavored network status document. + :var list or_addresses: **\*** relay's OR addresses, this is a tuple listing + of the form (address (**str**), port (**int**), is_ipv6 (**bool**)) :var int bandwidth: bandwidth claimed by the relay (in kb/s) :var int measured: bandwidth measured to be available by the relay :var bool is_unmeasured: bandwidth measurement isn't based on three or more @@ -675,11 +677,15 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): .. versionchanged:: 1.6.0 Added the protocols attribute. + .. versionchanged:: 1.7.0 + Added the or_addresses attribute. + **\*** attribute is either required when we're parsed with validation or has a default value, others are left as **None** if undefined """ ATTRIBUTES = dict(RouterStatusEntry.ATTRIBUTES, **{ + 'or_addresses': ([], _parse_a_line), 'bandwidth': (None, _parse_w_line), 'measured': (None, _parse_w_line), 'is_unmeasured': (False, _parse_w_line), @@ -690,6 +696,7 @@ class RouterStatusEntryMicroV3(RouterStatusEntry): }) PARSER_FOR_LINE = dict(RouterStatusEntry.PARSER_FOR_LINE, **{ + 'a': _parse_a_line, 'w': _parse_w_line, 'm': _parse_microdescriptor_m_line, 'pr': _parse_pr_line, diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index a4c14e01..b376f869 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -26,6 +26,12 @@ from stem.descriptor.router_status_entry import ( _base64_to_hex, ) +try: + # Added in 2.7 + from collections import OrderedDict +except ImportError: + from stem.util.ordereddict import OrderedDict + ENTRY_WITHOUT_ED25519 = """\ r seele AAoQ1DAR6kkoo19hBAX5K0QztNw m0ynPuwzSextzsiXYJYA0Hce+Cs 2015-08-23 00:26:35 73.15.150.172 9001 0 s Running Stable Valid @@ -52,6 +58,16 @@ m 18,19,20 sha256=AkZH3gIvz3wunsroqh5izBJizdYuR7kn2oVbsvqgML8 m 21 sha256=AVp41YVxKEJCaoEf0+77Cdvyw5YgpyDXdob0+LSv/pE """ +ENTRY_WITH_IPV6 = """\ +r MYLEX AQt3KEVEEfSFzinUx5oUU0FRwsQ 2018-07-15 16:38:10 77.123.42.148 444 800 +a [2001:470:71:9b9:f66d:4ff:fee7:954c]:444 +m GWb+xjav0fsuwPwPNnUvW9Q1Ivk5nz8m1McECM4KY8A +s Fast Guard HSDir Running Stable V2Dir Valid +v Tor 0.2.5.16 +pr Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 Link=1-4 LinkAuth=1 Microdesc=1 Relay=1-2 +w Bandwidth=4950 +""" + expect_invalid_attr = functools.partial(base_expect_invalid_attr, RouterStatusEntryV3, 'nickname', 'Unnamed') expect_invalid_attr_for_text = functools.partial(base_expect_invalid_attr_for_text, RouterStatusEntryV3, 'nickname', 'Unnamed') @@ -222,6 +238,43 @@ class TestRouterStatusEntry(unittest.TestCase): self.assertEqual('CAB27A6FFEF7A661C18B0B11120C3E8A77FC585C', entry.digest) self.assertEqual([], entry.get_unrecognized_lines()) + def test_with_ipv6(self): + """ + Parse a router status entry with an IPv6 address. + """ + + expected_protocols = OrderedDict(( + ('Cons', [1]), + ('Desc', [1]), + ('DirCache', [1]), + ('HSDir', [1]), + ('HSIntro', [3]), + ('HSRend', [1]), + ('Link', [1, 2, 3, 4]), + ('LinkAuth', [1]), + ('Microdesc', [1]), + ('Relay', [1, 2]), + )) + + entry = RouterStatusEntryMicroV3(ENTRY_WITH_IPV6, validate = True) + self.assertEqual('MYLEX', entry.nickname) + self.assertEqual('010B7728454411F485CE29D4C79A14534151C2C4', entry.fingerprint) + self.assertEqual(datetime.datetime(2018, 7, 15, 16, 38, 10), entry.published) + self.assertEqual('77.123.42.148', entry.address) + self.assertEqual(444, entry.or_port) + self.assertEqual(800, entry.dir_port) + self.assertEqual(set([Flag.FAST, Flag.GUARD, Flag.HSDIR, Flag.RUNNING, Flag.STABLE, Flag.V2DIR, Flag.VALID]), set(entry.flags)) + self.assertEqual('Tor 0.2.5.16', entry.version_line) + self.assertEqual(Version('0.2.5.16'), entry.version) + self.assertEqual([('2001:470:71:9b9:f66d:4ff:fee7:954c', 444, True)], entry.or_addresses) + self.assertEqual(4950, entry.bandwidth) + self.assertEqual(None, entry.measured) + self.assertEqual(False, entry.is_unmeasured) + self.assertEqual([], entry.unrecognized_bandwidth_entries) + self.assertEqual(expected_protocols, entry.protocols) + self.assertEqual('1966FEC636AFD1FB2EC0FC0F36752F5BD43522F9399F3F26D4C70408CE0A63C0', entry.digest) + self.assertEqual([], entry.get_unrecognized_lines()) + def test_missing_fields(self): """ Parses a router status entry that's missing fields.

1 0