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

[manual/translations] clone l10n repo for l10n QA scripts
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 1298edbd4ee6165d61ff9a5d3f656df0575027f6 Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 11:47:03 2021 +0000 clone l10n repo for l10n QA scripts --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93b7f5e..9622aed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,7 @@ pages: - rm -rf lego - git clone https://git.torproject.org/project/web/lego.git lego - cd lego && git checkout master && git pull && cd .. + - git clone https://gitlab.torproject.org/tpo/community/l10n.git - rm -rf public - echo 'building lektor 3 times to get translations in place' - lektor build --output-path public && lektor build --output-path public && lektor build --output-path public

1 0

[manual/translations] add l10n QA script and needed library
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 7236bd800339322b49172664ca5cfd642e4c166c Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 11:48:19 2021 +0000 add l10n QA script and needed library --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9622aed..00f07ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,7 @@ pages: - pip3 install babel - pip3 install wheel - pip3 install lektor + - pip3 install pofile - echo 'checking out translations' - rm -rf i18n - git clone https://git.torproject.org/translation.git i18n @@ -33,5 +34,5 @@ pages: - translations check_l10n_links: stage: test - script: - - 'test-links=$(grep -r "] (" i18n/*.po >&2 && echo "TEST FAILED: Broken links")' + script: + - l10n/bin/check_markdown_links.py i18n/

1 0

[manual/translations] order alphabetically, otherwise we end up duplicating languages and losing time
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit d3f8a849af22916842cd53363741dab83cde17ee Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 11:27:08 2021 +0000 order alphabetically, otherwise we end up duplicating languages and losing time --- manual.lektorproject | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/manual.lektorproject b/manual.lektorproject index 9710ebb..d349a66 100644 --- a/manual.lektorproject +++ b/manual.lektorproject @@ -4,12 +4,6 @@ url = https://manual.torproject.org/ url_style = relative locale = en -[alternatives.en] -name = English (en) -primary = yes -url_prefix = / -locale = en - [alternatives.ar] name = عربية (ar) url_prefix = /ar/ @@ -50,6 +44,12 @@ name = Ελληνικά (el) url_prefix = /el/ locale = el +[alternatives.en] +name = English (en) +primary = yes +url_prefix = / +locale = en + [alternatives.es] name = Español (es) url_prefix = /es/ @@ -120,16 +120,16 @@ name = lietuvių (lt) url_prefix = /lt/ locale = lt -[alternatives.ml] -name = മലയാളം (ml) -url_prefix = /ml/ -locale = ml - [alternatives.mk] name = македонски (mk) url_prefix = /mk/ locale = mk +[alternatives.ml] +name = മലയാളം (ml) +url_prefix = /ml/ +locale = ml + [alternatives.ms] name = Melayu (ms) url_prefix = /ms/ @@ -190,16 +190,16 @@ name = Türkçe (tr) url_prefix = /tr/ locale = tr -[alternatives.vi] -name = Tiếng Việt (vi) -url_prefix = /vi/ -locale = vi - [alternatives.uk] name = українська (uk) url_prefix = /uk/ locale = uk +[alternatives.vi] +name = Tiếng Việt (vi) +url_prefix = /vi/ +locale = vi + [alternatives.zh-CN] name = 简体中文 (zh-CN) url_prefix = /zh-CN/

1 0

[manual/master] add forward for dropped locale
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 0da7313aae7bbecff2767ae7eb0ffaaf981f6f4f Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 10:57:13 2021 +0000 add forward for dropped locale --- .htaccess | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.htaccess b/.htaccess index 54bca0c..c13c656 100644 --- a/.htaccess +++ b/.htaccess @@ -13,8 +13,8 @@ RewriteRule ^(en-US|en)$ / [R=302,L] RewriteRule ^(en-US|en)/(.*) /$2 [R=302,L] # Rewrites for languages that have a different mapping in the page -RewriteRule ^(es-ES|es-MX|es-CO)$ /es [R=302,L] -RewriteRule ^(es-ES|es-MX|es-CO)/(.*) /es/$2 [R=302,L] +RewriteRule ^(es-ES|es-MX|es-CO|es-AR)$ /es [R=302,L] +RewriteRule ^(es-ES|es-MX|es-CO|es-AR)/(.*) /es/$2 [R=302,L] # Rewrites for languages that have a Tor Browser release # but don't have a translated manual

