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

[tor/release-0.4.4] build: Add "make lsp" command
by dgoulet＠torproject.org 21 Jan '21

21 Jan '21

commit 8500700aa45722595938ef59935e7efde2b1e9e3 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Dec 16 10:01:15 2020 -0500 build: Add "make lsp" command Generates the compile_commands.json file using the "bear" application so the ccls server can be more efficient with our code base. Closes #40227 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- .gitignore | 3 +++ Makefile.am | 14 ++++++++++++++ changes/ticket40227 | 4 ++++ scripts/maint/gen_ccls_file.sh | 20 ++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/.gitignore b/.gitignore index b7f72617a8..cb49c098cd 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,8 @@ uptime-*.json # Core files core core.* +# ccls file that can be per directory. +*.ccls # / /Makefile @@ -76,6 +78,7 @@ core.* /Tor*Bundle.dmg /tor-*-win32.exe /warning_flags +/compile_commands.json /coverage_html/ /callgraph/ diff --git a/Makefile.am b/Makefile.am index a868be7362..c7bc514287 100644 --- a/Makefile.am +++ b/Makefile.am @@ -470,3 +470,17 @@ show-libs: show-testing-libs: @echo $(TOR_INTERNAL_TESTING_LIBS) + +# Note here that we hardcode this -j2 because if the user would pass too many +# cores, bear actually chockes and dies :S. For this to work, a make clean +# needs to be done else bear will miss some compile flags. +lsp: + @if test -x "`which bear 2>&1;true`"; then \ + echo "Generating LSP compile_commands.json. Might take few minutes..."; \ + $(MAKE) clean 2>&1 >/dev/null; \ + bear >/dev/null 2>&1 -- $(MAKE) -j2 2>&1 >/dev/null; \ + echo "Generating .ccls file..."; \ + ./scripts/maint/gen_ccls_file.sh \ + else \ + echo "No bear command found. On debian, apt install bear"; \ + fi diff --git a/changes/ticket40227 b/changes/ticket40227 new file mode 100644 index 0000000000..e5efad0f95 --- /dev/null +++ b/changes/ticket40227 @@ -0,0 +1,4 @@ + o Minor feature (build system): + - New "make lsp" command to auto generate the compile_commands.json file + used by the ccls server. The "bear" program is needed for this. Closes + ticket 40227. diff --git a/scripts/maint/gen_ccls_file.sh b/scripts/maint/gen_ccls_file.sh new file mode 100755 index 0000000000..899e4e9603 --- /dev/null +++ b/scripts/maint/gen_ccls_file.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +############################################################################## +# THIS MUST BE CALLED FROM THE ROOT DIRECTORY. IT IS USED BY THE MAKEFILE SO # +# IN THEORY, YOU SHOULD NEVER CALL THIS. # +############################################################################## + +set -e + +CCLS_FILE=".ccls" + +# Get all #define *_PRIVATE from our source. We need to list them in our .ccls +# file and enable them otherwise ccls will not find their definition thinking +# that they are dead code. +PRIVATE_DEFS=$(grep -r --include \*.h "_PRIVATE" | grep "#ifdef" | cut -d' ' -f2 | sort | uniq) + +echo "clang" > "$CCLS_FILE" +for p in $PRIVATE_DEFS; do + echo "-D$p" >> "$CCLS_FILE" +done

1 0

[Git][tpo/applications/android-components] Pushed new branch android-components-70.0.16-10.5-1
by Matthew Finkel 21 Jan '21

21 Jan '21

Matthew Finkel pushed new branch android-components-70.0.16-10.5-1 at The Tor Project / Applications / android-components -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/tree/an… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

21 Jan '21

commit 77e369589839e489a8f7fc4bfc33c13bbe754047 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 21 20:45:24 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- iw/torbrowser_strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iw/torbrowser_strings.xml b/iw/torbrowser_strings.xml index 67f384c95b..bdf979537c 100644 --- a/iw/torbrowser_strings.xml +++ b/iw/torbrowser_strings.xml @@ -73,7 +73,7 @@  <string name="tor_spoof_english">בקש גרסאות אנגליות של דפי רשת למען פרטיות מוגברת</string> - <string name="tor_useamask_usetor">שים מסיכה, שים Tor.</string> + <string name="tor_useamask_usetor">עטה מסיכה, עטה את Tor.</string> <string name="tor_resistsurveillance">התנגד למגפת המעקב הסמוי.</string> <string name="tor_donationmatch">התרומה שלך תושווה על ידי חברים של Tor.</string> </resources>

