September 2017 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'teor/bug23470-029'
by nickm＠torproject.org 13 Sep '17

13 Sep '17

commit dcaf971a01f912d74a076d53baf7689460c3474e Merge: 3092c8bb3 c86013291 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 13 09:20:19 2017 -0400 Merge remote-tracking branch 'teor/bug23470-029' changes/bug23470 | 6 ++++++ src/or/directory.c | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --cc src/or/directory.c index fed4277de,f285e4c6e..89e2735e6 --- a/src/or/directory.c +++ b/src/or/directory.c @@@ -5321,18 -3701,13 +5321,13 @@@ connection_dir_finished_connecting(dir_ * Helper function for download_status_increment_failure(), * download_status_reset(), and download_status_increment_attempt(). */ STATIC const smartlist_t * -find_dl_schedule(download_status_t *dls, const or_options_t *options) +find_dl_schedule(const download_status_t *dls, const or_options_t *options) { - const int dir_server = dir_server_mode(options); - const int multi_d = networkstatus_consensus_can_use_multiple_directories( - options); - const int we_are_bootstrapping = networkstatus_consensus_is_bootstrapping( - time(NULL)); - const int use_fallbacks = networkstatus_consensus_can_use_extra_fallbacks( - options); switch (dls->schedule) { case DL_SCHED_GENERIC: - if (dir_server) { + /* Any other directory document */ + if (dir_server_mode(options)) { + /* A directory authority or directory mirror */ return options->TestingServerDownloadSchedule; } else { return options->TestingClientDownloadSchedule;

1 0

[tor/master] Stop relays calling directory_fetches_from_authorities on dir downloads
by nickm＠torproject.org 13 Sep '17

13 Sep '17

commit c86013291bd26f3497e9efcf96125342d97cba33 Author: teor <teor2345(a)gmail.com> Date: Mon Sep 11 14:21:48 2017 +1000 Stop relays calling directory_fetches_from_authorities on dir downloads This change refactors find_dl_schedule() to only call dependent functions as needed. In particular, directory_fetches_from_authorities() only needs to be called on clients. Stopping spurious directory_fetches_from_authorities() calls on every download on public relays has the following impacts: * fewer address resolution attempts, particularly those mentioned in 21789 * fewer descriptor rebuilds * fewer log messages, particularly those limited in 20610 Fixes 23470 in 0.2.8.1-alpha. The original bug was introduced in commit 35bbf2e as part of prop210. --- changes/bug23470 | 6 ++++++ src/or/directory.c | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/changes/bug23470 b/changes/bug23470 new file mode 100644 index 000000000..33367b3a3 --- /dev/null +++ b/changes/bug23470 @@ -0,0 +1,6 @@ + o Minor bugfix (relay address resolution): + - Avoid unnecessary calls to directory_fetches_from_authorities() + on relays. This avoids spurious address resolutions and + descriptor rebuilds. This is a mitigation for 21789. The original + bug was introduced in commit 35bbf2e as part of prop210. + Fixes 23470 in 0.2.8.1-alpha. diff --git a/src/or/directory.c b/src/or/directory.c index fce48c6e9..f285e4c6e 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3703,26 +3703,24 @@ connection_dir_finished_connecting(dir_connection_t *conn) STATIC const smartlist_t * find_dl_schedule(download_status_t *dls, const or_options_t *options) { - const int dir_server = dir_server_mode(options); - const int multi_d = networkstatus_consensus_can_use_multiple_directories( - options); - const int we_are_bootstrapping = networkstatus_consensus_is_bootstrapping( - time(NULL)); - const int use_fallbacks = networkstatus_consensus_can_use_extra_fallbacks( - options); switch (dls->schedule) { case DL_SCHED_GENERIC: - if (dir_server) { + /* Any other directory document */ + if (dir_server_mode(options)) { + /* A directory authority or directory mirror */ return options->TestingServerDownloadSchedule; } else { return options->TestingClientDownloadSchedule; } case DL_SCHED_CONSENSUS: - if (!multi_d) { + if (!networkstatus_consensus_can_use_multiple_directories(options)) { + /* A public relay */ return options->TestingServerConsensusDownloadSchedule; } else { - if (we_are_bootstrapping) { - if (!use_fallbacks) { + /* A client or bridge */ + if (networkstatus_consensus_is_bootstrapping(time(NULL))) { + /* During bootstrapping */ + if (!networkstatus_consensus_can_use_extra_fallbacks(options)) { /* A bootstrapping client without extra fallback directories */ return options->ClientBootstrapConsensusAuthorityOnlyDownloadSchedule; @@ -3738,6 +3736,8 @@ find_dl_schedule(download_status_t *dls, const or_options_t *options) options->ClientBootstrapConsensusFallbackDownloadSchedule; } } else { + /* A client with a reasonably live consensus, with or without + * certificates */ return options->TestingClientConsensusDownloadSchedule; } }

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 13 Sep '17

13 Sep '17

commit 72d2fa0484a40e58d6eca5dd006776bbce3b1f71 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 13 06:48:02 2017 +0000 Update translations for tails-openpgp-applet_completed --- ru/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/openpgp-applet.pot b/ru/openpgp-applet.pot index 7d325e1cb..6b1206358 100644 --- a/ru/openpgp-applet.pot +++ b/ru/openpgp-applet.pot @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2017-09-12 11:27+0000\n" +"PO-Revision-Date: 2017-09-13 06:18+0000\n" "Last-Translator: Misha Dyachuk <Wikia(a)scryptmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 13 Sep '17

13 Sep '17

commit a3dca95cc1d1cf8161e8c82eda00371031125b32 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Sep 13 06:47:55 2017 +0000 Update translations for tails-openpgp-applet --- ru/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/openpgp-applet.pot b/ru/openpgp-applet.pot index 7d325e1cb..6b1206358 100644 --- a/ru/openpgp-applet.pot +++ b/ru/openpgp-applet.pot @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2017-09-12 11:27+0000\n" +"PO-Revision-Date: 2017-09-13 06:18+0000\n" "Last-Translator: Misha Dyachuk <Wikia(a)scryptmail.com>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n"

1 0

[chutney/master] Tag every client and bridge client in every networks file
by teor＠torproject.org 13 Sep '17

13 Sep '17

commit d1535113b2ef5c803877347612ad0376a1a034b0 Author: teor <teor2345(a)gmail.com> Date: Wed Sep 13 13:14:48 2017 +1000 Tag every client and bridge client in every networks file Using the following mass replace scripts: sed -i~ 's/tag="c",/tag="c", client=1,/' sed -i~ 's/tag="cOLD",/tag="cOLD", client=1,/' sed -i~ 's/tag="bc",/tag="bc", client=1, bridgeclient=1,/' sed -i~ 's/tag="bcOLD",/tag="bcOLD", client=1, bridgeclient=1,/' Part of 22224, but currently unused. --- networks/basic | 2 +- networks/basic-025 | 2 +- networks/basic-100 | 2 +- networks/basic-min | 2 +- networks/basic-min-mixed | 4 ++-- networks/bridges | 4 ++-- networks/bridges+hs | 4 ++-- networks/bridges+hs-v23 | 4 ++-- networks/bridges+ipv6 | 4 ++-- networks/bridges+ipv6+hs | 4 ++-- networks/bridges+ipv6+hs-v23 | 4 ++-- networks/bridges+ipv6-min | 2 +- networks/bridges-min | 2 +- networks/client-ipv6-only | 2 +- networks/hs | 2 +- networks/hs-025 | 2 +- networks/hs-100 | 2 +- networks/hs-100-clients | 2 +- networks/hs-client-ipv6 | 2 +- networks/hs-exit-min | 2 +- networks/hs-intro | 2 +- networks/hs-ipv6 | 4 ++-- networks/hs-min | 2 +- networks/hs-min-mixed | 4 ++-- networks/hs-v2-min | 2 +- networks/hs-v23-ipv6 | 4 ++-- networks/hs-v23-min | 2 +- networks/hs-v3 | 2 +- networks/hs-v3-intro | 2 +- networks/hs-v3-ipv6 | 4 ++-- networks/hs-v3-min | 2 +- networks/ipv6-exit-min | 2 +- networks/middle | 2 +- networks/middle-025 | 2 +- networks/middle-100 | 2 +- networks/mixed | 4 ++-- networks/mixed+hs-v2 | 4 ++-- networks/mixed+hs-v23 | 4 ++-- networks/mixed+hs-v3 | 4 ++-- networks/single-onion | 2 +- networks/single-onion-client-ipv6 | 2 +- networks/single-onion-indirect | 2 +- networks/single-onion-ipv6 | 4 ++-- networks/single-onion-v23 | 2 +- networks/single-onion-v23-ipv6 | 4 ++-- networks/single-onion-v3 | 2 +- networks/single-onion-v3-ipv6 | 4 ++-- 47 files changed, 65 insertions(+), 65 deletions(-) diff --git a/networks/basic b/networks/basic index f3f94de..703f5fc 100644 --- a/networks/basic +++ b/networks/basic @@ -1,7 +1,7 @@ # By default, Authorities are not configured as exits 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", torrc="client.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 diff --git a/networks/basic-025 b/networks/basic-025 index d57bcb8..266643f 100644 --- a/networks/basic-025 +++ b/networks/basic-025 @@ -1,7 +1,7 @@ # By default, Authorities are not configured as exits 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") NODES = Authority.getN(4) + ExitRelay.getN(16) + Client.getN(5) diff --git a/networks/basic-100 b/networks/basic-100 index 1b181eb..b1546e6 100644 --- a/networks/basic-100 +++ b/networks/basic-100 @@ -3,7 +3,7 @@ # By default, Authorities are not configured as exits 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") NODES = Authority.getN(5) + ExitRelay.getN(35) + Client.getN(60) diff --git a/networks/basic-min b/networks/basic-min index 48cf1cf..e5e0187 100644 --- a/networks/basic-min +++ b/networks/basic-min @@ -1,7 +1,7 @@ # By default, Authorities are not configured as exits 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/basic-min-mixed b/networks/basic-min-mixed index 5ae7bd5..6f19c16 100644 --- a/networks/basic-min-mixed +++ b/networks/basic-min-mixed @@ -17,8 +17,8 @@ ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") OldExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl", tor=OLD_TOR) -Client = Node(tag="c", torrc="client.tmpl") -OldClient = Node(tag="c", torrc="client.tmpl", tor=OLD_TOR) +Client = Node(tag="c", client=1, torrc="client.tmpl") +OldClient = Node(tag="c", client=1, torrc="client.tmpl", tor=OLD_TOR) # Choose old or new Exit and Client at random OldNewExitRelay = rng.choice([OldExitRelay, ExitRelay]) diff --git a/networks/bridges b/networks/bridges index 8b28eef..2557c0f 100644 --- a/networks/bridges +++ b/networks/bridges @@ -1,12 +1,12 @@ # By default, Authorities are not configured as exits 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, relay=1, torrc="bridgeauthority.tmpl") Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") -BridgeClient = Node(tag="bc", torrc="bridgeclient.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 diff --git a/networks/bridges+hs b/networks/bridges+hs index 8cf0ec6..3d01cfa 100644 --- a/networks/bridges+hs +++ b/networks/bridges+hs @@ -1,12 +1,12 @@ # By default, Authorities are not configured as exits 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, relay=1, torrc="bridgeauthority.tmpl") Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") -BridgeClient = Node(tag="bc", torrc="bridgeclient.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 diff --git a/networks/bridges+hs-v23 b/networks/bridges+hs-v23 index 5a5a367..e2ac4cd 100644 --- a/networks/bridges+hs-v23 +++ b/networks/bridges+hs-v23 @@ -1,12 +1,12 @@ # By default, Authorities are not configured as exits 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, relay=1, torrc="bridgeauthority.tmpl") Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") -BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl") +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") diff --git a/networks/bridges+ipv6 b/networks/bridges+ipv6 index 796a7be..92c9e22 100644 --- a/networks/bridges+ipv6 +++ b/networks/bridges+ipv6 @@ -1,13 +1,13 @@ # By default, Authorities are not configured as exits 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, relay=1, torrc="bridgeauthority.tmpl") 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", torrc="bridgeclient.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 diff --git a/networks/bridges+ipv6+hs b/networks/bridges+ipv6+hs index 39caee4..8cd3d71 100644 --- a/networks/bridges+ipv6+hs +++ b/networks/bridges+ipv6+hs @@ -1,13 +1,13 @@ # By default, Authorities are not configured as exits 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, relay=1, torrc="bridgeauthority.tmpl") 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", torrc="bridgeclient.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 diff --git a/networks/bridges+ipv6+hs-v23 b/networks/bridges+ipv6+hs-v23 index c99dff5..4e60a9a 100644 --- a/networks/bridges+ipv6+hs-v23 +++ b/networks/bridges+ipv6+hs-v23 @@ -1,13 +1,13 @@ # By default, Authorities are not configured as exits 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, relay=1, torrc="bridgeauthority.tmpl") 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", torrc="bridgeclient.tmpl") +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") diff --git a/networks/bridges+ipv6-min b/networks/bridges+ipv6-min index 4542f31..5c4d05f 100644 --- a/networks/bridges+ipv6-min +++ b/networks/bridges+ipv6-min @@ -6,7 +6,7 @@ BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, relay=1, torrc="bridgeauthority.tmpl") BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-v6.tmpl") -BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl") +BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/bridges-min b/networks/bridges-min index ffa3194..6ad3c75 100644 --- a/networks/bridges-min +++ b/networks/bridges-min @@ -5,7 +5,7 @@ ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, relay=1, torrc="bridgeauthority.tmpl") Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") -BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl") +BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/client-ipv6-only b/networks/client-ipv6-only index d36ba4f..59d5a63 100644 --- a/networks/client-ipv6-only +++ b/networks/client-ipv6-only @@ -9,7 +9,7 @@ ExitRelay6 = Node(tag="r", relay=1, exit=1, '[::1]'), torrc="relay-orport-v6-exit.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.tmpl") +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/hs b/networks/hs index 3776ed9..b08879e 100644 --- a/networks/hs +++ b/networks/hs @@ -1,7 +1,7 @@ # By default, Authorities are not configured as exits 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", torrc="client.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 diff --git a/networks/hs-025 b/networks/hs-025 index bb75ed1..ccdd321 100644 --- a/networks/hs-025 +++ b/networks/hs-025 @@ -1,7 +1,7 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") NODES = Authority.getN(4) + NonExitRelay.getN(10) + \ diff --git a/networks/hs-100 b/networks/hs-100 index a8401c9..2373e39 100644 --- a/networks/hs-100 +++ b/networks/hs-100 @@ -3,7 +3,7 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") NODES = Authority.getN(5) + NonExitRelay.getN(25) + \ diff --git a/networks/hs-100-clients b/networks/hs-100-clients index aecaf37..e61b42f 100644 --- a/networks/hs-100-clients +++ b/networks/hs-100-clients @@ -3,7 +3,7 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") # Well, 100 instances, with lots of clients diff --git a/networks/hs-client-ipv6 b/networks/hs-client-ipv6 index 62ffae2..89c1920 100644 --- a/networks/hs-client-ipv6 +++ b/networks/hs-client-ipv6 @@ -8,7 +8,7 @@ NonExitRelay6 = Node(tag="r", relay=1, ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', '[::1]'), torrc="relay-orport-v6-non-exit.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.tmpl") +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/hs-exit-min b/networks/hs-exit-min index 4a1705e..609561a 100644 --- a/networks/hs-exit-min +++ b/networks/hs-exit-min @@ -1,7 +1,7 @@ # By default, Authorities are not configured as exits 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", torrc="client.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 diff --git a/networks/hs-intro b/networks/hs-intro index c5714ce..3a21a7b 100644 --- a/networks/hs-intro +++ b/networks/hs-intro @@ -1,7 +1,7 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS0 = Node(tag="h", hs=1, torrc="hs0.tmpl") HS1 = Node(tag="h", hs=1, torrc="hs1.tmpl") HS2 = Node(tag="h", hs=1, torrc="hs2.tmpl") diff --git a/networks/hs-ipv6 b/networks/hs-ipv6 index 3e3984f..33edcf9 100644 --- a/networks/hs-ipv6 +++ b/networks/hs-ipv6 @@ -8,8 +8,8 @@ NonExitRelay6 = Node(tag="r", relay=1, ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', '[::1]'), torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") HS6 = Node(tag="h", hs=1, torrc="hs-only-v6.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/hs-min b/networks/hs-min index bb48287..39dac23 100644 --- a/networks/hs-min +++ b/networks/hs-min @@ -1,7 +1,7 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/hs-min-mixed b/networks/hs-min-mixed index 8de3825..ebe3beb 100644 --- a/networks/hs-min-mixed +++ b/networks/hs-min-mixed @@ -17,8 +17,8 @@ NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") OldNonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl", tor=OLD_TOR) -Client = Node(tag="c", torrc="client.tmpl") -OldClient = Node(tag="c", torrc="client.tmpl", tor=OLD_TOR) +Client = Node(tag="c", client=1, torrc="client.tmpl") +OldClient = Node(tag="c", client=1, torrc="client.tmpl", tor=OLD_TOR) HS = Node(tag="h", hs=1, torrc="hs.tmpl") OldHS = Node(tag="h", hs=1, torrc="hs.tmpl", tor=OLD_TOR) diff --git a/networks/hs-v2-min b/networks/hs-v2-min index fb68be8..461c56e 100644 --- a/networks/hs-v2-min +++ b/networks/hs-v2-min @@ -3,7 +3,7 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/hs-v23-ipv6 b/networks/hs-v23-ipv6 index b95123c..a217be9 100644 --- a/networks/hs-v23-ipv6 +++ b/networks/hs-v23-ipv6 @@ -8,8 +8,8 @@ NonExitRelay6 = Node(tag="r", relay=1, ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', '[::1]'), torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") HSv2IPv6 = Node(tag="h", hs=1, torrc="hs-only-v6.tmpl") HSv3IPv6 = Node(tag="h", hs=1, torrc="hs3-only-v6.tmpl") diff --git a/networks/hs-v23-min b/networks/hs-v23-min index 91338e8..4732520 100644 --- a/networks/hs-v23-min +++ b/networks/hs-v23-min @@ -1,7 +1,7 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") diff --git a/networks/hs-v3 b/networks/hs-v3 index ea67f79..ee440dd 100644 --- a/networks/hs-v3 +++ b/networks/hs-v3 @@ -3,7 +3,7 @@ # By default, Authorities are not configured as exits 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", torrc="client.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 diff --git a/networks/hs-v3-intro b/networks/hs-v3-intro index 6dc39f2..a76858f 100644 --- a/networks/hs-v3-intro +++ b/networks/hs-v3-intro @@ -1,7 +1,7 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS10 = Node(tag="h", hs=1, torrc="hs-v3-10.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/hs-v3-ipv6 b/networks/hs-v3-ipv6 index e606e53..2b9f63c 100644 --- a/networks/hs-v3-ipv6 +++ b/networks/hs-v3-ipv6 @@ -8,8 +8,8 @@ NonExitRelay6 = Node(tag="r", relay=1, ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', '[::1]'), torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") HS6 = Node(tag="h", hs=1, torrc="hs3-only-v6.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/hs-v3-min b/networks/hs-v3-min index 9812a31..20709d9 100644 --- a/networks/hs-v3-min +++ b/networks/hs-v3-min @@ -1,7 +1,7 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/ipv6-exit-min b/networks/ipv6-exit-min index 70379cc..410373e 100644 --- a/networks/ipv6-exit-min +++ b/networks/ipv6-exit-min @@ -1,7 +1,7 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") IPv6ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay-exit-v6-only.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/middle b/networks/middle index 9fbdf98..1dc49aa 100644 --- a/networks/middle +++ b/networks/middle @@ -2,7 +2,7 @@ Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") 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", torrc="client.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 diff --git a/networks/middle-025 b/networks/middle-025 index a3d11e3..ce02d27 100644 --- a/networks/middle-025 +++ b/networks/middle-025 @@ -2,7 +2,7 @@ Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") NODES = Authority.getN(4) + \ NonExitRelay.getN(10) + ExitRelay.getN(6) + \ diff --git a/networks/middle-100 b/networks/middle-100 index 72f5689..3046bb0 100644 --- a/networks/middle-100 +++ b/networks/middle-100 @@ -4,7 +4,7 @@ Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") 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", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") NODES = Authority.getN(5) + \ NonExitRelay.getN(25) + ExitRelay.getN(10) + \ diff --git a/networks/mixed b/networks/mixed index 38e0d4e..2c016eb 100644 --- a/networks/mixed +++ b/networks/mixed @@ -6,8 +6,8 @@ OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl", Relay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") OldRelay = Node(tag="rOLD", relay=1, exit=1, torrc="relay.tmpl", tor=OLD_TOR) -Client = Node(tag="c", torrc="client.tmpl") -OldClient = Node(tag="cOLD", torrc="client.tmpl", tor=OLD_TOR) +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 diff --git a/networks/mixed+hs-v2 b/networks/mixed+hs-v2 index 5afafde..a03d1d8 100644 --- a/networks/mixed+hs-v2 +++ b/networks/mixed+hs-v2 @@ -6,8 +6,8 @@ OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl", Relay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") OldRelay = Node(tag="rOLD", relay=1, exit=1, torrc="relay.tmpl", tor=OLD_TOR) -Client = Node(tag="c", torrc="client.tmpl") -OldClient = Node(tag="cOLD", torrc="client.tmpl", tor=OLD_TOR) +Client = Node(tag="c", client=1, torrc="client.tmpl") +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) diff --git a/networks/mixed+hs-v23 b/networks/mixed+hs-v23 index ca4dd2f..f959032 100644 --- a/networks/mixed+hs-v23 +++ b/networks/mixed+hs-v23 @@ -6,8 +6,8 @@ OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl", Relay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") OldRelay = Node(tag="rOLD", relay=1, exit=1, torrc="relay.tmpl", tor=OLD_TOR) -Client = Node(tag="c", torrc="client.tmpl") -OldClient = Node(tag="cOLD", torrc="client.tmpl", tor=OLD_TOR) +Client = Node(tag="c", client=1, torrc="client.tmpl") +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) # Old tor versions don't have HSv3 support yet diff --git a/networks/mixed+hs-v3 b/networks/mixed+hs-v3 index e9dcf5d..ec9b593 100644 --- a/networks/mixed+hs-v3 +++ b/networks/mixed+hs-v3 @@ -6,8 +6,8 @@ OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl", Relay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") OldRelay = Node(tag="rOLD", relay=1, exit=1, torrc="relay.tmpl", tor=OLD_TOR) -Client = Node(tag="c", torrc="client.tmpl") -OldClient = Node(tag="cOLD", torrc="client.tmpl", tor=OLD_TOR) +Client = Node(tag="c", client=1, torrc="client.tmpl") +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") diff --git a/networks/single-onion b/networks/single-onion index 14539a6..36dad53 100644 --- a/networks/single-onion +++ b/networks/single-onion @@ -1,7 +1,7 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") SingleOnion = Node(tag="h", hs=1, torrc="single-onion.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/single-onion-client-ipv6 b/networks/single-onion-client-ipv6 index 9f19915..a9bcaa8 100644 --- a/networks/single-onion-client-ipv6 +++ b/networks/single-onion-client-ipv6 @@ -8,7 +8,7 @@ NonExitRelay6 = Node(tag="r", relay=1, ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', '[::1]'), torrc="relay-orport-v6-non-exit.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.tmpl") +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") SingleOnion = Node(tag="h", hs=1, torrc="single-onion.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/single-onion-indirect b/networks/single-onion-indirect index 1c2a3ae..014e8bf 100644 --- a/networks/single-onion-indirect +++ b/networks/single-onion-indirect @@ -7,7 +7,7 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") SingleOnionIndirect = Node(tag="h", hs=1, torrc="single-onion-indirect.tmpl") # A hidden service needs 5 authorities/relays to ensure it can build HS diff --git a/networks/single-onion-ipv6 b/networks/single-onion-ipv6 index 392de36..9535940 100644 --- a/networks/single-onion-ipv6 +++ b/networks/single-onion-ipv6 @@ -8,8 +8,8 @@ NonExitRelay6 = Node(tag="r", relay=1, ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', '[::1]'), torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") SingleOnion6 = Node(tag="h", hs=1, torrc="single-onion-only-v6.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/single-onion-v23 b/networks/single-onion-v23 index 6816c94..7afd6b9 100644 --- a/networks/single-onion-v23 +++ b/networks/single-onion-v23 @@ -1,7 +1,7 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") SingleOnionv2 = Node(tag="h", hs=1, torrc="single-onion.tmpl") SingleOnionv3 = Node(tag="h", hs=1, torrc="single-onion-v3.tmpl") diff --git a/networks/single-onion-v23-ipv6 b/networks/single-onion-v23-ipv6 index b88f867..aeef809 100644 --- a/networks/single-onion-v23-ipv6 +++ b/networks/single-onion-v23-ipv6 @@ -8,8 +8,8 @@ NonExitRelay6 = Node(tag="r", relay=1, ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', '[::1]'), torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") SingleOnionv2IPv6 = Node(tag="h", hs=1, torrc="single-onion-only-v6.tmpl") SingleOnionv3IPv6 = Node(tag="h", hs=1, torrc="single-onion-v3-only-v6.tmpl") diff --git a/networks/single-onion-v3 b/networks/single-onion-v3 index e282b80..38d1a2a 100644 --- a/networks/single-onion-v3 +++ b/networks/single-onion-v3 @@ -1,7 +1,7 @@ # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") SingleOnion = Node(tag="h", hs=1, torrc="single-onion-v3.tmpl") # Since only 25% of relays get the guard flag, diff --git a/networks/single-onion-v3-ipv6 b/networks/single-onion-v3-ipv6 index 9a8dd3a..c5210a4 100644 --- a/networks/single-onion-v3-ipv6 +++ b/networks/single-onion-v3-ipv6 @@ -8,8 +8,8 @@ NonExitRelay6 = Node(tag="r", relay=1, ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', '[::1]'), torrc="relay-orport-v6-non-exit.tmpl") -Client = Node(tag="c", torrc="client.tmpl") -Client6 = Node(tag="c", torrc="client-only-v6.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl") SingleOnionv3IPv6 = Node(tag="h", hs=1, torrc="single-onion-v3-only-v6.tmpl") # Since only 25% of relays get the guard flag,

1 0

[chutney/master] Stop assuming that test module attribute errors are about run_test
by teor＠torproject.org 13 Sep '17

13 Sep '17

commit f1835b17ec878e1c4cdd87a015218f3fbf024ab0 Author: teor <teor2345(a)gmail.com> Date: Wed Sep 13 14:21:58 2017 +1000 Stop assuming that test module attribute errors are about run_test Fixes 23497, introduced when the verify test was refactored into a test script. --- lib/chutney/TorNet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 5d44128..aeab347 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -1118,8 +1118,8 @@ def runConfigFile(verb, data): test_module = importlib.import_module("chutney_tests.{}".format(verb)) try: return test_module.run_test(network) - except AttributeError: - print("Test {!r} has no 'run_test(network)' function".format(verb)) + except AttributeError as e: + print("Error running test {!r}: {}".format(verb, e)) return False # tell the user we don't know what their verb meant

1 0

[chutney/master] Test OLD clients, bridge clients, and hidden services in mixed networks
by teor＠torproject.org 13 Sep '17

13 Sep '17

commit 0df68e3a9950dc0d36387a31121497531ad12597 Author: teor <teor2345(a)gmail.com> Date: Wed Sep 13 14:20:24 2017 +1000 Test OLD clients, bridge clients, and hidden services in mixed networks Chutney uses tags and attributes to find clients and hidden services, for compatibility with old custom networks. Implements 22224 --- scripts/chutney_tests/verify.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/chutney_tests/verify.py b/scripts/chutney_tests/verify.py index 98beb74..063bf8f 100644 --- a/scripts/chutney_tests/verify.py +++ b/scripts/chutney_tests/verify.py @@ -63,14 +63,18 @@ def _verify_traffic(network): bind_to = (LISTEN_ADDR, LISTEN_PORT) tt = chutney.Traffic.TrafficTester(bind_to, tmpdata, TIMEOUT, reps, dot_reps) + # _env does not implement get() due to its fallback to parent behaviour client_list = filter(lambda n: - n._env['tag'] == 'c' or n._env['tag'] == 'bc', + n._env['tag'].startswith('c') or + n._env['tag'].startswith('bc') or + ('client' in n._env.keys() and n._env['client'] == 1), network._nodes) exit_list = filter(lambda n: - ('exit' in n._env.keys()) and n._env['exit'] == 1, + ('exit' in n._env.keys() and n._env['exit'] == 1), network._nodes) hs_list = filter(lambda n: - n._env['tag'] == 'h', + n._env['tag'].startswith('h') or + ('hs' in n._env.keys() and n._env['hs'] == 1), network._nodes) if len(client_list) == 0: print(" Unable to verify network: no client nodes available")

1 0

[chutney/master] Disable v3 onion services in mixed networks
by teor＠torproject.org 13 Sep '17

13 Sep '17

commit 99b7c5e8e8e063af8a166fea65ce77f02a483e39 Author: teor <teor2345(a)gmail.com> Date: Wed Sep 13 14:44:42 2017 +1000 Disable v3 onion services in mixed networks This is a workaround until 23498 is implemented. --- networks/mixed+hs-v23 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/networks/mixed+hs-v23 b/networks/mixed+hs-v23 index f959032..eab43e9 100644 --- a/networks/mixed+hs-v23 +++ b/networks/mixed+hs-v23 @@ -11,14 +11,16 @@ 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) # Old tor versions don't have HSv3 support yet -HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") +# And chutney doesn't know how to tell old clients to avoid v3 services +# 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) + \ - HSv2.getN(1) + OldHSv2.getN(1) + \ - HSv3.getN(1) + HSv2.getN(1) + OldHSv2.getN(1) +# HSv3.getN(1) ConfigureNodes(NODES)

1 0

[torspec/master] other easier fixes to prop#280
by arma＠torproject.org 13 Sep '17

13 Sep '17

commit eb7c64b9bacd884b5e7b8b69f3caa614f01d8d86 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 12 22:39:29 2017 -0400 other easier fixes to prop#280 --- proposals/280-privcount-in-tor.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proposals/280-privcount-in-tor.txt b/proposals/280-privcount-in-tor.txt index 716b48e..9b1a8b5 100644 --- a/proposals/280-privcount-in-tor.txt +++ b/proposals/280-privcount-in-tor.txt @@ -220,7 +220,7 @@ Status: Draft [Exactly once] The curve25519 public key of the tally reporter who is intended - to receive an decrypt this document. The key is base64-encoded + to receive and decrypt this document. The key is base64-encoded with padding stripped. "count-document-digest" SP "sha3" Digest NL @@ -259,7 +259,7 @@ Status: Draft instance of that keyword's blinded counter. For example: if the count document lists the keywords "b", "x", "g", - and "a" (in that order), and lists instances "0", and "2", then the + and "a" (in that order), and lists instances "0" and "2", then the decrypted data will hold the blinding values in this order: b, instance 0 b, instance 2 @@ -308,7 +308,7 @@ Status: Draft 6. An optimized alternative - As an alternative, the sequences of blinding values is NOT transmitted + As an alternative, the sequences of blinding values are NOT transmitted to the tally reporters. Instead the client generates a single ephemeral keypair sk_c, PK_c, and places the public key in its counts document. It does this each time a new round begins.

1 0

[chutney/master] Stop including two copies of common.i in single-onion-v3.tmpl
by teor＠torproject.org 13 Sep '17

13 Sep '17

commit d3cec8117065908f483ca12a335acb12861c62aa Author: teor <teor2345(a)gmail.com> Date: Wed Sep 13 12:32:13 2017 +1000 Stop including two copies of common.i in single-onion-v3.tmpl Fix for Tor's 22437. --- torrc_templates/single-onion-v3.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/torrc_templates/single-onion-v3.tmpl b/torrc_templates/single-onion-v3.tmpl index a9b1a19..403e8fa 100644 --- a/torrc_templates/single-onion-v3.tmpl +++ b/torrc_templates/single-onion-v3.tmpl @@ -1,2 +1,2 @@ ${include:single-onion.tmpl} -${include:hs-v3.tmpl} +HiddenServiceVersion 3

1 0