April 2018 - tor-commits - lists.torproject.org

[stem/master] Fix exit policy caching keys
by atagar＠torproject.org 17 Apr '18

17 Apr '18

commit ca93c11caf797546a0bd45574544b7ca9b622383 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 17 09:09:52 2018 -0700 Fix exit policy caching keys Oops, great catch from dmr on #25423. We had one spot referring to the key as 'exit_policy' and two that were 'exitpolicy'. Sandardizing on the former. --- stem/control.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/control.py b/stem/control.py index 3db4d35a..93f8fc19 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1073,7 +1073,7 @@ class Controller(BaseController): self._set_cache(dict((k, None) for k in event.config), 'getconf') if 'exitpolicy' in event.config.keys(): - self._set_cache({'exitpolicy': None}) + self._set_cache({'exit_policy': None}) self.add_event_listener(_confchanged_listener, EventType.CONF_CHANGED) @@ -2411,7 +2411,7 @@ class Controller(BaseController): to_cache[param] = value if param == 'exitpolicy': - self._set_cache({'exitpolicy': None}) + self._set_cache({'exit_policy': None}) elif 'hidden' in param: self._set_cache({'hidden_service_conf': None})

1 0

[stem/master] More eagerly invalidate our exit policy cache
by atagar＠torproject.org 17 Apr '18

17 Apr '18

commit 720164398b847dfedde9e2dc9de7a6eb85c18de8 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 17 09:19:17 2018 -0700 More eagerly invalidate our exit policy cache Lots of great points on #25423. There's several torrc options that can adjust our exit policy so simply invalidating it with any SETCONF call. It's cheap to reconstruct the ExitPolicy instance anyway. --- stem/control.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/stem/control.py b/stem/control.py index 93f8fc19..ed869a8c 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1072,8 +1072,7 @@ class Controller(BaseController): if self.is_caching_enabled(): self._set_cache(dict((k, None) for k in event.config), 'getconf') - if 'exitpolicy' in event.config.keys(): - self._set_cache({'exit_policy': None}) + self._set_cache({'exit_policy': None}) # numerous options can change our policy self.add_event_listener(_confchanged_listener, EventType.CONF_CHANGED) @@ -2410,9 +2409,7 @@ class Controller(BaseController): to_cache[param] = value - if param == 'exitpolicy': - self._set_cache({'exit_policy': None}) - elif 'hidden' in param: + if 'hidden' in param: self._set_cache({'hidden_service_conf': None}) # reset any getinfo parameters that can be changed by a SETCONF @@ -2422,6 +2419,8 @@ class Controller(BaseController): self._set_cache(to_cache, 'getconf') self._set_cache({'get_custom_options': None}) + + self._set_cache({'exit_policy': None}) # numerous options can change our policy else: log.debug('%s (failed, code: %s, message: %s)' % (query, response.code, response.message)) immutable_params = [k for k, v in params if stem.util.str_tools._to_unicode(k).lower() in IMMUTABLE_CONFIG_OPTIONS]

1 0

[stem/master] Drop message lock check from get_exit_policy
by atagar＠torproject.org 17 Apr '18

17 Apr '18

commit 142db72abfd8b2139096d41581e7cad43ac8981c Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 17 09:32:47 2018 -0700 Drop message lock check from get_exit_policy Great catch from dmr on #25423. This method is odd in that it's the only one using the BaseController's msg_lock. I can't see a reason for this either. --- stem/control.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/stem/control.py b/stem/control.py index ed869a8c..a91e9588 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1283,14 +1283,13 @@ class Controller(BaseController): An exception is only raised if we weren't provided a default response. """ - with self._msg_lock: - policy = self._get_cache('exit_policy') + policy = self._get_cache('exit_policy') - if not policy: - policy = stem.exit_policy.ExitPolicy(*self.get_info('exit-policy/full').splitlines()) - self._set_cache({'exit_policy': policy}) + if not policy: + policy = stem.exit_policy.ExitPolicy(*self.get_info('exit-policy/full').splitlines()) + self._set_cache({'exit_policy': policy}) - return policy + return policy @with_default() def get_ports(self, listener_type, default = UNDEFINED):

1 0

[stem/master] Deprecate ExitPolicy's get_config_policy function
by atagar＠torproject.org 17 Apr '18

17 Apr '18

commit 9370b14bae9daae1ec917f2cd52e2d3ea6634cd1 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 17 09:44:15 2018 -0700 Deprecate ExitPolicy's get_config_policy function Great point by dmr on #25423. Now that we're no longer attempting to make sense of the torrc this function will become less and less reliable over time. --- stem/exit_policy.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 3c13be7e..e921fb3c 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -110,6 +110,12 @@ def get_config_policy(rules, ip_address = None): * ports being optional * the 'private' keyword + .. deprecated:: 1.7.0 + + Tor's torrc parameters lack a formal spec, making it difficult for this + method to be reliable. Callers are encouraged to move to + :func:`~stem.control.Controller.get_exit_policy` instead. + :param str,list rules: comma separated rules or list to be converted :param str ip_address: this relay's IP address for the 'private' policy if it's present, this defaults to the local address

1 0

[stem/master] ExitPolicy cache fixes and related corrections
by atagar＠torproject.org 17 Apr '18

17 Apr '18

commit c305b7f6fc203568f3cb4a71ca61fb33c8e7423c Merge: 82b22046 9370b14b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 17 09:46:17 2018 -0700 ExitPolicy cache fixes and related corrections Lot of great catches from dmr on #25423. Snagging the most important ones from his branch. https://trac.torproject.org/projects/tor/ticket/25423 stem/control.py | 20 +++++++++----------- stem/exit_policy.py | 6 ++++++ 2 files changed, 15 insertions(+), 11 deletions(-)

1 0