1 0

[Git][tpo/applications/fenix] Pushed new branch tor-browser-85.1.0-10.5-1
by Matthew Finkel 21 Jan '21

21 Jan '21

Matthew Finkel pushed new branch tor-browser-85.1.0-10.5-1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-85.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

21 Jan '21

commit dab9c0ff864dfd559e532392508f84b3230a1ae1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 21 20:45:06 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_c… --- he/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd index 90c2e8f0f4..4b1bd3e1b9 100644 --- a/he/aboutTor.dtd +++ b/he/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו">  -<!ENTITY aboutTor.ey2020.useamask "שים מסיכה, שים Tor."> +<!ENTITY aboutTor.ey2020.useamask "עטה מסיכה, עטה את Tor."> <!ENTITY aboutTor.ey2020.resistsurveillance "התנגד למגפת המעקב הסמוי.">

1 0

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

21 Jan '21

commit 1703c75a19bfe23cbe7b1a3825437e3071fb509b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 21 20:45:03 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- he/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/he/aboutTor.dtd b/he/aboutTor.dtd index 90c2e8f0f4..4b1bd3e1b9 100644 --- a/he/aboutTor.dtd +++ b/he/aboutTor.dtd @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו">  -<!ENTITY aboutTor.ey2020.useamask "שים מסיכה, שים Tor."> +<!ENTITY aboutTor.ey2020.useamask "עטה מסיכה, עטה את Tor."> <!ENTITY aboutTor.ey2020.resistsurveillance "התנגד למגפת המעקב הסמוי.">

1 0

[tor/maint-0.4.5] log more about testing incoming relay descriptors
by dgoulet＠torproject.org 21 Jan '21

21 Jan '21

