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

[fallback-scripts/master] requirements: Split Python 2 only requirements
by teor＠torproject.org 01 Dec '19

01 Dec '19

commit 6ce22864e02ccfc58fb5ebdfe12fd8c25e1751f3 Author: teor <teor(a)torproject.org> Date: Sun Dec 1 18:33:03 2019 +1000 requirements: Split Python 2 only requirements Part of 28863. --- requirements-python2.txt | 2 ++ requirements.txt | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements-python2.txt b/requirements-python2.txt new file mode 100644 index 0000000..e86c4bc --- /dev/null +++ b/requirements-python2.txt @@ -0,0 +1,2 @@ +-r requirements.txt +py2-ipaddress diff --git a/requirements.txt b/requirements.txt index 17b94f9..31ee04a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ -py2-ipaddress python-dateutil stem

1 0

[fallback-scripts/master] Travis: Add a macOS python 3 build
by teor＠torproject.org 01 Dec '19

01 Dec '19

commit 6d57156c1c7a7f1472dd90e0de72cff055e634df Author: teor <teor(a)torproject.org> Date: Sun Dec 1 18:50:28 2019 +1000 Travis: Add a macOS python 3 build Part of 28863. --- .travis.yml | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index a0ab3f0..12ab9fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,15 @@ os: - linux ## We also run a single macOS job with python 2.7 +## Default env vars +env: + global: + ## Most builds use "pip" as the pip command name + - PIP="pip" + matrix: + ## This matrix entry is required, but it doesn't actually create any jobs + - + ## We don't use the build matrix cross-product, because it makes too many jobs ## Instead, we list each job under matrix: include: matrix: @@ -22,6 +31,21 @@ matrix: - os: osx language: c python: + addons: + ## (macOS only) + homebrew: + packages: + ## macOS needs pip(2) from homebrew python + - python@2 + ## See ticket #30928 for more information. This key should be + ## removed at some point to speed up builds. + update: true + env: PYTHON="2.7" + - os: osx + language: c + python: + ## python 3 is already installed + env: PYTHON="3" PIP="pip3" ## Test all supported python releases ## Pre-installed in Travis Bionic: @@ -61,26 +85,18 @@ matrix: - python: "3.6" - python: "nightly" - python: "pypy3" + ## (macOS only) + - env: PYTHON="3" PIP="pip3" ## (Linux only) Use a recent Linux image (Ubuntu Bionic) dist: bionic -## (OSX only) Use a recent macOS image +## (macOS only) Use a recent macOS image ## See https://docs.travis-ci.com/user/reference/osx#os-x-version ## Default is Xcode 9.4 on macOS 10.13 as of October 2019 ## Recent is Xcode 11.2 on macOS 10.14 as of October 2019 osx_image: xcode11.2 -addons: - ## (macOS only) - homebrew: - packages: - ## macOS needs pip(2) from homebrew python - - python@2 - ## See ticket #30928 for more information. This key should be removed at - ## some point to speed up builds. - update: true - install: ## List installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi @@ -89,11 +105,11 @@ install: ## Are we running python 2? - if python --version 2>&1 | cut -d" " -f2 | grep -q '2[.]'; then PY2=1; else PY2= ; fi ## We could install stem's dependencies, but they are all optional - - pip install -U pip - - pip install -r requirements.txt - - if [[ "$PY2" ]]; then pip install -r requirements-python2.txt; fi + - $PIP install -U pip + - $PIP install -r requirements.txt + - if [[ "$PY2" ]]; then $PIP install -r requirements-python2.txt; fi ## Now list installed python package versions - - pip list + - $PIP list script: ## Run some fallback-scripts tests

1 0

[fallback-scripts/master] Travis: Conditionally install Python 2 requirements
by teor＠torproject.org 01 Dec '19

01 Dec '19

