May 2019 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'tor-github/pr/1037'
by asn＠torproject.org 29 May '19

29 May '19

commit 70553a91343e242e05e569d59584674a21d09679 Merge: 650bdca97 e2d3d4449 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed May 29 21:25:32 2019 +0300 Merge branch 'tor-github/pr/1037' Makefile.am | 31 +++- changes/ticket30539 | 4 + scripts/maint/add_c_file.py | 251 +++++++++++++++++++++++++++++++++ scripts/maint/rectify_include_paths.py | 13 +- scripts/maint/updateCopyright.pl | 6 +- 5 files changed, 296 insertions(+), 9 deletions(-)

1 0

[tor/master] Use empty torrc file when launching tor in test_rebind.py
by asn＠torproject.org 29 May '19

29 May '19

commit 93dcfc659300f9ad5277ec531612013e4b8a13d3 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Mar 13 17:53:51 2019 +0200 Use empty torrc file when launching tor in test_rebind.py --- src/test/test_rebind.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index 00e5a08be..4c41e1f43 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -82,13 +82,17 @@ if not os.path.exists(sys.argv[2]): tor_path = sys.argv[1] data_dir = sys.argv[2] +empty_torrc_path = os.path.join(data_dir, 'empty_torrc') +open(empty_torrc_path, 'w').close() + tor_process = subprocess.Popen([tor_path, '-DataDirectory', data_dir, '-ControlPort', '127.0.0.1:{}'.format(control_port), '-SOCKSPort', '127.0.0.1:{}'.format(socks_port), '-Log', 'debug stdout', '-LogTimeGranularity', '1', - '-FetchServerDescriptors', '0'], + '-FetchServerDescriptors', '0', + '-f', empty_torrc_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)

1 0

[tor/master] Merge branch 'tor-github/pr/924' into maint-0.4.0
by asn＠torproject.org 29 May '19

29 May '19

commit 00108b75d4c0f02a7fa5aba240e4b60f79bf4d1d Merge: c7f9f7e54 12b9bfc05 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed May 29 21:19:56 2019 +0300 Merge branch 'tor-github/pr/924' into maint-0.4.0 changes/ticket29702 | 4 ++++ src/test/test_key_expiration.sh | 3 ++- src/test/test_keygen.sh | 3 ++- src/test/test_rebind.py | 10 +++++++++- src/test/zero_length_keys.sh | 3 ++- 5 files changed, 19 insertions(+), 4 deletions(-)

1 0

[tor/master] test: Also avoid reading the system default torrc in integration tests
by asn＠torproject.org 29 May '19

29 May '19

