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

[chutney/master] TorNet: Raise a ValueError when an unknown tor_name is used
by teor＠torproject.org 23 Jan '20

23 Jan '20

commit 126e8ec9faddd6f6e969a387138c5472c5b0ea72 Author: teor <teor(a)torproject.org> Date: Fri Jan 24 11:02:32 2020 +1000 TorNet: Raise a ValueError when an unknown tor_name is used Follow-up for 33041. --- lib/chutney/TorNet.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 1cc1d4e..0da0839 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -218,6 +218,8 @@ def _warnMissingTor(tor_path, cmdline, tor_name="tor"): help_msg = help_msg_fmt.format("CHUTNEY_TOR", tor_name) elif tor_name == "tor-gencert": help_msg = help_msg_fmt.format("CHUTNEY_TOR_GENCERT", tor_name) + else: + raise ValueError("Unknown tor_name: '{}'".format(tor_name)) print(("Cannot find the {} binary at '{}' for the command line '{}'. {}") .format(tor_name, tor_path, " ".join(cmdline), help_msg)) @@ -267,10 +269,14 @@ def launch_process(cmdline, tor_name="tor", stdin=None, exit_on_missing=True): Returns the Popen object for the launched process. """ - if tor_name == "tor" and not debug_flag: - cmdline.append("--quiet") - elif tor_name == "tor-gencert" and debug_flag: - cmdline.append("-v") + if tor_name == "tor": + if not debug_flag: + cmdline.append("--quiet") + elif tor_name == "tor-gencert": + if debug_flag: + cmdline.append("-v") + else: + raise ValueError("Unknown tor_name: '{}'".format(tor_name)) try: p = subprocess.Popen(cmdline, stdin=stdin,

1 0

[chutney/master] TorNet: Include test-network.sh usage in the tor* launch error message
by teor＠torproject.org 23 Jan '20

23 Jan '20

commit 403574b6405d045860c8eb359dd8532caab7b8b3 Author: teor <teor(a)torproject.org> Date: Fri Jan 24 11:36:40 2020 +1000 TorNet: Include test-network.sh usage in the tor* launch error message Fix on 33041. --- lib/chutney/TorNet.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 061ebfa..7c7e8f1 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -212,7 +212,9 @@ def _warnMissingTor(tor_path, cmdline, tor_name="tor"): at tor_path while running cmdline. Suggest the appropriate environmental variable to set to resolve the issue. """ - help_msg_fmt = "Set the '{}' environment variable to the path of '{}'." + help_msg_fmt = ("Set the '{}' environment variable to the path of '{}'. " + + "If using test-network.sh, set the 'TOR_DIR' " + + "environment variable to the directory containing '{1}'.") help_msg = "" if tor_name == "tor": help_msg = help_msg_fmt.format("CHUTNEY_TOR", tor_name)

1 0

[chutney/master] TorNet: Fix a dict key typo for 'tor-gencert'
by teor＠torproject.org 23 Jan '20

23 Jan '20

commit c49affde435cd95eb078e1fe504678fd4a810a50 Author: teor <teor(a)torproject.org> Date: Fri Jan 24 11:33:52 2020 +1000 TorNet: Fix a dict key typo for 'tor-gencert' --- lib/chutney/TorNet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 0da0839..061ebfa 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -688,7 +688,7 @@ class LocalNodeBuilder(NodeBuilder): print("No dirauth support in %r"%self._env['tor']) return False if not tor_gencert_exists(self._env['tor-gencert']): - print("No binary found for tor-gencert %r"%self._env['tor-gencrrt']) + print("No binary found for tor-gencert %r"%self._env['tor-gencert']) def _makeDataDir(self): """Create the data directory (with keys subdirectory) for this node.

1 0

[chutney/master] Error message for missing tor uses correct env var names
by teor＠torproject.org 23 Jan '20

23 Jan '20

commit 6244c2e12184793244e32abd4e494fd76773b548 Author: Steven Engler <sengler(a)uwaterloo.ca> Date: Thu Jan 23 14:26:38 2020 -0500 Error message for missing tor uses correct env var names --- lib/chutney/TorNet.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index ea3b320..a18c8e9 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -167,10 +167,14 @@ def _warnMissingTor(tor_path, cmdline, tor_name="tor"): """Log a warning that the binary tor_name can't be found at tor_path while running cmdline. """ - print(("Cannot find the {} binary at '{}' for the command line '{}'. " + - "Set the TOR_DIR environment variable to the directory " + - "containing {}.") - .format(tor_name, tor_path, " ".join(cmdline), tor_name)) + help_msg_fmt = "Set the '{}' environment variable to the directory containing '{}'." + help_msg = "" + if tor_name == "tor": + help_msg = help_msg_fmt.format("CHUTNEY_TOR", tor_name) + elif tor_name == "tor-gencert": + help_msg = help_msg_fmt.format("CHUTNEY_TOR_GENCERT", tor_name) + print(("Cannot find the {} binary at '{}' for the command line '{}'. {}") + .format(tor_name, tor_path, " ".join(cmdline), help_msg)) def run_tor(cmdline, exit_on_missing=True): """Run the tor command line cmdline, which must start with the path or

