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

[tor/master] Coverity: fix test issues with always-present 'service' var.
by asn＠torproject.org 19 Aug '19

19 Aug '19

commit 5fa2b322005d1860d39e420cb6d3ed25f5073389 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 28 12:24:26 2019 -0400 Coverity: fix test issues with always-present 'service' var. Coverity is worried that we check "service" at the end of these test functions, since it doesn't see any way to reach the cleanup code without having first dereferenced the variable. Removing the check would be unwise in this case: instead we add a tt_assert check before using "service" so that coverity thinks that the check is doing something useful. Bugfix on 0.3.2.1-alpha. --- src/test/test_hs_common.c | 1 + src/test/test_hs_service.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index abded6021..de3f7e04f 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -502,6 +502,7 @@ test_desc_reupload_logic(void *arg) pubkey_hex, strlen(pubkey_hex)); hs_build_address(&pubkey, HS_VERSION_THREE, onion_addr); service = tor_malloc_zero(sizeof(hs_service_t)); + tt_assert(service); memcpy(service->onion_address, onion_addr, sizeof(service->onion_address)); ed25519_secret_key_generate(&service->keys.identity_sk, 0); ed25519_public_key_generate(&service->keys.identity_pk, diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index a303f1041..2e4be4e29 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1265,6 +1265,7 @@ test_service_event(void *arg) /* Set a service for this circuit. */ service = helper_create_service(); + tt_assert(service); ed25519_pubkey_copy(&circ->hs_ident->identity_pk, &service->keys.identity_pk);

1 0

[tor/master] Fix a few coverity unitinitialzed-value warnings in the unit tests.
by asn＠torproject.org 19 Aug '19

19 Aug '19

commit 68792f77e51f84d0fb6758ef9491a70570ac9a53 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 28 12:21:49 2019 -0400 Fix a few coverity unitinitialzed-value warnings in the unit tests. Coverity can't see that it is not in fact going to read uninitialized memory here, so we initialize these values unconditionally. Bugfix on 0.4.0.1-alpha. --- src/test/test_btrack.c | 4 ++++ src/test/test_controller_events.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/test/test_btrack.c b/src/test/test_btrack.c index 9e5d0d072..21e88a57b 100644 --- a/src/test/test_btrack.c +++ b/src/test/test_btrack.c @@ -44,6 +44,8 @@ test_btrack_launch(void *arg) { orconn_state_msg_t conn; ocirc_chan_msg_t circ; + memset(&conn, 0, sizeof(conn)); + memset(&circ, 0, sizeof(circ)); (void)arg; conn.gid = 1; @@ -93,6 +95,8 @@ test_btrack_delete(void *arg) { orconn_state_msg_t state; orconn_status_msg_t status; + memset(&state, 0, sizeof(state)); + memset(&status, 0, sizeof(status)); (void)arg; state.gid = 1; diff --git a/src/test/test_controller_events.c b/src/test/test_controller_events.c index a8967bba5..9fb2bc725 100644 --- a/src/test/test_controller_events.c +++ b/src/test/test_controller_events.c @@ -429,6 +429,7 @@ static void test_cntev_orconn_state(void *arg) { orconn_state_msg_t conn; + memset(&conn, 0, sizeof(conn)); (void)arg; MOCK(queue_control_event_string, mock_queue_control_event_string); @@ -468,6 +469,7 @@ static void test_cntev_orconn_state_pt(void *arg) { orconn_state_msg_t conn; + memset(&conn, 0, sizeof(conn)); (void)arg; MOCK(queue_control_event_string, mock_queue_control_event_string); @@ -503,6 +505,7 @@ static void test_cntev_orconn_state_proxy(void *arg) { orconn_state_msg_t conn; + memset(&conn, 0, sizeof(conn)); (void)arg; MOCK(queue_control_event_string, mock_queue_control_event_string);

1 0

[tor/master] Add a changes file for coverity test fixes of 31030.
by asn＠torproject.org 19 Aug '19

19 Aug '19

commit 75ea7514e1e87124bf250b36a1a1c243b6b0cea0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 28 12:36:12 2019 -0400 Add a changes file for coverity test fixes of 31030. --- changes/ticket31030 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket31030 b/changes/ticket31030 new file mode 100644 index 000000000..4d99323b4 --- /dev/null +++ b/changes/ticket31030 @@ -0,0 +1,3 @@ + o Minor bugfixes (coverity, tests): + - Fix several coverity warnings from our unit tests. Fixes bug 31030; + bugfix on 0.2.4.1-alpha, 0.3.2.1-alpha, and 0.4.0.1-alpha.

