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

[chutney/master] Add a print_phases command to report how many phases there are.
by nickm＠torproject.org 26 Jun '20

26 Jun '20

commit 5d4f04d32887412a66fb189025ff51a1dc755701 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 10:33:25 2020 -0400 Add a print_phases command to report how many phases there are. Chutney supports multiple phases so that we can configure the network in a particular sequence. But to use them in a shell script, we'll need to have some way to ask chutney how many phases a network has. --- lib/chutney/TorNet.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index a00decd..8e8a151 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -2561,6 +2561,16 @@ class Network(object): any_tor_was_running, True) + def print_phases(self): + """Print the total number of phases in which the network is + initialized, configured, or bootstrapped.""" + def max_phase(key): + return max(int(n._env[key]) for n in self._nodes) + cfg_max = max_phase("config_phase") + launch_max = max_phase("launch_phase") + print("CHUTNEY_CONFIG_PHASES={}".format(cfg_max)) + print("CHUTNEY_LAUNCH_PHASES={}".format(launch_max)) + def Require(feature): network = _THE_NETWORK network._addRequirement(feature)

1 0

[chutney/master] Add two more default variables.
by nickm＠torproject.org 26 Jun '20

26 Jun '20

commit 428152ebefacf3a065eebec144fc098f7615c84e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 12:56:44 2020 -0400 Add two more default variables. --- tools/test-network.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/test-network.sh b/tools/test-network.sh index 12b908c..4cec921 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -37,6 +37,9 @@ export CHUTNEY_DNS_CONF=${CHUTNEY_DNS_CONF:-/dev/null} : "${USE_COVERAGE_BINARY:=false}" : "${CHUTNEY_DIAGNOSTICS:=false}" : "${CHUTNEY_DATA_DIR:=}" +: "${TOR_DIR:=}" +: "${CHUTNEY_TOR:=}" +: "${CHUTNEY_TOR_GENCERT:=}" # what we say when we fail UPDATE_YOUR_CHUTNEY="Please update your chutney using 'git pull'."

1 0

[chutney/master] Make sure TOR_APP_DIR is set, to avoid -o nounset error
by nickm＠torproject.org 26 Jun '20

26 Jun '20

commit 906fa80bf4be60298803c097c0f5a5bc97f9eb29 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 15:30:47 2020 -0400 Make sure TOR_APP_DIR is set, to avoid -o nounset error --- tools/test-network.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/test-network.sh b/tools/test-network.sh index 7717655..99fde76 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -38,6 +38,7 @@ export CHUTNEY_DNS_CONF=${CHUTNEY_DNS_CONF:-/dev/null} : "${CHUTNEY_DIAGNOSTICS:=false}" : "${CHUTNEY_DATA_DIR:=}" : "${TOR_DIR:=}" +: "${TOR_APP_DIR:=}" : "${CHUTNEY_TOR:=}" : "${CHUTNEY_TOR_GENCERT:=}"

1 0

[chutney/master] bootstrap-network.sh: support multi-phase networks.
by nickm＠torproject.org 26 Jun '20

26 Jun '20

