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

[tor/master] Merge remote-tracking branch 'dgoulet/ticket32822_045_01'
by nickm＠torproject.org 02 Jul '20

02 Jul '20

commit 20d1a1cdbd9d4a3d21e80c62027522505731189a Merge: 9b560ea71 82010b0e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 2 09:47:43 2020 -0400 Merge remote-tracking branch 'dgoulet/ticket32822_045_01' changes/ticket32822 | 5 +++++ src/feature/nodelist/dirlist.c | 2 +- src/feature/relay/router.c | 4 +++- src/test/conf_examples/dirauth_3/error_no_dirauth | 1 + src/test/conf_examples/dirauth_3/error_no_dirauth_relay | 1 + src/test/conf_examples/dirauth_3/expected | 9 +++++++++ src/test/conf_examples/dirauth_3/expected_log | 1 + src/test/conf_examples/dirauth_3/torrc | 13 +++++++++++++ 8 files changed, 34 insertions(+), 2 deletions(-)

1 0

[tor/master] parseconf: Add an authority IPv6 ORPort test
by nickm＠torproject.org 02 Jul '20

02 Jul '20

commit 82010b0e2e995b3a4c7030c5f2339480a7f1e48e Author: teor <teor(a)torproject.org> Date: Wed Jan 15 21:20:57 2020 +1000 parseconf: Add an authority IPv6 ORPort test These tests don't actually exercise the authority IPv6 ORPort self-add feature in 32822, but they do improve coverage of the related config code. Part of 32822. --- src/test/conf_examples/dirauth_3/error_no_dirauth | 1 + src/test/conf_examples/dirauth_3/error_no_dirauth_relay | 1 + src/test/conf_examples/dirauth_3/expected | 9 +++++++++ src/test/conf_examples/dirauth_3/expected_log | 1 + src/test/conf_examples/dirauth_3/torrc | 13 +++++++++++++ 5 files changed, 25 insertions(+) diff --git a/src/test/conf_examples/dirauth_3/error_no_dirauth b/src/test/conf_examples/dirauth_3/error_no_dirauth new file mode 100644 index 000000000..e6bd5db69 --- /dev/null +++ b/src/test/conf_examples/dirauth_3/error_no_dirauth @@ -0,0 +1 @@ +This tor was built with dirauth mode disabled. diff --git a/src/test/conf_examples/dirauth_3/error_no_dirauth_relay b/src/test/conf_examples/dirauth_3/error_no_dirauth_relay new file mode 100644 index 000000000..e6bd5db69 --- /dev/null +++ b/src/test/conf_examples/dirauth_3/error_no_dirauth_relay @@ -0,0 +1 @@ +This tor was built with dirauth mode disabled. diff --git a/src/test/conf_examples/dirauth_3/expected b/src/test/conf_examples/dirauth_3/expected new file mode 100644 index 000000000..23eac3a5f --- /dev/null +++ b/src/test/conf_examples/dirauth_3/expected @@ -0,0 +1,9 @@ +Address 192.0.2.1 +AuthoritativeDirectory 1 +ContactInfo tor_parse_test(a)example.net +DirPort 192.0.2.1:2 +DownloadExtraInfo 1 +Nickname Unnamed +ORPort 192.0.2.1:1 +ORPort [2001:DB8::1]:3 +V3AuthoritativeDirectory 1 diff --git a/src/test/conf_examples/dirauth_3/expected_log b/src/test/conf_examples/dirauth_3/expected_log new file mode 100644 index 000000000..3127c9b12 --- /dev/null +++ b/src/test/conf_examples/dirauth_3/expected_log @@ -0,0 +1 @@ +Read configuration file .*dirauth_3[./]*torrc diff --git a/src/test/conf_examples/dirauth_3/torrc b/src/test/conf_examples/dirauth_3/torrc new file mode 100644 index 000000000..9663a9bc0 --- /dev/null +++ b/src/test/conf_examples/dirauth_3/torrc @@ -0,0 +1,13 @@ +# Authority with IPv6 address + +AuthoritativeDirectory 1 +V3AuthoritativeDirectory 1 + +ContactInfo tor_parse_test(a)example.net + +Address 192.0.2.1 + +ORPort 192.0.2.1:1 +DirPort 192.0.2.1:2 + +ORPort [2001:DB8::1]:3

1 0

