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

[tor/maint-0.3.5] Add changes file
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit 6b2d8b1a7c81cce0ee357ba74e494f1438ef3cbf Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Apr 21 21:06:57 2019 +0300 Add changes file --- changes/ticket30213 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket30213 b/changes/ticket30213 new file mode 100644 index 000000000..acb761480 --- /dev/null +++ b/changes/ticket30213 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Remove sudo configuration lines from .travis.yml as they are no longer + needed with current Travis build environment. Resolves issue 30213.

1 0

[tor/maint-0.3.5] Travis: allow the test-stem job to fail
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit d761c3ca6de62ecdced9933a0717bf3ee598b073 Author: teor <teor(a)torproject.org> Date: Mon Jun 10 19:18:35 2019 +1000 Travis: allow the test-stem job to fail Allow the test-stem job to fail in Travis, because it sometimes hangs. Fixes bug 30744; bugfix on 0.3.5.4-alpha. --- .travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 89040d822..a1a48baff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,6 +70,10 @@ 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 diff --git a/changes/bug30744 b/changes/bug30744 new file mode 100644 index 000000000..9f07d4855 --- /dev/null +++ b/changes/bug30744 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - Allow the test-stem job to fail in Travis, because it sometimes hangs. + Fixes bug 30744; bugfix on 0.3.5.4-alpha.

1 0

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

11 Jun '19

commit a58c4cc6dd905acb5ab5c29c0152e792b27dd428 Merge: cb20054cc 9a97b5ff5 Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:47:40 2019 +1000 Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5 .travis.yml | 1 + changes/ticket30234 | 2 ++ 2 files changed, 3 insertions(+)

1 0

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

11 Jun '19

commit cb20054ccda422ddf5af29d4bf5c55fa3a701e1f Merge: e5deb2bbc 12b9bfc05 Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:46:24 2019 +1000 Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5 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/maint-0.3.5] Travis: Skip test_rebind on macOS builds
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit be0a4be276c945e4e90b43ce8f784b5b75bef122 Author: teor <teor(a)torproject.org> Date: Mon Jun 10 18:59:02 2019 +1000 Travis: Skip test_rebind on macOS builds Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable is set. Skip test_rebind on macOS in Travis builds, because it is unreliable on macOS on Travis. Fixes bug 30713; bugfix on 0.3.5.1-alpha. --- .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(-) diff --git a/.travis.yml b/.travis.yml index 89040d822..3a9715b25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -204,6 +204,8 @@ install: - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: + # Skip test_rebind on macOS + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - echo "Configure flags are $CONFIGURE_FLAGS" diff --git a/changes/bug30713 b/changes/bug30713 new file mode 100644 index 000000000..e00b98da6 --- /dev/null +++ b/changes/bug30713 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable is + set. Fixes bug 30713; bugfix on 0.3.5.1-alpha. + - Skip test_rebind on macOS in Travis, because it is unreliable on + macOS on Travis. Fixes bug 30713; bugfix on 0.3.5.1-alpha. diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index 00e5a08be..77829ca92 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -16,6 +16,10 @@ def fail(msg): logging.error('FAIL') sys.exit(msg) +def skip(msg): + logging.warning('SKIP: {}'.format(msg)) + sys.exit(77) + def try_connecting_to_socksport(): socks_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) if socks_socket.connect_ex(('127.0.0.1', socks_port)): @@ -65,6 +69,9 @@ if sys.hexversion < 0x02070000: if sys.hexversion > 0x03000000 and sys.hexversion < 0x03010000: fail("ERROR: unsupported Python3 version (should be >= 3.1)") +if 'TOR_SKIP_TEST_REBIND' in os.environ: + skip('$TOR_SKIP_TEST_REBIND is set') + control_port = pick_random_port() socks_port = pick_random_port() diff --git a/src/test/test_rebind.sh b/src/test/test_rebind.sh index 498072de3..ea2012957 100755 --- a/src/test/test_rebind.sh +++ b/src/test/test_rebind.sh @@ -27,6 +27,6 @@ elif [ ! -d "$tmpdir" ]; then exit 3 fi -"${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/test_rebind.py" "${TESTING_TOR_BINARY}" "$tmpdir" || exitcode=1 +"${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/test_rebind.py" "${TESTING_TOR_BINARY}" "$tmpdir" -exit ${exitcode} +exit $?