1 0

[manual/master] remove non-supported languages
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 377d660a4a1bbb6597b6c234792c22b164dcf524 Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 10:56:29 2021 +0000 remove non-supported languages --- databags/alternatives.ini | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/databags/alternatives.ini b/databags/alternatives.ini index a0c0a8c..b87c383 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -34,24 +34,12 @@ order = order-last url = /el/ language = Ελληνικά (el) -[en-US] -direction = text-left -order = order-last -url = /en-US/ -language = English (en-US) - [es] direction = text-left order = order-last url = /es/ language = Español (es) -[es-AR] -direction = text-left -order = order-last -url = /es-AR/ -language = Español Arg. (es-AR) - [fr] direction = text-left order = order-last

1 0

[manual/master] order alphabetically
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit e8c1ace923b8955c5a47bf6a45c4fbb3e5e70cbe Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 10:57:44 2021 +0000 order alphabetically --- manual.lektorproject | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/manual.lektorproject b/manual.lektorproject index c17211a..35dd586 100644 --- a/manual.lektorproject +++ b/manual.lektorproject @@ -4,12 +4,6 @@ url = https://manual.torproject.org/ url_style = relative locale = en -[alternatives.en] -name = English (en) -primary = yes -url_prefix = / -locale = en - [alternatives.ar] name = عربية (ar) url_prefix = /ar/ @@ -35,16 +29,17 @@ name = Ελληνικά (el) url_prefix = /el/ locale = el +[alternatives.en] +name = English (en) +primary = yes +url_prefix = / +locale = en + [alternatives.es] name = Español (es) url_prefix = /es/ locale = es -[alternatives.es-AR] -name = Español Arg. (es-AR) -url_prefix = /es-AR/ -locale = es-AR - [alternatives.fr] name = Français (fr) url_prefix = /fr/ @@ -65,16 +60,16 @@ name = Indonesia (id) url_prefix = /id/ locale = id -[alternatives.it] -name = Italiano (it) -url_prefix = /it/ -locale = it - [alternatives.is] name = Íslenska (is) url_prefix = /is/ locale = is +[alternatives.it] +name = Italiano (it) +url_prefix = /it/ +locale = it + [alternatives.ka] name = ქართული ენა (ka) url_prefix = /ka/

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by asn＠torproject.org 23 Apr '21

23 Apr '21

