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

[tor/release-0.4.1] Set 'routerlist' global to NULL before freeing it.
by asn＠torproject.org 24 Jul '19

24 Jul '19

commit a9379d6750d025d8bfe54a79c26e89eb45393f3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 19 09:49:52 2019 -0400 Set 'routerlist' global to NULL before freeing it. There is other code that uses this value, and some of it is apparently reachable from inside router_dir_info_changed(), which routerlist_free() apparently calls. (ouch!) This is a minimal fix to try to resolve the issue without causing other problems. Fixes bug 31003. I'm calling this a bugfix on 0.1.2.2-alpha, where the call to router_dir_info_changed() was added to routerlist_free(). --- changes/bug31003 | 4 ++++ src/feature/nodelist/routerlist.c | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/changes/bug31003 b/changes/bug31003 new file mode 100644 index 000000000..6c7516338 --- /dev/null +++ b/changes/bug31003 @@ -0,0 +1,4 @@ + o Minor bugfixes (crash on exit): + - Avoid a set of possible code paths that could use try to use freed memory + in routerlist_free() while Tor was exiting. Fixes bug 31003; bugfix on + 0.1.2.2-alpha. diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index 4a99427cd..61af09742 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -954,20 +954,18 @@ routerlist_free_(routerlist_t *rl) smartlist_free(rl->routers); smartlist_free(rl->old_routers); if (rl->desc_store.mmap) { - int res = tor_munmap_file(routerlist->desc_store.mmap); + int res = tor_munmap_file(rl->desc_store.mmap); if (res != 0) { log_warn(LD_FS, "Failed to munmap routerlist->desc_store.mmap"); } } if (rl->extrainfo_store.mmap) { - int res = tor_munmap_file(routerlist->extrainfo_store.mmap); + int res = tor_munmap_file(rl->extrainfo_store.mmap); if (res != 0) { log_warn(LD_FS, "Failed to munmap routerlist->extrainfo_store.mmap"); } } tor_free(rl); - - router_dir_info_changed(); } /** Log information about how much memory is being used for routerlist, @@ -1426,8 +1424,10 @@ routerlist_reparse_old(routerlist_t *rl, signed_descriptor_t *sd) void routerlist_free_all(void) { - routerlist_free(routerlist); - routerlist = NULL; + routerlist_t *rl = routerlist; + routerlist = NULL; // Prevent internals of routerlist_free() from using + // routerlist. + routerlist_free(rl); dirlist_free_all(); if (warned_nicknames) { SMARTLIST_FOREACH(warned_nicknames, char *, cp, tor_free(cp));

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by asn＠torproject.org 24 Jul '19

24 Jul '19

commit b0a06e7b186f728a25c75743f30965b2ee46dc26 Merge: 634087304 bb33a2f29 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jul 24 12:32:06 2019 +0300 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug31003 | 4 ++++ src/feature/nodelist/routerlist.c | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)

1 0

[tor/master] Early exit from post-merge git hook script when not merging to master
by asn＠torproject.org 24 Jul '19

24 Jul '19

commit 59e523f058ee0953deacf1370d546cabd192584d Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Jul 2 20:06:23 2019 +0300 Early exit from post-merge git hook script when not merging to master --- changes/bug31040 | 3 +++ scripts/git/post-merge.git-hook | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/changes/bug31040 b/changes/bug31040 new file mode 100644 index 000000000..81f6d7e79 --- /dev/null +++ b/changes/bug31040 @@ -0,0 +1,3 @@ + o Minor bugfixes (developer tooling): + - Only log git script changes in post-merge script when merge was to the + master branch. Fixes bug 31040; bugfix on 0.4.1.1-alpha. diff --git a/scripts/git/post-merge.git-hook b/scripts/git/post-merge.git-hook index 176b7c9bb..eae4f999e 100755 --- a/scripts/git/post-merge.git-hook +++ b/scripts/git/post-merge.git-hook @@ -35,6 +35,12 @@ check_for_script_update() { fi } +cur_branch=$(git rev-parse --abbrev-ref HEAD) +if [ "$cur_branch" != "master" ]; then + echo "post-merge: Not a master branch. Skipping." + exit 0 +fi + check_for_diffs "pre-push" check_for_diffs "pre-commit" check_for_diffs "post-merge"

1 0

[tor/master] Merge branch 'tor-github/pr/1165'
by asn＠torproject.org 24 Jul '19

24 Jul '19

commit 91f04d006bb850736df587e2942fedcc26d3dca9 Merge: ab1f82ea2 59e523f05 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jul 24 12:29:57 2019 +0300 Merge branch 'tor-github/pr/1165' changes/bug31040 | 3 +++ scripts/git/post-merge.git-hook | 6 ++++++ 2 files changed, 9 insertions(+)

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 24 Jul '19

24 Jul '19

commit c50f734061e60c95dd652e06ed6d0ea1813eed6d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 24 09:22:02 2019 +0000 Update translations for support-portal_completed --- contents+tr.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contents+tr.po b/contents+tr.po index ea60d536d..4075066a7 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -451,6 +451,8 @@ msgid "" "gpg.exe --auto-key-locate nodefault,wkd --locate-keys " "torbrowser(a)torproject.org" msgstr "" +"gpg.exe --auto-key-locate nodefault,wkd --locate-keys " +"torbrowser(a)torproject.org" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -686,6 +688,7 @@ msgstr "" msgid "" "gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser(a)torproject.org" msgstr "" +"gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser(a)torproject.org" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 24 Jul '19

24 Jul '19

