tor-commits December 2020

tor-commits@lists.torproject.org

19 participants
1639 discussions

[tor/master] relay: Avoid log reachability test for bandwidth test circuit
by dgoulet＠torproject.org 08 Dec '20

08 Dec '20

commit e74f168bb4df0b06d4f224421570e160cfcdb7a9 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Dec 8 11:58:10 2020 -0500 relay: Avoid log reachability test for bandwidth test circuit Fixes #40205 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40205 | 5 +++++ src/feature/relay/selftest.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/changes/ticket40205 b/changes/ticket40205 new file mode 100644 index 0000000000..e21c7fab7c --- /dev/null +++ b/changes/ticket40205 @@ -0,0 +1,5 @@ + o Minor bugfixes (relay, logging, reachability): + - When launching bandwidth testing circuit, don't log notice that we are + doing a reachability test. Furthermore, avoid to trigger a + "CHECKING_REACHABILITY" control event. Fixes bug 40205; bugfix on + 0.4.5.1-alpha. diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index b711c94eb6..86b1533be1 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -274,7 +274,12 @@ router_do_orport_reachability_checks(const routerinfo_t *me, !orport_reachable ? "reachability" : "bandwidth", family_name, fmt_addrport_ap(ap)); - inform_testing_reachability(&ap->addr, ap->port, false); + if (!orport_reachable) { + /* Only log if we are actually doing a reachability test to learn if our + * ORPort is reachable. Else, this prints a log notice if we are simply + * opening a bandwidth testing circuit even do we are reachable. */ + inform_testing_reachability(&ap->addr, ap->port, false); + } circuit_launch_by_extend_info(CIRCUIT_PURPOSE_TESTING, ei, CIRCLAUNCH_NEED_CAPACITY|

1 0

[tor/master] Merge branch 'maint-0.4.5'
by dgoulet＠torproject.org 08 Dec '20

08 Dec '20

commit 6e83a520776e503974e4020a9ff011eb6bef9d39 Merge: f280c171e2 e74f168bb4 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Dec 8 14:51:43 2020 -0500 Merge branch 'maint-0.4.5' changes/ticket40205 | 5 +++++ src/feature/relay/selftest.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.5] relay: Avoid log reachability test for bandwidth test circuit
by dgoulet＠torproject.org 08 Dec '20

08 Dec '20

1 0

[tor/maint-0.4.5] relay: Avoid log reachability test for bandwidth test circuit
by dgoulet＠torproject.org 08 Dec '20

08 Dec '20

1 0

[tor-browser-build/maint-10.0-android] Bug 40139: Pick up rbm commit for bug 40008
by sysrqb＠torproject.org 08 Dec '20

08 Dec '20

commit 35e166b3fa2bba66355e6ccbad79de50cd92b20d Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Oct 28 22:08:13 2020 +0000 Bug 40139: Pick up rbm commit for bug 40008 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index a32239d..15c8476 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit a32239ddb1f465115cb4a8bb9f4b853c149506f3 +Subproject commit 15c84760ebe3f2677d1212aa00ef6f7485446a69

1 0

[tor-browser-build/maint-10.0-desktop] Bug 40139: Pick up rbm commit for bug 40008
by sysrqb＠torproject.org 08 Dec '20

08 Dec '20

commit 84f086a26c83449131c0ba4d5cc371d9a55c8fe1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Oct 28 22:08:13 2020 +0000 Bug 40139: Pick up rbm commit for bug 40008 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index a32239d..15c8476 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit a32239ddb1f465115cb4a8bb9f4b853c149506f3 +Subproject commit 15c84760ebe3f2677d1212aa00ef6f7485446a69

1 0

[tor-browser/tor-browser-78.5.0esr-10.0-1] Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
by sysrqb＠torproject.org 08 Dec '20

08 Dec '20

commit 9cc097d454330ca53808b4a90bf3677c4f8a6f2d Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Oct 9 12:55:35 2020 +0200 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots --- browser/app/profile/000-tor-browser.js | 3 +++ browser/components/BrowserGlue.jsm | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 6bc759bdf30b..5c65eff70fc0 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -323,6 +323,9 @@ pref("security.enterprise_roots.enabled", false); // Don't ping Mozilla for MitM detection, see bug 32321 pref("security.certerrors.mitm.priming.enabled", false); +// Don't automatically enable enterprise roots, see bug 40166 +pref("security.certerrors.mitm.auto_enable_enterprise_roots", false); + // Disable the language pack signing check for now on macOS, see #31942 #ifdef XP_MACOSX pref("extensions.langpacks.signatures.required", false); diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 057a2121533c..3750230a250b 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -1319,6 +1319,20 @@ BrowserGlue.prototype = { // handle any UI migration this._migrateUI(); + // Clear possibly auto enabled enterprise_roots prefs (see bug 40166) + if ( + !Services.prefs.getBoolPref( + "security.certerrors.mitm.auto_enable_enterprise_roots" + ) && + Services.prefs.getBoolPref( + "security.enterprise_roots.auto-enabled", + false + ) + ) { + Services.prefs.clearUserPref("security.enterprise_roots.enabled"); + Services.prefs.clearUserPref("security.enterprise_roots.auto-enabled"); + } + if (!Services.prefs.prefHasUserValue(PREF_PDFJS_ISDEFAULT_CACHE_STATE)) { PdfJs.checkIsDefault(this._isNewProfile); }

1 0

[tor/master] Command-line arguments: be better at detecting absent optional args.
by asn＠torproject.org 08 Dec '20

08 Dec '20