commit de866052a5f686a8d4275c4a0fcee433ac906168 Author: teor <teor(a)torproject.org> Date: Sun Dec 1 18:33:47 2019 +1000 Travis: Conditionally install Python 2 requirements Part of 28863. --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cbb90f2..a0ab3f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,10 +86,13 @@ install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi - python --version + ## Are we running python 2? + - if python --version 2>&1 | cut -d" " -f2 | grep -q '2[.]'; then PY2=1; else PY2= ; fi ## We could install stem's dependencies, but they are all optional - pip install -U pip - pip install -r requirements.txt - # Now list installed python package versions + - if [[ "$PY2" ]]; then pip install -r requirements-python2.txt; fi + ## Now list installed python package versions - pip list script:

1 0

[fallback-scripts/master] Travis: Use python3 command on macOS
by teor＠torproject.org 01 Dec '19

01 Dec '19

commit 20917a861e9fef2f10e50e1579ac3987806008a6 Author: teor <teor(a)torproject.org> Date: Sun Dec 1 19:05:42 2019 +1000 Travis: Use python3 command on macOS Part of 28863. --- .travis.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 12ab9fd..54670e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,8 @@ os: ## Default env vars env: global: - ## Most builds use "pip" as the pip command name + ## Most builds use the standard command names + - PYTHON="python" - PIP="pip" matrix: ## This matrix entry is required, but it doesn't actually create any jobs @@ -40,12 +41,11 @@ matrix: ## See ticket #30928 for more information. This key should be ## removed at some point to speed up builds. update: true - env: PYTHON="2.7" - os: osx language: c python: - ## python 3 is already installed - env: PYTHON="3" PIP="pip3" + ## python 3 is already installed, under these names + env: PYTHON="python3" PIP="pip3" ## Test all supported python releases ## Pre-installed in Travis Bionic: @@ -86,7 +86,7 @@ matrix: - python: "nightly" - python: "pypy3" ## (macOS only) - - env: PYTHON="3" PIP="pip3" + - env: PYTHON="python3" PIP="pip3" ## (Linux only) Use a recent Linux image (Ubuntu Bionic) dist: bionic @@ -101,9 +101,9 @@ install: ## List installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi - - python --version + - $PYTHON --version ## Are we running python 2? - - if python --version 2>&1 | cut -d" " -f2 | grep -q '2[.]'; then PY2=1; else PY2= ; fi + - if $PYTHON --version 2>&1 | cut -d" " -f2 | grep -q '2[.]'; then PY2=1; else PY2= ; fi ## We could install stem's dependencies, but they are all optional - $PIP install -U pip - $PIP install -r requirements.txt @@ -115,13 +115,13 @@ script: ## Run some fallback-scripts tests ## moria1, Serge, no caches extra info, no dir port, doesn't exist ## TODO: validate output from all 3 commands using grep, grep, and stem? - - ./generateFallbackDirLine.py 9695DFC35FFEB861329B9F1AB04C46397020CE31 BA44A889E64B93FAA2B114E02C2A279A8555C533 001524DD403D729F08F7E5D77813EF12756CFA8D 5AFAC3D00E97D6733112CC9CA2A788691FA87125 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - - ./lookupFallbackDirContact.py 9695DFC35FFEB861329B9F1AB04C46397020CE31 BA44A889E64B93FAA2B114E02C2A279A8555C533 001524DD403D729F08F7E5D77813EF12756CFA8D 5AFAC3D00E97D6733112CC9CA2A788691FA87125 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + - $PYTHON generateFallbackDirLine.py 9695DFC35FFEB861329B9F1AB04C46397020CE31 BA44A889E64B93FAA2B114E02C2A279A8555C533 001524DD403D729F08F7E5D77813EF12756CFA8D 5AFAC3D00E97D6733112CC9CA2A788691FA87125 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + - $PYTHON lookupFallbackDirContact.py 9695DFC35FFEB861329B9F1AB04C46397020CE31 BA44A889E64B93FAA2B114E02C2A279A8555C533 001524DD403D729F08F7E5D77813EF12756CFA8D 5AFAC3D00E97D6733112CC9CA2A788691FA87125 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ## If we get the top 200 relays from Onionoo, we generate a list with about ## 10 fallbacks - export TOR_FB_ONIONOO_LIMIT=200 ## Hide info-level logs - - ./updateFallbackDirs.py 2>&1 | tee -a fallback.log | grep -v "INFO::" + - $PYTHON updateFallbackDirs.py 2>&1 | tee -a fallback.log | grep -v "INFO::" after_failure: ## Show all the output, including info-level logs