commit c8d5941f8469cbd93e279bd8419846a930e8edff Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 24 09:21:53 2019 +0000 Update translations for support-portal --- contents+tr.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contents+tr.po b/contents+tr.po index ea60d536d..4075066a7 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -451,6 +451,8 @@ msgid "" "gpg.exe --auto-key-locate nodefault,wkd --locate-keys " "torbrowser(a)torproject.org" msgstr "" +"gpg.exe --auto-key-locate nodefault,wkd --locate-keys " +"torbrowser(a)torproject.org" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -686,6 +688,7 @@ msgstr "" msgid "" "gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser(a)torproject.org" msgstr "" +"gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser(a)torproject.org" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 23 Jul '19

23 Jul '19

commit a41ba40a8eaebcd963a5c3171daf90d69d02cc33 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 23 20:45:49 2019 +0000 Update translations for exoneratorproperties --- sq/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sq/exonerator.properties b/sq/exonerator.properties index 45e9aa829..f04e86f68 100644 --- a/sq/exonerator.properties +++ b/sq/exonerator.properties @@ -1,4 +1,4 @@ -form.explanation=Futni një adresë IP dhe datën, që të gjeni nëse kjo adresë është përdorur si rele Tor: +form.explanation=Fusni një adresë IP dhe datën, që të gjeni nëse kjo adresë është përdorur si rele Tor: form.ip.label=Adresa IP form.timestamp.label=Data form.search.label=Kërkoni

1 0

[tor/master] Allow NULL circ->p_chan in circuit_is_suitable_for_introduce1()
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit f14ce4bce6cb1772ce4dbba79acbed27b3a40b31 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 12:36:40 2019 -0400 Allow NULL circ->p_chan in circuit_is_suitable_for_introduce1() This shouldn't be possible while Tor is running, but the tests can hit this code. Rather than force the tests to add a dummy channel object, let's just tolerate their incompletely built circuits. --- src/feature/hs/hs_intropoint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feature/hs/hs_intropoint.c b/src/feature/hs/hs_intropoint.c index 447f73b60..6383d3ed2 100644 --- a/src/feature/hs/hs_intropoint.c +++ b/src/feature/hs/hs_intropoint.c @@ -548,7 +548,7 @@ circuit_is_suitable_for_introduce1(const or_circuit_t *circ) } /* Disallow single hop client circuit. */ - if (channel_is_client(circ->p_chan)) { + if (circ->p_chan && channel_is_client(circ->p_chan)) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "Single hop client was rejected while trying to introduce. " "Closing circuit.");

1 0

[tor/master] hs: Disallow single hop client circuit when introducing
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit f2b1eb1f052c99e0be096b98888e9854cf57a64c Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jun 19 11:09:14 2019 -0400 hs: Disallow single hop client circuit when introducing This will effectively also deny any bridge to be used as a single hop to the introduction point since bridge do not authenticate like clients. Fixes #24963 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket24963 | 5 +++++ src/feature/hs/hs_intropoint.c | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/changes/ticket24963 b/changes/ticket24963 new file mode 100644 index 000000000..50adcfaaf --- /dev/null +++ b/changes/ticket24963 @@ -0,0 +1,5 @@ + o Minor feature (onion service): + - Disallow single hop clients to introduce directly at the introduction + point. We've removed Tor2web a while back and rendezvous are blocked at + the relays. This is to remove load off the network from spammy clients. + Close ticket 24963. diff --git a/src/feature/hs/hs_intropoint.c b/src/feature/hs/hs_intropoint.c index 9333060e7..447f73b60 100644 --- a/src/feature/hs/hs_intropoint.c +++ b/src/feature/hs/hs_intropoint.c @@ -10,6 +10,7 @@ #include "core/or/or.h" #include "app/config/config.h" +#include "core/or/channel.h" #include "core/or/circuitlist.h" #include "core/or/circuituse.h" #include "core/or/relay.h" @@ -546,6 +547,14 @@ circuit_is_suitable_for_introduce1(const or_circuit_t *circ) return 0; } + /* Disallow single hop client circuit. */ + if (channel_is_client(circ->p_chan)) { + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Single hop client was rejected while trying to introduce. " + "Closing circuit."); + return 0; + } + return 1; }

1 0

[tor/master] Add a test for disallowing single-hop introductions.
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit df12ff3deaa7ad4a5eb2098f4ed9d12ee4084d6d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 12:42:33 2019 -0400 Add a test for disallowing single-hop introductions. Code from dgoulet. --- src/test/test_hs_intropoint.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c index 732836fb5..0cdb1fef2 100644 --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@ -16,6 +16,7 @@ #include "lib/crypt_ops/crypto_rand.h" #include "core/or/or.h" +#include "core/or/channel.h" #include "core/or/circuitlist.h" #include "core/or/circuituse.h" #include "ht.h" @@ -693,6 +694,17 @@ test_introduce1_suitable_circuit(void *arg) tt_int_op(ret, OP_EQ, 0); } + /* Single hop circuit should not be allowed. */ + { + circ = or_circuit_new(0, NULL); + circ->p_chan = tor_malloc_zero(sizeof(channel_t)); + circ->p_chan->is_client = 1; + ret = circuit_is_suitable_for_introduce1(circ); + tor_free(circ->p_chan); + circuit_free_(TO_CIRCUIT(circ)); + tt_int_op(ret, OP_EQ, 0); + } + done: ; } @@ -927,4 +939,3 @@ struct testcase_t hs_intropoint_tests[] = { END_OF_TESTCASES }; -

1 0