commit 558aaf1c32ece99f62006c6a3395c3e53d5e414d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 7 16:40:19 2020 -0500 Command-line arguments: be better at detecting absent optional args. Previously, "--list-fingerprint --quiet" was an error. Now, the handler for optional arguments to "--list-fingerprint" can tell that "--quiet" is a flag, not an argument. This only affects flags that take an _optional_ argument, so you can still put your torrc file in a location starting with "-". Closes #40223. --- changes/argument_parse | 5 +++++ src/app/config/config.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/argument_parse b/changes/argument_parse new file mode 100644 index 0000000000..ed8e66bba3 --- /dev/null +++ b/changes/argument_parse @@ -0,0 +1,5 @@ + o Minor features (command-line interface): + - When parsing command-line flags that take an optional argument, + treat the argument as absent if it would start with a '-' character. + Arguments in that form are not intelligible for any of our + optional-argument flags. Closes ticket 40223. diff --git a/src/app/config/config.c b/src/app/config/config.c index df89b6ede9..660c89bc4c 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2601,8 +2601,11 @@ config_parse_commandline(int argc, char **argv, int ignore_errors) parsed_cmdline_free(result); return NULL; } - } else if (want_arg == ARGUMENT_OPTIONAL && is_last) { + } else if (want_arg == ARGUMENT_OPTIONAL && + /* optional arguments may never start with '-'. */ + (is_last || argv[i+1][0] == '-')) { arg = tor_strdup(""); + want_arg = ARGUMENT_NONE; // prevent skipping the next flag. } else { arg = (want_arg != ARGUMENT_NONE) ? tor_strdup(argv[i+1]) : tor_strdup("");

1 0

[tor/master] Merge branch 'mr/233'
by asn＠torproject.org 08 Dec '20

08 Dec '20

commit f280c171e261dfe6fe9f39f715b4a40254982d58 Merge: 2d0a7f2e89 558aaf1c32 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Dec 8 16:54:18 2020 +0200 Merge branch 'mr/233' changes/argument_parse | 5 +++++ src/app/config/config.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.5] configure: Fix the --enable-static-tor switch
by dgoulet＠torproject.org 08 Dec '20

08 Dec '20

commit c618c4f27986825df2026fb22b8ee222edd1afa1 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 18 11:24:38 2020 -0500 configure: Fix the --enable-static-tor switch The "-static" compile flag was set globally which means that all autoconf test were attempting to be built statically and lead to failures of detecting OpenSSL libraries and others. This commit adds this flag only to the "tor" binary build. There is also a fix on where to find libevent.a since it is using libtool, it is in .libs/. At this commit, there are still warnings being emitted that informs the user that the built binary must still be linked dynamically with glibc. Fixes #40111 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40111 | 7 +++++++ configure.ac | 5 +++-- src/app/include.am | 6 ++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/changes/ticket40111 b/changes/ticket40111 new file mode 100644 index 0000000000..a82ca0d489 --- /dev/null +++ b/changes/ticket40111 @@ -0,0 +1,7 @@ + o Minor bugfixes (configure, build): + - Fix the --enable-static-tor switch to properly set the -static compile + option onto the tor binary only. Fixes bug 40111; bugfix on + 0.2.3.1-alpha. + - Path to static libevent has been fixed as well which affects the + --enable-static-libevent to behave correctly now. The .a file is in + .libs/ of libevent repository, not at the root. diff --git a/configure.ac b/configure.ac index 6eb09db429..83f6ad1821 100644 --- a/configure.ac +++ b/configure.ac @@ -129,8 +129,9 @@ if test "$enable_static_tor" = "yes"; then enable_static_libevent="yes"; enable_static_openssl="yes"; enable_static_zlib="yes"; - CFLAGS="$CFLAGS -static" + TOR_STATIC_LDFLAGS="-static" fi +AC_SUBST(TOR_STATIC_LDFLAGS) if test "$enable_system_torrc" = "no"; then AC_DEFINE(DISABLE_SYSTEM_TORRC, 1, @@ -953,7 +954,7 @@ if test "$enable_static_libevent" = "yes"; then if test "$tor_cv_library_libevent_dir" = "(system)"; then AC_MSG_ERROR("You must specify an explicit --with-libevent-dir=x option when using --enable-static-libevent") else - TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent.a $STATIC_LIBEVENT_FLAGS" + TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/.libs/libevent.a $STATIC_LIBEVENT_FLAGS" fi else if test "x$ac_cv_header_event2_event_h" = "xyes"; then diff --git a/src/app/include.am b/src/app/include.am index b81fad0276..8bb315fff1 100644 --- a/src/app/include.am +++ b/src/app/include.am @@ -14,7 +14,8 @@ src_app_tor_SOURCES = src/app/main/tor_main.c # This seems to matter nowhere but on windows, but I assure you that it # matters a lot there, and is quite hard to debug if you forget to do it. -src_app_tor_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) @TOR_LDFLAGS_libevent@ +src_app_tor_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) \ + @TOR_LDFLAGS_libevent@ @TOR_STATIC_LDFLAGS@ src_app_tor_LDADD = libtor.a \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ $(TOR_LIBS_CRYPTLIB) \ @@ -26,7 +27,8 @@ if COVERAGE_ENABLED src_app_tor_cov_SOURCES = $(src_app_tor_SOURCES) src_app_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_app_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) -src_app_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) @TOR_LDFLAGS_libevent@ +src_app_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) \ + @TOR_LDFLAGS_libevent@ @TOR_STATIC_LDFALGS@ src_app_tor_cov_LDADD = src/test/libtor-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ $(TOR_LIBS_CRYPTLIB) \ @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2020