commit 65a3fa7c83fe27722bcbbda69a8cc2d05d3eae65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 11:43:45 2020 -0400 bootstrap-network.sh: support multi-phase networks. With this change, I now see the single-onion network passing. --- tools/bootstrap-network.sh | 74 +++++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh index fd9f7ae..3bc272a 100755 --- a/tools/bootstrap-network.sh +++ b/tools/bootstrap-network.sh @@ -24,7 +24,6 @@ set -o nounset : "${CHUTNEY_DIAGNOSTICS:=false}" : "${CHUTNEY_DATA_DIR:=}" - # Get a working chutney path if [ ! -d "$CHUTNEY_PATH" ] || [ ! -x "$CHUTNEY_PATH/chutney" ]; then # looks like a broken path: use the path to this tool instead @@ -79,40 +78,53 @@ if ! "$CHUTNEY" supported "$CHUTNEY_NETWORK"; then exit 77 fi -echo "$myname: bootstrapping network: $NETWORK_FLAVOUR" -"$CHUTNEY" configure "$CHUTNEY_NETWORK" - -"$CHUTNEY" start "$CHUTNEY_NETWORK" -sleep 3 -if ! "$CHUTNEY" status "$CHUTNEY_NETWORK"; then - # Try to work out why the start or status command is failing - CHUTNEY_DEBUG=1 "$CHUTNEY" start "$CHUTNEY_NETWORK" - # Wait a little longer, just in case - sleep 6 - CHUTNEY_DEBUG=1 "$CHUTNEY" status "$CHUTNEY_NETWORK" +# Find out how many phases there are. This will set CHUTNEY_CONFIG_PHASES +# and CHUTNEY_LAUNCH_PHASES. +if [ -z "${CHUTNEY_CONFIG_PHASES:-}" ] || [ -z "${CHUTNEY_LAUNCH_PHASES:-}" ]; then + eval "$("$CHUTNEY" print_phases "$CHUTNEY_NETWORK" |grep =)" fi +$ECHO "$myname: bootstrapping network: $NETWORK_FLAVOUR" +for config_idx in $(seq 1 "$CHUTNEY_CONFIG_PHASES"); do + export CHUTNEY_CONFIG_PHASE="${config_idx}" + "$CHUTNEY" configure "$CHUTNEY_NETWORK" +done + +for launch_idx in $(seq 1 "$CHUTNEY_LAUNCH_PHASES"); do + export CHUTNEY_LAUNCH_PHASE="${launch_idx}" + $ECHO "======= phase ${launch_idx}" + "$CHUTNEY" start "$CHUTNEY_NETWORK" + sleep 3 + if ! "$CHUTNEY" status "$CHUTNEY_NETWORK"; then + # Try to work out why the start or status command is failing + CHUTNEY_DEBUG=1 "$CHUTNEY" start "$CHUTNEY_NETWORK" + # Wait a little longer, just in case + sleep 6 + CHUTNEY_DEBUG=1 "$CHUTNEY" status "$CHUTNEY_NETWORK" + fi -# We allow up to CHUTNEY_START_TIME for each bootstrap phase to -# complete. -export CHUTNEY_START_TIME=${CHUTNEY_START_TIME:-120} + # We allow up to CHUTNEY_START_TIME for each bootstrap phase to + # complete. + export CHUTNEY_START_TIME=${CHUTNEY_START_TIME:-120} -if [ "$CHUTNEY_START_TIME" -ge 0 ]; then - $ECHO "Waiting up to $CHUTNEY_START_TIME seconds for all nodes to bootstrap..." - # We require the network to bootstrap, before we verify - if ! "$CHUTNEY" wait_for_bootstrap "$CHUTNEY_NETWORK"; then - "$DIAGNOSTICS" - CHUTNEY_WARNINGS_IGNORE_EXPECTED=false \ + if [ "$CHUTNEY_START_TIME" -ge 0 ]; then + $ECHO "Waiting up to $CHUTNEY_START_TIME seconds for all nodes in phase ${launch_idx} to bootstrap..." + # We require the network to bootstrap, before we verify + if ! "$CHUTNEY" wait_for_bootstrap "$CHUTNEY_NETWORK"; then + "$DIAGNOSTICS" + CHUTNEY_WARNINGS_IGNORE_EXPECTED=false \ CHUTNEY_WARNINGS_SUMMARY=false \ "$WARNING_COMMAND" - "$WARNINGS" - $ECHO "chutney boostrap failed (in wait_for_bootstrap)" - exit 1 + "$WARNINGS" + $ECHO "chutney boostrap phase ${launch_idx} failed (in wait_for_bootstrap)" + exit 1 + fi + else + $ECHO "Chutney network launched and running. To stop the network, use:" + $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK" + "$DIAGNOSTICS" + "$WARNINGS" fi -else - $ECHO "Chutney network launched and running. To stop the network, use:" - $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK" - "$DIAGNOSTICS" - "$WARNINGS" - exit 0 -fi +done + +exit 0

1 0

[chutney/master] Avoid using "unset" now that we have -o nounset enabled.
by nickm＠torproject.org 26 Jun '20

26 Jun '20

