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

[tor/release-0.4.5] config: Catch missing Bridge for ClientTransportPlugin
by ahf＠torproject.org 16 Dec '20

16 Dec '20

commit ee6ad0e592c9b6239066697ae8aff83136edc2ed Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Dec 8 10:01:23 2020 -0500 config: Catch missing Bridge for ClientTransportPlugin When making sure we have a Bridge line with a ClientTransportPlugin, we now check in the managed proxy list and so we can catch any missing ClientTransportPlugin for a Bridge line. Fixes #40106 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40106 | 5 +++++ src/app/config/config.c | 3 ++- src/feature/client/transports.c | 22 ++++++++++++++++++++++ src/feature/client/transports.h | 1 + 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/changes/ticket40106 b/changes/ticket40106 new file mode 100644 index 0000000000..d007cf535e --- /dev/null +++ b/changes/ticket40106 @@ -0,0 +1,5 @@ + o Minor bugfixes (config, bridge): + - Really fix the case where torrc has a missing ClientTransportPlugin but + configured with a Bridge line and UseBridges. Previously, we failed to + also look at the managed proxy list and thus it would fail for the + "exec" case. Fixes bug 40106; bugfix on 0.4.5.1-alpha. diff --git a/src/app/config/config.c b/src/app/config/config.c index 79b67e7a90..d8bc5f6025 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2198,7 +2198,8 @@ options_act,(const or_options_t *old_options)) * validation time. */ SMARTLIST_FOREACH_BEGIN(bridge_list_get(), const bridge_info_t *, bi) { const char *bi_transport_name = bridget_get_transport_name(bi); - if (bi_transport_name && !transport_get_by_name(bi_transport_name)) { + if (bi_transport_name && (!transport_get_by_name(bi_transport_name) && + !managed_proxy_has_transport(bi_transport_name))) { log_warn(LD_CONFIG, "Bridge line with transport %s is missing a " "ClientTransportPlugin line", bi_transport_name); return -1; diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index d1c807189a..4b05d55494 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -368,6 +368,28 @@ static int unconfigured_proxies_n = 0; /** Boolean: True iff we might need to restart some proxies. */ static int check_if_restarts_needed = 0; +/** Return true iff we have a managed_proxy_t in the global list is for the + * given transport name. */ +bool +managed_proxy_has_transport(const char *transport_name) +{ + tor_assert(transport_name); + + if (!managed_proxy_list) { + return false; + } + + SMARTLIST_FOREACH_BEGIN(managed_proxy_list, const managed_proxy_t *, mp) { + SMARTLIST_FOREACH_BEGIN(mp->transports_to_launch, const char *, name) { + if (!strcasecmp(name, transport_name)) { + return true; + } + } SMARTLIST_FOREACH_END(name); + } SMARTLIST_FOREACH_END(mp); + + return false; +} + /** Return true if there are still unconfigured managed proxies, or proxies * that need restarting. */ int diff --git a/src/feature/client/transports.h b/src/feature/client/transports.h index 3aff1cb248..47b118e77b 100644 --- a/src/feature/client/transports.h +++ b/src/feature/client/transports.h @@ -41,6 +41,7 @@ void transport_free_(transport_t *transport); #define transport_free(tr) FREE_AND_NULL(transport_t, transport_free_, (tr)) MOCK_DECL(transport_t*, transport_get_by_name, (const char *name)); +bool managed_proxy_has_transport(const char *transport_name); MOCK_DECL(void, pt_kickstart_proxy, (const smartlist_t *transport_list, char **proxy_argv,

1 0

[tor/release-0.4.5] Merge branch 'tor-gitlab/mr/234' into maint-0.4.5
by ahf＠torproject.org 16 Dec '20

16 Dec '20

commit 5a2d01ae57a2b90a03895fe33f07629089eee21a Merge: b83777f7b2 ee6ad0e592 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Dec 16 20:38:23 2020 +0000 Merge branch 'tor-gitlab/mr/234' into maint-0.4.5 changes/ticket40106 | 5 +++++ src/app/config/config.c | 3 ++- src/feature/client/transports.c | 22 ++++++++++++++++++++++ src/feature/client/transports.h | 1 + 4 files changed, 30 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by ahf＠torproject.org 16 Dec '20

16 Dec '20

commit 649ca08dd9f36b6d71034203a1fe8b57629a1665 Merge: d041f083c8 5a2d01ae57 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Dec 16 20:39:01 2020 +0000 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40106 | 5 +++++ src/app/config/config.c | 3 ++- src/feature/client/transports.c | 22 ++++++++++++++++++++++ src/feature/client/transports.h | 1 + 4 files changed, 30 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/238' into maint-0.4.5
by ahf＠torproject.org 16 Dec '20

16 Dec '20

commit b83777f7b2c0809d9f92ae36bd5ea7975a0a2d06 Merge: 7998ea2f18 15b0d30a55 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Dec 16 20:31:10 2020 +0000 Merge remote-tracking branch 'tor-gitlab/mr/238' into maint-0.4.5 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

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

16 Dec '20

commit 66b1a9a5c101d071c88a4f6786dbed9ad4e94982 Merge: 2d68fdc94c b83777f7b2 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Dec 16 20:31:46 2020 +0000 Merge branch 'maint-0.4.5' configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/238' into maint-0.4.5
by ahf＠torproject.org 16 Dec '20

16 Dec '20

commit b83777f7b2c0809d9f92ae36bd5ea7975a0a2d06 Merge: 7998ea2f18 15b0d30a55 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Dec 16 20:31:10 2020 +0000 Merge remote-tracking branch 'tor-gitlab/mr/238' into maint-0.4.5 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] configure: Revert back the static libevent path
by ahf＠torproject.org 16 Dec '20

