October 2017 - tor-commits - lists.torproject.org

[webwml/master] remove temp files
by hiro＠torproject.org 27 Oct '17

27 Oct '17

commit bfe079ed8b6f348cdaabc60abeb1642402c40d2e Author: hiromipaw <hiro(a)torproject.org> Date: Fri Oct 27 19:44:41 2017 +0200 remove temp files --- include/#navigation.wmi# | 29 ----------------------------- include/.#navigation.wmi | 1 - 2 files changed, 30 deletions(-) diff --git a/include/#navigation.wmi# b/include/#navigation.wmi# deleted file mode 100644 index 456b4f04..00000000 --- a/include/#navigation.wmi# +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/wml - -## translation metadata -# Revision: $Revision: 22069 $ -# Translation-Priority: 1-high - -<: - # path link text - my @navigation = ( - 'index' , 'Home', - 'about/overview' , 'About Tor', - 'docs/documentation' , 'Documentation', - 'press/press' , 'Press', - '<blog>' , 'Blog', - '<newsletter>' , 'Newsletter', - 'about/contact' , 'Contact', - ); - my @donatenav = ( - 'index' , 'Home', - 'about/overview' , 'About Tor', - 'about/contact' , 'Contact', - ); - my @calltoaction = ( - 'download/download-easy' , 'Download', - 'getinvolved/volunteer' , 'Get Involved', - 'donate/donate-button' , 'Donate', - ); - -:> diff --git a/include/.#navigation.wmi b/include/.#navigation.wmi deleted file mode 120000 index de260ad0..00000000 --- a/include/.#navigation.wmi +++ /dev/null @@ -1 +0,0 @@ -hiro@coruscant.9885:1509102593 \ No newline at end of file

1 0

[stem/master] Skip running async tests under python 2.6
by atagar＠torproject.org 27 Oct '17

27 Oct '17