commit 830566f3b49e5fcd0251ee7aabcb07be7651408f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 14:06:11 2020 -0400 Avoid using "unset" now that we have -o nounset enabled. --- tools/test-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test-network.sh b/tools/test-network.sh index 4cec921..c221db4 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -267,7 +267,7 @@ if [ ! -d "${TOR_DIR:-}" ]; then export TOR_DIR="$PWD/../tor" else $ECHO "$myname: no \$TOR_DIR, chutney will use \$CHUTNEY_TOR and \$CHUTNEY_TOR_GENCERT as tor binary paths, or search \$PATH for tor binary names" - unset TOR_DIR + export TOR_DIR="" fi fi

1 0

[chutney/master] Use multiphase launching in all networks with onion services.
by nickm＠torproject.org 26 Jun '20

26 Jun '20

commit 7fb1e61a1290fb09635fe30446e44053b3ff71bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 13:18:20 2020 -0400 Use multiphase launching in all networks with onion services. --- networks/bridges+hs-v23 | 8 ++++---- networks/hs-ob-v3 | 4 ++-- networks/hs-v2-min | 4 ++-- networks/hs-v23-ipv6-md | 8 ++++---- networks/hs-v23-min | 6 +++--- networks/hs-v3 | 4 ++-- networks/hs-v3-ipv6 | 6 +++--- networks/hs-v3-min | 4 ++-- networks/mixed+hs-v23 | 12 ++++++------ networks/mixed+hs-v23-ipv6 | 12 ++++++------ 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/networks/bridges+hs-v23 b/networks/bridges+hs-v23 index 1022849..9411414 100644 --- a/networks/bridges+hs-v23 +++ b/networks/bridges+hs-v23 @@ -5,10 +5,10 @@ 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") -HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") -HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") +Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl", launch_phase=2) +BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl", launch_phase=2) +HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl", launch_phase=2) +HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl", launch_phase=2) # We need 5 authorities/relays/exits to ensure we can build HS connections NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ diff --git a/networks/hs-ob-v3 b/networks/hs-ob-v3 index 6309762..056eebd 100644 --- a/networks/hs-ob-v3 +++ b/networks/hs-ob-v3 @@ -5,8 +5,8 @@ # 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-v3.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl", launch_phase=2) NODES = Authority.getN(3) + ExitRelay.getN(5) + \ Client.getN(2) + HS.getN(4) diff --git a/networks/hs-v2-min b/networks/hs-v2-min index 3f1cea8..a483adc 100644 --- a/networks/hs-v2-min +++ b/networks/hs-v2-min @@ -3,8 +3,8 @@ # 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") +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +HS = Node(tag="h", hs=1, torrc="hs.tmpl", launch_phase=2) # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/hs-v23-ipv6-md b/networks/hs-v23-ipv6-md index 2254309..47c9aa2 100644 --- a/networks/hs-v23-ipv6-md +++ b/networks/hs-v23-ipv6-md @@ -13,11 +13,11 @@ NonExitRelay6 = Node(tag="r", relay=1, '[::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") +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl", launch_phase=2) -HSv2IPv6 = Node(tag="h", hs=1, torrc="hs-only-v6-md.tmpl") -HSv3IPv6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6-md.tmpl") +HSv2IPv6 = Node(tag="h", hs=1, torrc="hs-only-v6-md.tmpl", launch_phase=2) +HSv3IPv6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6-md.tmpl", launch_phase=2) # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/hs-v23-min b/networks/hs-v23-min index de0ff16..def8b46 100644 --- a/networks/hs-v23-min +++ b/networks/hs-v23-min @@ -1,9 +1,9 @@ # 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") -HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") -HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl", launch_phase=2) +HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl", launch_phase=2) # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/hs-v3 b/networks/hs-v3 index 6367c41..4112756 100644 --- a/networks/hs-v3 +++ b/networks/hs-v3 @@ -3,8 +3,8 @@ # 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-v3.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl", launch_phase=2) # We need 5 authorities/relays/exits to ensure we can build HS connections NODES = Authority.getN(3) + ExitRelay.getN(5) + \ diff --git a/networks/hs-v3-ipv6 b/networks/hs-v3-ipv6 index a363991..c5eee74 100644 --- a/networks/hs-v3-ipv6 +++ b/networks/hs-v3-ipv6 @@ -9,9 +9,9 @@ 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-v3-only-v6.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl", launch_phase=2) +HS6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6.tmpl", launch_phase=2) # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/hs-v3-min b/networks/hs-v3-min index e007f84..03894ce 100644 --- a/networks/hs-v3-min +++ b/networks/hs-v3-min @@ -1,8 +1,8 @@ # 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-v3.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl", launch_phase=2) # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/mixed+hs-v23 b/networks/mixed+hs-v23 index 992e99a..47bc88e 100644 --- a/networks/mixed+hs-v23 +++ b/networks/mixed+hs-v23 @@ -6,12 +6,12 @@ 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", 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) -HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") -OldHSv3 = Node(tag="hOLD", hs=1, torrc="hs-v3.tmpl", tor=OLD_TOR) +Client = Node(tag="c", client=1, torrc="client.tmpl", launch_phase=2) +OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR, launch_phase=2) +HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl", launch_phase=2) +OldHSv2 = Node(tag="hOLD", hs=1, torrc="hs.tmpl", tor=OLD_TOR, launch_phase=2) +HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl", launch_phase=2) +OldHSv3 = Node(tag="hOLD", hs=1, torrc="hs-v3.tmpl", tor=OLD_TOR, launch_phase=2) NODES = Authority.getN(2) + OldAuthority.getN(2) + \ Relay.getN(1) + OldRelay.getN(1) + \ diff --git a/networks/mixed+hs-v23-ipv6 b/networks/mixed+hs-v23-ipv6 index 5d9e2e3..c7fdbcd 100644 --- a/networks/mixed+hs-v23-ipv6 +++ b/networks/mixed+hs-v23-ipv6 @@ -34,22 +34,22 @@ OldNonExitRelay6 = Node(tag="rOLD", relay=1, tor=OLD_TOR) Client6 = Node(tag="c", client=1, - torrc="client-only-v6-md.tmpl") + torrc="client-only-v6-md.tmpl", launch_phase=2) OldClient6 = Node(tag="cOLD", client=1, torrc="client-only-v6-md.tmpl", - tor=OLD_TOR) + tor=OLD_TOR, launch_phase=2) HSv2IPv6 = Node(tag="h", hs=1, - torrc="hs-only-v6-md.tmpl") + torrc="hs-only-v6-md.tmpl", launch_phase=2) OldHSv2IPv6 = Node(tag="hOLD", hs=1, torrc="hs-only-v6-md.tmpl", - tor=OLD_TOR) + tor=OLD_TOR, launch_phase=2) HSv3IPv6 = Node(tag="h", hs=1, - torrc="hs-v3-only-v6-md.tmpl") + torrc="hs-v3-only-v6-md.tmpl", launch_phase=2) OldHSv3IPv6 = Node(tag="hOLD", hs=1, torrc="hs-v3-only-v6-md.tmpl", - tor=OLD_TOR) + tor=OLD_TOR, launch_phase=2) # (XXX We have temporarily added an extra authority to work around issue # 34447.)