[tor/master] Fixup timing wheel warnings related to recent WHEEL_BIT change.
by nickm＠torproject.org 17 Apr '18

17 Apr '18

commit 31fbbf2377846535848553938f6be233f3092702 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 12:45:53 2018 -0400 Fixup timing wheel warnings related to recent WHEEL_BIT change. --- src/ext/timeouts/timeout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ext/timeouts/timeout.c b/src/ext/timeouts/timeout.c index 713ec219c..d4b514d2c 100644 --- a/src/ext/timeouts/timeout.c +++ b/src/ext/timeouts/timeout.c @@ -150,7 +150,7 @@ #else #define ctz(n) ctz32(n) #define clz(n) clz32(n) -#define fls(n) ((int)(32 - clz32(n))) +#define fls(n) ((int)(32 - clz32((uint32_t)n))) #endif #if WHEEL_BIT == 6 @@ -432,7 +432,7 @@ TIMEOUT_PUBLIC void timeouts_update(struct timeouts *T, abstime_t curtime) { * or can be replaced with a simpler operation. */ oslot = WHEEL_MASK & (T->curtime >> (wheel * WHEEL_BIT)); - pending = rotl(((UINT64_C(1) << _elapsed) - 1), oslot); + pending = rotl(((WHEEL_C(1) << _elapsed) - 1), oslot); nslot = WHEEL_MASK & (curtime >> (wheel * WHEEL_BIT)); pending |= rotr(rotl(((WHEEL_C(1) << _elapsed) - 1), nslot), (int)_elapsed);

1 0

[tor/master] token bucket: Add parens to rate_per_sec_to_rate_per_step()
by nickm＠torproject.org 17 Apr '18

17 Apr '18

commit 2bf6f1cd39c102749ee518664036c90ab1dbfc9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 11:09:55 2018 -0400 token bucket: Add parens to rate_per_sec_to_rate_per_step() Typecasts bind more tightly than division, so we need to do the division first. --- src/common/token_bucket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/token_bucket.c b/src/common/token_bucket.c index d18731b0e..747189e75 100644 --- a/src/common/token_bucket.c +++ b/src/common/token_bucket.c @@ -119,7 +119,7 @@ rate_per_sec_to_rate_per_step(uint32_t rate) */ uint64_t units = (uint64_t) rate * TICKS_PER_STEP; uint32_t val = (uint32_t) - monotime_coarse_stamp_units_to_approx_msec(units) / 1000; + (monotime_coarse_stamp_units_to_approx_msec(units) / 1000); return val ? val : 1; }

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 17 Apr '18

17 Apr '18

commit ce8e7427b9284ef12b69d50d72c8fc315b90e36d Merge: 5e0fbd700 d3ff12630 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 10:47:30 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .travis.yml | 9 ++++++++- changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --cc .travis.yml index 0c0188410,dc0a8ac67..bf55b7756 --- a/.travis.yml +++ b/.travis.yml @@@ -96,7 -89,7 +96,9 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="" ++ - compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@@ -111,7 -101,8 +113,8 @@@ before_install ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above)

1 0

[tor/maint-0.2.9] Add support for the coveralls.io coverage tool in travis config
by nickm＠torproject.org 17 Apr '18

17 Apr '18

commit d3ff1263092d9ca205b5b54b77db31633bcd80b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 14:42:28 2018 -0400 Add support for the coveralls.io coverage tool in travis config Closes ticket 25818. --- .travis.yml | 9 ++++++++- changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d314c141..dc0a8ac67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,8 @@ matrix: ## entry under that key outside the "include" clause. include: - compiler: gcc + - compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@ -100,6 +102,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) @@ -113,10 +116,14 @@ install: script: - ./autogen.sh - - ./configure $RUST_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening + - ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening ## We run `make check` because that's what https://jenkins.torproject.org does. - make check after_failure: ## `make check` will leave a log file with more details of test failures. - cat test-suite.log + +after_success: + ## If this build was one that produced coverage, upload it. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi diff --git a/changes/coveralls b/changes/coveralls new file mode 100644 index 000000000..7fa69bb2b --- /dev/null +++ b/changes/coveralls @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Our Travis CI configuration now integrates with the Coveralls coverage + analysis tool. Closes ticket 25818.

1 0

[tor/maint-0.3.1] Add support for the coveralls.io coverage tool in travis config
by nickm＠torproject.org 17 Apr '18

17 Apr '18

commit d3ff1263092d9ca205b5b54b77db31633bcd80b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 14:42:28 2018 -0400 Add support for the coveralls.io coverage tool in travis config Closes ticket 25818. --- .travis.yml | 9 ++++++++- changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6d314c141..dc0a8ac67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,8 @@ matrix: ## entry under that key outside the "include" clause. include: - compiler: gcc + - compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## The "sudo: required" forces non-containerized builds, working ## around a Travis CI environment issue: clang LeakAnalyzer fails ## because it requires ptrace and the containerized environment no @@ -100,6 +102,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi ## Download rustup - curl -Ssf -o rustup.sh https://sh.rustup.rs + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi install: ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) @@ -113,10 +116,14 @@ install: script: - ./autogen.sh - - ./configure $RUST_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening + - ./configure $RUST_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules --enable-fragile-hardening ## We run `make check` because that's what https://jenkins.torproject.org does. - make check after_failure: ## `make check` will leave a log file with more details of test failures. - cat test-suite.log + +after_success: + ## If this build was one that produced coverage, upload it. + - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p'; fi diff --git a/changes/coveralls b/changes/coveralls new file mode 100644 index 000000000..7fa69bb2b --- /dev/null +++ b/changes/coveralls @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Our Travis CI configuration now integrates with the Coveralls coverage + analysis tool. Closes ticket 25818.

1 0