1 0

[tor/maint-0.3.5] 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/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit 202ccc3930be8d93424303cc13a5c80c58c07817 Merge: a58c4cc6d 6b2d8b1a7 Author: teor <teor(a)torproject.org> Date: Tue Jun 11 14:48:52 2019 +1000 Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5 .travis.yml | 22 +--------------------- changes/ticket30213 | 3 +++ 2 files changed, 4 insertions(+), 21 deletions(-)

1 0

[tor/maint-0.3.5] 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

[chutney/master] Add a function to test whether we have ipv6 support.
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit 31c4ad44f5f124f3e69d480a1b4d99ecd86dd10e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 9 11:45:02 2019 -0400 Add a function to test whether we have ipv6 support. --- lib/chutney/Host.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/lib/chutney/Host.py b/lib/chutney/Host.py new file mode 100644 index 0000000..75573d6 --- /dev/null +++ b/lib/chutney/Host.py @@ -0,0 +1,20 @@ + +import socket +import chutney.Util + +(a)chutney.Util.memoized +def is_ipv6_supported(): + """Return true iff ipv6 is supported on this host.""" + try: + s = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) + s.bind(("::1", 0)) + s.listen(128) + a = s.getsockname() + s2 = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) + s2.settimeout(1) + s2.connect(a) + return True + except socket.error: + return False + +

1 0

[chutney/master] Mark all ipv6 networks as requiring ipv6.
by teor＠torproject.org 11 Jun '19

11 Jun '19

