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

[torspec/main] Clarify handling of dubious RELAY_END cell formats.
by nickm＠torproject.org 16 Aug '21

16 Aug '21

commit a681521b9d04135d2cff5d20b82927162c6626cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 16 11:25:08 2021 -0400 Clarify handling of dubious RELAY_END cell formats. --- tor-spec.txt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tor-spec.txt b/tor-spec.txt index a3a0ffd..4d9513e 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -1817,25 +1817,31 @@ see tor-design.pdf. 14 -- REASON_NOTDIRECTORY (Client sent RELAY_BEGIN_DIR to a non-directory relay.) + [*] Older versions of Tor also send this reason when connections are + reset. + + OPs and ORs MUST accept reasons not on the above list, since future + versions of Tor may provide more fine-grained reasons. - For most reasons, the format is: + For most reasons, the format of RELAY_END is: Reason [1 byte] - For REASON_EXITPOLICY, the format is: + For REASON_EXITPOLICY, the format of RELAY_END is: Reason [1 byte] IPv4 or IPv6 address [4 bytes or 16 bytes] TTL [4 bytes] - OPs and ORs MUST accept reasons not on the above list, since future - versions of Tor may provide more fine-grained reasons. + (If the TTL is absent, it should be treated as if it were 0xffffffff. + If the address is absent or is the wrong length, the RELAY_END message + should be processed anyway.) Tors SHOULD NOT send any reason except REASON_MISC for a stream that they have originated. - [*] Older versions of Tor also send this reason when connections are - reset. + Implementations SHOULD accept empty RELAY_END messages, and treat them + as if they specified REASON_MISC. Upon receiving a RELAY_END cell, the recipient may be sure that no further cells will arrive on that stream, and can treat such cells as a protocol

1 0

[tor/main] Merge branch 'maint-0.4.6' into main
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 168ea275b83b3415f08fb53193534757e383c187 Merge: 790107322a 46ad2240de Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:28:22 2021 +0000 Merge branch 'maint-0.4.6' into main src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 46ad2240de54f4d4499542b1dfe769378555ad65 Merge: d1c781e67e 903c578119 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:28:22 2021 +0000 Merge branch 'maint-0.4.5' into maint-0.4.6 src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[tor/main] Always teardown capture of logs in CAPTURE().
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 903c5781192d7902c01ab6b0d4b2aec91da44890 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:27:38 2021 +0000 Always teardown capture of logs in CAPTURE(). This will hopefully solve an issue where our gmtime related tests are failing on 32-bit builds. --- src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index fd0e6763e8..f567a18367 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -819,17 +819,16 @@ test_util_time(void *arg) /* The below tests will all cause a BUG message, so we capture, suppress, * and detect. */ #define CAPTURE() do { \ + teardown_capture_of_logs(); \ setup_full_capture_of_logs(LOG_WARN); \ } while (0) #define CHECK_TIMEGM_WARNING(msg) do { \ expect_single_log_msg_containing(msg); \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_POSSIBLE_EINVAL() do { \ if (mock_saved_log_n_entries()) { \ expect_single_log_msg_containing("Invalid argument"); \ } \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \

1 0

[tor/maint-0.4.5] Always teardown capture of logs in CAPTURE().
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 903c5781192d7902c01ab6b0d4b2aec91da44890 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:27:38 2021 +0000 Always teardown capture of logs in CAPTURE(). This will hopefully solve an issue where our gmtime related tests are failing on 32-bit builds. --- src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index fd0e6763e8..f567a18367 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -819,17 +819,16 @@ test_util_time(void *arg) /* The below tests will all cause a BUG message, so we capture, suppress, * and detect. */ #define CAPTURE() do { \ + teardown_capture_of_logs(); \ setup_full_capture_of_logs(LOG_WARN); \ } while (0) #define CHECK_TIMEGM_WARNING(msg) do { \ expect_single_log_msg_containing(msg); \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_POSSIBLE_EINVAL() do { \ if (mock_saved_log_n_entries()) { \ expect_single_log_msg_containing("Invalid argument"); \ } \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \

1 0

[tor/maint-0.4.6] Always teardown capture of logs in CAPTURE().
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 903c5781192d7902c01ab6b0d4b2aec91da44890 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:27:38 2021 +0000 Always teardown capture of logs in CAPTURE(). This will hopefully solve an issue where our gmtime related tests are failing on 32-bit builds. --- src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index fd0e6763e8..f567a18367 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -819,17 +819,16 @@ test_util_time(void *arg) /* The below tests will all cause a BUG message, so we capture, suppress, * and detect. */ #define CAPTURE() do { \ + teardown_capture_of_logs(); \ setup_full_capture_of_logs(LOG_WARN); \ } while (0) #define CHECK_TIMEGM_WARNING(msg) do { \ expect_single_log_msg_containing(msg); \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_POSSIBLE_EINVAL() do { \ if (mock_saved_log_n_entries()) { \ expect_single_log_msg_containing("Invalid argument"); \ } \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \

1 0

[tor/release-0.4.5] Always teardown capture of logs in CAPTURE().
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 903c5781192d7902c01ab6b0d4b2aec91da44890 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:27:38 2021 +0000 Always teardown capture of logs in CAPTURE(). This will hopefully solve an issue where our gmtime related tests are failing on 32-bit builds. --- src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index fd0e6763e8..f567a18367 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -819,17 +819,16 @@ test_util_time(void *arg) /* The below tests will all cause a BUG message, so we capture, suppress, * and detect. */ #define CAPTURE() do { \ + teardown_capture_of_logs(); \ setup_full_capture_of_logs(LOG_WARN); \ } while (0) #define CHECK_TIMEGM_WARNING(msg) do { \ expect_single_log_msg_containing(msg); \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_POSSIBLE_EINVAL() do { \ if (mock_saved_log_n_entries()) { \ expect_single_log_msg_containing("Invalid argument"); \ } \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \

1 0

[tor/release-0.4.6] Always teardown capture of logs in CAPTURE().
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 903c5781192d7902c01ab6b0d4b2aec91da44890 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:27:38 2021 +0000 Always teardown capture of logs in CAPTURE(). This will hopefully solve an issue where our gmtime related tests are failing on 32-bit builds. --- src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index fd0e6763e8..f567a18367 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -819,17 +819,16 @@ test_util_time(void *arg) /* The below tests will all cause a BUG message, so we capture, suppress, * and detect. */ #define CAPTURE() do { \ + teardown_capture_of_logs(); \ setup_full_capture_of_logs(LOG_WARN); \ } while (0) #define CHECK_TIMEGM_WARNING(msg) do { \ expect_single_log_msg_containing(msg); \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_POSSIBLE_EINVAL() do { \ if (mock_saved_log_n_entries()) { \ expect_single_log_msg_containing("Invalid argument"); \ } \ - teardown_capture_of_logs(); \ } while (0) #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 80d33e10aa5b4537c7dbc051b3b4e7ae3570aa12 Merge: 86aec2abf3 903c578119 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:28:22 2021 +0000 Merge branch 'maint-0.4.5' into release-0.4.5 src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by ahf＠torproject.org 16 Aug '21

16 Aug '21

commit 46ad2240de54f4d4499542b1dfe769378555ad65 Merge: d1c781e67e 903c578119 Author: Alexander Færøy <ahf(a)torproject.org> Date: Mon Aug 16 15:28:22 2021 +0000 Merge branch 'maint-0.4.5' into maint-0.4.6 src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0