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

[manual/master] Merge branch 'fix-issue-79'
by gus＠torproject.org 22 Jan '21

22 Jan '21

commit 20eb0897a0abb5dd88df666a4e9d2e1cfcd30ebd Merge: a48c121 bdb7053 Author: gus <gus(a)torproject.org> Date: Thu Jan 21 20:23:37 2021 -0500 Merge branch 'fix-issue-79' content/mobile-tor/contents.lr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[translation/tails-onioncircuits_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits_release
by translation＠torproject.org 22 Jan '21

22 Jan '21

commit c8bc6c1b31561da47307a245d878234db2868705 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 22 01:17:00 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits… --- pt_BR/onioncircuits.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/onioncircuits.po b/pt_BR/onioncircuits.po index c7eecf32b0..f22fa05b85 100644 --- a/pt_BR/onioncircuits.po +++ b/pt_BR/onioncircuits.po @@ -5,7 +5,7 @@ # Translators: # Communia <ameaneantie(a)riseup.net>, 2016-2018 # Maicon Grahl <maicongrahl(a)hotmail.com>, 2016 -# Rhcastilhos, 2016 +# Rodrigo, 2016 # yyyyyyyan <contact(a)yyyyyyyan.tech>, 2020 msgid "" msgstr ""

1 0

[tor/maint-0.4.5] Merge branch 'mr/251' into maint-0.4.5
by asn＠torproject.org 22 Jan '21

22 Jan '21

commit 4cbd22f1a7f876c7b47a0e688e28c5ac1f256d6d Merge: 68d1e02c3a 5d711450dd Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jan 22 00:21:09 2021 +0200 Merge branch 'mr/251' into maint-0.4.5 changes/bug40238 | 3 +++ src/feature/dirparse/routerparse.c | 11 +++++++++++ 2 files changed, 14 insertions(+)

1 0

[tor/master] Changes file for #40238.
by asn＠torproject.org 22 Jan '21

22 Jan '21

commit 5d711450dd3a1a08ec8461600b558ac7880bf7cf Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Jan 21 23:17:31 2021 +0200 Changes file for #40238. --- changes/bug40238 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug40238 b/changes/bug40238 new file mode 100644 index 0000000000..35784a16bb --- /dev/null +++ b/changes/bug40238 @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - Reject obsolete router/extrainfo descs earlier and more quietly. + Fixes bug 40238; bugfix on 0.4.5.1-alpha. \ No newline at end of file

1 0

[tor/maint-0.4.5] Reject obsolete router/extrainfo descs more quietly.
by asn＠torproject.org 22 Jan '21

22 Jan '21

commit ca6ccd372f8f56c842dfad8203bace99be580b90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 11 14:50:40 2021 -0500 Reject obsolete router/extrainfo descs more quietly. Thanks to proposal 315 / ticket #30132, more fields are now required in these documents. But ancient Tors that try to upload obsolete documents were causing the authorities to log warnings about missing fields, and to do so very spammily. We now detect the missing fields before tokenizing, and log at debug. This is a bit of ugliness, but it's probably a safer choice than making _all_ unparseable-desc warnings into debug-level logs. I'm looking at identity-ed25519 in extrainfos and proto in routerdescs because they were (I believe) the latest-added fields in Tor's history: any Tor that lacks them will also lack the other newly required fields. Fixes bug #40238; bugfix on 0.4.5.1-alpha. --- src/feature/dirparse/routerparse.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/feature/dirparse/routerparse.c b/src/feature/dirparse/routerparse.c index 635fc4b49d..3d90c1bc91 100644 --- a/src/feature/dirparse/routerparse.c +++ b/src/feature/dirparse/routerparse.c @@ -456,6 +456,12 @@ router_parse_entry_from_string(const char *s, const char *end, } } + if (!tor_memstr(s, end-s, "\nproto ")) { + log_debug(LD_DIR, "Found an obsolete router descriptor. " + "Rejecting quietly."); + goto err; + } + if (router_get_router_hash(s, end - s, digest) < 0) { log_warn(LD_DIR, "Couldn't compute router hash."); goto err; @@ -991,6 +997,11 @@ extrainfo_parse_entry_from_string(const char *s, const char *end, while (end > s+2 && *(end-1) == '\n' && *(end-2) == '\n') --end; + if (!tor_memstr(s, end-s, "\nidentity-ed25519")) { + log_debug(LD_DIR, "Found an obsolete extrainfo. Rejecting quietly."); + goto err; + } + if (router_get_extrainfo_hash(s, end-s, digest) < 0) { log_warn(LD_DIR, "Couldn't compute router hash."); goto err;

1 0

[tor/maint-0.4.5] Changes file for #40238.
by asn＠torproject.org 22 Jan '21

22 Jan '21

commit 5d711450dd3a1a08ec8461600b558ac7880bf7cf Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Jan 21 23:17:31 2021 +0200 Changes file for #40238. --- changes/bug40238 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug40238 b/changes/bug40238 new file mode 100644 index 0000000000..35784a16bb --- /dev/null +++ b/changes/bug40238 @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - Reject obsolete router/extrainfo descs earlier and more quietly. + Fixes bug 40238; bugfix on 0.4.5.1-alpha. \ No newline at end of file

1 0

[tor/master] Reject obsolete router/extrainfo descs more quietly.
by asn＠torproject.org 22 Jan '21

22 Jan '21

commit ca6ccd372f8f56c842dfad8203bace99be580b90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 11 14:50:40 2021 -0500 Reject obsolete router/extrainfo descs more quietly. Thanks to proposal 315 / ticket #30132, more fields are now required in these documents. But ancient Tors that try to upload obsolete documents were causing the authorities to log warnings about missing fields, and to do so very spammily. We now detect the missing fields before tokenizing, and log at debug. This is a bit of ugliness, but it's probably a safer choice than making _all_ unparseable-desc warnings into debug-level logs. I'm looking at identity-ed25519 in extrainfos and proto in routerdescs because they were (I believe) the latest-added fields in Tor's history: any Tor that lacks them will also lack the other newly required fields. Fixes bug #40238; bugfix on 0.4.5.1-alpha. --- src/feature/dirparse/routerparse.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/feature/dirparse/routerparse.c b/src/feature/dirparse/routerparse.c index 635fc4b49d..3d90c1bc91 100644 --- a/src/feature/dirparse/routerparse.c +++ b/src/feature/dirparse/routerparse.c @@ -456,6 +456,12 @@ router_parse_entry_from_string(const char *s, const char *end, } } + if (!tor_memstr(s, end-s, "\nproto ")) { + log_debug(LD_DIR, "Found an obsolete router descriptor. " + "Rejecting quietly."); + goto err; + } + if (router_get_router_hash(s, end - s, digest) < 0) { log_warn(LD_DIR, "Couldn't compute router hash."); goto err; @@ -991,6 +997,11 @@ extrainfo_parse_entry_from_string(const char *s, const char *end, while (end > s+2 && *(end-1) == '\n' && *(end-2) == '\n') --end; + if (!tor_memstr(s, end-s, "\nidentity-ed25519")) { + log_debug(LD_DIR, "Found an obsolete extrainfo. Rejecting quietly."); + goto err; + } + if (router_get_extrainfo_hash(s, end-s, digest) < 0) { log_warn(LD_DIR, "Couldn't compute router hash."); goto err;

1 0

[tor/master] Merge branch 'maint-0.4.5'
by asn＠torproject.org 22 Jan '21

22 Jan '21

commit 74cfe3611f7b54f7c68bb8ea932a5ab224b95154 Merge: ceefdf984c 4cbd22f1a7 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jan 22 00:21:21 2021 +0200 Merge branch 'maint-0.4.5' changes/bug40238 | 3 +++ src/feature/dirparse/routerparse.c | 11 +++++++++++ 2 files changed, 14 insertions(+)

1 0

[tor/release-0.4.5] Reject obsolete router/extrainfo descs more quietly.
by asn＠torproject.org 22 Jan '21

22 Jan '21

commit ca6ccd372f8f56c842dfad8203bace99be580b90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 11 14:50:40 2021 -0500 Reject obsolete router/extrainfo descs more quietly. Thanks to proposal 315 / ticket #30132, more fields are now required in these documents. But ancient Tors that try to upload obsolete documents were causing the authorities to log warnings about missing fields, and to do so very spammily. We now detect the missing fields before tokenizing, and log at debug. This is a bit of ugliness, but it's probably a safer choice than making _all_ unparseable-desc warnings into debug-level logs. I'm looking at identity-ed25519 in extrainfos and proto in routerdescs because they were (I believe) the latest-added fields in Tor's history: any Tor that lacks them will also lack the other newly required fields. Fixes bug #40238; bugfix on 0.4.5.1-alpha. --- src/feature/dirparse/routerparse.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/feature/dirparse/routerparse.c b/src/feature/dirparse/routerparse.c index 635fc4b49d..3d90c1bc91 100644 --- a/src/feature/dirparse/routerparse.c +++ b/src/feature/dirparse/routerparse.c @@ -456,6 +456,12 @@ router_parse_entry_from_string(const char *s, const char *end, } } + if (!tor_memstr(s, end-s, "\nproto ")) { + log_debug(LD_DIR, "Found an obsolete router descriptor. " + "Rejecting quietly."); + goto err; + } + if (router_get_router_hash(s, end - s, digest) < 0) { log_warn(LD_DIR, "Couldn't compute router hash."); goto err; @@ -991,6 +997,11 @@ extrainfo_parse_entry_from_string(const char *s, const char *end, while (end > s+2 && *(end-1) == '\n' && *(end-2) == '\n') --end; + if (!tor_memstr(s, end-s, "\nidentity-ed25519")) { + log_debug(LD_DIR, "Found an obsolete extrainfo. Rejecting quietly."); + goto err; + } + if (router_get_extrainfo_hash(s, end-s, digest) < 0) { log_warn(LD_DIR, "Couldn't compute router hash."); goto err;

1 0

[tor/master] Merge branch 'mr/251' into maint-0.4.5
by asn＠torproject.org 22 Jan '21

22 Jan '21

commit 4cbd22f1a7f876c7b47a0e688e28c5ac1f256d6d Merge: 68d1e02c3a 5d711450dd Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jan 22 00:21:09 2021 +0200 Merge branch 'mr/251' into maint-0.4.5 changes/bug40238 | 3 +++ src/feature/dirparse/routerparse.c | 11 +++++++++++ 2 files changed, 14 insertions(+)

1 0