1 0

[tor/master] control: Rename a function variable
by teor＠torproject.org 01 Dec '19

01 Dec '19

commit 7a69b3aebc2d1aebc6851ac742c20acb574f78ea Author: teor <teor(a)torproject.org> Date: Fri Nov 29 10:53:32 2019 +1000 control: Rename a function variable Cleanup after 31531. --- src/feature/control/control_events.c | 10 +++++----- src/feature/control/control_events.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index 02e30f66d..fb3410b89 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -1771,19 +1771,19 @@ control_event_guard(const char *nickname, const char *digest, } /** Called when a configuration option changes. This is generally triggered - * by SETCONF requests and RELOAD/SIGHUP signals. The elements is + * by SETCONF requests and RELOAD/SIGHUP signals. The changes are * a smartlist_t containing (key, value, ...) pairs in sequence. - * value can be NULL. */ + * changes can be NULL. */ int -control_event_conf_changed(const config_line_t *elements) +control_event_conf_changed(const config_line_t *changes) { char *result; smartlist_t *lines; - if (!EVENT_IS_INTERESTING(EVENT_CONF_CHANGED) || !elements) { + if (!EVENT_IS_INTERESTING(EVENT_CONF_CHANGED) || !changes) { return 0; } lines = smartlist_new(); - for (const config_line_t *line = elements; line; line = line->next) { + for (const config_line_t *line = changes; line; line = line->next) { if (line->value == NULL) { smartlist_add_asprintf(lines, "650-%s", line->key); } else { diff --git a/src/feature/control/control_events.h b/src/feature/control/control_events.h index 3e9192fcc..833727a49 100644 --- a/src/feature/control/control_events.h +++ b/src/feature/control/control_events.h @@ -158,7 +158,7 @@ int control_event_server_error(const char *format, ...) int control_event_guard(const char *nickname, const char *digest, const char *status); -int control_event_conf_changed(const struct config_line_t *elements); +int control_event_conf_changed(const struct config_line_t *changes); int control_event_buildtimeout_set(buildtimeout_set_event_t type, const char *args); int control_event_signal(uintptr_t signal);

1 0

[tor/master] Make control_event_conf_changed() take a config_line_t
by teor＠torproject.org 01 Dec '19

01 Dec '19

commit 99cf3f99c02752f8d6d89fe94272454c55285b66 Author: Neel Chauhan <neel(a)neelc.org> Date: Tue Nov 26 20:57:33 2019 -0500 Make control_event_conf_changed() take a config_line_t --- changes/bug31531 | 4 ++++ src/app/config/config.c | 8 +------- src/feature/control/control_events.c | 17 +++++++---------- src/feature/control/control_events.h | 3 ++- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/changes/bug31531 b/changes/bug31531 new file mode 100644 index 000000000..c549c79ec --- /dev/null +++ b/changes/bug31531 @@ -0,0 +1,4 @@ + o Minor bugfixes (configuration handling): + - Make control_event_conf_changed() take in a config_line_t instead of + a smartlist(k, v, k, v, ...) where keys are followed by values. Fixes + bug 31531; bugfix on 0.2.3.3-alpha. Patch by Neel Chauhan. diff --git a/src/app/config/config.c b/src/app/config/config.c index 34f20c31c..5ea8cec6a 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -1001,15 +1001,9 @@ set_options(or_options_t *new_val, char **msg) /* Issues a CONF_CHANGED event to notify controller of the change. If Tor is * just starting up then the old_options will be undefined. */ if (old_options && old_options != global_options) { - smartlist_t *elements = smartlist_new(); config_line_t *changes = config_get_changes(get_options_mgr(), old_options, new_val); - for (config_line_t *line = changes; line; line = line->next) { - smartlist_add(elements, line->key); - smartlist_add(elements, line->value); - } - control_event_conf_changed(elements); - smartlist_free(elements); + control_event_conf_changed(changes); config_free_lines(changes); } diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index f88bcfdb9..02e30f66d 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -38,6 +38,7 @@ #include "core/or/origin_circuit_st.h" #include "lib/evloop/compat_libevent.h" +#include "lib/encoding/confline.h" static void flush_queued_events_cb(mainloop_event_t *event, void *arg); static void control_get_bytes_rw_last_sec(uint64_t *r, uint64_t *w); @@ -1774,23 +1775,19 @@ control_event_guard(const char *nickname, const char *digest, * a smartlist_t containing (key, value, ...) pairs in sequence. * value can be NULL. */ int -control_event_conf_changed(const smartlist_t *elements) +control_event_conf_changed(const config_line_t *elements) { - int i; char *result; smartlist_t *lines; - if (!EVENT_IS_INTERESTING(EVENT_CONF_CHANGED) || - smartlist_len(elements) == 0) { + if (!EVENT_IS_INTERESTING(EVENT_CONF_CHANGED) || !elements) { return 0; } lines = smartlist_new(); - for (i = 0; i < smartlist_len(elements); i += 2) { - char *k = smartlist_get(elements, i); - char *v = smartlist_get(elements, i+1); - if (v == NULL) { - smartlist_add_asprintf(lines, "650-%s", k); + for (const config_line_t *line = elements; line; line = line->next) { + if (line->value == NULL) { + smartlist_add_asprintf(lines, "650-%s", line->key); } else { - smartlist_add_asprintf(lines, "650-%s=%s", k, v); + smartlist_add_asprintf(lines, "650-%s=%s", line->key, line->value); } } result = smartlist_join_strings(lines, "\r\n", 0, NULL); diff --git a/src/feature/control/control_events.h b/src/feature/control/control_events.h index 34986fdb8..b0cf429fe 100644 --- a/src/feature/control/control_events.h +++ b/src/feature/control/control_events.h @@ -13,6 +13,7 @@ #define TOR_CONTROL_EVENTS_H #include "core/or/ocirc_event.h" +#include "lib/encoding/confline.h" /** Used to indicate the type of a CIRC_MINOR event passed to the controller. * The various types are defined in control-spec.txt . */ @@ -157,7 +158,7 @@ int control_event_server_error(const char *format, ...) int control_event_guard(const char *nickname, const char *digest, const char *status); -int control_event_conf_changed(const smartlist_t *elements); +int control_event_conf_changed(const config_line_t *elements); int control_event_buildtimeout_set(buildtimeout_set_event_t type, const char *args); int control_event_signal(uintptr_t signal);

1 0

[tor/master] control: Update an outdated function comment
by teor＠torproject.org 01 Dec '19

01 Dec '19

commit 41a3930129cac293e958ccb43bcddf82a9643e29 Author: teor <teor(a)torproject.org> Date: Fri Nov 29 10:55:27 2019 +1000 control: Update an outdated function comment Cleanup after 31531. --- src/feature/control/control_events.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index 82349bc6a..ea07a896d 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -1772,8 +1772,9 @@ control_event_guard(const char *nickname, const char *digest, /** Called when a configuration option changes. This is generally triggered * by SETCONF requests and RELOAD/SIGHUP signals. The changes are - * a smartlist_t containing (key, value, ...) pairs in sequence. - * changes can be NULL. */ + * a linked list of configuration key-values. + * changes can be NULL, meaning "no changes". + */ void control_event_conf_changed(const config_line_t *changes) {

1 0

[tor/master] control: Remove an unused function return value
by teor＠torproject.org 01 Dec '19

01 Dec '19

commit f8f278f8c43358d5eb1d316008375313ddbe0fee Author: teor <teor(a)torproject.org> Date: Fri Nov 29 10:54:42 2019 +1000 control: Remove an unused function return value Cleanup after 31531. --- src/feature/control/control_events.c | 5 ++--- src/feature/control/control_events.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index fb3410b89..82349bc6a 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -1774,13 +1774,13 @@ control_event_guard(const char *nickname, const char *digest, * by SETCONF requests and RELOAD/SIGHUP signals. The changes are * a smartlist_t containing (key, value, ...) pairs in sequence. * changes can be NULL. */ -int +void control_event_conf_changed(const config_line_t *changes) { char *result; smartlist_t *lines; if (!EVENT_IS_INTERESTING(EVENT_CONF_CHANGED) || !changes) { - return 0; + return; } lines = smartlist_new(); for (const config_line_t *line = changes; line; line = line->next) { @@ -1796,7 +1796,6 @@ control_event_conf_changed(const config_line_t *changes) tor_free(result); SMARTLIST_FOREACH(lines, char *, cp, tor_free(cp)); smartlist_free(lines); - return 0; } /** We just generated a new summary of which countries we've seen clients diff --git a/src/feature/control/control_events.h b/src/feature/control/control_events.h index 833727a49..edb0e90cd 100644 --- a/src/feature/control/control_events.h +++ b/src/feature/control/control_events.h @@ -158,7 +158,7 @@ int control_event_server_error(const char *format, ...) int control_event_guard(const char *nickname, const char *digest, const char *status); -int control_event_conf_changed(const struct config_line_t *changes); +void control_event_conf_changed(const struct config_line_t *changes); int control_event_buildtimeout_set(buildtimeout_set_event_t type, const char *args); int control_event_signal(uintptr_t signal);

1 0

[tor/master] control: Remove an unnecessary header in control_events.h
by teor＠torproject.org 01 Dec '19

01 Dec '19

commit 7572988ea95fe4ae5201509a37ab06a3c3778c6d Author: teor <teor(a)torproject.org> Date: Fri Nov 29 10:50:09 2019 +1000 control: Remove an unnecessary header in control_events.h And replace it with a struct forward declaration. Also, move all the headers in the file before the forward declaration. Cleanup after 31531. --- src/feature/control/control_events.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/feature/control/control_events.h b/src/feature/control/control_events.h index b0cf429fe..3e9192fcc 100644 --- a/src/feature/control/control_events.h +++ b/src/feature/control/control_events.h @@ -13,7 +13,9 @@ #define TOR_CONTROL_EVENTS_H #include "core/or/ocirc_event.h" -#include "lib/encoding/confline.h" +#include "core/or/orconn_event.h" + +struct config_line_t; /** Used to indicate the type of a CIRC_MINOR event passed to the controller. * The various types are defined in control-spec.txt . */ @@ -22,8 +24,6 @@ typedef enum circuit_status_minor_event_t { CIRC_MINOR_EVENT_CANNIBALIZED, } circuit_status_minor_event_t; -#include "core/or/orconn_event.h" - /** Used to indicate the type of a stream event passed to the controller. * The various types are defined in control-spec.txt */ typedef enum stream_status_event_t { @@ -158,7 +158,7 @@ int control_event_server_error(const char *format, ...) int control_event_guard(const char *nickname, const char *digest, const char *status); -int control_event_conf_changed(const config_line_t *elements); +int control_event_conf_changed(const struct config_line_t *elements); int control_event_buildtimeout_set(buildtimeout_set_event_t type, const char *args); int control_event_signal(uintptr_t signal);

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1574'
by teor＠torproject.org 01 Dec '19

01 Dec '19

commit 96e620caaf11909bce704f3c55187a139595a8e9 Merge: 68a00c495 41a393012 Author: teor <teor(a)torproject.org> Date: Sun Dec 1 17:53:06 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1574' changes/bug31531 | 4 ++++ src/app/config/config.c | 8 +------- src/feature/control/control_events.c | 29 +++++++++++++---------------- src/feature/control/control_events.h | 7 ++++--- 4 files changed, 22 insertions(+), 26 deletions(-)

1 0