[tor/maint-0.4.3] Downgrade "Bug: No entry found in extrainfo map" message.
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 39830b6408f8a720ce71ccb6b853663c6e6047e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 30 11:54:13 2020 -0400 Downgrade "Bug: No entry found in extrainfo map" message. This is not actually a bug! It can happen for a bunch of reasons, which all boil down to "trying to add an extrainfo for which we no longer have the corresponding routerinfo". Fixes #16016; bugfix on 0.2.6.3-alpha. --- changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug16016 b/changes/bug16016 new file mode 100644 index 000000000..313ef672e --- /dev/null +++ b/changes/bug16016 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Downgrade a noisy log message that could occur naturally when + receiving an extrainfo document that we no longer want. + Fixes bug 16016; bugfix on 0.2.6.3-alpha. diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index e48675aad..c7fa86892 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -1087,7 +1087,11 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei, int warn_if_incompatible)) * This just won't work. */; static ratelim_t no_sd_ratelim = RATELIM_INIT(1800); r = ROUTER_BAD_EI; - log_fn_ratelim(&no_sd_ratelim, severity, LD_BUG, + /* This is a DEBUG because it can happen naturally, if we tried + * to add an extrainfo for which we no longer have the + * corresponding routerinfo. + */ + log_fn_ratelim(&no_sd_ratelim, LOG_DEBUG, LD_DIR, "No entry found in extrainfo map."); goto done; }

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 07d8d398ca8961d2d9155a2df9c7ced6b382e73b Merge: dbb70d85b 39830b640 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 2 07:20:57 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 07d8d398ca8961d2d9155a2df9c7ced6b382e73b Merge: dbb70d85b 39830b640 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 2 07:20:57 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.2] Downgrade "Bug: No entry found in extrainfo map" message.
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 39830b6408f8a720ce71ccb6b853663c6e6047e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 30 11:54:13 2020 -0400 Downgrade "Bug: No entry found in extrainfo map" message. This is not actually a bug! It can happen for a bunch of reasons, which all boil down to "trying to add an extrainfo for which we no longer have the corresponding routerinfo". Fixes #16016; bugfix on 0.2.6.3-alpha. --- changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug16016 b/changes/bug16016 new file mode 100644 index 000000000..313ef672e --- /dev/null +++ b/changes/bug16016 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Downgrade a noisy log message that could occur naturally when + receiving an extrainfo document that we no longer want. + Fixes bug 16016; bugfix on 0.2.6.3-alpha. diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index e48675aad..c7fa86892 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -1087,7 +1087,11 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei, int warn_if_incompatible)) * This just won't work. */; static ratelim_t no_sd_ratelim = RATELIM_INIT(1800); r = ROUTER_BAD_EI; - log_fn_ratelim(&no_sd_ratelim, severity, LD_BUG, + /* This is a DEBUG because it can happen naturally, if we tried + * to add an extrainfo for which we no longer have the + * corresponding routerinfo. + */ + log_fn_ratelim(&no_sd_ratelim, LOG_DEBUG, LD_DIR, "No entry found in extrainfo map."); goto done; }

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 5a5ff3d8c5d6b27d5c0371a3bbb0113332e2a9f9 Merge: 322abd4fd 07d8d398c Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 2 07:20:57 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/master] Downgrade "Bug: No entry found in extrainfo map" message.
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 39830b6408f8a720ce71ccb6b853663c6e6047e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 30 11:54:13 2020 -0400 Downgrade "Bug: No entry found in extrainfo map" message. This is not actually a bug! It can happen for a bunch of reasons, which all boil down to "trying to add an extrainfo for which we no longer have the corresponding routerinfo". Fixes #16016; bugfix on 0.2.6.3-alpha. --- changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug16016 b/changes/bug16016 new file mode 100644 index 000000000..313ef672e --- /dev/null +++ b/changes/bug16016 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Downgrade a noisy log message that could occur naturally when + receiving an extrainfo document that we no longer want. + Fixes bug 16016; bugfix on 0.2.6.3-alpha. diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index e48675aad..c7fa86892 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -1087,7 +1087,11 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei, int warn_if_incompatible)) * This just won't work. */; static ratelim_t no_sd_ratelim = RATELIM_INIT(1800); r = ROUTER_BAD_EI; - log_fn_ratelim(&no_sd_ratelim, severity, LD_BUG, + /* This is a DEBUG because it can happen naturally, if we tried + * to add an extrainfo for which we no longer have the + * corresponding routerinfo. + */ + log_fn_ratelim(&no_sd_ratelim, LOG_DEBUG, LD_DIR, "No entry found in extrainfo map."); goto done; }

1 0

[tor/maint-0.4.4] Downgrade "Bug: No entry found in extrainfo map" message.
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 39830b6408f8a720ce71ccb6b853663c6e6047e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 30 11:54:13 2020 -0400 Downgrade "Bug: No entry found in extrainfo map" message. This is not actually a bug! It can happen for a bunch of reasons, which all boil down to "trying to add an extrainfo for which we no longer have the corresponding routerinfo". Fixes #16016; bugfix on 0.2.6.3-alpha. --- changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug16016 b/changes/bug16016 new file mode 100644 index 000000000..313ef672e --- /dev/null +++ b/changes/bug16016 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Downgrade a noisy log message that could occur naturally when + receiving an extrainfo document that we no longer want. + Fixes bug 16016; bugfix on 0.2.6.3-alpha. diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index e48675aad..c7fa86892 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -1087,7 +1087,11 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei, int warn_if_incompatible)) * This just won't work. */; static ratelim_t no_sd_ratelim = RATELIM_INIT(1800); r = ROUTER_BAD_EI; - log_fn_ratelim(&no_sd_ratelim, severity, LD_BUG, + /* This is a DEBUG because it can happen naturally, if we tried + * to add an extrainfo for which we no longer have the + * corresponding routerinfo. + */ + log_fn_ratelim(&no_sd_ratelim, LOG_DEBUG, LD_DIR, "No entry found in extrainfo map."); goto done; }

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2
by dgoulet＠torproject.org 02 Jul '20

02 Jul '20

commit 07d8d398ca8961d2d9155a2df9c7ced6b382e73b Merge: dbb70d85b 39830b640 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 2 07:20:57 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug16016 | 4 ++++ src/feature/nodelist/routerlist.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0