commit 12b9bfc05f3a163b44f0f8b6638f027de16e622b Author: teor <teor(a)torproject.org> Date: Wed Apr 10 19:03:43 2019 +1000 test: Also avoid reading the system default torrc in integration tests Part of 29702. --- changes/ticket29702 | 6 +++--- src/test/test_key_expiration.sh | 3 ++- src/test/test_keygen.sh | 3 ++- src/test/test_rebind.py | 6 +++++- src/test/zero_length_keys.sh | 3 ++- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/changes/ticket29702 b/changes/ticket29702 index d2cacd55d..e1cc1f867 100644 --- a/changes/ticket29702 +++ b/changes/ticket29702 @@ -1,4 +1,4 @@ o Testing: - - Specify torrc path (with empty file) when launching tor from - test_rebind.py; refrain from relying on default torrc path. Resolves - issue 29702. + - Specify torrc paths (with empty files) when launching tor in + integration tests; refrain from reading user and system torrcs. + Resolves issue 29702. diff --git a/src/test/test_key_expiration.sh b/src/test/test_key_expiration.sh index cf6608634..347421060 100755 --- a/src/test/test_key_expiration.sh +++ b/src/test/test_key_expiration.sh @@ -66,10 +66,11 @@ trap "rm -rf '$DATA_DIR'" 0 DATA_DIR=`cd "${DATA_DIR}" && pwd` touch "${DATA_DIR}/empty_torrc" +touch "${DATA_DIR}/empty_defaults_torrc" QUIETLY="--hush" SILENTLY="--quiet" -TOR="${TOR_BINARY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc --DataDirectory ${DATA_DIR}" +TOR="${TOR_BINARY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 --DataDirectory ${DATA_DIR} -f ${DATA_DIR}/empty_torrc --defaults-torrc ${DATA_DIR}/empty_defaults_torrc" ##### SETUP # diff --git a/src/test/test_keygen.sh b/src/test/test_keygen.sh index 455f9e7d4..7afff271c 100755 --- a/src/test/test_keygen.sh +++ b/src/test/test_keygen.sh @@ -83,10 +83,11 @@ trap "rm -rf '$DATA_DIR'" 0 DATA_DIR=`cd "${DATA_DIR}" && pwd` touch "${DATA_DIR}/empty_torrc" +touch "${DATA_DIR}/empty_defaults_torrc" QUIETLY="--hush" SILENTLY="--quiet" -TOR="${TOR_BINARY} ${QUIETLY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc" +TOR="${TOR_BINARY} ${QUIETLY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc --defaults-torrc ${DATA_DIR}/empty_defaults_torrc" ##### SETUP # diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index 4c41e1f43..a376e62cb 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -84,6 +84,8 @@ data_dir = sys.argv[2] empty_torrc_path = os.path.join(data_dir, 'empty_torrc') open(empty_torrc_path, 'w').close() +empty_defaults_torrc_path = os.path.join(data_dir, 'empty_defaults_torrc') +open(empty_defaults_torrc_path, 'w').close() tor_process = subprocess.Popen([tor_path, '-DataDirectory', data_dir, @@ -92,7 +94,9 @@ tor_process = subprocess.Popen([tor_path, '-Log', 'debug stdout', '-LogTimeGranularity', '1', '-FetchServerDescriptors', '0', - '-f', empty_torrc_path], + '-f', empty_torrc_path, + '--defaults-torrc', empty_defaults_torrc_path, + ], stdout=subprocess.PIPE, stderr=subprocess.PIPE) diff --git a/src/test/zero_length_keys.sh b/src/test/zero_length_keys.sh index 3c61f8d46..5635bdfd8 100755 --- a/src/test/zero_length_keys.sh +++ b/src/test/zero_length_keys.sh @@ -43,10 +43,11 @@ fi trap "rm -rf '$DATA_DIR'" 0 touch "$DATA_DIR"/empty_torrc +touch "$DATA_DIR"/empty_defaults_torrc # DisableNetwork means that the ORPort won't actually be opened. # 'ExitRelay 0' suppresses a warning. -TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc" +TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc --defaults-torrc $DATA_DIR/empty_defaults_torrc" if [ -s "$DATA_DIR"/keys/secret_id_key ] && [ -s "$DATA_DIR"/keys/secret_onion_key ] && [ -s "$DATA_DIR"/keys/secret_onion_key_ntor ]; then

1 0

[tor/master] Add changes file
by asn＠torproject.org 29 May '19

29 May '19

commit acec0192c3d6400316037cdc3e4c9093c1919252 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Mar 13 18:51:41 2019 +0200 Add changes file --- changes/ticket29702 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket29702 b/changes/ticket29702 new file mode 100644 index 000000000..d2cacd55d --- /dev/null +++ b/changes/ticket29702 @@ -0,0 +1,4 @@ + o Testing: + - Specify torrc path (with empty file) when launching tor from + test_rebind.py; refrain from relying on default torrc path. Resolves + issue 29702.

1 0

[tor/release-0.4.0] Add changes file
by asn＠torproject.org 29 May '19

29 May '19

commit acec0192c3d6400316037cdc3e4c9093c1919252 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Mar 13 18:51:41 2019 +0200 Add changes file --- changes/ticket29702 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket29702 b/changes/ticket29702 new file mode 100644 index 000000000..d2cacd55d --- /dev/null +++ b/changes/ticket29702 @@ -0,0 +1,4 @@ + o Testing: + - Specify torrc path (with empty file) when launching tor from + test_rebind.py; refrain from relying on default torrc path. Resolves + issue 29702.

1 0

[tor/master] Merge branch 'maint-0.4.0'
by asn＠torproject.org 29 May '19

29 May '19