1 0

[chutney/master] Remove temporary files created in 'show_warnings()'
by teor＠torproject.org 23 Jan '20

23 Jan '20

commit 2cd77aab3bc7f3479a64ad3291478fb3a938d7ee Author: Steven Engler <sengler(a)uwaterloo.ca> Date: Tue Jan 21 23:26:12 2020 -0500 Remove temporary files created in 'show_warnings()' --- tools/warnings.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/warnings.sh b/tools/warnings.sh index b8c263d..e9915a7 100755 --- a/tools/warnings.sh +++ b/tools/warnings.sh @@ -77,6 +77,8 @@ show_warnings() { if [ "$CHUTNEY_WARNINGS_SUMMARY" != true ]; then $ECHO_Q "" fi + # Remove the temporary files we created + rm "${LOGS}" "${FILTERED_LOGS}" } usage() {

1 0

[chutney/master] Support non-existing absolute paths for the data directory
by teor＠torproject.org 23 Jan '20

23 Jan '20

commit 09dc71a8aae5245757a5988c97b8c4824bebbc3b Author: Steven Engler <sengler(a)uwaterloo.ca> Date: Wed Jan 22 00:50:10 2020 -0500 Support non-existing absolute paths for the data directory If the user provides an absolute path for the data directory with 'CHUTNEY_DATA_DIR' or '--net-dir', it should not be overwritten in the case that the directory does not exist. Chutney will automatically create this directory. --- lib/chutney/TorNet.py | 6 +++++- tools/bootstrap-network.sh | 25 +++++++++++++++++-------- tools/hsaddress.sh | 25 +++++++++++++++++-------- tools/warnings.sh | 25 +++++++++++++++++-------- 4 files changed, 56 insertions(+), 25 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index ea3b320..66e19d2 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -131,9 +131,13 @@ def get_absolute_chutney_path(): return os.path.abspath(relative_chutney_path) def get_absolute_net_path(): + data_dir = os.environ.get('CHUTNEY_DATA_DIR', 'net') + if os.path.isabs(data_dir): + # if we are given an absolute path, we should use it + return data_dir # use the chutney path as the default absolute_chutney_path = get_absolute_chutney_path() - relative_net_path = os.environ.get('CHUTNEY_DATA_DIR', 'net') + relative_net_path = data_dir # but what is it relative to? # let's check if it's in CHUTNEY_PATH first, to preserve # backwards-compatible behaviour diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh index 34db0f3..7cfc55e 100755 --- a/tools/bootstrap-network.sh +++ b/tools/bootstrap-network.sh @@ -26,14 +26,23 @@ if [ -d "$PWD/$CHUTNEY_PATH" ] && [ -x "$PWD/$CHUTNEY_PATH/chutney" ]; then fi # Get a working net path -if [ ! -d "$CHUTNEY_DATA_DIR" ]; then - # looks like a broken path: use the chutney path as a base - export CHUTNEY_DATA_DIR="$CHUTNEY_PATH/net" -fi -if [ -d "$PWD/$CHUTNEY_DATA_DIR" ]; then - # looks like a relative path: make chutney path absolute - export CHUTNEY_DATA_DIR="$PWD/$CHUTNEY_DATA_DIR" -fi +case "$CHUTNEY_DATA_DIR" in + /*) + # if an absolute path, then leave as-is + # chutney will make this directory automatically if needed + ;; + *) + # if a relative path + if [ ! -d "$CHUTNEY_DATA_DIR" ]; then + # looks like a broken path: use the chutney path as a base + export CHUTNEY_DATA_DIR="$CHUTNEY_PATH/net" + fi + if [ -d "$PWD/$CHUTNEY_DATA_DIR" ]; then + # looks like a relative path: make chutney path absolute + export CHUTNEY_DATA_DIR="$PWD/$CHUTNEY_DATA_DIR" + fi + ;; +esac CHUTNEY="$CHUTNEY_PATH/chutney" myname=$(basename "$0") diff --git a/tools/hsaddress.sh b/tools/hsaddress.sh index bc1d123..b975f0a 100755 --- a/tools/hsaddress.sh +++ b/tools/hsaddress.sh @@ -19,14 +19,23 @@ if [ -d "$PWD/$CHUTNEY_PATH" ] && [ -x "$PWD/$CHUTNEY_PATH/chutney" ]; then fi # Get a working net path -if [ ! -d "$CHUTNEY_DATA_DIR" ]; then - # looks like a broken path: use the chutney path as a base - export CHUTNEY_DATA_DIR="$CHUTNEY_PATH/net" -fi -if [ -d "$PWD/$CHUTNEY_DATA_DIR" ]; then - # looks like a relative path: make chutney path absolute - export CHUTNEY_DATA_DIR="$PWD/$CHUTNEY_DATA_DIR" -fi +case "$CHUTNEY_DATA_DIR" in + /*) + # if an absolute path, then leave as-is + # chutney will make this directory automatically if needed + ;; + *) + # if a relative path + if [ ! -d "$CHUTNEY_DATA_DIR" ]; then + # looks like a broken path: use the chutney path as a base + export CHUTNEY_DATA_DIR="$CHUTNEY_PATH/net" + fi + if [ -d "$PWD/$CHUTNEY_DATA_DIR" ]; then + # looks like a relative path: make chutney path absolute + export CHUTNEY_DATA_DIR="$PWD/$CHUTNEY_DATA_DIR" + fi + ;; +esac NAME=$(basename "$0") DEST="$CHUTNEY_DATA_DIR/nodes" diff --git a/tools/warnings.sh b/tools/warnings.sh index b8c263d..79a135c 100755 --- a/tools/warnings.sh +++ b/tools/warnings.sh @@ -23,14 +23,23 @@ if [ -d "$PWD/$CHUTNEY_PATH" ] && [ -x "$PWD/$CHUTNEY_PATH/chutney" ]; then fi # Get a working net path -if [ ! -d "$CHUTNEY_DATA_DIR" ]; then - # looks like a broken path: use the chutney path as a base - export CHUTNEY_DATA_DIR="$CHUTNEY_PATH/net" -fi -if [ -d "$PWD/$CHUTNEY_DATA_DIR" ]; then - # looks like a relative path: make chutney path absolute - export CHUTNEY_DATA_DIR="$PWD/$CHUTNEY_DATA_DIR" -fi +case "$CHUTNEY_DATA_DIR" in + /*) + # if an absolute path, then leave as-is + # chutney will make this directory automatically if needed + ;; + *) + # if a relative path + if [ ! -d "$CHUTNEY_DATA_DIR" ]; then + # looks like a broken path: use the chutney path as a base + export CHUTNEY_DATA_DIR="$CHUTNEY_PATH/net" + fi + if [ -d "$PWD/$CHUTNEY_DATA_DIR" ]; then + # looks like a relative path: make chutney path absolute + export CHUTNEY_DATA_DIR="$PWD/$CHUTNEY_DATA_DIR" + fi + ;; +esac show_warnings() { # Work out the file and filter settings

1 0

[chutney/master] Merge remote-tracking branch 'tor-github/pr/47'
by teor＠torproject.org 23 Jan '20

23 Jan '20

commit 3ad3b906c1ec798ddac58ba9ffa3737fad595209 Merge: 2cd77aa 633f374 Author: teor <teor(a)torproject.org> Date: Fri Jan 24 10:25:54 2020 +1000 Merge remote-tracking branch 'tor-github/pr/47' tools/bootstrap-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[chutney/master] Updated usage comments in 'bootstrap-network.sh'
by teor＠torproject.org 23 Jan '20

23 Jan '20

commit 633f3740d3ea256ff4b562876b55a0cac799520d Author: Steven Engler <sengler(a)uwaterloo.ca> Date: Tue Jan 21 23:29:22 2020 -0500 Updated usage comments in 'bootstrap-network.sh' The usage comment now correctly describes the default network flavour started by the script. --- tools/bootstrap-network.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh index 34db0f3..64d644b 100755 --- a/tools/bootstrap-network.sh +++ b/tools/bootstrap-network.sh @@ -10,7 +10,7 @@ # Usage: # tools/bootstrap-network.sh [network-flavour] # network-flavour: one of the files in the networks directory, -# (default: 'basic') +# (default: 'bridges+hs-v2') # # Get a working chutney path

1 0

[chutney/master] Merge remote-tracking branch 'tor-github/pr/48'
by teor＠torproject.org 23 Jan '20

23 Jan '20

commit 733c44581faa3356740f75f78dfdefc3015d0d8d Merge: 3ad3b90 09dc71a Author: teor <teor(a)torproject.org> Date: Fri Jan 24 10:26:11 2020 +1000 Merge remote-tracking branch 'tor-github/pr/48' lib/chutney/TorNet.py | 6 +++++- tools/bootstrap-network.sh | 25 +++++++++++++++++-------- tools/hsaddress.sh | 25 +++++++++++++++++-------- tools/warnings.sh | 25 +++++++++++++++++-------- 4 files changed, 56 insertions(+), 25 deletions(-)

1 0

[chutney/master] TorNet: CHUTNEY_TOR and CHUTNEY_TOR_GENCERT are binary paths
by teor＠torproject.org 23 Jan '20

23 Jan '20

commit ab43124c15b38d874d959c918b1403430d071297 Author: teor <teor(a)torproject.org> Date: Fri Jan 24 10:59:35 2020 +1000 TorNet: CHUTNEY_TOR and CHUTNEY_TOR_GENCERT are binary paths (Not directory paths.) Fixes 33041. --- lib/chutney/TorNet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 1a38a24..c94cd8a 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -211,7 +211,7 @@ def _warnMissingTor(tor_path, cmdline, tor_name="tor"): """Log a warning that the binary tor_name can't be found at tor_path while running cmdline. """ - help_msg_fmt = "Set the '{}' environment variable to the directory containing '{}'." + help_msg_fmt = "Set the '{}' environment variable to the path of '{}'." help_msg = "" if tor_name == "tor": help_msg = help_msg_fmt.format("CHUTNEY_TOR", tor_name)

1 0