commit 79105ffac06e96b53dd7d9c2cbbb8d947f008059 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 9 13:11:45 2019 -0400 Mark all ipv6 networks as requiring ipv6. --- networks/bridges+ipv6 | 1 + networks/bridges+ipv6+hs | 1 + networks/bridges+ipv6+hs-v2 | 1 + networks/bridges+ipv6+hs-v23 | 1 + networks/bridges+ipv6-min | 1 + networks/client-ipv6-only | 1 + networks/client-ipv6-only-md | 1 + networks/hs-client-ipv6 | 1 + networks/hs-client-ipv6-md | 1 + networks/hs-ipv6 | 1 + networks/hs-ipv6-md | 1 + networks/hs-v23-ipv6 | 1 + networks/hs-v23-ipv6-md | 1 + networks/hs-v3-ipv6 | 1 + networks/hs-v3-ipv6-md | 1 + networks/ipv6-exit-min | 1 + networks/single-onion-client-ipv6 | 1 + networks/single-onion-client-ipv6-md | 1 + networks/single-onion-ipv6 | 1 + networks/single-onion-ipv6-md | 1 + networks/single-onion-v23-ipv6 | 1 + networks/single-onion-v23-ipv6-md | 1 + networks/single-onion-v3-ipv6 | 1 + networks/single-onion-v3-ipv6-md | 1 + 24 files changed, 24 insertions(+) diff --git a/networks/bridges+ipv6 b/networks/bridges+ipv6 index 4638c82..bda054b 100644 --- a/networks/bridges+ipv6 +++ b/networks/bridges+ipv6 @@ -1,3 +1,4 @@ +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") diff --git a/networks/bridges+ipv6+hs b/networks/bridges+ipv6+hs index 16bc6ed..bf25fb0 100644 --- a/networks/bridges+ipv6+hs +++ b/networks/bridges+ipv6+hs @@ -1,3 +1,4 @@ +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") diff --git a/networks/bridges+ipv6+hs-v2 b/networks/bridges+ipv6+hs-v2 index 5b62b7c..29f3e6f 100644 --- a/networks/bridges+ipv6+hs-v2 +++ b/networks/bridges+ipv6+hs-v2 @@ -1,3 +1,4 @@ +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") diff --git a/networks/bridges+ipv6+hs-v23 b/networks/bridges+ipv6+hs-v23 index 3147085..977e93a 100644 --- a/networks/bridges+ipv6+hs-v23 +++ b/networks/bridges+ipv6+hs-v23 @@ -1,3 +1,4 @@ +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") diff --git a/networks/bridges+ipv6-min b/networks/bridges+ipv6-min index 5c4d05f..34c2063 100644 --- a/networks/bridges+ipv6-min +++ b/networks/bridges+ipv6-min @@ -1,3 +1,4 @@ +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") diff --git a/networks/client-ipv6-only b/networks/client-ipv6-only index 59d5a63..305a4a5 100644 --- a/networks/client-ipv6-only +++ b/networks/client-ipv6-only @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/client-ipv6-only-md b/networks/client-ipv6-only-md index 32f713e..77b5bbe 100644 --- a/networks/client-ipv6-only-md +++ b/networks/client-ipv6-only-md @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/hs-client-ipv6 b/networks/hs-client-ipv6 index 89c1920..a89a04c 100644 --- a/networks/hs-client-ipv6 +++ b/networks/hs-client-ipv6 @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/hs-client-ipv6-md b/networks/hs-client-ipv6-md index c93c354..fb18e70 100644 --- a/networks/hs-client-ipv6-md +++ b/networks/hs-client-ipv6-md @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/hs-ipv6 b/networks/hs-ipv6 index 33edcf9..815de7d 100644 --- a/networks/hs-ipv6 +++ b/networks/hs-ipv6 @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/hs-ipv6-md b/networks/hs-ipv6-md index c64080f..82d3f48 100644 --- a/networks/hs-ipv6-md +++ b/networks/hs-ipv6-md @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/hs-v23-ipv6 b/networks/hs-v23-ipv6 index 1154031..1d96ee9 100644 --- a/networks/hs-v23-ipv6 +++ b/networks/hs-v23-ipv6 @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/hs-v23-ipv6-md b/networks/hs-v23-ipv6-md index 7349c4a..fb7161b 100644 --- a/networks/hs-v23-ipv6-md +++ b/networks/hs-v23-ipv6-md @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/hs-v3-ipv6 b/networks/hs-v3-ipv6 index f262de3..0ea857b 100644 --- a/networks/hs-v3-ipv6 +++ b/networks/hs-v3-ipv6 @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/hs-v3-ipv6-md b/networks/hs-v3-ipv6-md index e83f351..b02822e 100644 --- a/networks/hs-v3-ipv6-md +++ b/networks/hs-v3-ipv6-md @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/ipv6-exit-min b/networks/ipv6-exit-min index 410373e..df54574 100644 --- a/networks/ipv6-exit-min +++ b/networks/ipv6-exit-min @@ -1,3 +1,4 @@ +Require("IPV6") # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") IPv6ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay-exit-v6-only.tmpl") diff --git a/networks/single-onion-client-ipv6 b/networks/single-onion-client-ipv6 index a9bcaa8..177974c 100644 --- a/networks/single-onion-client-ipv6 +++ b/networks/single-onion-client-ipv6 @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/single-onion-client-ipv6-md b/networks/single-onion-client-ipv6-md index cdd64ec..387567a 100644 --- a/networks/single-onion-client-ipv6-md +++ b/networks/single-onion-client-ipv6-md @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/single-onion-ipv6 b/networks/single-onion-ipv6 index 9535940..98f780c 100644 --- a/networks/single-onion-ipv6 +++ b/networks/single-onion-ipv6 @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/single-onion-ipv6-md b/networks/single-onion-ipv6-md index 7464e4b..c71a6ab 100644 --- a/networks/single-onion-ipv6-md +++ b/networks/single-onion-ipv6-md @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/single-onion-v23-ipv6 b/networks/single-onion-v23-ipv6 index aeef809..84be7e1 100644 --- a/networks/single-onion-v23-ipv6 +++ b/networks/single-onion-v23-ipv6 @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/single-onion-v23-ipv6-md b/networks/single-onion-v23-ipv6-md index 4450a66..bb76ed8 100644 --- a/networks/single-onion-v23-ipv6-md +++ b/networks/single-onion-v23-ipv6-md @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/single-onion-v3-ipv6 b/networks/single-onion-v3-ipv6 index c5210a4..b91f48f 100644 --- a/networks/single-onion-v3-ipv6 +++ b/networks/single-onion-v3-ipv6 @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1, diff --git a/networks/single-onion-v3-ipv6-md b/networks/single-onion-v3-ipv6-md index fc166cd..faa1527 100644 --- a/networks/single-onion-v3-ipv6-md +++ b/networks/single-onion-v3-ipv6-md @@ -1,3 +1,4 @@ +Require("IPV6") import os # By default, Authorities are not configured as exits Authority6 = Node(tag="a", authority=1, relay=1,

1 0