commit f0260c4cea6da784369e8d47f0b4bf01863c5af5 Merge: 38bfb3cdfe 8c29729916 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Apr 23 13:00:23 2021 +0300 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40356 | 3 +++ src/feature/hs/hs_cache.c | 61 ++++++++++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 25 deletions(-) diff --cc src/feature/hs/hs_cache.c index bb1532f808,9c35936748..cf8e377313 --- a/src/feature/hs/hs_cache.c +++ b/src/feature/hs/hs_cache.c @@@ -390,10 -415,21 +415,21 @@@ remove_v3_desc_as_client(const hs_cache static void store_v3_desc_as_client(hs_cache_client_descriptor_t *desc) { + hs_cache_client_descriptor_t *cached_desc; + tor_assert(desc); + + /* Because the lookup function doesn't return an expired entry, it can linger + * in the cache until we clean it up or a new descriptor is stored. So, + * before adding, we'll make sure we are not overwriting an old descriptor + * (which is OK in terms of semantic) but leads to memory leak. */ + cached_desc = digest256map_get(hs_cache_v3_client, desc->key.pubkey); + if (cached_desc) { + cache_client_desc_free(cached_desc); + } digest256map_set(hs_cache_v3_client, desc->key.pubkey, desc); /* Update cache size with this entry for the OOM handler. */ - rend_cache_increment_allocation(cache_get_client_entry_size(desc)); + hs_cache_increment_allocation(cache_get_client_entry_size(desc)); } /** Query our cache and return the entry or NULL if not found or if expired. */

1 0

[tor/master] hs: Fix memory leak in client cache
by asn＠torproject.org 23 Apr '21

23 Apr '21

commit 8c29729916be9cd9692657096babb838fc2e7a4c Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 20 13:13:54 2021 -0400 hs: Fix memory leak in client cache Fixes #40356 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40356 | 3 +++ src/feature/hs/hs_cache.c | 61 ++++++++++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/changes/ticket40356 b/changes/ticket40356 new file mode 100644 index 0000000000..59c32ce0cc --- /dev/null +++ b/changes/ticket40356 @@ -0,0 +1,3 @@ + o Minor bugfix (onion service, client, memory leak): + - An expired cached descriptor could have been overwritten with a new one + leading to a memory leak. Fixes bug 40356; bugfix on 0.3.5.1-alpha. diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c index c1334a7d27..9c35936748 100644 --- a/src/feature/hs/hs_cache.c +++ b/src/feature/hs/hs_cache.c @@ -353,6 +353,31 @@ static digest256map_t *hs_cache_v3_client; * objects all related to a specific service. */ static digest256map_t *hs_cache_client_intro_state; +#define cache_client_desc_free(val) \ + FREE_AND_NULL(hs_cache_client_descriptor_t, cache_client_desc_free_, (val)) + +/** Free memory allocated by desc. */ +static void +cache_client_desc_free_(hs_cache_client_descriptor_t *desc) +{ + if (desc == NULL) { + return; + } + hs_descriptor_free(desc->desc); + memwipe(&desc->key, 0, sizeof(desc->key)); + memwipe(desc->encoded_desc, 0, strlen(desc->encoded_desc)); + tor_free(desc->encoded_desc); + tor_free(desc); +} + +/** Helper function: Use by the free all function to clear the client cache */ +static void +cache_client_desc_free_void(void *ptr) +{ + hs_cache_client_descriptor_t *desc = ptr; + cache_client_desc_free(desc); +} + /** Return the size of a client cache entry in bytes. */ static size_t cache_get_client_entry_size(const hs_cache_client_descriptor_t *entry) @@ -390,7 +415,18 @@ remove_v3_desc_as_client(const hs_cache_client_descriptor_t *desc) static void store_v3_desc_as_client(hs_cache_client_descriptor_t *desc) { + hs_cache_client_descriptor_t *cached_desc; + tor_assert(desc); + + /* Because the lookup function doesn't return an expired entry, it can linger + * in the cache until we clean it up or a new descriptor is stored. So, + * before adding, we'll make sure we are not overwriting an old descriptor + * (which is OK in terms of semantic) but leads to memory leak. */ + cached_desc = digest256map_get(hs_cache_v3_client, desc->key.pubkey); + if (cached_desc) { + cache_client_desc_free(cached_desc); + } digest256map_set(hs_cache_v3_client, desc->key.pubkey, desc); /* Update cache size with this entry for the OOM handler. */ rend_cache_increment_allocation(cache_get_client_entry_size(desc)); @@ -473,31 +509,6 @@ cache_client_desc_new(const char *desc_str, return client_desc; } -#define cache_client_desc_free(val) \ - FREE_AND_NULL(hs_cache_client_descriptor_t, cache_client_desc_free_, (val)) - -/** Free memory allocated by desc. */ -static void -cache_client_desc_free_(hs_cache_client_descriptor_t *desc) -{ - if (desc == NULL) { - return; - } - hs_descriptor_free(desc->desc); - memwipe(&desc->key, 0, sizeof(desc->key)); - memwipe(desc->encoded_desc, 0, strlen(desc->encoded_desc)); - tor_free(desc->encoded_desc); - tor_free(desc); -} - -/** Helper function: Use by the free all function to clear the client cache */ -static void -cache_client_desc_free_void(void *ptr) -{ - hs_cache_client_descriptor_t *desc = ptr; - cache_client_desc_free(desc); -} - /** Return a newly allocated and initialized hs_cache_intro_state_t object. */ static hs_cache_intro_state_t * cache_intro_state_new(void)

1 0

[tor/maint-0.4.5] hs: Fix memory leak in client cache
by asn＠torproject.org 23 Apr '21

23 Apr '21

commit 8c29729916be9cd9692657096babb838fc2e7a4c Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 20 13:13:54 2021 -0400 hs: Fix memory leak in client cache Fixes #40356 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40356 | 3 +++ src/feature/hs/hs_cache.c | 61 ++++++++++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/changes/ticket40356 b/changes/ticket40356 new file mode 100644 index 0000000000..59c32ce0cc --- /dev/null +++ b/changes/ticket40356 @@ -0,0 +1,3 @@ + o Minor bugfix (onion service, client, memory leak): + - An expired cached descriptor could have been overwritten with a new one + leading to a memory leak. Fixes bug 40356; bugfix on 0.3.5.1-alpha. diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c index c1334a7d27..9c35936748 100644 --- a/src/feature/hs/hs_cache.c +++ b/src/feature/hs/hs_cache.c @@ -353,6 +353,31 @@ static digest256map_t *hs_cache_v3_client; * objects all related to a specific service. */ static digest256map_t *hs_cache_client_intro_state; +#define cache_client_desc_free(val) \ + FREE_AND_NULL(hs_cache_client_descriptor_t, cache_client_desc_free_, (val)) + +/** Free memory allocated by desc. */ +static void +cache_client_desc_free_(hs_cache_client_descriptor_t *desc) +{ + if (desc == NULL) { + return; + } + hs_descriptor_free(desc->desc); + memwipe(&desc->key, 0, sizeof(desc->key)); + memwipe(desc->encoded_desc, 0, strlen(desc->encoded_desc)); + tor_free(desc->encoded_desc); + tor_free(desc); +} + +/** Helper function: Use by the free all function to clear the client cache */ +static void +cache_client_desc_free_void(void *ptr) +{ + hs_cache_client_descriptor_t *desc = ptr; + cache_client_desc_free(desc); +} + /** Return the size of a client cache entry in bytes. */ static size_t cache_get_client_entry_size(const hs_cache_client_descriptor_t *entry) @@ -390,7 +415,18 @@ remove_v3_desc_as_client(const hs_cache_client_descriptor_t *desc) static void store_v3_desc_as_client(hs_cache_client_descriptor_t *desc) { + hs_cache_client_descriptor_t *cached_desc; + tor_assert(desc); + + /* Because the lookup function doesn't return an expired entry, it can linger + * in the cache until we clean it up or a new descriptor is stored. So, + * before adding, we'll make sure we are not overwriting an old descriptor + * (which is OK in terms of semantic) but leads to memory leak. */ + cached_desc = digest256map_get(hs_cache_v3_client, desc->key.pubkey); + if (cached_desc) { + cache_client_desc_free(cached_desc); + } digest256map_set(hs_cache_v3_client, desc->key.pubkey, desc); /* Update cache size with this entry for the OOM handler. */ rend_cache_increment_allocation(cache_get_client_entry_size(desc)); @@ -473,31 +509,6 @@ cache_client_desc_new(const char *desc_str, return client_desc; } -#define cache_client_desc_free(val) \ - FREE_AND_NULL(hs_cache_client_descriptor_t, cache_client_desc_free_, (val)) - -/** Free memory allocated by desc. */ -static void -cache_client_desc_free_(hs_cache_client_descriptor_t *desc) -{ - if (desc == NULL) { - return; - } - hs_descriptor_free(desc->desc); - memwipe(&desc->key, 0, sizeof(desc->key)); - memwipe(desc->encoded_desc, 0, strlen(desc->encoded_desc)); - tor_free(desc->encoded_desc); - tor_free(desc); -} - -/** Helper function: Use by the free all function to clear the client cache */ -static void -cache_client_desc_free_void(void *ptr) -{ - hs_cache_client_descriptor_t *desc = ptr; - cache_client_desc_free(desc); -} - /** Return a newly allocated and initialized hs_cache_intro_state_t object. */ static hs_cache_intro_state_t * cache_intro_state_new(void)

1 0

[tor/maint-0.4.6] hs: Fix memory leak in client cache
by asn＠torproject.org 23 Apr '21

23 Apr '21

commit 8c29729916be9cd9692657096babb838fc2e7a4c Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 20 13:13:54 2021 -0400 hs: Fix memory leak in client cache Fixes #40356 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40356 | 3 +++ src/feature/hs/hs_cache.c | 61 ++++++++++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 25 deletions(-) diff --git a/changes/ticket40356 b/changes/ticket40356 new file mode 100644 index 0000000000..59c32ce0cc --- /dev/null +++ b/changes/ticket40356 @@ -0,0 +1,3 @@ + o Minor bugfix (onion service, client, memory leak): + - An expired cached descriptor could have been overwritten with a new one + leading to a memory leak. Fixes bug 40356; bugfix on 0.3.5.1-alpha. diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c index c1334a7d27..9c35936748 100644 --- a/src/feature/hs/hs_cache.c +++ b/src/feature/hs/hs_cache.c @@ -353,6 +353,31 @@ static digest256map_t *hs_cache_v3_client; * objects all related to a specific service. */ static digest256map_t *hs_cache_client_intro_state; +#define cache_client_desc_free(val) \ + FREE_AND_NULL(hs_cache_client_descriptor_t, cache_client_desc_free_, (val)) + +/** Free memory allocated by desc. */ +static void +cache_client_desc_free_(hs_cache_client_descriptor_t *desc) +{ + if (desc == NULL) { + return; + } + hs_descriptor_free(desc->desc); + memwipe(&desc->key, 0, sizeof(desc->key)); + memwipe(desc->encoded_desc, 0, strlen(desc->encoded_desc)); + tor_free(desc->encoded_desc); + tor_free(desc); +} + +/** Helper function: Use by the free all function to clear the client cache */ +static void +cache_client_desc_free_void(void *ptr) +{ + hs_cache_client_descriptor_t *desc = ptr; + cache_client_desc_free(desc); +} + /** Return the size of a client cache entry in bytes. */ static size_t cache_get_client_entry_size(const hs_cache_client_descriptor_t *entry) @@ -390,7 +415,18 @@ remove_v3_desc_as_client(const hs_cache_client_descriptor_t *desc) static void store_v3_desc_as_client(hs_cache_client_descriptor_t *desc) { + hs_cache_client_descriptor_t *cached_desc; + tor_assert(desc); + + /* Because the lookup function doesn't return an expired entry, it can linger + * in the cache until we clean it up or a new descriptor is stored. So, + * before adding, we'll make sure we are not overwriting an old descriptor + * (which is OK in terms of semantic) but leads to memory leak. */ + cached_desc = digest256map_get(hs_cache_v3_client, desc->key.pubkey); + if (cached_desc) { + cache_client_desc_free(cached_desc); + } digest256map_set(hs_cache_v3_client, desc->key.pubkey, desc); /* Update cache size with this entry for the OOM handler. */ rend_cache_increment_allocation(cache_get_client_entry_size(desc)); @@ -473,31 +509,6 @@ cache_client_desc_new(const char *desc_str, return client_desc; } -#define cache_client_desc_free(val) \ - FREE_AND_NULL(hs_cache_client_descriptor_t, cache_client_desc_free_, (val)) - -/** Free memory allocated by desc. */ -static void -cache_client_desc_free_(hs_cache_client_descriptor_t *desc) -{ - if (desc == NULL) { - return; - } - hs_descriptor_free(desc->desc); - memwipe(&desc->key, 0, sizeof(desc->key)); - memwipe(desc->encoded_desc, 0, strlen(desc->encoded_desc)); - tor_free(desc->encoded_desc); - tor_free(desc); -} - -/** Helper function: Use by the free all function to clear the client cache */ -static void -cache_client_desc_free_void(void *ptr) -{ - hs_cache_client_descriptor_t *desc = ptr; - cache_client_desc_free(desc); -} - /** Return a newly allocated and initialized hs_cache_intro_state_t object. */ static hs_cache_intro_state_t * cache_intro_state_new(void)

1 0