1 0

[chutney/master] fixup! Avoid using "unset" now that we have -o nounset enabled.
by nickm＠torproject.org 26 Jun '20

26 Jun '20

commit 4b2cb0d8084bc26b06993bcdd12cf739b7aeee6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 15:30:29 2020 -0400 fixup! Avoid using "unset" now that we have -o nounset enabled. --- tools/test-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test-network.sh b/tools/test-network.sh index c221db4..7717655 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -285,7 +285,7 @@ if [ -d "$TOR_DIR" ]; then TOR_APP_DIR="$TOR_DIR/src/or" else $ECHO "$myname: \$TOR_DIR has no src/app or src/or, looking elsewhere" - unset TOR_DIR + TOR_DIR="" fi fi

1 0

[chutney/master] Make sure CHUTNEY_PATH is set, to avoid -o nounset error
by nickm＠torproject.org 26 Jun '20

26 Jun '20

commit bc6015cf8ad1c471d63b6bc0aa9e60994835c973 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 16:27:26 2020 -0400 Make sure CHUTNEY_PATH is set, to avoid -o nounset error --- tools/test-network.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/test-network.sh b/tools/test-network.sh index 99fde76..41169f1 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -39,6 +39,7 @@ export CHUTNEY_DNS_CONF=${CHUTNEY_DNS_CONF:-/dev/null} : "${CHUTNEY_DATA_DIR:=}" : "${TOR_DIR:=}" : "${TOR_APP_DIR:=}" +: "${CHUTNEY_PATH:=}" : "${CHUTNEY_TOR:=}" : "${CHUTNEY_TOR_GENCERT:=}"