1 0

[tor/master] Merge branch 'tor-github/pr/1154'
by asn＠torproject.org 19 Aug '19

19 Aug '19

commit 19e19c1fa8d138b36b115a6cf5e1993df08c3df3 Merge: e411fcabd 75ea7514e Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Aug 19 18:03:51 2019 +0300 Merge branch 'tor-github/pr/1154' changes/ticket31030 | 3 +++ src/test/test_btrack.c | 4 ++++ src/test/test_controller_events.c | 3 +++ src/test/test_hs_common.c | 1 + src/test/test_hs_service.c | 1 + src/test/test_introduce.c | 3 ++- 6 files changed, 14 insertions(+), 1 deletion(-)

1 0

[tor/master] Coverity: fix memory leak on error in test function.
by asn＠torproject.org 19 Aug '19

19 Aug '19

commit ea154a6108bae597cb37e6bc53036b6dd2ed6187 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 28 12:27:51 2019 -0400 Coverity: fix memory leak on error in test function. The function make_intro_from_plaintext() in test_introduce.c would leak memory if we ever hit a failure from our underlying crypto functions. This kind of failure should be impossible, but it's best to be safe here. Bugfix on 0.2.4.1-alpha. --- src/test/test_introduce.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/test_introduce.c b/src/test/test_introduce.c index 4a6d90d97..104e973b1 100644 --- a/src/test/test_introduce.c +++ b/src/test/test_introduce.c @@ -383,8 +383,10 @@ make_intro_from_plaintext( /* Output the cell */ *cell_out = cell; + cell = NULL; done: + tor_free(cell); return cell_len; } @@ -535,4 +537,3 @@ struct testcase_t introduce_tests[] = { INTRODUCE_LEGACY(late_parse_v3), END_OF_TESTCASES }; -

1 0

[tor/master] pre-push hook: Only run practracker when a special file is present
by asn＠torproject.org 19 Aug '19

19 Aug '19

commit 71e5af0221568b36d128be88c958a7de018ebcb3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 8 11:32:11 2019 -0400 pre-push hook: Only run practracker when a special file is present Closes ticket 30979. --- changes/ticket30979 | 5 +++++ scripts/git/pre-push.git-hook | 13 ++++++++----- scripts/maint/practracker/.enable_practracker_in_hooks | 1 + 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/changes/ticket30979 b/changes/ticket30979 new file mode 100644 index 000000000..8ae9b3c41 --- /dev/null +++ b/changes/ticket30979 @@ -0,0 +1,5 @@ + o Minor features (git hooks): + - Our pre-push git hook now checks for a special file + before running practracker, so that it only runs on branches + that are based on master. + Closes ticket 30979. diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook index 71abc9aa2..40a3bffa7 100755 --- a/scripts/git/pre-push.git-hook +++ b/scripts/git/pre-push.git-hook @@ -28,10 +28,14 @@ if [ -x "$workdir/.git/hooks/pre-commit" ]; then fi fi -if [ -e scripts/maint/practracker/practracker.py ]; then - if ! python3 ./scripts/maint/practracker/practracker.py "$workdir"; then - exit 1 - fi +PT_DIR=scripts/maint/practracker + +if [ -e "${PT_DIR}/practracker.py" ]; then + if [ -e "${PT_DIR}/.enable_practracker_in_hooks" ]; then + if ! python3 "${PT_DIR}/practracker.py" "$workdir"; then + exit 1 + fi + fi fi remote="$1" @@ -104,4 +108,3 @@ do done exit 0 - diff --git a/scripts/maint/practracker/.enable_practracker_in_hooks b/scripts/maint/practracker/.enable_practracker_in_hooks new file mode 100644 index 000000000..a9e707f5d --- /dev/null +++ b/scripts/maint/practracker/.enable_practracker_in_hooks @@ -0,0 +1 @@ +This file is present to tell our git hooks to run practracker on this branch.

1 0

[tor/master] Merge branch 'tor-github/pr/1220'
by asn＠torproject.org 19 Aug '19

19 Aug '19