commit 650bdca97f2bf45b27fe8ae0f9a2da5cbf36f959 Merge: 24a2352d5 00108b75d Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed May 29 21:20:02 2019 +0300 Merge branch 'maint-0.4.0' changes/ticket29702 | 4 ++++ src/test/test_key_expiration.sh | 3 ++- src/test/test_keygen.sh | 3 ++- src/test/test_rebind.py | 10 +++++++++- src/test/zero_length_keys.sh | 3 ++- 5 files changed, 19 insertions(+), 4 deletions(-) diff --cc src/test/test_key_expiration.sh index 1ed81c81c,347421060..54abb4a2f --- a/src/test/test_key_expiration.sh +++ b/src/test/test_key_expiration.sh @@@ -60,12 -60,13 +60,13 @@@ if [ ! -d "$DATA_DIR" ]; the echo "Failure: mktemp invocation result doesn't point to directory" >&2 exit 3 fi -trap "rm -rf '$DATA_DIR'" 0 +trap 'rm -rf "$DATA_DIR"' 0 # Use an absolute path for this or Tor will complain -DATA_DIR=`cd "${DATA_DIR}" && pwd` +DATA_DIR=$(cd "${DATA_DIR}" && pwd) touch "${DATA_DIR}/empty_torrc" + touch "${DATA_DIR}/empty_defaults_torrc" QUIETLY="--hush" SILENTLY="--quiet" diff --cc src/test/test_keygen.sh index 9fbf7dd57,7afff271c..cbdfd1909 --- a/src/test/test_keygen.sh +++ b/src/test/test_keygen.sh @@@ -77,12 -77,13 +77,13 @@@ if [ ! -d "$DATA_DIR" ]; the echo "Failure: mktemp invocation result doesn't point to directory" >&2 exit 3 fi -trap "rm -rf '$DATA_DIR'" 0 +trap 'rm -rf "$DATA_DIR"' 0 # Use an absolute path for this or Tor will complain -DATA_DIR=`cd "${DATA_DIR}" && pwd` +DATA_DIR=$(cd "${DATA_DIR}" && pwd) touch "${DATA_DIR}/empty_torrc" + touch "${DATA_DIR}/empty_defaults_torrc" QUIETLY="--hush" SILENTLY="--quiet" diff --cc src/test/zero_length_keys.sh index 4069148e0,5635bdfd8..1702d1124 --- a/src/test/zero_length_keys.sh +++ b/src/test/zero_length_keys.sh @@@ -40,9 -40,10 +40,10 @@@ if [ ! -d "$DATA_DIR" ]; the echo "Failure: mktemp invocation result doesn't point to directory" >&2 exit 3 fi -trap "rm -rf '$DATA_DIR'" 0 +trap 'rm -rf "$DATA_DIR"' 0 touch "$DATA_DIR"/empty_torrc + touch "$DATA_DIR"/empty_defaults_torrc # DisableNetwork means that the ORPort won't actually be opened. # 'ExitRelay 0' suppresses a warning.

1 0

[tor/release-0.4.0] Merge branch 'tor-github/pr/924' into maint-0.4.0
by asn＠torproject.org 29 May '19

29 May '19

commit 00108b75d4c0f02a7fa5aba240e4b60f79bf4d1d Merge: c7f9f7e54 12b9bfc05 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed May 29 21:19:56 2019 +0300 Merge branch 'tor-github/pr/924' into maint-0.4.0 changes/ticket29702 | 4 ++++ src/test/test_key_expiration.sh | 3 ++- src/test/test_keygen.sh | 3 ++- src/test/test_rebind.py | 10 +++++++++- src/test/zero_length_keys.sh | 3 ++- 5 files changed, 19 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by asn＠torproject.org 29 May '19

29 May '19

commit 121d271dc6db82b0c49125b7160ed320e6398682 Merge: 63e0599c5 00108b75d Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed May 29 21:20:02 2019 +0300 Merge branch 'maint-0.4.0' into release-0.4.0 changes/ticket29702 | 4 ++++ src/test/test_key_expiration.sh | 3 ++- src/test/test_keygen.sh | 3 ++- src/test/test_rebind.py | 10 +++++++++- src/test/zero_length_keys.sh | 3 ++- 5 files changed, 19 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.0] Use empty torrc file when launching tor in test_rebind.py
by asn＠torproject.org 29 May '19

29 May '19

commit 93dcfc659300f9ad5277ec531612013e4b8a13d3 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Mar 13 17:53:51 2019 +0200 Use empty torrc file when launching tor in test_rebind.py --- src/test/test_rebind.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index 00e5a08be..4c41e1f43 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -82,13 +82,17 @@ if not os.path.exists(sys.argv[2]): tor_path = sys.argv[1] data_dir = sys.argv[2] +empty_torrc_path = os.path.join(data_dir, 'empty_torrc') +open(empty_torrc_path, 'w').close() + tor_process = subprocess.Popen([tor_path, '-DataDirectory', data_dir, '-ControlPort', '127.0.0.1:{}'.format(control_port), '-SOCKSPort', '127.0.0.1:{}'.format(socks_port), '-Log', 'debug stdout', '-LogTimeGranularity', '1', - '-FetchServerDescriptors', '0'], + '-FetchServerDescriptors', '0', + '-f', empty_torrc_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)

1 0