1 0

[tor/master] Move code into notify_after_networkstatus_changes().
by nickm＠torproject.org 26 Jun '20

26 Jun '20

commit 5c5fb0fcca504d319276a697fec43287e242765d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 14:30:05 2020 -0400 Move code into notify_after_networkstatus_changes(). The purpose of having this function was to inform other code that the consensus has changed, so it should go there. --- src/feature/nodelist/networkstatus.c | 50 +++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index e07d58c91..010963cda 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -1670,7 +1670,34 @@ notify_before_networkstatus_changes(const networkstatus_t *old_c, static void notify_after_networkstatus_changes(void) { + const networkstatus_t *c = networkstatus_get_latest_consensus(); + const or_options_t *options = get_options(); + const time_t now = approx_time(); + scheduler_notify_networkstatus_changed(); + + /* The "current" consensus has just been set and it is a usable flavor so + * the first thing we need to do is recalculate the voting schedule static + * object so we can use the timings in there needed by some subsystems + * such as hidden service and shared random. */ + dirauth_sched_recalculate_timing(options, now); + reschedule_dirvote(options); + + nodelist_set_consensus(c); + + update_consensus_networkstatus_fetch_time(now); + + /* Change the cell EWMA settings */ + cmux_ewma_set_options(options, c); + + /* XXXX this call might be unnecessary here: can changing the + * current consensus really alter our view of any OR's rate limits? */ + connection_or_update_token_buckets(get_connection_array(), options); + + circuit_build_times_new_consensus_params( + get_circuit_build_times_mutable(), c); + channelpadding_new_consensus_params(c); + circpad_new_consensus_params(c); } /** Copy all the ancillary information (like router download status and so on) @@ -2115,29 +2142,6 @@ networkstatus_set_current_consensus(const char *consensus, /* Notify that we just changed the consensus so the current global value * can be looked at. */ notify_after_networkstatus_changes(); - - /* The "current" consensus has just been set and it is a usable flavor so - * the first thing we need to do is recalculate the voting schedule static - * object so we can use the timings in there needed by some subsystems - * such as hidden service and shared random. */ - dirauth_sched_recalculate_timing(options, now); - reschedule_dirvote(options); - - nodelist_set_consensus(c); - - update_consensus_networkstatus_fetch_time(now); - - /* Change the cell EWMA settings */ - cmux_ewma_set_options(options, c); - - /* XXXX this call might be unnecessary here: can changing the - * current consensus really alter our view of any OR's rate limits? */ - connection_or_update_token_buckets(get_connection_array(), options); - - circuit_build_times_new_consensus_params( - get_circuit_build_times_mutable(), c); - channelpadding_new_consensus_params(c); - circpad_new_consensus_params(c); } /* Reset the failure count only if this consensus is actually valid. */

1 0

[tor/master] Add two new networkstatus parameters to emulate AssumeReachable.
by nickm＠torproject.org 26 Jun '20

26 Jun '20

