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

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 17 Dec '20

17 Dec '20

commit 625a006a71546f54af20da0bc06b450f8dda6019 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 17 03:15:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- es/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index b8ee5112af..f66dea5928 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -47,7 +47,7 @@ <!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere ha detectado que estabas yendo hacia una página que no era HTTTPS, y ha intentado enviarte, en su lugar, a la versión HTTPS. No está disponible dicha versión HTTPS. Lo más probable es que este sitio no soporte HTTPS, pero también es posible que un atacante esté bloqueando la versión HTTPS. Si deseas ver la versión no cifrada de esta página, puedes hacerlo desactivando la opción'Encrypt All Sites Eligible' (EASE) en tu extensión HTTPS Everywhere. Ten en cuenta que deshabilitar esta opción puede hacer que tu navegador sea vulnerable a los ataques de baja intensidad de los sitios web que visites."> <!ENTITY https-everywhere.cancel.he_blocking_network "ataques de baja intensidad basados en la red"> -<!ENTITY https-everywhere.cancel.copy_url ""> +<!ENTITY https-everywhere.cancel.copy_url "Copiar URL"> <!ENTITY https-everywhere.cancel.copied_url ""> <!ENTITY https-everywhere.cancel.open_page "Abrir una página insegura"> <!ENTITY https-everywhere.cancel.http_once "Abrir una página insegura sólo por esta sesión">

1 0

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

16 Dec '20

commit 0bd4cd8101422e0f3604cdf80e28ec4e8ac67877 Merge: 66597b9291 6c602026e8 Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Dec 16 20:55:03 2020 +0000 Merge remote-tracking branch 'tor-gitlab/mr/230' changes/ticket40017_redux | 3 +++ src/core/or/connection_or.c | 5 +++++ 2 files changed, 8 insertions(+)

1 0

[tor/master] Detect extra bytes in HAProxy inbuf when transitioning to OR handshake
by ahf＠torproject.org 16 Dec '20

16 Dec '20

commit 6c602026e8a9f5e115f4892162c513e3f44ae1da Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 2 10:07:26 2020 -0500 Detect extra bytes in HAProxy inbuf when transitioning to OR handshake This shouldn't be possible, but let's add it for defense-in-depth. Closes #40017. --- changes/ticket40017_redux | 3 +++ src/core/or/connection_or.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/changes/ticket40017_redux b/changes/ticket40017_redux new file mode 100644 index 0000000000..b190e7080e --- /dev/null +++ b/changes/ticket40017_redux @@ -0,0 +1,3 @@ + o Minor features (protocol, proxy support, defense in depth): + - Close HAProxy connections if they somehow manage to send us data before + we start reading. Closes another case of ticket 40017. \ No newline at end of file diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c index e3e81ed9cb..40c4441de6 100644 --- a/src/core/or/connection_or.c +++ b/src/core/or/connection_or.c @@ -686,6 +686,11 @@ connection_or_finished_flushing(or_connection_t *conn) /* PROXY_HAPROXY gets connected by receiving an ack. */ if (conn->proxy_type == PROXY_HAPROXY) { tor_assert(TO_CONN(conn)->proxy_state == PROXY_HAPROXY_WAIT_FOR_FLUSH); + IF_BUG_ONCE(buf_datalen(TO_CONN(conn)->inbuf) != 0) { + /* This should be impossible; we're not even reading. */ + connection_or_close_for_error(conn, 0); + return -1; + } TO_CONN(conn)->proxy_state = PROXY_CONNECTED; if (connection_tls_start_handshake(conn, 0) < 0) {

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 16 Dec '20

16 Dec '20

commit ef25691d452fe6ee3d449ef4af49c1dd369ec404 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Dec 16 20:50:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/contents+ru.po b/contents+ru.po index 7d22015fe9..9ecb2b645a 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -8906,6 +8906,8 @@ msgid "" "We simply divide directory requests by 10 and consider the result as the " "number of users." msgstr "" +"Мы просто делим запросы директорий на 10 и считаем результат количеством " +"пользователей." #: https//support.torproject.org/metrics/user-numbers/ #: (content/metrics/user-numbers/contents+en.lrquestion.description) @@ -8914,6 +8916,9 @@ msgid "" " a client that stays online for one tenth of a day, so 2 hours and 24 " "minutes." msgstr "" +"Есть и другой подход: мы предполагаем, что каждый запрос относится к " +"клиенту, которые находится онлайн 1/10 часть суток, то есть, 2 часа 24 " +"минуты." #: https//support.torproject.org/metrics/users-or-clients/ #: (content/metrics/user-or-clients/contents+en.lrquestion.title) @@ -8936,6 +8941,8 @@ msgid "" "What if a user runs tor on a laptop and changes their IP address a few times" " per day? Don't you overcount that user?" msgstr "" +"Что если пользователь входит в сеть с ноутбука и меняет свой IP-адрес по " +"несколько раз на дню? Вы считаете его каждый раз как нового пользователя?" #: https//support.torproject.org/metrics/user-overcount/ #: (content/metrics/user-overcount/contents+en.lrquestion.description)

1 0

[tor/maint-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/maint-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/master] 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/master] 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/master] Merge branch 'maint-0.4.5'
by ahf＠torproject.org 16 Dec '20

16 Dec '20

commit 66597b9291eb95203c0d84fb38f9a9561b4c8d85 Merge: 66b1a9a5c1 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' 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] 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