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

[tor/master] Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit dcb8cad4e65022820c1660838e72b5b5ea67f850 Merge: a742a80ee d761c3ca6 Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:51:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5 .travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --cc .travis.yml index 3c0a3a02a,a1a48baff..861b37f08 --- a/.travis.yml +++ b/.travis.yml @@@ -70,7 -70,17 +70,11 @@@ matrix ## Careful! We use global envs, which makes it hard to exclude or ## allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… + allow_failures: + ## test-stem sometimes hangs on Travis + - env: TEST_STEM="yes" + exclude: - ## Clang doesn't work in containerized builds, see below. - - compiler: clang - sudo: false - ## Non-containerized gcc are slow and redundant. - - compiler: gcc - sudo: required ## gcc on OSX is less useful, because the default compiler is clang. - compiler: gcc os: osx

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit 4ca18fde93642976da326e207e62791780aad56f Merge: c8447f95e dcb8cad4e Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:52:27 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0

1 0

[tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit 2779ce1f6fbcb9a80284246593758e5fce71d718 Merge: 5b07ff401 4ca18fde9 Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:52:36 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1

1 0

[tor/master] Merge branch 'maint-0.4.1'
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit e9f1e975df89bbb08fb183ede5629e4025b44c44 Merge: cfa943f14 2779ce1f6 Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:52:40 2019 +1000 Merge branch 'maint-0.4.1'

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit a742a80eeaf12e238c5b2e9eb06d8edbc8797c2b Merge: 202ccc393 be0a4be27 Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:51:37 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5 .travis.yml | 2 ++ changes/bug30713 | 5 +++++ src/test/test_rebind.py | 7 +++++++ src/test/test_rebind.sh | 4 ++-- 4 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.5] test: Also avoid reading the system default torrc in integration tests
by teor＠torproject.org 11 Jun '19

11 Jun '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/maint-0.3.5] Travis: remove sudo configuration
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit 5c00b25c0e63380ec175353f8f389d9bede31a5a Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Apr 24 13:29:23 2019 +0300 Travis: remove sudo configuration See: https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migrati… --- .travis.yml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89040d822..d8faafec0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ env: - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true matrix: - ## include creates builds with gcc, linux, sudo: false + ## include creates builds with gcc, linux include: ## We include a single coverage build with the best options for coverage - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" @@ -71,12 +71,6 @@ matrix: ## allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… exclude: - ## Clang doesn't work in containerized builds, see below. - - compiler: clang - sudo: false - ## Non-containerized gcc are slow and redundant. - - compiler: gcc - sudo: required ## gcc on OSX is less useful, because the default compiler is clang. - compiler: gcc os: osx @@ -92,20 +86,6 @@ matrix: ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" -## We don't need sudo. (The "apt:" stanza after this allows us to not need -## sudo; otherwise, we would need it for getting dependencies.) -## -## But we use "sudo: required" to force non-containerized builds, working -## around a Travis CI environment issue: clang LeakAnalyzer fails -## because it requires ptrace and the containerized environment no -## longer allows ptrace. -## https://github.com/travis-ci/travis-ci/issues/9033 -## -## In the matrix above, we exclude redundant combinations. -sudo: - - false - - required - ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty

1 0

[tor/maint-0.3.5] Use empty torrc file when launching tor in test_rebind.py
by teor＠torproject.org 11 Jun '19

11 Jun '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/maint-0.3.5] Add changes file
by teor＠torproject.org 11 Jun '19

11 Jun '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/maint-0.3.5] Travis: Show stem's tor log after failure
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit 9a97b5ff56fc6f29d93ee515eb7244fe4db34c66 Author: teor <teor(a)torproject.org> Date: Mon Apr 22 11:48:07 2019 +1000 Travis: Show stem's tor log after failure Closes ticket 30234. --- .travis.yml | 1 + changes/ticket30234 | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 89040d822..1b04fa48f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -225,6 +225,7 @@ after_failure: ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi + - if [[ "$TEST_STEM" != "" ]]; then cat "$STEM_SOURCE_DIR"/test/data/tor_log || echo "cat failed"; fi before_cache: ## Delete all gcov files. diff --git a/changes/ticket30234 b/changes/ticket30234 new file mode 100644 index 000000000..5a0076bad --- /dev/null +++ b/changes/ticket30234 @@ -0,0 +1,2 @@ + o Testing (continuous integration): + - In Travis, show stem's tor log after failure. Closes ticket 30234.

1 0