commit 6edf7f6710600962f95e7f5458787dbc5e5c7411 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 14:52:44 2020 -0400 Add two new networkstatus parameters to emulate AssumeReachable. These parameters do not suppress checks, but they tell relays that it's okay to publish even when those checks fail. I have chosen lowercase hyphenated names, since these seem to be more common in networkstatus params. Closes #33224 and part of #34064. --- changes/ticket34064 | 5 +++++ src/feature/nodelist/networkstatus.c | 1 + src/feature/relay/router.c | 43 ++++++++++++++++++++++++++++++++++-- src/feature/relay/router.h | 2 ++ 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/changes/ticket34064 b/changes/ticket34064 new file mode 100644 index 000000000..13ed70c8f --- /dev/null +++ b/changes/ticket34064 @@ -0,0 +1,5 @@ + o Minor features (relay, ipv6): + - Add new "assume-reachable" and "assume-reachable-ipv6" parameters + to be used in an emergency to tell relays that they should publish + even if they cannot complete their ORPort self-checks. + Closes ticket 34064 and part of 33224. diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 010963cda..f63d598ef 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -1698,6 +1698,7 @@ notify_after_networkstatus_changes(void) get_circuit_build_times_mutable(), c); channelpadding_new_consensus_params(c); circpad_new_consensus_params(c); + router_new_consensus_params(c); } /** Copy all the ancillary information (like router download status and so on) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 1933f61ed..97b630add 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -1335,6 +1335,17 @@ should_refuse_unknown_exits(const or_options_t *options) } } +/** + * If true, then we will publish our descriptor even if our own IPv4 ORPort + * seems to be unreachable. + **/ +static bool publish_even_when_ipv4_orport_unreachable = false; +/** + * If true, then we will publish our descriptor even if our own IPv6 ORPort + * seems to be unreachable. + **/ +static bool publish_even_when_ipv6_orport_unreachable = false; + /** Decide if we're a publishable server. We are a publishable server if: * - We don't have the ClientOnly option set * and @@ -1363,8 +1374,18 @@ decide_if_publishable_server(void) return 1; if (!router_get_advertised_or_port(options)) return 0; - if (!router_all_orports_seem_reachable(options)) - return 0; + if (!router_orport_seems_reachable(AF_INET)) { + // We have an ipv4 orport, and it doesn't seem reachable. + if (!publish_even_when_ipv4_orport_unreachable) { + return 0; + } + } + if (!router_orport_seems_reachable(AF_INET6)) { + // We have an ipv6 orport, and it doesn't seem reachable. + if (!publish_even_when_ipv6_orport_unreachable) { + return 0; + } + } if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) { /* All set: there are no exits in the consensus (maybe this is a tiny * test network), so we can't check our DirPort reachability. */ @@ -2388,6 +2409,24 @@ router_rebuild_descriptor(int force) return 0; } +/** Called when we have a new set of consensus parameters. */ +void +router_new_consensus_params(const networkstatus_t *ns) +{ + const int32_t DEFAULT_ASSUME_REACHABLE = 0; + const int32_t DEFAULT_ASSUME_REACHABLE_IPV6 = 0; + int ar, ar6; + ar = networkstatus_get_param(ns, + "assume-reachable", + DEFAULT_ASSUME_REACHABLE, 0, 1); + ar6 = networkstatus_get_param(ns, + "assume-reachable-ipv6", + DEFAULT_ASSUME_REACHABLE_IPV6, 0, 1); + + publish_even_when_ipv4_orport_unreachable = ar; + publish_even_when_ipv6_orport_unreachable = ar || ar6; +} + /** If our router descriptor ever goes this long without being regenerated * because something changed, we force an immediate regenerate-and-upload. */ #define FORCE_REGENERATE_DESCRIPTOR_INTERVAL (18*60*60) diff --git a/src/feature/relay/router.h b/src/feature/relay/router.h index 50790a73d..b1f90699a 100644 --- a/src/feature/relay/router.h +++ b/src/feature/relay/router.h @@ -34,6 +34,7 @@ void set_server_identity_key(crypto_pk_t *k); MOCK_DECL(crypto_pk_t *,get_server_identity_key,(void)); #else #define get_server_identity_key() (tor_abort_(),NULL) +#define router_new_consensus_params(c) ((void)(c)) #endif int server_identity_key_is_set(void); void set_client_identity_key(crypto_pk_t *k); @@ -81,6 +82,7 @@ int router_should_advertise_dirport(const or_options_t *options, void consider_publishable_server(int force); int should_refuse_unknown_exits(const or_options_t *options); +void router_new_consensus_params(const networkstatus_t *); void router_upload_dir_desc_to_dirservers(int force); void mark_my_descriptor_dirty_if_too_old(time_t now); void mark_my_descriptor_dirty(const char *reason);

1 0