commit 0b00f79c82894c0bd0ff2d492420f7d9e6101d9e Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jan 16 16:11:33 2021 -0500 log more about testing incoming relay descriptors --- src/feature/dirauth/process_descs.c | 8 ++++++-- src/feature/dirauth/reachability.c | 14 +++++++++----- src/feature/dircache/dircache.c | 9 +++++++++ 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index b08ffeba07..a382f237c4 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -322,8 +322,9 @@ dirserv_router_get_status(const routerinfo_t *router, const char **msg, * and is non-zero (clients check that it's non-zero before using it). */ if (!routerinfo_has_curve25519_onion_key(router)) { log_fn(severity, LD_DIR, - "Descriptor from router %s is missing an ntor curve25519 onion " - "key.", router_describe(router)); + "Descriptor from router %s (platform %s) " + "is missing an ntor curve25519 onion key.", + router_describe(router), router->platform); if (msg) *msg = "Missing ntor curve25519 onion key. Please upgrade!"; return RTR_REJECT; @@ -761,6 +762,9 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) goto fail; } + log_info(LD_DIR, "Assessing new descriptor: %s: %s", + ri->nickname, ri->platform); + /* Check whether this descriptor is semantically identical to the last one * from this server. (We do this here and not in router_add_to_routerlist * because we want to be able to accept the newest router descriptor that diff --git a/src/feature/dirauth/reachability.c b/src/feature/dirauth/reachability.c index eb88b4aa07..8717646314 100644 --- a/src/feature/dirauth/reachability.c +++ b/src/feature/dirauth/reachability.c @@ -110,14 +110,18 @@ dirserv_should_launch_reachability_test(const routerinfo_t *ri, if (!ri_old) { /* New router: Launch an immediate reachability test, so we will have an * opinion soon in case we're generating a consensus soon */ + log_info(LD_DIR, "descriptor for new router %s", router_describe(ri)); return 1; } if (ri_old->is_hibernating && !ri->is_hibernating) { /* It just came out of hibernation; launch a reachability test */ + log_info(LD_DIR, "out of hibernation: router %s", router_describe(ri)); return 1; } if (! routers_have_same_or_addrs(ri, ri_old)) { /* Address or port changed; launch a reachability test */ + log_info(LD_DIR, "address or port changed: router %s", + router_describe(ri)); return 1; } return 0; @@ -148,7 +152,7 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router) } /* IPv4. */ - log_debug(LD_OR,"Testing reachability of %s at %s:%u.", + log_info(LD_OR,"Testing reachability of %s at %s:%u.", router->nickname, fmt_addr(&router->ipv4_addr), router->ipv4_orport); chan = channel_tls_connect(&router->ipv4_addr, router->ipv4_orport, @@ -160,10 +164,10 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router) if (dirauth_get_options()->AuthDirHasIPv6Connectivity == 1 && !tor_addr_is_null(&router->ipv6_addr)) { char addrstr[TOR_ADDR_BUF_LEN]; - log_debug(LD_OR, "Testing reachability of %s at %s:%u.", - router->nickname, - tor_addr_to_str(addrstr, &router->ipv6_addr, sizeof(addrstr), 1), - router->ipv6_orport); + log_info(LD_OR, "Testing reachability of %s at %s:%u.", + router->nickname, + tor_addr_to_str(addrstr, &router->ipv6_addr, sizeof(addrstr), 1), + router->ipv6_orport); chan = channel_tls_connect(&router->ipv6_addr, router->ipv6_orport, router->cache_info.identity_digest, ed_id_key); diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index 207ea6698b..7f6452afbb 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -1675,6 +1675,15 @@ directory_handle_command_post,(dir_connection_t *conn, const char *headers, const char *msg = "[None]"; uint8_t purpose = authdir_mode_bridge(options) ? ROUTER_PURPOSE_BRIDGE : ROUTER_PURPOSE_GENERAL; + + { + char *genreason = http_get_header(headers, "X-Desc-Gen-Reason: "); + log_info(LD_DIRSERV, + "New descriptor post, because: %s", + genreason ? genreason : "not specified"); + tor_free(genreason); + } + was_router_added_t r = dirserv_add_multiple_descriptors(body, body_len, purpose, conn->base_.address, &msg); tor_assert(msg);

1 0

[tor/master] log more about testing incoming relay descriptors
by dgoulet＠torproject.org 21 Jan '21

21 Jan '21

commit 0b00f79c82894c0bd0ff2d492420f7d9e6101d9e Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jan 16 16:11:33 2021 -0500 log more about testing incoming relay descriptors --- src/feature/dirauth/process_descs.c | 8 ++++++-- src/feature/dirauth/reachability.c | 14 +++++++++----- src/feature/dircache/dircache.c | 9 +++++++++ 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index b08ffeba07..a382f237c4 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -322,8 +322,9 @@ dirserv_router_get_status(const routerinfo_t *router, const char **msg, * and is non-zero (clients check that it's non-zero before using it). */ if (!routerinfo_has_curve25519_onion_key(router)) { log_fn(severity, LD_DIR, - "Descriptor from router %s is missing an ntor curve25519 onion " - "key.", router_describe(router)); + "Descriptor from router %s (platform %s) " + "is missing an ntor curve25519 onion key.", + router_describe(router), router->platform); if (msg) *msg = "Missing ntor curve25519 onion key. Please upgrade!"; return RTR_REJECT; @@ -761,6 +762,9 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) goto fail; } + log_info(LD_DIR, "Assessing new descriptor: %s: %s", + ri->nickname, ri->platform); + /* Check whether this descriptor is semantically identical to the last one * from this server. (We do this here and not in router_add_to_routerlist * because we want to be able to accept the newest router descriptor that diff --git a/src/feature/dirauth/reachability.c b/src/feature/dirauth/reachability.c index eb88b4aa07..8717646314 100644 --- a/src/feature/dirauth/reachability.c +++ b/src/feature/dirauth/reachability.c @@ -110,14 +110,18 @@ dirserv_should_launch_reachability_test(const routerinfo_t *ri, if (!ri_old) { /* New router: Launch an immediate reachability test, so we will have an * opinion soon in case we're generating a consensus soon */ + log_info(LD_DIR, "descriptor for new router %s", router_describe(ri)); return 1; } if (ri_old->is_hibernating && !ri->is_hibernating) { /* It just came out of hibernation; launch a reachability test */ + log_info(LD_DIR, "out of hibernation: router %s", router_describe(ri)); return 1; } if (! routers_have_same_or_addrs(ri, ri_old)) { /* Address or port changed; launch a reachability test */ + log_info(LD_DIR, "address or port changed: router %s", + router_describe(ri)); return 1; } return 0; @@ -148,7 +152,7 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router) } /* IPv4. */ - log_debug(LD_OR,"Testing reachability of %s at %s:%u.", + log_info(LD_OR,"Testing reachability of %s at %s:%u.", router->nickname, fmt_addr(&router->ipv4_addr), router->ipv4_orport); chan = channel_tls_connect(&router->ipv4_addr, router->ipv4_orport, @@ -160,10 +164,10 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router) if (dirauth_get_options()->AuthDirHasIPv6Connectivity == 1 && !tor_addr_is_null(&router->ipv6_addr)) { char addrstr[TOR_ADDR_BUF_LEN]; - log_debug(LD_OR, "Testing reachability of %s at %s:%u.", - router->nickname, - tor_addr_to_str(addrstr, &router->ipv6_addr, sizeof(addrstr), 1), - router->ipv6_orport); + log_info(LD_OR, "Testing reachability of %s at %s:%u.", + router->nickname, + tor_addr_to_str(addrstr, &router->ipv6_addr, sizeof(addrstr), 1), + router->ipv6_orport); chan = channel_tls_connect(&router->ipv6_addr, router->ipv6_orport, router->cache_info.identity_digest, ed_id_key); diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index 207ea6698b..7f6452afbb 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -1675,6 +1675,15 @@ directory_handle_command_post,(dir_connection_t *conn, const char *headers, const char *msg = "[None]"; uint8_t purpose = authdir_mode_bridge(options) ? ROUTER_PURPOSE_BRIDGE : ROUTER_PURPOSE_GENERAL; + + { + char *genreason = http_get_header(headers, "X-Desc-Gen-Reason: "); + log_info(LD_DIRSERV, + "New descriptor post, because: %s", + genreason ? genreason : "not specified"); + tor_free(genreason); + } + was_router_added_t r = dirserv_add_multiple_descriptors(body, body_len, purpose, conn->base_.address, &msg); tor_assert(msg);

1 0

[tor/maint-0.4.5] Merge branch 'tor-gitlab/mr/270' into maint-0.4.5
by dgoulet＠torproject.org 21 Jan '21

21 Jan '21

commit c54f4b81da5635b282fc45c6301c490663113434 Merge: 08c0ef61d8 633b68bfe2 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jan 21 14:58:31 2021 -0500 Merge branch 'tor-gitlab/mr/270' into maint-0.4.5 changes/ticket40245 | 4 ++++ src/feature/dirauth/dirvote.c | 30 +++++++++++++++++++++++++----- src/feature/dirauth/dirvote.h | 3 +++ src/feature/dirauth/process_descs.c | 8 ++++++-- src/feature/dirauth/reachability.c | 14 +++++++++----- src/feature/dircache/dircache.c | 12 +++++++++++- src/feature/dirclient/dirclient.c | 8 ++++---- src/test/test_dir_handle_get.c | 18 +++++++++--------- 8 files changed, 71 insertions(+), 26 deletions(-)

1 0

[tor/maint-0.4.5] dir auths write consensuses to disk after creation
by dgoulet＠torproject.org 21 Jan '21

21 Jan '21

commit 9e6064ec359a170ab37fb5d66ef7c46519ac1caa Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jan 16 16:23:31 2021 -0500 dir auths write consensuses to disk after creation This step happens after we make each consensus flavor, and before we worry about sigs or anything. That way if Tor crashes, or if we fail to get enough sigs, we still have a chance to know what consensus we wanted to make. --- src/feature/dirauth/dirvote.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 6824af815f..cf1135ba37 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -3462,6 +3462,15 @@ dirvote_compute_consensuses(void) pending[flav].body = consensus_body; pending[flav].consensus = consensus; n_generated++; + + /* Write it out to disk too, for dir auth debugging purposes */ + { + char *filename; + tor_asprintf(&filename, "my-consensus-%s", flavor_name); + write_str_to_file(get_datadir_fname(filename), consensus_body, 0); + tor_free(filename); + } + consensus_body = NULL; consensus = NULL; }

1 0