commit f927505344ab392e90ce48df32fdb43185b3ea94 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 15 10:59:06 2020 -0400
Remove all unused chutney networks.
Out of the 66 networks in the networks directory, only 13 are used by Tor or Chutney for testing. I'm removing most of extraneous ones in order to reduce our maintenance burden.
I'm keeping these on request from dgoulet: basic hs-ob-v3 hs-v3 hs-v3-ipv6
We can restore any of these that I was wrong about. --- networks/basic-025 | 8 ----- networks/basic-100 | 10 ------ networks/basic-min-mixed | 47 --------------------------- networks/bridges | 14 -------- networks/bridges+hs | 19 ----------- networks/bridges+hs-v2 | 19 ----------- networks/bridges+ipv6 | 21 ------------ networks/bridges+ipv6+hs | 24 -------------- networks/bridges+ipv6+hs-v2 | 24 -------------- networks/bridges+ipv6+hs-v23 | 25 -------------- networks/bridges-obfs2 | 15 --------- networks/bridges-obfs4 | 39 ---------------------- networks/bwfile | 9 ------ networks/bwscanner | 10 ------ networks/client-ipv6-only | 22 ------------- networks/client-ipv6-only-md | 22 ------------- networks/hs | 11 ------- networks/hs-025 | 10 ------ networks/hs-100 | 12 ------- networks/hs-100-clients | 13 -------- networks/hs-client-ipv6 | 25 -------------- networks/hs-client-ipv6-md | 25 -------------- networks/hs-exit-min | 11 ------- networks/hs-intro | 39 ---------------------- networks/hs-ipv6 | 26 --------------- networks/hs-ipv6-md | 26 --------------- networks/hs-min | 17 ---------- networks/hs-min-mixed | 61 ----------------------------------- networks/hs-single-onion-v23-exit-min | 19 ----------- networks/hs-v23-exit-min | 15 --------- networks/hs-v23-ipv6 | 27 ---------------- networks/hs-v3-intro | 18 ----------- networks/hs-v3-ipv6-md | 26 --------------- networks/middle | 11 ------- networks/middle-025 | 11 ------- networks/middle-100 | 13 -------- networks/mixed | 16 --------- networks/mixed+hs-v2 | 22 ------------- networks/mixed+hs-v3 | 19 ----------- networks/single-onion | 17 ---------- networks/single-onion-client-ipv6 | 25 -------------- networks/single-onion-client-ipv6-md | 25 -------------- networks/single-onion-indirect | 20 ------------ networks/single-onion-ipv6 | 26 --------------- networks/single-onion-ipv6-md | 26 --------------- networks/single-onion-v23-ipv6 | 28 ---------------- networks/single-onion-v3 | 17 ---------- networks/single-onion-v3-ipv6 | 26 --------------- networks/single-onion-v3-ipv6-md | 26 --------------- 49 files changed, 1037 deletions(-)
diff --git a/networks/basic-025 b/networks/basic-025 deleted file mode 100644 index 266643f..0000000 --- a/networks/basic-025 +++ /dev/null @@ -1,8 +0,0 @@ -# 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", client=1, torrc="client.tmpl") - -NODES = Authority.getN(4) + ExitRelay.getN(16) + Client.getN(5) - -ConfigureNodes(NODES) diff --git a/networks/basic-100 b/networks/basic-100 deleted file mode 100644 index b1546e6..0000000 --- a/networks/basic-100 +++ /dev/null @@ -1,10 +0,0 @@ -# WARNING: This network can bring down a low-specced machine - -# 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", client=1, torrc="client.tmpl") - -NODES = Authority.getN(5) + ExitRelay.getN(35) + Client.getN(60) - -ConfigureNodes(NODES) diff --git a/networks/basic-min-mixed b/networks/basic-min-mixed deleted file mode 100644 index 6f19c16..0000000 --- a/networks/basic-min-mixed +++ /dev/null @@ -1,47 +0,0 @@ -# This network generates a random mix of tor versions each time it is run -# You'll need at least 4 runs to cover all possibilities - -import random -rng = random.SystemRandom() - -# We have to use the same tags for old and new versions, otherwise switching -# between them at random does not work -OLD_TOR="tor-stable" - -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -OldAuthority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl", - tor=OLD_TOR) - -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", 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]) -OldNewClient = rng.choice([OldClient, Client]) - -def version(node): - if node._env["tor"] == Authority._env["tor"]: - return "new" - elif node._env["tor"] == OldAuthority._env["tor"]: - return "old" - else: - return "unk" - -# Every time chutney takes an action, it will pick versions at random -# It will likely choose different versions for each action -# This could be confusing, so log a message each time -print("Chose 1 %s authority, 1 %s authority, 1 %s exit and 1 %s client" - % (version(Authority), - version(OldAuthority), - version(OldNewExitRelay), - version(OldNewClient))) - -# The minimum number of authorities/relays/exits is 3, the minimum path length -NODES = Authority.getN(1) + OldAuthority.getN(1) + OldExitRelay.getN(1) + OldClient.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges b/networks/bridges deleted file mode 100644 index c5f6076..0000000 --- a/networks/bridges +++ /dev/null @@ -1,14 +0,0 @@ -# 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", 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", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") - -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + ExitRelay.getN(4) + \ - Bridge.getN(1) + Client.getN(1) + BridgeClient.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges+hs b/networks/bridges+hs deleted file mode 100644 index f240bcb..0000000 --- a/networks/bridges+hs +++ /dev/null @@ -1,19 +0,0 @@ -# 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", 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", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# We need 5 authorities/relays/exits to ensure we can build HS connections -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ - ExitRelay.getN(4) + \ - Bridge.getN(1) + \ - Client.getN(1) + BridgeClient.getN(1) + \ - HS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges+hs-v2 b/networks/bridges+hs-v2 deleted file mode 100644 index f240bcb..0000000 --- a/networks/bridges+hs-v2 +++ /dev/null @@ -1,19 +0,0 @@ -# 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", 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", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# We need 5 authorities/relays/exits to ensure we can build HS connections -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ - ExitRelay.getN(4) + \ - Bridge.getN(1) + \ - Client.getN(1) + BridgeClient.getN(1) + \ - HS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges+ipv6 b/networks/bridges+ipv6 deleted file mode 100644 index bda054b..0000000 --- a/networks/bridges+ipv6 +++ /dev/null @@ -1,21 +0,0 @@ -Require("IPV6") -# 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", 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", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") - -# 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 -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ - ExitRelay.getN(4) + \ - BridgeIPv6.getN(1) + Bridge.getN(1) + \ - Client.getN(1) + BridgeClient.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges+ipv6+hs b/networks/bridges+ipv6+hs deleted file mode 100644 index bf25fb0..0000000 --- a/networks/bridges+ipv6+hs +++ /dev/null @@ -1,24 +0,0 @@ -Require("IPV6") -# 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", 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", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# 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 -# bridges+ipv6-min only has IPv6 bridges -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ - ExitRelay.getN(4) + \ - BridgeIPv6.getN(1) + Bridge.getN(1) + \ - Client.getN(1) + BridgeClient.getN(1) + \ - HS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges+ipv6+hs-v2 b/networks/bridges+ipv6+hs-v2 deleted file mode 100644 index 29f3e6f..0000000 --- a/networks/bridges+ipv6+hs-v2 +++ /dev/null @@ -1,24 +0,0 @@ -Require("IPV6") -# 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", 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", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") -HSv2 = Node(tag="h", hs=1, torrc="hs-v2.tmpl") - -# 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 -# bridges+ipv6-min only has IPv6 bridges -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ - ExitRelay.getN(4) + \ - BridgeIPv6.getN(1) + Bridge.getN(1) + \ - Client.getN(1) + BridgeClient.getN(1) + \ - HSv2.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges+ipv6+hs-v23 b/networks/bridges+ipv6+hs-v23 deleted file mode 100644 index 977e93a..0000000 --- a/networks/bridges+ipv6+hs-v23 +++ /dev/null @@ -1,25 +0,0 @@ -Require("IPV6") -# 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", 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", 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 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 -# bridges+ipv6-min only has IPv6 bridges -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ - ExitRelay.getN(4) + \ - BridgeIPv6.getN(1) + Bridge.getN(1) + \ - Client.getN(1) + BridgeClient.getN(1) + \ - HSv2.getN(1) + HSv3.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges-obfs2 b/networks/bridges-obfs2 deleted file mode 100644 index 035be09..0000000 --- a/networks/bridges-obfs2 +++ /dev/null @@ -1,15 +0,0 @@ -# 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", client=1, torrc="client.tmpl") - -BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, - relay=1, torrc="bridgeauthority.tmpl") -Bridge = Node(tag="br", bridge=1, pt_bridge=1, relay=1, pt_transport="obfs2", - torrc="bridge-obfs2.tmpl") -BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient-obfs2.tmpl") - -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + ExitRelay.getN(4) + \ - Bridge.getN(1) + Client.getN(1) + BridgeClient.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bridges-obfs4 b/networks/bridges-obfs4 deleted file mode 100644 index b1ca6c4..0000000 --- a/networks/bridges-obfs4 +++ /dev/null @@ -1,39 +0,0 @@ -# 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", client=1, torrc="client.tmpl") - -BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, - relay=1, torrc="bridgeauthority.tmpl") -Bridge = Node(tag="br", bridge=1, pt_bridge=1, relay=1, pt_transport="obfs4", - torrc="bridge-obfs4.tmpl") - -def obfs4_extra_args(env): - import os, re - # find the obfs4_bridgeline file. - location = os.path.join(env['dir'], - "pt_state", - "obfs4_bridgeline.txt") - if not os.path.exists(location): - return "" - # read the file and find the actual line - with open(location, 'r') as f: - for line in f: - if line.startswith("#"): - continue - if line.isspace(): - continue - m = re.match(r'(.*<FINGERPRINT>) (cert.*)', line) - if m: - return m.group(2) - return "" - -Bridge.set_runtime("pt_extra", obfs4_extra_args) - -BridgeClient = Node(tag="bc", client=1, bridgeclient=1, - torrc="bridgeclient-obfs4.tmpl", config_phase=2, launch_phase=2) - -NODES = Authority.getN(3) + BridgeAuthority.getN(1) + ExitRelay.getN(4) + \ - Bridge.getN(1) + Client.getN(1) + BridgeClient.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/bwfile b/networks/bwfile deleted file mode 100644 index 43fdf19..0000000 --- a/networks/bwfile +++ /dev/null @@ -1,9 +0,0 @@ -# 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/networks/bwscanner b/networks/bwscanner deleted file mode 100644 index 8ed1789..0000000 --- a/networks/bwscanner +++ /dev/null @@ -1,10 +0,0 @@ -# By default, Authorities are not configured as exits -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", client=1, torrc="client_bwscanner.tmpl") - -NODES = Authority.getN(3) + \ - NonExitRelay.getN(21) + ExitRelay.getN(3) + Client.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/client-ipv6-only b/networks/client-ipv6-only deleted file mode 100644 index 5349c72..0000000 --- a/networks/client-ipv6-only +++ /dev/null @@ -1,22 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -ExitRelay6 = Node(tag="r", relay=1, exit=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-exit.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.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 - -# The minimum number of authorities/relays/exits is 3, the minimum path length -# But for some reason, Tor wants 4 "acceptable routers" (Tor bug #20071) -NODES = Authority6.getN(3) + ExitRelay6.getN(2) + HS.getN(1) + Client6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/client-ipv6-only-md b/networks/client-ipv6-only-md deleted file mode 100644 index ff7a664..0000000 --- a/networks/client-ipv6-only-md +++ /dev/null @@ -1,22 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -ExitRelay6 = Node(tag="r", relay=1, exit=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="relay-orport-v6-exit.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# The minimum number of authorities/relays/exits is 3, the minimum path length -# But for some reason, Tor wants 4 "acceptable routers" (Tor bug #20071) -NODES = Authority6.getN(3) + ExitRelay6.getN(2) + HS.getN(1) + Client6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs b/networks/hs deleted file mode 100644 index 2e27b76..0000000 --- a/networks/hs +++ /dev/null @@ -1,11 +0,0 @@ -# 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", client=1, torrc="client.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# 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) - -ConfigureNodes(NODES) diff --git a/networks/hs-025 b/networks/hs-025 deleted file mode 100644 index ccdd321..0000000 --- a/networks/hs-025 +++ /dev/null @@ -1,10 +0,0 @@ -# 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", client=1, torrc="client.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -NODES = Authority.getN(4) + NonExitRelay.getN(10) + \ - Client.getN(6) + HS.getN(5) - -ConfigureNodes(NODES) diff --git a/networks/hs-100 b/networks/hs-100 deleted file mode 100644 index 2373e39..0000000 --- a/networks/hs-100 +++ /dev/null @@ -1,12 +0,0 @@ -# WARNING: This network can bring down a low-specced machine - -# 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", client=1, torrc="client.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -NODES = Authority.getN(5) + NonExitRelay.getN(25) + \ - Client.getN(10) + HS.getN(60) - -ConfigureNodes(NODES) diff --git a/networks/hs-100-clients b/networks/hs-100-clients deleted file mode 100644 index e61b42f..0000000 --- a/networks/hs-100-clients +++ /dev/null @@ -1,13 +0,0 @@ -# Each client sends to the hidden service simultaneously -# This requires the appropriate chutney arguments to make each client send data -# 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", client=1, torrc="client.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# Well, 100 instances, with lots of clients -NODES = Authority.getN(3) + NonExitRelay.getN(10) + \ - Client.getN(86) + HS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-client-ipv6 b/networks/hs-client-ipv6 deleted file mode 100644 index a89a04c..0000000 --- a/networks/hs-client-ipv6 +++ /dev/null @@ -1,25 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -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", 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, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client6.getN(1) + HS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-client-ipv6-md b/networks/hs-client-ipv6-md deleted file mode 100644 index fb18e70..0000000 --- a/networks/hs-client-ipv6-md +++ /dev/null @@ -1,25 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -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", client=1, torrc="client-only-v6-md.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client6.getN(1) + HS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-exit-min b/networks/hs-exit-min deleted file mode 100644 index 2d94d5b..0000000 --- a/networks/hs-exit-min +++ /dev/null @@ -1,11 +0,0 @@ -# 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", client=1, torrc="client.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# 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) - -ConfigureNodes(NODES) diff --git a/networks/hs-intro b/networks/hs-intro deleted file mode 100644 index 3a21a7b..0000000 --- a/networks/hs-intro +++ /dev/null @@ -1,39 +0,0 @@ -# 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", 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") -HS3 = Node(tag="h", hs=1, torrc="hs3.tmpl") -HS4 = Node(tag="h", hs=1, torrc="hs4.tmpl") -HS5 = Node(tag="h", hs=1, torrc="hs5.tmpl") -HS6 = Node(tag="h", hs=1, torrc="hs6.tmpl") -HS7 = Node(tag="h", hs=1, torrc="hs7.tmpl") -HS8 = Node(tag="h", hs=1, torrc="hs8.tmpl") -HS9 = Node(tag="h", hs=1, torrc="hs9.tmpl") -HS10 = Node(tag="h", hs=1, torrc="hs10.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -# A hidden service with 10 intro points actually tries 12, then repurposes 2 -NODES = Authority.getN(2) + NonExitRelay.getN(10) + \ - Client.getN(1) + \ - HS0.getN(2) + \ - HS1.getN(2) + \ - HS2.getN(2) + \ - HS3.getN(2) + \ - HS4.getN(2) + \ - HS5.getN(2) + \ - HS6.getN(2) + \ - HS7.getN(2) + \ - HS8.getN(2) + \ - HS9.getN(2) + \ - HS10.getN(2) - -ConfigureNodes(NODES) diff --git a/networks/hs-ipv6 b/networks/hs-ipv6 deleted file mode 100644 index 815de7d..0000000 --- a/networks/hs-ipv6 +++ /dev/null @@ -1,26 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -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", 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, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + HS6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-ipv6-md b/networks/hs-ipv6-md deleted file mode 100644 index 82d3f48..0000000 --- a/networks/hs-ipv6-md +++ /dev/null @@ -1,26 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -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", client=1, torrc="client.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl") -HS6 = Node(tag="h", hs=1, torrc="hs-only-v6-md.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + HS6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-min b/networks/hs-min deleted file mode 100644 index 39dac23..0000000 --- a/networks/hs-min +++ /dev/null @@ -1,17 +0,0 @@ -# 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", client=1, torrc="client.tmpl") -HS = Node(tag="h", hs=1, torrc="hs.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority.getN(2) + NonExitRelay.getN(3) + \ - Client.getN(1) + HS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-min-mixed b/networks/hs-min-mixed deleted file mode 100644 index ebe3beb..0000000 --- a/networks/hs-min-mixed +++ /dev/null @@ -1,61 +0,0 @@ -# This network generates a random mix of tor versions each time it is run -# You'll need at least 8 runs to cover all possibilities - -import random -rng = random.SystemRandom() - -# We have to use the same tags for old and new versions, otherwise switching -# between them at random does not work -OLD_TOR="tor-stable" - -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -OldAuthority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl", - tor=OLD_TOR) - -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", 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) - -# Choose old or new Relay, Client, and HS at random -OldNewNonExitRelay = rng.choice([OldNonExitRelay, NonExitRelay]) -OldNewClient = rng.choice([OldClient, Client]) -OldNewHS = rng.choice([OldHS, HS]) - -def version(node): - if node._env["tor"] == Authority._env["tor"]: - return "new" - elif node._env["tor"] == OldAuthority._env["tor"]: - return "old" - else: - return "unk" - -# Every time chutney takes an action, it will pick versions at random -# It will likely choose different versions for each action -# This could be confusing, so log a message each time -print(("Chose 1 %s authority, 1 %s authority, %d %s non-exit relay, " + - "%d %s non-exit relay, 1 %s client and 1 %s hidden service") - % (version(Authority), - version(OldAuthority), - 2 if OldNewNonExitRelay == NonExitRelay else 1, - version(NonExitRelay), - 2 if OldNewNonExitRelay == OldNonExitRelay else 1, - version(OldNonExitRelay), - version(OldNewClient), - version(OldNewHS))) - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority.getN(1) + OldAuthority.getN(1) + NonExitRelay.getN(1) + \ - OldNonExitRelay.getN(1) + OldNewNonExitRelay.getN(1) + \ - OldNewClient.getN(1) + OldNewHS.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-single-onion-v23-exit-min b/networks/hs-single-onion-v23-exit-min deleted file mode 100644 index 5f2d6f5..0000000 --- a/networks/hs-single-onion-v23-exit-min +++ /dev/null @@ -1,19 +0,0 @@ -# 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", client=1, torrc="client.tmpl") -HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") -HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") -SingleOnionv2 = Node(tag="h", hs=1, torrc="single-onion.tmpl") -SingleOnionv3 = Node(tag="h", hs=1, torrc="single-onion-v3.tmpl") - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority.getN(2) + ExitRelay.getN(3) + \ - Client.getN(1) + \ - HSv2.getN(1) + HSv3.getN(1) + \ - SingleOnionv2.getN(1) + SingleOnionv3.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-v23-exit-min b/networks/hs-v23-exit-min deleted file mode 100644 index ec7d9ac..0000000 --- a/networks/hs-v23-exit-min +++ /dev/null @@ -1,15 +0,0 @@ -# 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", client=1, torrc="client.tmpl") -HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") -HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority.getN(2) + ExitRelay.getN(3) + \ - Client.getN(1) + HSv2.getN(1) + HSv3.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-v23-ipv6 b/networks/hs-v23-ipv6 deleted file mode 100644 index 1d96ee9..0000000 --- a/networks/hs-v23-ipv6 +++ /dev/null @@ -1,27 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -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", 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="hs-v3-only-v6.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + HSv2IPv6.getN(1) + HSv3IPv6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/hs-v3-intro b/networks/hs-v3-intro deleted file mode 100644 index a76858f..0000000 --- a/networks/hs-v3-intro +++ /dev/null @@ -1,18 +0,0 @@ -# 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", 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, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -# A hidden service with 10 intro points actually tries 12, then repurposes 2 -NODES = Authority.getN(2) + NonExitRelay.getN(10) + \ - Client.getN(1) + HS10.getN(2) - -ConfigureNodes(NODES) diff --git a/networks/hs-v3-ipv6-md b/networks/hs-v3-ipv6-md deleted file mode 100644 index b02822e..0000000 --- a/networks/hs-v3-ipv6-md +++ /dev/null @@ -1,26 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -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", client=1, torrc="client.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl") -HS6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6-md.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + HS6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/middle b/networks/middle deleted file mode 100644 index 10a1720..0000000 --- a/networks/middle +++ /dev/null @@ -1,11 +0,0 @@ -# By default, Authorities are not configured as exits -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", client=1, torrc="client.tmpl") - -NODES = Authority.getN(3) + \ - NonExitRelay.getN(2) + ExitRelay.getN(3) + \ - Client.getN(2) - -ConfigureNodes(NODES) diff --git a/networks/middle-025 b/networks/middle-025 deleted file mode 100644 index ce02d27..0000000 --- a/networks/middle-025 +++ /dev/null @@ -1,11 +0,0 @@ -# By default, Authorities are not configured as exits -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", client=1, torrc="client.tmpl") - -NODES = Authority.getN(4) + \ - NonExitRelay.getN(10) + ExitRelay.getN(6) + \ - Client.getN(5) - -ConfigureNodes(NODES) diff --git a/networks/middle-100 b/networks/middle-100 deleted file mode 100644 index 3046bb0..0000000 --- a/networks/middle-100 +++ /dev/null @@ -1,13 +0,0 @@ -# WARNING: This network can bring down a low-specced machine - -# By default, Authorities are not configured as exits -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", client=1, torrc="client.tmpl") - -NODES = Authority.getN(5) + \ - NonExitRelay.getN(25) + ExitRelay.getN(10) + \ - Client.getN(60) - -ConfigureNodes(NODES) diff --git a/networks/mixed b/networks/mixed deleted file mode 100644 index 488d91d..0000000 --- a/networks/mixed +++ /dev/null @@ -1,16 +0,0 @@ -OLD_TOR="tor-stable" -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl", - tor=OLD_TOR) -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", client=1, torrc="client.tmpl") -OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR) - -NODES = Authority.getN(2) + OldAuthority.getN(2) + \ - Relay.getN(1) + OldRelay.getN(1) + \ - Client.getN(2) + OldClient.getN(2) - -ConfigureNodes(NODES) diff --git a/networks/mixed+hs-v2 b/networks/mixed+hs-v2 deleted file mode 100644 index e0dfa78..0000000 --- a/networks/mixed+hs-v2 +++ /dev/null @@ -1,22 +0,0 @@ -OLD_TOR="tor-stable" -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl", - tor=OLD_TOR) -NonExitRelay = Node(tag="r", relay=1, torrc="relay.tmpl") -OldNonExitRelay = Node(tag="rOLD", relay=1, torrc="relay.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) - -# Due to microdec download issues, tor 0.3.5 needs at least 5 -# authorities/relays/exits in the consensus. -# And for similar reasons, it needs non-exit relays in this network. -NODES = Authority.getN(2) + OldAuthority.getN(2) + \ - NonExitRelay.getN(1) + OldNonExitRelay.getN(1) + \ - Client.getN(1) + OldClient.getN(1) + \ - HSv2.getN(1) + OldHSv2.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/mixed+hs-v3 b/networks/mixed+hs-v3 deleted file mode 100644 index b1dcce7..0000000 --- a/networks/mixed+hs-v3 +++ /dev/null @@ -1,19 +0,0 @@ -OLD_TOR="tor-stable" -# By default, Authorities are not configured as exits -Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") -OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl", - tor=OLD_TOR) -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", client=1, torrc="client.tmpl") -OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR) -HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") -OldHSv3 = Node(tag="hOLD", hs=1, torrc="hs-v3.tmpl", tor=OLD_TOR) - -NODES = Authority.getN(2) + OldAuthority.getN(2) + \ - Relay.getN(1) + OldRelay.getN(1) + \ - Client.getN(1) + OldClient.getN(1) + \ - HSv3.getN(1) + OldHSv3.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion b/networks/single-onion deleted file mode 100644 index 36dad53..0000000 --- a/networks/single-onion +++ /dev/null @@ -1,17 +0,0 @@ -# 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", client=1, torrc="client.tmpl") -SingleOnion = Node(tag="h", hs=1, torrc="single-onion.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority.getN(2) + NonExitRelay.getN(3) + \ - Client.getN(1) + SingleOnion.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-client-ipv6 b/networks/single-onion-client-ipv6 deleted file mode 100644 index 177974c..0000000 --- a/networks/single-onion-client-ipv6 +++ /dev/null @@ -1,25 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -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", 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, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client6.getN(1) + SingleOnion.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-client-ipv6-md b/networks/single-onion-client-ipv6-md deleted file mode 100644 index 387567a..0000000 --- a/networks/single-onion-client-ipv6-md +++ /dev/null @@ -1,25 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -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", client=1, torrc="client-only-v6-md.tmpl") -SingleOnion = Node(tag="h", hs=1, torrc="single-onion.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client6.getN(1) + SingleOnion.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-indirect b/networks/single-onion-indirect deleted file mode 100644 index 014e8bf..0000000 --- a/networks/single-onion-indirect +++ /dev/null @@ -1,20 +0,0 @@ -# Check that a single onion service makes 3-hop connections to -# unreachable intro points and rend points, by forcing it to connect -# through only one guard -# It should act exactly like a hidden service, except that it might make -# direct connections to that one guard if that guard is also intro or rend - -# 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", 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 -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority.getN(2) + NonExitRelay.getN(3) + \ - Client.getN(1) + SingleOnionIndirect.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-ipv6 b/networks/single-onion-ipv6 deleted file mode 100644 index 98f780c..0000000 --- a/networks/single-onion-ipv6 +++ /dev/null @@ -1,26 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -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", 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, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + SingleOnion6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-ipv6-md b/networks/single-onion-ipv6-md deleted file mode 100644 index c71a6ab..0000000 --- a/networks/single-onion-ipv6-md +++ /dev/null @@ -1,26 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -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", client=1, torrc="client.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl") -SingleOnion6 = Node(tag="h", hs=1, torrc="single-onion-only-v6-md.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + SingleOnion6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-v23-ipv6 b/networks/single-onion-v23-ipv6 deleted file mode 100644 index 84be7e1..0000000 --- a/networks/single-onion-v23-ipv6 +++ /dev/null @@ -1,28 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -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", 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") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + \ - SingleOnionv2IPv6.getN(1) + SingleOnionv3IPv6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-v3 b/networks/single-onion-v3 deleted file mode 100644 index 38d1a2a..0000000 --- a/networks/single-onion-v3 +++ /dev/null @@ -1,17 +0,0 @@ -# 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", 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, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority.getN(2) + NonExitRelay.getN(3) + \ - Client.getN(1) + SingleOnion.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-v3-ipv6 b/networks/single-onion-v3-ipv6 deleted file mode 100644 index b91f48f..0000000 --- a/networks/single-onion-v3-ipv6 +++ /dev/null @@ -1,26 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -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", 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, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + SingleOnionv3IPv6.getN(1) - -ConfigureNodes(NODES) diff --git a/networks/single-onion-v3-ipv6-md b/networks/single-onion-v3-ipv6-md deleted file mode 100644 index faa1527..0000000 --- a/networks/single-onion-v3-ipv6-md +++ /dev/null @@ -1,26 +0,0 @@ -Require("IPV6") -import os -# By default, Authorities are not configured as exits -Authority6 = Node(tag="a", authority=1, relay=1, - ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6', - '[::1]'), - torrc="authority-orport-v6.tmpl") -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", client=1, torrc="client.tmpl") -Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl") -SingleOnionv3IPv6 = Node(tag="h", hs=1, torrc="single-onion-v3-only-v6-md.tmpl") - -# Since only 25% of relays get the guard flag, -# TestingDirAuthVoteGuard * may need to be used in small networks - -# A hidden service needs 5 authorities/relays to ensure it can build HS -# connections: -# a minimum path length of 3, plus the client-nominated rendezvous point, -# plus a seperate introduction point -NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \ - Client.getN(1) + Client6.getN(1) + SingleOnionv3IPv6.getN(1) - -ConfigureNodes(NODES)