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

[tor/master] Add routerset_contains_router() test
by nickm＠torproject.org 24 Jun '20

24 Jun '20

commit c3c7ef5125fe1db59f6017390e6b068b1faaad27 Author: Neel Chauhan <neel(a)neelc.org> Date: Mon Jun 22 11:51:01 2020 -0700 Add routerset_contains_router() test --- src/test/test_routerset.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/src/test/test_routerset.c b/src/test/test_routerset.c index 892ac6e21..7601d5ba0 100644 --- a/src/test/test_routerset.c +++ b/src/test/test_routerset.c @@ -1417,12 +1417,62 @@ test_rset_contains_router(void *arg) ri.nickname = (char *)nickname; r = routerset_contains_router(set, &ri, country); - tt_int_op(r, OP_EQ, 4); + done: routerset_free(set); } +static void +test_rset_contains_router_ipv4(void *arg) +{ + routerset_t *set; + routerinfo_t ri; + country_t country = 1; + int r; + const char *s; + (void) arg; + + /* IPv4 address test. */ + memset(&ri, 0, sizeof(ri)); + set = routerset_new(); + s = "10.0.0.1"; + r = routerset_parse(set, s, ""); + ri.addr = htonl(0x0a000001); /* 10.0.0.1 */ + ri.or_port = 1234; + + r = routerset_contains_router(set, &ri, country); + tt_int_op(r, OP_EQ, 3); + + done: + routerset_free(set); +} + +static void +test_rset_contains_router_ipv6(void *arg) +{ + routerset_t *set; + routerinfo_t ri; + country_t country = 1; + int r; + const char *s; + (void) arg; + + /* IPv6 address test. */ + memset(&ri, 0, sizeof(ri)); + set = routerset_new(); + s = "2600::1"; + r = routerset_parse(set, s, ""); + tor_addr_parse(&ri.ipv6_addr, "2600::1"); + ri.ipv6_orport = 12345; + + r = routerset_contains_router(set, &ri, country); + tt_int_op(r, OP_EQ, 3); + + done: + routerset_free(set); +} + /* * Functional test for routerset_contains_routerstatus. */ @@ -2144,6 +2194,10 @@ struct testcase_t routerset_tests[] = { { "contains_extendinfo", test_rset_contains_extendinfo, TT_FORK, NULL, NULL }, { "contains_router", test_rset_contains_router, TT_FORK, NULL, NULL }, + { "contains_router_ipv4", test_rset_contains_router_ipv4, + TT_FORK, NULL, NULL }, + { "contains_router_ipv6", test_rset_contains_router_ipv6, + TT_FORK, NULL, NULL }, { "contains_routerstatus", test_rset_contains_routerstatus, TT_FORK, NULL, NULL }, { "contains_none", test_rset_contains_none, TT_FORK, NULL, NULL },

1 0

[tor/master] Make routerset_contains_router() support IPv6
by nickm＠torproject.org 24 Jun '20

24 Jun '20

commit 0a3e6d81bba31ca19ce412d943901f43f54c4894 Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Jun 11 12:27:40 2020 -0700 Make routerset_contains_router() support IPv6 --- src/feature/nodelist/routerset.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/src/feature/nodelist/routerset.c b/src/feature/nodelist/routerset.c index 2e06ecbf0..ebc08b7a5 100644 --- a/src/feature/nodelist/routerset.c +++ b/src/feature/nodelist/routerset.c @@ -223,11 +223,11 @@ routerset_len(const routerset_t *set) * * (If country is -1, then we take the country * from addr.) */ -STATIC int -routerset_contains(const routerset_t *set, const tor_addr_t *addr, - uint16_t orport, - const char *nickname, const char *id_digest, - country_t country) +static int +routerset_contains2(const routerset_t *set, const tor_addr_t *addr, + uint16_t orport, const tor_addr_t *addr2, + uint16_t orport2, const char *nickname, + const char *id_digest, country_t country) { if (!set || !set->list) return 0; @@ -238,6 +238,9 @@ routerset_contains(const routerset_t *set, const tor_addr_t *addr, if (addr && compare_tor_addr_to_addr_policy(addr, orport, set->policies) == ADDR_POLICY_REJECTED) return 3; + if (addr2 && compare_tor_addr_to_addr_policy(addr2, orport2, set->policies) + == ADDR_POLICY_REJECTED) + return 3; if (set->countries) { if (country < 0 && addr) country = geoip_get_country_by_addr(addr); @@ -249,6 +252,17 @@ routerset_contains(const routerset_t *set, const tor_addr_t *addr, return 0; } +/** Helper. Like routerset_contains2() but for a single IP/port combo. + */ +STATIC int +routerset_contains(const routerset_t *set, const tor_addr_t *addr, + uint16_t orport, const char *nickname, + const char *id_digest, country_t country) +{ + return routerset_contains2(set, addr, orport, NULL, 0, + nickname, id_digest, country); +} + /** If *setp includes at least one country code, or if * only_some_cc_set is 0, add the ?? and A1 country codes to * *setp, creating it as needed. Return true iff *setp changed. @@ -306,14 +320,11 @@ int routerset_contains_router(const routerset_t *set, const routerinfo_t *ri, country_t country) { - tor_addr_t addr; - tor_addr_from_ipv4h(&addr, ri->addr); - return routerset_contains(set, - &addr, - ri->or_port, - ri->nickname, - ri->cache_info.identity_digest, - country); + tor_addr_t addr_v4; + tor_addr_from_ipv4h(&addr_v4, ri->addr); + return routerset_contains2(set, &addr_v4, ri->or_port, &ri->ipv6_addr, + ri->ipv6_orport, ri->nickname, + ri->cache_info.identity_digest, country); } /** Return true iff rs is in set. If country is -1, we

1 0

[tor/master] Add changes file for ticket #34065
by nickm＠torproject.org 24 Jun '20

24 Jun '20

commit 6209939e864e5bfb951cb0406c24a85c27a7811a Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Jun 11 13:13:13 2020 -0700 Add changes file for ticket #34065 --- changes/bug34065 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug34065 b/changes/bug34065 new file mode 100644 index 000000000..f81cb77c2 --- /dev/null +++ b/changes/bug34065 @@ -0,0 +1,5 @@ + o Minor features (IPv6, ExcludeNodes): + - Make routerset_contains_router() capable of handling IPv6 + addresses. This makes ExcludeNodes capable of excluding an + IPv6 adddress. Previously, ExcludeNodes ignored IPv6 + addresses. Closes ticket 34065. Patch by Neel Chauhan.

1 0

[chutney/master] fix unset-variable error in warnings.sh
by nickm＠torproject.org 24 Jun '20

24 Jun '20

commit 3637b58c68f17982de06c7f0b14a3f3d72762140 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 12:09:40 2020 -0400 fix unset-variable error in warnings.sh --- tools/warnings.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/warnings.sh b/tools/warnings.sh index c3b3432..f481639 100755 --- a/tools/warnings.sh +++ b/tools/warnings.sh @@ -127,6 +127,10 @@ if [ -t 1 ]; then NC=$(tput sgr0) YELLOW=$(tput setaf 3) GREEN=$(tput setaf 2) +else + NC="" + YELLOW="" + GREEN="" fi NAME=$(basename "$0")

1 0

[chutney/master] use quotes to fix a shellcheck warning.
by nickm＠torproject.org 24 Jun '20

24 Jun '20

commit e5834f2ee274686bfbb54cee76cc340a262b1064 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 12:00:07 2020 -0400 use quotes to fix a shellcheck warning. --- tools/bootstrap-network.sh | 14 +++++++------- tools/test-network.sh | 14 +++++++------- tools/warnings.sh | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh index 005e0b4..a7a5dbe 100755 --- a/tools/bootstrap-network.sh +++ b/tools/bootstrap-network.sh @@ -16,13 +16,13 @@ set -o errexit set -o nounset # Set some default values if the variables are not already set -: ${CHUTNEY_WARNINGS_ONLY:=false} -: ${CHUTNEY_WARNINGS_SKIP:=false} -: ${CHUTNEY_DIAGNOSTICS_ONLY:=false} -: ${NETWORK_DRY_RUN:=false} -: ${USE_COVERAGE_BINARY:=false} -: ${CHUTNEY_DIAGNOSTICS:=false} -: ${CHUTNEY_DATA_DIR:=} +: "${CHUTNEY_WARNINGS_ONLY:=false}" +: "${CHUTNEY_WARNINGS_SKIP:=false}" +: "${CHUTNEY_DIAGNOSTICS_ONLY:=false}" +: "${NETWORK_DRY_RUN:=false}" +: "${USE_COVERAGE_BINARY:=false}" +: "${CHUTNEY_DIAGNOSTICS:=false}" +: "${CHUTNEY_DATA_DIR:=}" # Get a working chutney path diff --git a/tools/test-network.sh b/tools/test-network.sh index 633798b..12b908c 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -30,13 +30,13 @@ export CHUTNEY_DNS_CONF=${CHUTNEY_DNS_CONF:-/dev/null} #export CHUTNEY_TOR_SANDBOX=1 # Set some default values if the variables are not already set -: ${CHUTNEY_WARNINGS_ONLY:=false} -: ${CHUTNEY_WARNINGS_SKIP:=false} -: ${CHUTNEY_DIAGNOSTICS_ONLY:=false} -: ${NETWORK_DRY_RUN:=false} -: ${USE_COVERAGE_BINARY:=false} -: ${CHUTNEY_DIAGNOSTICS:=false} -: ${CHUTNEY_DATA_DIR:=} +: "${CHUTNEY_WARNINGS_ONLY:=false}" +: "${CHUTNEY_WARNINGS_SKIP:=false}" +: "${CHUTNEY_DIAGNOSTICS_ONLY:=false}" +: "${NETWORK_DRY_RUN:=false}" +: "${USE_COVERAGE_BINARY:=false}" +: "${CHUTNEY_DIAGNOSTICS:=false}" +: "${CHUTNEY_DATA_DIR:=}" # what we say when we fail UPDATE_YOUR_CHUTNEY="Please update your chutney using 'git pull'." diff --git a/tools/warnings.sh b/tools/warnings.sh index 7793b28..1dd2d1c 100755 --- a/tools/warnings.sh +++ b/tools/warnings.sh @@ -29,13 +29,13 @@ set -o errexit set -o nounset # Set some default values if the variables are not already set -: ${CHUTNEY_WARNINGS_ONLY:=false} -: ${CHUTNEY_WARNINGS_SKIP:=false} -: ${CHUTNEY_DIAGNOSTICS_ONLY:=false} -: ${NETWORK_DRY_RUN:=false} -: ${USE_COVERAGE_BINARY:=false} -: ${CHUTNEY_DIAGNOSTICS:=false} -: ${CHUTNEY_DATA_DIR:=} +: "${CHUTNEY_WARNINGS_ONLY:=false}" +: "${CHUTNEY_WARNINGS_SKIP:=false}" +: "${CHUTNEY_DIAGNOSTICS_ONLY:=false}" +: "${NETWORK_DRY_RUN:=false}" +: "${USE_COVERAGE_BINARY:=false}" +: "${CHUTNEY_DIAGNOSTICS:=false}" +: "${CHUTNEY_DATA_DIR:=}" if [ "$CHUTNEY_WARNINGS_SKIP" = true ]; then exit 0

1 0

[chutney/master] Remove unused vars in warnings.sh
by nickm＠torproject.org 24 Jun '20

24 Jun '20

commit 581f1932b7db033f417c2955f05364d5adf4f6c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 24 12:00:41 2020 -0400 Remove unused vars in warnings.sh --- tools/warnings.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/warnings.sh b/tools/warnings.sh index 1dd2d1c..c3b3432 100755 --- a/tools/warnings.sh +++ b/tools/warnings.sh @@ -29,12 +29,7 @@ set -o errexit set -o nounset # Set some default values if the variables are not already set -: "${CHUTNEY_WARNINGS_ONLY:=false}" : "${CHUTNEY_WARNINGS_SKIP:=false}" -: "${CHUTNEY_DIAGNOSTICS_ONLY:=false}" -: "${NETWORK_DRY_RUN:=false}" -: "${USE_COVERAGE_BINARY:=false}" -: "${CHUTNEY_DIAGNOSTICS:=false}" : "${CHUTNEY_DATA_DIR:=}" if [ "$CHUTNEY_WARNINGS_SKIP" = true ]; then

1 0

[tor-browser-build/maint-9.5] Bug 40008: Update sysrqb's key and subkeys
by gk＠torproject.org 24 Jun '20

24 Jun '20

commit dc292d9cf92762533328169e586a96113a035ef3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jun 24 15:08:01 2020 +0000 Bug 40008: Update sysrqb's key and subkeys --- keyring/torbutton.gpg | Bin 125829 -> 132637 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index 8ace7fd..b587a66 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ

1 0

[tor-browser-build/master] Bug 40008: Update sysrqb's key and subkeys
by gk＠torproject.org 24 Jun '20

24 Jun '20

commit f3872586e5b2ed57c41480f5ee0e12e12200a36f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jun 24 15:08:01 2020 +0000 Bug 40008: Update sysrqb's key and subkeys --- keyring/torbutton.gpg | Bin 125829 -> 132637 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index 8ace7fd..b587a66 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ

1 0

[tor/master] tls: Make buf_read_from_tls() read at most bytes
by dgoulet＠torproject.org 24 Jun '20

24 Jun '20

commit 3adabaf3e925f3ad395a2a0a2dbc92aa1d018ec4 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jun 19 10:35:50 2020 -0400 tls: Make buf_read_from_tls() read at most bytes The buf_read_from_tls() function was designed to read up to a certain number of bytes a TLS socket using read_to_chunk_tls() which boils down to SSL_read() (with OpenSSL, common case). However, at the end of the loop, the returned number of bytes from read_to_chunk_tls() was treated like the syscall read() for which if less bytes than the total asked are returned, it signals EOF. But, with SSL_read(), it returns up to a TLS record which can be less than what was asked. The assumption that it was EOF was wrong which made the while loop exiting before it was able to consume all requested bytes (at_most parameter). The general use case that Tor sees is that it will ask the network layer to give it at most 16KB (that is roughly 32 cells) but because of KIST scheduler, the highest possible TLS record we currently observe is 4096 bytes (4KB or 8 cells). Thus the loop would at best always return 8 cells even though much more could be on the TLS socket. See ticket #40006 for more details. Fixes #40006 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40006 | 6 ++++++ src/lib/tls/buffers_tls.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/ticket40006 b/changes/ticket40006 new file mode 100644 index 000000000..ad10e236c --- /dev/null +++ b/changes/ticket40006 @@ -0,0 +1,6 @@ + o Major bugfix (TLS, buffer): + - When attempting to read N bytes on a TLS connection, really try to read + those N bytes. Before that, Tor would stop reading after the first TLS + record which can be smaller than N bytes even though more data was waiting + on the TLS connection socket. The remaining data would have been read at + the next mainloop event. Fixes bug 40006; bugfix on 0.1.0.5-rc. diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c index b92a14d6a..1b99467d2 100644 --- a/src/lib/tls/buffers_tls.c +++ b/src/lib/tls/buffers_tls.c @@ -59,6 +59,9 @@ read_to_chunk_tls(buf_t *buf, chunk_t *chunk, tor_tls_t *tls, * Second, the TLS stream's events do not correspond directly to network * events: sometimes, before a TLS stream can read, the network must be * ready to write -- or vice versa. + * + * On success, return the number of bytes read. On error, a TOR_TLS_* negative + * code is returned (expect any of them except TOR_TLS_DONE). */ int buf_read_from_tls(buf_t *buf, tor_tls_t *tls, size_t at_most) @@ -92,8 +95,6 @@ buf_read_from_tls(buf_t *buf, tor_tls_t *tls, size_t at_most) return r; /* Error */ tor_assert(total_read+r <= BUF_MAX_LEN); total_read += r; - if ((size_t)r < readlen) /* eof, block, or no more to read. */ - break; } return (int)total_read; }

1 0

[tor/master] Merge branch 'tor-github/pr/1944'
by dgoulet＠torproject.org 24 Jun '20

24 Jun '20

commit bc50f082bd3a84156dd12db9e2186fd083b216c1 Merge: 2eae59e47 3adabaf3e Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jun 24 10:48:14 2020 -0400 Merge branch 'tor-github/pr/1944' changes/ticket40006 | 6 ++++++ src/lib/tls/buffers_tls.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0