16 Dec '20

commit 15b0d30a553e2e3e7eba2539d6531025a0272d2c Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Dec 11 09:52:23 2020 -0500 configure: Revert back the static libevent path From c618c4f27986825df2026fb22b8ee222edd1afa1, we changed the static libevent.a path to be able to use the git repository or tarball directly but that broke the "make install" setup that Tor Browser is using with Android. In other words, the git repository and tarball put the "libevent.a" in ".libs/" where "make install" puts it in "lib/". Using the --with-libevent-dir=..., which is mandatory for static libevent, autoconf will take the path and use it for the includes (-I) and library (-L) for which if it finds a "include/" and a "lib/" in the root, it will use those. However, with the git repo or tarball, the "lib/" doesn't exists thus autoconf sets the library search path to be at the root and thus fails to find the libevent.a in ".libs/". This is a whole lot more work to make both cases work in our configure.ac thus I'm reverting the change here to the Tor Browser case works again and the work around for others is to either symlink the libevent.a at the root or use a temporary make install directory. One long term fix here would likely be to ask libevent to symblink the .a into the root along the .la files and likely do the same for .so. Or, use the "lib/" structure to contain the .a + .so files. Would be better than doing ninji-tsu in our configure.ac Fixes #40225 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 83f6ad1821..1c3fa7d15c 100644 --- a/configure.ac +++ b/configure.ac @@ -954,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/.libs/libevent.a $STATIC_LIBEVENT_FLAGS" + TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent.a $STATIC_LIBEVENT_FLAGS" fi else if test "x$ac_cv_header_event2_event_h" = "xyes"; then

1 0

[tor/maint-0.4.5] configure: Revert back the static libevent path
by ahf＠torproject.org 16 Dec '20

16 Dec '20

commit 15b0d30a553e2e3e7eba2539d6531025a0272d2c Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Dec 11 09:52:23 2020 -0500 configure: Revert back the static libevent path From c618c4f27986825df2026fb22b8ee222edd1afa1, we changed the static libevent.a path to be able to use the git repository or tarball directly but that broke the "make install" setup that Tor Browser is using with Android. In other words, the git repository and tarball put the "libevent.a" in ".libs/" where "make install" puts it in "lib/". Using the --with-libevent-dir=..., which is mandatory for static libevent, autoconf will take the path and use it for the includes (-I) and library (-L) for which if it finds a "include/" and a "lib/" in the root, it will use those. However, with the git repo or tarball, the "lib/" doesn't exists thus autoconf sets the library search path to be at the root and thus fails to find the libevent.a in ".libs/". This is a whole lot more work to make both cases work in our configure.ac thus I'm reverting the change here to the Tor Browser case works again and the work around for others is to either symlink the libevent.a at the root or use a temporary make install directory. One long term fix here would likely be to ask libevent to symblink the .a into the root along the .la files and likely do the same for .so. Or, use the "lib/" structure to contain the .a + .so files. Would be better than doing ninji-tsu in our configure.ac Fixes #40225 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 83f6ad1821..1c3fa7d15c 100644 --- a/configure.ac +++ b/configure.ac @@ -954,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/.libs/libevent.a $STATIC_LIBEVENT_FLAGS" + TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent.a $STATIC_LIBEVENT_FLAGS" fi else if test "x$ac_cv_header_event2_event_h" = "xyes"; then

1 0

[tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/238' into maint-0.4.5
by ahf＠torproject.org 16 Dec '20

16 Dec '20

commit b83777f7b2c0809d9f92ae36bd5ea7975a0a2d06 Merge: 7998ea2f18 15b0d30a55 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Dec 16 20:31:10 2020 +0000 Merge remote-tracking branch 'tor-gitlab/mr/238' into maint-0.4.5 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.4.5] configure: Revert back the static libevent path
by ahf＠torproject.org 16 Dec '20

16 Dec '20

commit 15b0d30a553e2e3e7eba2539d6531025a0272d2c Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Dec 11 09:52:23 2020 -0500 configure: Revert back the static libevent path From c618c4f27986825df2026fb22b8ee222edd1afa1, we changed the static libevent.a path to be able to use the git repository or tarball directly but that broke the "make install" setup that Tor Browser is using with Android. In other words, the git repository and tarball put the "libevent.a" in ".libs/" where "make install" puts it in "lib/". Using the --with-libevent-dir=..., which is mandatory for static libevent, autoconf will take the path and use it for the includes (-I) and library (-L) for which if it finds a "include/" and a "lib/" in the root, it will use those. However, with the git repo or tarball, the "lib/" doesn't exists thus autoconf sets the library search path to be at the root and thus fails to find the libevent.a in ".libs/". This is a whole lot more work to make both cases work in our configure.ac thus I'm reverting the change here to the Tor Browser case works again and the work around for others is to either symlink the libevent.a at the root or use a temporary make install directory. One long term fix here would likely be to ask libevent to symblink the .a into the root along the .la files and likely do the same for .so. Or, use the "lib/" structure to contain the .a + .so files. Would be better than doing ninji-tsu in our configure.ac Fixes #40225 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 83f6ad1821..1c3fa7d15c 100644 --- a/configure.ac +++ b/configure.ac @@ -954,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/.libs/libevent.a $STATIC_LIBEVENT_FLAGS" + TOR_LIBEVENT_LIBS="$TOR_LIBDIR_libevent/libevent.a $STATIC_LIBEVENT_FLAGS" fi else if test "x$ac_cv_header_event2_event_h" = "xyes"; then

1 0