commit e411fcabd7f52f2ddb108dd3973be944a0e0ef2b Merge: c214402a5 71e5af022 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Aug 19 18:02:44 2019 +0300 Merge branch 'tor-github/pr/1220' changes/ticket30979 | 5 +++++ scripts/git/pre-push.git-hook | 13 ++++++++----- scripts/maint/practracker/.enable_practracker_in_hooks | 1 + 3 files changed, 14 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.5
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit 5653b93a1d25e173bebb8f45d364e3a578572789 Merge: d253b31ce 5a1c3e44f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 19 10:37:21 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/ticket31406 | 3 +++ src/app/config/auth_dirs.inc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.0] dirauth: Change dizum IP address
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit 5a1c3e44f758cda18bb0a0a8ef7c94a0122c85e4 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Aug 15 08:16:53 2019 -0400 dirauth: Change dizum IP address New IP address from 194.109.206.212 to 45.66.33.45. Signed request from Alex de Joode, operator of dizum: https://trac.torproject.org/projects/tor/ticket/31406 Published descriptor by dizum on August 12th, 2019: -- r dizum fqbq1v2DCDxTj0QDi7+gd1h911U GZmZtCLaPDQNxkhIFj8UcgTRAuA 2019-08-12 15:28:40 45.66.33.45 443 80 s Authority Fast Running Stable V2Dir Valid v Tor 0.4.0.5 pr Cons=1-2 Desc=1-2 DirCache=1-2 HSDir=1-2 HSIntro=3-4 HSRend=1-2 Link=1-5 LinkAuth=1,3 Microdesc=1-2 Relay=1-2 Padding=1 w Bandwidth=20 Unmeasured=1 p reject 1-65535 -- Finally, confirmed by DNS: $ dig +short tor.dizum.com 45.66.33.45 Closes #31406 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket31406 | 3 +++ src/or/auth_dirs.inc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/ticket31406 b/changes/ticket31406 new file mode 100644 index 000000000..0ebe6f6c4 --- /dev/null +++ b/changes/ticket31406 @@ -0,0 +1,3 @@ + o Minor features (directory authority): + - A new IP address the directory authority "dizum" has been changed. Closes + ticket 31406; diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc index 08a919b05..278f08bfc 100644 --- a/src/or/auth_dirs.inc +++ b/src/or/auth_dirs.inc @@ -7,7 +7,7 @@ "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 " "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " - "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", + "45.66.33.45:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", "Serge orport=9001 bridge " "66.111.2.131:9030 BA44 A889 E64B 93FA A2B1 14E0 2C2A 279A 8555 C533", "gabelmoo orport=443 "

1 0

[tor/maint-0.4.1] dirauth: Change dizum IP address
by nickm＠torproject.org 19 Aug '19

19 Aug '19

commit 5a1c3e44f758cda18bb0a0a8ef7c94a0122c85e4 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Aug 15 08:16:53 2019 -0400 dirauth: Change dizum IP address New IP address from 194.109.206.212 to 45.66.33.45. Signed request from Alex de Joode, operator of dizum: https://trac.torproject.org/projects/tor/ticket/31406 Published descriptor by dizum on August 12th, 2019: -- r dizum fqbq1v2DCDxTj0QDi7+gd1h911U GZmZtCLaPDQNxkhIFj8UcgTRAuA 2019-08-12 15:28:40 45.66.33.45 443 80 s Authority Fast Running Stable V2Dir Valid v Tor 0.4.0.5 pr Cons=1-2 Desc=1-2 DirCache=1-2 HSDir=1-2 HSIntro=3-4 HSRend=1-2 Link=1-5 LinkAuth=1,3 Microdesc=1-2 Relay=1-2 Padding=1 w Bandwidth=20 Unmeasured=1 p reject 1-65535 -- Finally, confirmed by DNS: $ dig +short tor.dizum.com 45.66.33.45 Closes #31406 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket31406 | 3 +++ src/or/auth_dirs.inc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/ticket31406 b/changes/ticket31406 new file mode 100644 index 000000000..0ebe6f6c4 --- /dev/null +++ b/changes/ticket31406 @@ -0,0 +1,3 @@ + o Minor features (directory authority): + - A new IP address the directory authority "dizum" has been changed. Closes + ticket 31406; diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc index 08a919b05..278f08bfc 100644 --- a/src/or/auth_dirs.inc +++ b/src/or/auth_dirs.inc @@ -7,7 +7,7 @@ "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 " "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " - "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", + "45.66.33.45:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", "Serge orport=9001 bridge " "66.111.2.131:9030 BA44 A889 E64B 93FA A2B1 14E0 2C2A 279A 8555 C533", "gabelmoo orport=443 "

1 0