commit 70b49df22b11f9dfc18e939413d9e847996c1f11 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Oct 27 09:20:43 2017 -0700 Skip running async tests under python 2.6 Turns out importlib was added in python 2.7... Traceback (most recent call last): File "./run_tests.py", line 9, in <module> import importlib ImportError: No module named importlib This means we're losing quite a bit of test coverage under python 2.6 but... screw it. Guido rolled his eyes when I mentioned we even offered 2.6 support. It's been dead a long time. We'll continue to support python 2.6 until stem 2.0, but not gonna bend over backwards for it. This change will let us invoke our tests again. --- run_tests.py | 11 +++++++++-- stem/util/test_tools.py | 6 ++++++ test/integ/process.py | 2 +- test/task.py | 14 ++++++++++++-- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/run_tests.py b/run_tests.py index e2bc19ad..fe4a908f 100755 --- a/run_tests.py +++ b/run_tests.py @@ -6,7 +6,6 @@ Runs unit and integration tests. For usage information run this with '--help'. """ -import importlib import os import sys import threading @@ -15,6 +14,14 @@ import traceback import unittest try: + # TODO: added in python 2.7, drop check when removing 2.6 support + + import importlib + RUN_ASYNC_TESTS = true +except ImportError: + RUN_ASYNC_TESTS = False + +try: from StringIO import StringIO except ImportError: from io import StringIO @@ -194,7 +201,7 @@ def main(): async_args = test.AsyncTestArgs(default_test_dir, args.tor_path) for module_str in stem.util.test_tools.ASYNC_TESTS: - if not args.specific_test or module_str.startswith(args.specific_test): + if RUN_ASYNC_TESTS and (not args.specific_test or module_str.startswith(args.specific_test)): module = importlib.import_module(module_str.rsplit('.', 1)[0]) test_classes = [v for k, v in module.__dict__.items() if k.startswith('Test')] diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index d12ccf82..62ca1577 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -158,6 +158,9 @@ class AsyncTest(object): self._status = AsyncStatus.PENDING def run(self, *runner_args, **kwargs): + if stem.prereq._is_python_26(): + return # not supported under python 2.6 + def _wrapper(conn, runner, args): os.nice(12) @@ -199,6 +202,9 @@ class AsyncTest(object): self.result(None) def result(self, test): + if stem.prereq._is_python_26(): + return # not supported under python 2.6 + with self._process_lock: if self._status == AsyncStatus.PENDING: self.run() diff --git a/test/integ/process.py b/test/integ/process.py index 72cba38b..1c8035b5 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -45,7 +45,7 @@ PublishServerDescriptor 0 DataDirectory %s """ -TOR_CMD = None +TOR_CMD = 'tor' def random_port(): diff --git a/test/task.py b/test/task.py index 53606a19..2af92875 100644 --- a/test/task.py +++ b/test/task.py @@ -22,7 +22,6 @@ +- PYCODESTYLE_TASK - style checks """ -import importlib import os import re import sys @@ -39,6 +38,14 @@ import test.output from test.output import STATUS, ERROR, NO_NL, println +try: + # TODO: remove check when dropping python 2.6 support + + import importlib + HAS_IMPORTLIB = True +except ImportError: + HAS_IMPORTLIB = False + CONFIG = stem.util.conf.config_dict('test', { 'integ.test_directory': './test/data', 'test.unit_tests': '', @@ -81,6 +88,9 @@ def _import_tests(): register if they're asynchronous. """ + if not HAS_IMPORTLIB: + return + for module in (CONFIG['test.unit_tests'].splitlines() + CONFIG['test.integ_tests'].splitlines()): importlib.import_module(module.rsplit('.', 1)[0]) @@ -217,7 +227,7 @@ class ModuleVersion(Task): def version_check(): if prereq_check is None or prereq_check(): for module in modules: - if stem.util.test_tools._module_exists(module): + if HAS_IMPORTLIB and stem.util.test_tools._module_exists(module): return importlib.import_module(module).__version__ return 'missing'

1 0

[stem/master] Loosen regex metching for python 2.6 assertions
by atagar＠torproject.org 27 Oct '17

27 Oct '17

commit e69d22fdf8003e0422fd97d4de7538947a1d2fb4 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Oct 27 09:43:47 2017 -0700 Loosen regex metching for python 2.6 assertions Python 2.6 lacks assertRaisesRegexp so we made our own handler for it. However, the assertions it did were more strict, causing failures for tests that pass with other python versions... ====================================================================== FAIL: test_get_info_address_caching ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/local/lib/python2.6/dist-packages/mock.py", line 1201, in patched return func(*args, **keywargs) File "/home/atagar/Desktop/stem/test/unit/control/controller.py", line 61, in test_get_info_address_caching self.assertRaisesRegexp(stem.ProtocolError, 'Address unknown', self.controller.get_info, 'address') File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 270, in assertRaisesRegexp self.assertTrue(re.match(exc_msg, str(exc))) AssertionError --- stem/util/test_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/util/test_tools.py b/stem/util/test_tools.py index 62ca1577..c6e2b304 100644 --- a/stem/util/test_tools.py +++ b/stem/util/test_tools.py @@ -273,7 +273,7 @@ class TimedTestRunner(unittest.TextTestRunner): func(*args, **kwargs) self.fail('Expected a %s to be raised but nothing was' % exc_type) except exc_type as exc: - self.assertTrue(re.match(exc_msg, str(exc))) + self.assertTrue(re.search(exc_msg, str(exc), re.MULTILINE)) else: return super(original_type, self).assertRaisesRegexp(exc_type, exc_msg, func, *args, **kwargs)

1 0

[tor/master] Only prototype rust_welcome_string() when it exists.
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit 5e52beceb080864a0dfb570d9c8d1d10ccac3e88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 13:03:24 2017 -0400 Only prototype rust_welcome_string() when it exists. --- src/or/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index b9d261e09..bc47c9eb2 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -127,9 +127,11 @@ void evdns_shutdown(int); +#ifdef HAVE_RUST // helper function defined in Rust to output a log message indicating if tor is // running with Rust enabled. See src/rust/tor_util char *rust_welcome_string(void); +#endif /********* PROTOTYPES **********/

1 0

[tor/master] [rust] Avoid a clone in contract_protocol_list()
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit 69502942b00ecc944437894b40b286cbfa3df928 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 13:02:14 2017 -0400 [rust] Avoid a clone in contract_protocol_list() --- src/rust/protover/protover.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 11e9d0079..f19f7972f 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -429,8 +429,9 @@ fn find_range(list: &Vec<u32>) -> (bool, u32) { /// A `String` representation of this set in ascending order. /// fn contract_protocol_list<'a>(supported_set: &'a HashSet<u32>) -> String { - let mut supported_clone = supported_set.clone(); - let mut supported: Vec<u32> = supported_clone.drain().collect(); + let mut supported: Vec<u32> = supported_set.iter() + .map(|x| *x) + .collect(); supported.sort(); let mut final_output: Vec<String> = Vec::new();

1 0

[tor/master] [rust] Add "unsafe" to the testing-mode tor_malloc_ wrapper.
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit 1e66ab363a561c3b419269eca8f7e92346718075 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 12:49:51 2017 -0400 [rust] Add "unsafe" to the testing-mode tor_malloc_ wrapper. This change lets us remove the allow(unused_unsafe) directive from allocate_and_copy_string(). --- src/rust/tor_allocate/tor_allocate.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/rust/tor_allocate/tor_allocate.rs b/src/rust/tor_allocate/tor_allocate.rs index 8a6fabe9c..359df1cd7 100644 --- a/src/rust/tor_allocate/tor_allocate.rs +++ b/src/rust/tor_allocate/tor_allocate.rs @@ -12,9 +12,9 @@ extern "C" { // Defined only for tests, used for testing purposes, so that we don't need // to link to tor C files. Uses the system allocator #[cfg(test)] -extern "C" fn tor_malloc_(size: usize) -> *mut c_void { +unsafe extern "C" fn tor_malloc_(size: usize) -> *mut c_void { use libc::malloc; - unsafe { malloc(size) } + malloc(size) } /// Allocate memory using tor_malloc_ and copy an existing string into the @@ -28,10 +28,6 @@ extern "C" fn tor_malloc_(size: usize) -> *mut c_void { /// /// A `*mut c_char` that should be freed by tor_free in C /// -/// Allow unused unsafe as at compile-time, we get warnings that unsafe is not -/// needed even though this calls tor_malloc in C. -/// -#[allow(unused_unsafe)] pub fn allocate_and_copy_string(src: &String) -> *mut c_char { let bytes: &[u8] = src.as_bytes();

1 0

[tor/master] Add a build-rust alias to just rebuild the rust code.
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit 6e08807b543bad89be4de72ab73c0c2c5997aac7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 12:52:07 2017 -0400 Add a build-rust alias to just rebuild the rust code. --- src/rust/tor_rust/include.am | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am index f3b0748ba..90f37a9f1 100644 --- a/src/rust/tor_rust/include.am +++ b/src/rust/tor_rust/include.am @@ -15,4 +15,10 @@ distclean-rust: $(CARGO) clean --quiet $(CARGO_ONLINE) ) rm -rf "$(abs_top_builddir)/src/rust/registry" +if USE_RUST +build-rust: src/rust/target/release/@TOR_RUST_STATIC_NAME@ +else +build-rust: +endif + FORCE:

1 0

[tor/master] Allow test_rust.sh to run from outside the makefile
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit 12f58b42a8adfeee09b140819819eee4108e22d8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 12:54:52 2017 -0400 Allow test_rust.sh to run from outside the makefile (This is just a matter of making sure that we handle the case where abs_top_builddir is not set) --- src/test/test_rust.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 50740fd18..8d7900e1d 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -5,9 +5,11 @@ crates="protover tor_util smartlist tor_allocate" exitcode=0 +set -e + for crate in $crates; do cd "${abs_top_srcdir:-.}/src/rust/${crate}" - CARGO_TARGET_DIR="${abs_top_builddir}/src/rust/target" CARGO_HOME="${abs_top_builddir}/src/rust" "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1 + CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1 cd - done

1 0

[tor/master] forward-port the 0.3.2.3-alpha changelog
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit d64297e4e0c08c26502078cb7ee2815f9d2f8049 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 12:36:14 2017 -0400 forward-port the 0.3.2.3-alpha changelog --- ChangeLog | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/ChangeLog b/ChangeLog index ac517ca75..c77d5a570 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,102 @@ +Changes in version 0.3.2.3-alpha - 2017-10-27 + Tor 0.3.2.3-alpha is the third release in the 0.3.2 series. It fixes + numerous small bugs in earlier versions of 0.3.2.x, and adds a new + directory authority, Bastet. + + o Directory authority changes: + - Add "Bastet" as a ninth directory authority to the default list. + Closes ticket 23910. + - The directory authority "Longclaw" has changed its IP address. + Closes ticket 23592. + + o Minor features (bridge): + - Bridge relays can now set the BridgeDistribution config option to + add a "bridge-distribution-request" line to their bridge + descriptor, which tells BridgeDB how they'd like their bridge + address to be given out. (Note that as of Oct 2017, BridgeDB does + not yet implement this feature.) As a side benefit, this feature + provides a way to distinguish bridge descriptors from non-bridge + descriptors. Implements tickets 18329. + + o Minor features (client, entry guards): + - Improve log messages when missing descriptors for primary guards. + Resolves ticket 23670. + + o Minor features (geoip): + - Update geoip and geoip6 to the October 4 2017 Maxmind GeoLite2 + Country database. + + o Minor bugfixes (bridge): + - Overwrite the bridge address earlier in the process of retrieving + its descriptor, to make sure we reach it on the configured + address. Fixes bug 20532; bugfix on 0.2.0.10-alpha. + + o Minor bugfixes (documentation): + - Document better how to read gcov, and what our gcov postprocessing + scripts do. Fixes bug 23739; bugfix on 0.2.9.1-alpha. + + o Minor bugfixes (entry guards): + - Tor now updates its guard state when it reads a consensus + regardless of whether it's missing descriptors. That makes tor use + its primary guards to fetch descriptors in some edge cases where + it would previously have used fallback directories. Fixes bug + 23862; bugfix on 0.3.0.1-alpha. + + o Minor bugfixes (hidden service client): + - When handling multiple SOCKS request for the same .onion address, + only fetch the service descriptor once. + - When a descriptor fetch fails with a non-recoverable error, close + all pending SOCKS requests for that .onion. Fixes bug 23653; + bugfix on 0.3.2.1-alpha. + + o Minor bugfixes (hidden service): + - Always regenerate missing hidden service public key files. Prior + to this, if the public key was deleted from disk, it wouldn't get + recreated. Fixes bug 23748; bugfix on 0.3.2.2-alpha. Patch + from "cathugger". + - Make sure that we have a usable ed25519 key when the intro point + relay supports ed25519 link authentication. Fixes bug 24002; + bugfix on 0.3.2.1-alpha. + + o Minor bugfixes (hidden service, v2): + - When reloading configured hidden services, copy all information + from the old service object. Previously, some data was omitted, + causing delays in descriptor upload, and other bugs. Fixes bug + 23790; bugfix on 0.2.1.9-alpha. + + o Minor bugfixes (memory safety, defensive programming): + - Clear the target address when node_get_prim_orport() returns + early. Fixes bug 23874; bugfix on 0.2.8.2-alpha. + + o Minor bugfixes (relay): + - Avoid a BUG warning when receiving a dubious CREATE cell while an + option transition is in progress. Fixes bug 23952; bugfix + on 0.3.2.1-alpha. + + o Minor bugfixes (testing): + - Adjust the GitLab CI configuration to more closely match that of + Travis CI. Fixes bug 23757; bugfix on 0.3.2.2-alpha. + - Prevent scripts/test/coverage from attempting to move gcov output + to the root directory. Fixes bug 23741; bugfix on 0.2.5.1-alpha. + - When running unit tests as root, skip a test that would fail + because it expects a permissions error. This affects some + continuous integration setups. Fixes bug 23758; bugfix + on 0.3.2.2-alpha. + - Stop unconditionally mirroring the tor repository in GitLab CI. + This prevented developers from enabling GitLab CI on master. Fixes + bug 23755; bugfix on 0.3.2.2-alpha. + - Fix the hidden service v3 descriptor decoding fuzzing to use the + latest decoding API correctly. Fixes bug 21509; bugfix + on 0.3.2.1-alpha. + + o Minor bugfixes (warnings): + - When we get an HTTP request on a SOCKS port, tell the user about + the new HTTPTunnelPort option. Previously, we would give a "Tor is + not an HTTP Proxy" message, which stopped being true when + HTTPTunnelPort was introduced. Fixes bug 23678; bugfix + on 0.3.2.1-alpha. + + Changes in version 0.2.5.15 - 2017-10-25 Tor 0.2.5.15 backports a collection of bugfixes from later Tor release series. It also adds a new directory authority, Bastet.

1 0

[tor/master] Make distcleancheck pass with --enable-rust
by nickm＠torproject.org 27 Oct '17

27 Oct '17

commit 3a364529a49257aaa3710499874bde84fb6b0d06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 27 12:35:13 2017 -0400 Make distcleancheck pass with --enable-rust --- Makefile.am | 5 +++++ src/rust/tor_rust/include.am | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/Makefile.am b/Makefile.am index 137fb1edc..3445fc064 100644 --- a/Makefile.am +++ b/Makefile.am @@ -246,3 +246,8 @@ mostlyclean-local: clean-local: rm -rf $(top_builddir)/src/rust/target rm -rf $(top_builddir)/src/rust/.cargo/registry + +if USE_RUST +distclean-local: distclean-rust +endif + diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am index 6bfec77fb..f3b0748ba 100644 --- a/src/rust/tor_rust/include.am +++ b/src/rust/tor_rust/include.am @@ -8,4 +8,11 @@ src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE CARGO_HOME="$(abs_top_builddir)/src/rust" \ $(CARGO) build --release --quiet $(CARGO_ONLINE) ) +distclean-rust: + ( cd "$(abs_top_srcdir)/src/rust/tor_rust" ; \ + CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ + CARGO_HOME="$(abs_top_builddir)/src/rust" \ + $(CARGO) clean --quiet $(CARGO_ONLINE) ) + rm -rf "$(abs_top_builddir)/src/rust/registry" + FORCE:

1 0