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

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 27 Apr '17

27 Apr '17

commit a624754ea3aec984e1fd003b800e290e0f7ed5e2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 27 18:45:25 2017 +0000 Update translations for https_everywhere_completed --- eo/ssl-observatory.dtd | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/eo/ssl-observatory.dtd b/eo/ssl-observatory.dtd new file mode 100644 index 0000000..be25fda --- /dev/null +++ b/eo/ssl-observatory.dtd @@ -0,0 +1,92 @@ + +<!ENTITY ssl-observatory.popup.details "Detaloj kaj informoj pri privateco"> +<!ENTITY ssl-observatory.popup.later "Demandi min poste"> +<!ENTITY ssl-observatory.popup.no "Ne"> + +<!ENTITY ssl-observatory.popup.text "HTTPS-Ĉie povas detekti atakojn kontraŭ via retumilo per sendi ricevitajn atestilojn al la Observejo. Ĉu aktivigi ĉi tion?"> + + + +<!ENTITY ssl-observatory.popup.title +"Ĉu HTTPS-Ĉie devas uzi la SSL-Observejon?"> + +<!ENTITY ssl-observatory.popup.yes "Jes"> + + + +<!ENTITY ssl-observatory.prefs.adv_priv_opts1 +"Estas sekure enŝalti ĉi tion, escepte se vi uzas tre malmildan firmaan reton:"> + +<!ENTITY ssl-observatory.prefs.adv_priv_opts2 +"Sekura, escepte se vi uzas firmaan reton kun sekretaj intraretaj nomoj de serviloj:"> + +<!ENTITY ssl-observatory.prefs.alt_roots +"Alŝuti kaj kontroli atestilojn subskribitajn de nekutimaj ĉefaj atestilaj aŭtoritatoj"> + +<!ENTITY ssl-observatory.prefs.alt_roots_tooltip +"Estas sekure (kaj konsilinde) enŝalti ĉi tiun agordon, escepte se vi uzas blokatajn firmaajn reton aŭ kontraŭvirusan programon Kaspersky, kiu observas vian foliumadon per TLS-prokurilo kaj privata ĉefa Atestila Aŭtoritato (CA). Se enŝaltita ĉe tia reto, ĉi tiu agordo povas publikigi kiujn https:// domajnojn vi vizitis per ĉi tiu prokurilo, pro unikaj atestiloj kreitaj de ĝi. Do ni lasas ĉi tion apriore malŝaltita."> + +<!ENTITY ssl-observatory.prefs.anonymous "Kontroli atestilojn anonime per Tor"> +<!ENTITY ssl-observatory.prefs.anonymous_unavailable +"Kontroli atestilojn anonime per Tor-reto (postulas Tor)"> +<!ENTITY ssl-observatory.prefs.anonymous_tooltip +"Ĉi tiu eblo postulas instalitan kaj rulantan Tor"> + +<!ENTITY ssl-observatory.prefs.asn +"Kiam vi vidas novan atestilon, informi la Observejon pri kiu interret-provizanton (ISP) vi estas konektita"> + +<!ENTITY ssl-observatory.prefs.asn_tooltip +"Ĉi tio legos kaj sendos la "Aŭtonoman Sisteman Numeron" (ASN) de via reto. Ĉi tio helpos al ni trovi atakojn kontraŭ HTTPS kaj ĉu ni ricevas observaĵojn de retoj el ejoj kiel Irano aŭ Sirio, kie atakoj ofte okazas."> + +<!ENTITY ssl-observatory.prefs.show_cert_warning +"Montri averton kiam la Observejo detektos senvalidigitan atestilon ne rimarkitan de via foliumilo"> + +<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip +"Ĉi tio kontrolos alŝutitajn atestilojn kontraŭ konatajn listojn de senvalidigitaj atestiloj. Bedaŭrinde ni ne povas garantii, ke senvalidigita atestilo estos markita, tamen se vi vidos averton, probable io estos malbone."> + +<!ENTITY ssl-observatory.prefs.done "Preta"> + +<!ENTITY ssl-observatory.prefs.explanation +"HTTPS-Ĉie povas uzi SSL-Observejon de EFF. Ĉi tio agas dumaniere: (1) sendas kopiojn de HTTPS-atestiloj al la Observejo por helpi al ni detekti atakojn 'ulo inter' kaj plibonigi sekurecon de la interreto; kaj (2) informas vin pri nesekuraj konektoj kaj atakoj kontraŭ via foliumilo."> + + + +<!ENTITY ssl-observatory.prefs.explanation2 + +"Ekzemplo: kiam vi vizitas https://www.ekzemplo.com la atestilo ricevita de la Observejo indikos, ke iu vizitis www.ekzemplo.com, sed ne kiu vizitis la retejon aŭ kiun precizan paĝon li foliumis. Musumu agordojn por pliaj detaloj:"> + +<!ENTITY ssl-observatory.prefs.hide "Kaŝi altnivelajn agordojn"> + +<!ENTITY ssl-observatory.prefs.nonanon +"Kontroli atestilojn ankaŭ se Tor ne uzeblas"> + +<!ENTITY ssl-observatory.prefs.nonanon_tooltip +"Ni plue provos anonimigi datumojn, sed ĉi tiu agordo estas malpli sekura"> + +<!ENTITY ssl-observatory.prefs.priv_dns +"Alŝuti kaj kontroli atestilojn de nepublikaj DNS-nomoj"> + +<!ENTITY ssl-observatory.prefs.priv_dns_tooltip +"Escepte se ĉi tiu eblo estas enŝaltita, la Observejo ne registros atestilojn por nomoj, kiuj oni ne povas venigi per DNS-sistemo."> + +<!ENTITY ssl-observatory.prefs.show "Montri altnivelajn agordojn"> + +<!ENTITY ssl-observatory.prefs.title "Agordoj de SSL-Observejo"> + +<!ENTITY ssl-observatory.prefs.use "Ĉu uzi la Observejon?"> +<!ENTITY ssl-observatory.warning.title "AVERTO el SSL-Observejo de EFF"> +<!ENTITY ssl-observatory.warning.showcert "Montri atestilan ĉenon"> +<!ENTITY ssl-observatory.warning.okay "Mi komprenas"> +<!ENTITY ssl-observatory.warning.text "SSL-Observejo de EFF avertos pri HTTPS-atestilo(j) por ĉi tiu retejo:"> +<!ENTITY ssl-observatory.warning.defense "Se vi estas ensalutinta al ĉi tiu retejo, estas konsilinde ŝanĝi pasvorton kiam vi havos sekuran konekton. (Ĉi tiuj avertojn oni povas malŝalti en la langeto "SSL-Observejo" en agordoj de HTTPS-Ĉie.)"> + +<!ENTITY ssl-observatory.prefs.self_signed +"Alŝuti kaj kontroli mem-subskribitajn atestilojn"> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"Ĉi tio estas konsilinda, ĉar ĉifraj problemoj ofte okazas ĉe mem-subskribitaj enkorpigitaj aparatoj">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Apr '17

27 Apr '17

commit 29167327740c32379b19599cccb9e48547fe15a1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 27 18:45:20 2017 +0000 Update translations for https_everywhere --- eo/ssl-observatory.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/eo/ssl-observatory.dtd b/eo/ssl-observatory.dtd index f416bcb..be25fda 100644 --- a/eo/ssl-observatory.dtd +++ b/eo/ssl-observatory.dtd @@ -1,6 +1,6 @@  <!ENTITY ssl-observatory.popup.details "Detaloj kaj informoj pri privateco"> -<!ENTITY ssl-observatory.popup.later "Demandi min pli poste"> +<!ENTITY ssl-observatory.popup.later "Demandi min poste"> <!ENTITY ssl-observatory.popup.no "Ne"> <!ENTITY ssl-observatory.popup.text "HTTPS-Ĉie povas detekti atakojn kontraŭ via retumilo per sendi ricevitajn atestilojn al la Observejo. Ĉu aktivigi ĉi tion?"> @@ -11,7 +11,7 @@ and auditing the certificates being presented to your browser. Would you like to turn it on?">--> <!ENTITY ssl-observatory.popup.title -"Ĉu HTTPS-ĉie devas uzi la SSL-Observejon?"> +"Ĉu HTTPS-Ĉie devas uzi la SSL-Observejon?"> <!ENTITY ssl-observatory.popup.yes "Jes"> @@ -79,14 +79,14 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.prefs.title "Agordoj de SSL-Observejo"> -<!ENTITY ssl-observatory.prefs.use "Use the Observatory?"> -<!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory"> -<!ENTITY ssl-observatory.warning.showcert "Show the certificate chain"> +<!ENTITY ssl-observatory.prefs.use "Ĉu uzi la Observejon?"> +<!ENTITY ssl-observatory.warning.title "AVERTO el SSL-Observejo de EFF"> +<!ENTITY ssl-observatory.warning.showcert "Montri atestilan ĉenon"> <!ENTITY ssl-observatory.warning.okay "Mi komprenas"> -<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:"> -<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection. (These warnings can be disabled in the "SSL Observatory" tab of the HTTPS Everywhere preferences dialog.)"> +<!ENTITY ssl-observatory.warning.text "SSL-Observejo de EFF avertos pri HTTPS-atestilo(j) por ĉi tiu retejo:"> +<!ENTITY ssl-observatory.warning.defense "Se vi estas ensalutinta al ĉi tiu retejo, estas konsilinde ŝanĝi pasvorton kiam vi havos sekuran konekton. (Ĉi tiuj avertojn oni povas malŝalti en la langeto "SSL-Observejo" en agordoj de HTTPS-Ĉie.)"> <!ENTITY ssl-observatory.prefs.self_signed -"Submit and check self-signed certificates"> +"Alŝuti kaj kontroli mem-subskribitajn atestilojn"> <!ENTITY ssl-observatory.prefs.self_signed_tooltip -"This is recommended; cryptographic problems are especially common in self-signed embedded devices"> +"Ĉi tio estas konsilinda, ĉar ĉifraj problemoj ofte okazas ĉe mem-subskribitaj enkorpigitaj aparatoj">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Apr '17

27 Apr '17

commit 37bc8ff47d62af688eac748c7201f0f82664bab1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 27 18:15:21 2017 +0000 Update translations for https_everywhere --- eo/ssl-observatory.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eo/ssl-observatory.dtd b/eo/ssl-observatory.dtd index 686e004..f416bcb 100644 --- a/eo/ssl-observatory.dtd +++ b/eo/ssl-observatory.dtd @@ -73,11 +73,11 @@ Mouseover the options for further details:">--> "Alŝuti kaj kontroli atestilojn de nepublikaj DNS-nomoj"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip -"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system."> +"Escepte se ĉi tiu eblo estas enŝaltita, la Observejo ne registros atestilojn por nomoj, kiuj oni ne povas venigi per DNS-sistemo."> -<!ENTITY ssl-observatory.prefs.show "Show advanced options"> +<!ENTITY ssl-observatory.prefs.show "Montri altnivelajn agordojn"> -<!ENTITY ssl-observatory.prefs.title "Preferumoj pri "SSL Observatory""> +<!ENTITY ssl-observatory.prefs.title "Agordoj de SSL-Observejo"> <!ENTITY ssl-observatory.prefs.use "Use the Observatory?"> <!ENTITY ssl-observatory.warning.title "WARNING from EFF's SSL Observatory">

1 0

[tor/master] Use a cast to try to avoid a tautalogical comparison warning
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit 480dab4f2f8de6661c71e71f37d4a824ecf38e3c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 27 11:58:26 2017 -0400 Use a cast to try to avoid a tautalogical comparison warning --- src/or/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index e53bc78..2b9f18a 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2942,7 +2942,7 @@ parse_accept_encoding_header(const char *h) SMARTLIST_FOREACH_BEGIN(methods, const char *, m) { compress_method_t method = compression_method_get_by_name(m); if (method != UNKNOWN_METHOD) { - tor_assert(method < 8*sizeof(unsigned)); + tor_assert(((unsigned)method) < 8*sizeof(unsigned)); result |= (1u << method); } } SMARTLIST_FOREACH_END(m);

1 0

[tor/master] Parse recognized entries from the Accept-Encoding header.
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit fd48b757d3a85099057d27a74555d87fcd33936e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 25 16:44:24 2017 -0400 Parse recognized entries from the Accept-Encoding header. --- src/or/directory.c | 59 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 11 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index e0409e2..8229279 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2789,6 +2789,31 @@ write_http_response_header(dir_connection_t *conn, ssize_t length, cache_lifetime); } +/** Parse the compression methods listed in an Accept-Encoding header h, + * and convert them to a bitfield where compression method x is supported if + * and only if 1 << x is set in the bitfield. */ +static unsigned +parse_accept_encoding_header(const char *h) +{ + unsigned result = (1u << NO_METHOD); + smartlist_t *methods = smartlist_new(); + smartlist_split_string(methods, h, ",", + SPLIT_SKIP_SPACE|SPLIT_STRIP_SPACE|SPLIT_IGNORE_BLANK, 0); + + SMARTLIST_FOREACH_BEGIN(methods, const char *, m) { + compress_method_t method = compression_method_get_by_name(m); + if (method != UNKNOWN_METHOD) { + tor_assert(method < 8*sizeof(unsigned)); + result |= (1u << method); + } + } SMARTLIST_FOREACH_END(m); + SMARTLIST_FOREACH_BEGIN(methods, char *, m) { + tor_free(m); + } SMARTLIST_FOREACH_END(m); + smartlist_free(methods); + return result; +} + /** Decide whether a client would accept the consensus we have. * * Clients can say they only want a consensus if it's signed by more @@ -2863,8 +2888,9 @@ choose_compression_level(ssize_t n_bytes) /** Information passed to handle a GET request. */ typedef struct get_handler_args_t { - /** True if the client asked for compressed data. */ - int compressed; + /** Bitmask of compression methods that the client said (or implied) it + * supported. */ + unsigned compression_supported; /** If nonzero, the time included an if-modified-since header with this * value. */ time_t if_modified_since; @@ -2938,8 +2964,9 @@ directory_handle_command_get,(dir_connection_t *conn, const char *headers, { char *url, *url_mem, *header; time_t if_modified_since = 0; - int compressed; + int zlib_compressed_in_url; size_t url_len; + unsigned compression_methods_supported; /* We ignore the body of a GET request. */ (void)req_body; @@ -2970,17 +2997,27 @@ directory_handle_command_get,(dir_connection_t *conn, const char *headers, url_mem = url; url_len = strlen(url); - compressed = url_len > 2 && !strcmp(url+url_len-2, ".z"); - if (compressed) { + + zlib_compressed_in_url = url_len > 2 && !strcmp(url+url_len-2, ".z"); + if (zlib_compressed_in_url) { url[url_len-2] = '\0'; url_len -= 2; } + if ((header = http_get_header(headers, "Accept-Encoding"))) { + compression_methods_supported = parse_accept_encoding_header(header); + tor_free(header); + } else { + compression_methods_supported = (1u << NO_METHOD); + if (zlib_compressed_in_url) + compression_methods_supported |= (1u << ZLIB_METHOD); + } + get_handler_args_t args; args.url = url; args.headers = headers; args.if_modified_since = if_modified_since; - args.compressed = compressed; + args.compression_supported = compression_methods_supported; int i, result = -1; for (i = 0; url_table[i].string; ++i) { @@ -3059,7 +3096,7 @@ handle_get_current_consensus(dir_connection_t *conn, const get_handler_args_t *args) { const char *url = args->url; - const int compressed = args->compressed; + const int compressed = args->compression_supported & (1u << ZLIB_METHOD); const time_t if_modified_since = args->if_modified_since; int clear_spool = 0; @@ -3200,7 +3237,7 @@ static int handle_get_status_vote(dir_connection_t *conn, const get_handler_args_t *args) { const char *url = args->url; - const int compressed = args->compressed; + const int compressed = args->compression_supported & (1u << ZLIB_METHOD); { int current; ssize_t body_len = 0; @@ -3307,7 +3344,7 @@ static int handle_get_microdesc(dir_connection_t *conn, const get_handler_args_t *args) { const char *url = args->url; - const int compressed = args->compressed; + const int compressed = args->compression_supported & (1u << ZLIB_METHOD); int clear_spool = 1; { conn->spool = smartlist_new(); @@ -3357,7 +3394,7 @@ static int handle_get_descriptor(dir_connection_t *conn, const get_handler_args_t *args) { const char *url = args->url; - const int compressed = args->compressed; + const int compressed = args->compression_supported & (1u << ZLIB_METHOD); const or_options_t *options = get_options(); int clear_spool = 1; if (!strcmpstart(url,"/tor/server/") || @@ -3450,7 +3487,7 @@ static int handle_get_keys(dir_connection_t *conn, const get_handler_args_t *args) { const char *url = args->url; - const int compressed = args->compressed; + const int compressed = args->compression_supported & (1u << ZLIB_METHOD); const time_t if_modified_since = args->if_modified_since; { smartlist_t *certs = smartlist_new();

1 0

[tor/master] Bitmask out the compression methods that we do not support
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit 65ff0f8267b99a55a099eec2a71cb45557ae84eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 25 19:07:17 2017 -0400 Bitmask out the compression methods that we do not support --- src/or/directory.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/or/directory.c b/src/or/directory.c index 95c3c84..ea3410d 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2814,6 +2814,20 @@ parse_accept_encoding_header(const char *h) return result; } +/** Bitmask of supported compression types, to use in a bitwise "and" + * with the results of parse_accept_encoding_header */ +static const unsigned SUPPORTED_COMPRESSION_MASK = + (1u << NO_METHOD) + | (1u << ZLIB_METHOD) + | (1u << GZIP_METHOD) +#ifdef HAVE_ZSTD + | (1u << ZSTD_METHOD) +#endif +#ifdef HAVE_LZMA + | (1u << LZMA_METHOD) +#endif + ; + /** Decide whether a client would accept the consensus we have. * * Clients can say they only want a consensus if it's signed by more @@ -3013,6 +3027,9 @@ directory_handle_command_get,(dir_connection_t *conn, const char *headers, compression_methods_supported |= (1u << ZLIB_METHOD); } + /* Remove all methods that we don't both support. */ + compression_methods_supported &= SUPPORTED_COMPRESSION_MASK; + get_handler_args_t args; args.url = url; args.headers = headers;

1 0

[tor/master] Move the "supported compression bitmask" into compress.[ch]
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit 2903c329aaad1b7628c1def4168270d626755566 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 27 11:30:51 2017 -0400 Move the "supported compression bitmask" into compress.[ch] --- src/common/compress.c | 20 ++++++++++++++++++++ src/common/compress.h | 5 +++-- src/or/directory.c | 16 +--------------- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/common/compress.c b/src/common/compress.c index 2e7412f..42a5097 100644 --- a/src/common/compress.c +++ b/src/common/compress.c @@ -277,6 +277,26 @@ tor_compress_supports_method(compress_method_t method) } } +/** + * Return a bitmask of the supported compression types, where 1<<m is + * set in the bitmask if and only if compression with method m is + * supported. + */ +unsigned +tor_compress_get_supported_method_bitmask(void) +{ + static unsigned supported = 0; + if (supported == 0) { + compress_method_t m; + for (m = NO_METHOD; m <= UNKNOWN_METHOD; ++m) { + if (tor_compress_supports_method(m)) { + supported |= (1u << m); + } + } + } + return supported; +} + /** Table of compression method names. These should have an "x-" prefix, * if they are not listed in the IANA content coding registry. */ static const struct { diff --git a/src/common/compress.h b/src/common/compress.h index 95b70c0..5b47c5d 100644 --- a/src/common/compress.h +++ b/src/common/compress.h @@ -16,12 +16,12 @@ * functions here. Call tor_compress_supports_method() to check if a given * compression schema is supported by Tor. */ typedef enum { - NO_METHOD=0, + NO_METHOD=0, // This method must be first. GZIP_METHOD=1, ZLIB_METHOD=2, LZMA_METHOD=3, ZSTD_METHOD=4, - UNKNOWN_METHOD=5 + UNKNOWN_METHOD=5, // This method must be last. Add new ones in the middle. } compress_method_t; /** @@ -48,6 +48,7 @@ compress_method_t detect_compression_method(const char *in, size_t in_len); int tor_compress_is_compression_bomb(size_t size_in, size_t size_out); int tor_compress_supports_method(compress_method_t method); +unsigned tor_compress_get_supported_method_bitmask(void); const char * compression_method_get_name(compress_method_t method); compress_method_t compression_method_get_by_name(const char *name); diff --git a/src/or/directory.c b/src/or/directory.c index ea3410d..3b3f7ea 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2814,20 +2814,6 @@ parse_accept_encoding_header(const char *h) return result; } -/** Bitmask of supported compression types, to use in a bitwise "and" - * with the results of parse_accept_encoding_header */ -static const unsigned SUPPORTED_COMPRESSION_MASK = - (1u << NO_METHOD) - | (1u << ZLIB_METHOD) - | (1u << GZIP_METHOD) -#ifdef HAVE_ZSTD - | (1u << ZSTD_METHOD) -#endif -#ifdef HAVE_LZMA - | (1u << LZMA_METHOD) -#endif - ; - /** Decide whether a client would accept the consensus we have. * * Clients can say they only want a consensus if it's signed by more @@ -3028,7 +3014,7 @@ directory_handle_command_get,(dir_connection_t *conn, const char *headers, } /* Remove all methods that we don't both support. */ - compression_methods_supported &= SUPPORTED_COMPRESSION_MASK; + compression_methods_supported &= tor_compress_get_supported_method_bitmask(); get_handler_args_t args; args.url = url;

1 0

[tor/master] Tests for parse_accept_encoding
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit fec3050ea968ae913b108a4c48bce2293b92072c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 25 19:00:31 2017 -0400 Tests for parse_accept_encoding --- src/or/directory.c | 2 +- src/or/directory.h | 1 + src/test/test_dir_handle_get.c | 47 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index 8229279..95c3c84 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2792,7 +2792,7 @@ write_http_response_header(dir_connection_t *conn, ssize_t length, /** Parse the compression methods listed in an Accept-Encoding header h, * and convert them to a bitfield where compression method x is supported if * and only if 1 << x is set in the bitfield. */ -static unsigned +STATIC unsigned parse_accept_encoding_header(const char *h) { unsigned result = (1u << NO_METHOD); diff --git a/src/or/directory.h b/src/or/directory.h index 4c52c24..dc02027 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -192,6 +192,7 @@ STATIC int next_random_exponential_delay(int delay, int max_delay); STATIC int parse_hs_version_from_post(const char *url, const char *prefix, const char **end_pos); +STATIC unsigned parse_accept_encoding_header(const char *h); #endif #endif diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 392fa4d..7794bd7 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -2497,6 +2497,52 @@ test_dir_handle_get_status_vote_current_authority(void* data) dirvote_free_all(); } +static void +test_dir_handle_get_parse_accept_encoding(void *arg) +{ + (void)arg; + const unsigned B_NONE = 1u << NO_METHOD; + const unsigned B_ZLIB = 1u << ZLIB_METHOD; + const unsigned B_GZIP = 1u << GZIP_METHOD; + const unsigned B_LZMA = 1u << LZMA_METHOD; + const unsigned B_ZSTD = 1u << ZSTD_METHOD; + + unsigned encodings; + + encodings = parse_accept_encoding_header(""); + tt_uint_op(B_NONE, OP_EQ, encodings); + + encodings = parse_accept_encoding_header(" "); + tt_uint_op(B_NONE, OP_EQ, encodings); + + encodings = parse_accept_encoding_header("dewey, cheatham, and howe "); + tt_uint_op(B_NONE, OP_EQ, encodings); + + encodings = parse_accept_encoding_header("dewey, cheatham, and gzip"); + tt_uint_op(B_NONE, OP_EQ, encodings); + + encodings = parse_accept_encoding_header("dewey, cheatham, and, gzip"); + tt_uint_op(B_NONE|B_GZIP, OP_EQ, encodings); + + encodings = parse_accept_encoding_header(" gzip"); + tt_uint_op(B_NONE|B_GZIP, OP_EQ, encodings); + + encodings = parse_accept_encoding_header("gzip"); + tt_uint_op(B_NONE|B_GZIP, OP_EQ, encodings); + + encodings = parse_accept_encoding_header("x-zstd, deflate, x-lzma"); + tt_uint_op(B_NONE|B_ZLIB|B_ZSTD|B_LZMA, OP_EQ, encodings); + + encodings = parse_accept_encoding_header("x-zstd, deflate, x-lzma, gzip"); + tt_uint_op(B_NONE|B_ZLIB|B_ZSTD|B_LZMA|B_GZIP, OP_EQ, encodings); + + encodings = parse_accept_encoding_header("x-zstd,deflate,x-lzma,gzip"); + tt_uint_op(B_NONE|B_ZLIB|B_ZSTD|B_LZMA|B_GZIP, OP_EQ, encodings); + + done: + ; +} + #define DIR_HANDLE_CMD(name,flags) \ { #name, test_dir_handle_get_##name, (flags), NULL, NULL } @@ -2555,6 +2601,7 @@ struct testcase_t dir_handle_get_tests[] = { DIR_HANDLE_CMD(status_vote_next_consensus_signatures_not_found, 0), DIR_HANDLE_CMD(status_vote_next_consensus_signatures_busy, 0), DIR_HANDLE_CMD(status_vote_next_consensus_signatures, 0), + DIR_HANDLE_CMD(parse_accept_encoding, 0), END_OF_TESTCASES };

1 0

[tor/master] Merge branch 'parse_accept_encoding'
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit 10a4f9cd0745cbcb1a9018304dad2dd5edbee1f2 Merge: 49deb1e 2903c32 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 27 11:31:31 2017 -0400 Merge branch 'parse_accept_encoding' src/common/compress.c | 20 ++++++++++++++ src/common/compress.h | 5 ++-- src/or/directory.c | 62 ++++++++++++++++++++++++++++++++++-------- src/or/directory.h | 1 + src/test/test_dir_handle_get.c | 47 ++++++++++++++++++++++++++++++++ 5 files changed, 122 insertions(+), 13 deletions(-)

1 0

[tor/master] Document and test nul-terminating behavior of tor_uncompress()
by nickm＠torproject.org 27 Apr '17

27 Apr '17

commit 49deb1e1b810e348bfa9fb27a0f0ef54f3694cc9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 27 10:59:48 2017 -0400 Document and test nul-terminating behavior of tor_uncompress() We added this as a safety feature, but there are a few places in the code that actually depend on it. --- src/common/compress.c | 6 ++++++ src/test/test_util.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/common/compress.c b/src/common/compress.c index 771f5ab..9a24025 100644 --- a/src/common/compress.c +++ b/src/common/compress.c @@ -221,6 +221,12 @@ tor_compress(char **out, size_t *out_len, * *out, and its length in *out_len. Return 0 on success, -1 on * failure. * + * If any bytes are written to out, an extra byte NUL is always + * written at the end, but not counted in out_len. This is a + * safety feature to ensure that the output can be treated as a + * NUL-terminated string -- though of course, callers should check + * out_len anyway. + * * If complete_only is true, we consider a truncated input as a * failure; otherwise we decompress as much as we can. Warn about truncated * or corrupt inputs at protocol_warn_level. diff --git a/src/test/test_util.c b/src/test/test_util.c index 1f37fc3..dec1d52 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2262,6 +2262,7 @@ test_util_compress_impl(compress_method_t method) tt_assert(buf3 != NULL); tt_int_op(strlen(buf1) + 1, OP_EQ, len2); tt_str_op(buf1, OP_EQ, buf3); + tt_int_op(buf3[len2], OP_EQ, 0); /* Check whether we can uncompress concatenated, compressed strings. */ tor_free(buf3); @@ -2273,6 +2274,7 @@ test_util_compress_impl(compress_method_t method) "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAAAAAAAAAAAAAZ\0" "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZAAAAAAAAAAAAAAAAAAAZ\0", (strlen(buf1)+1)*2); + tt_int_op(buf3[len2], OP_EQ, 0); /* Check whether we can uncompress partial strings */ @@ -2296,6 +2298,8 @@ test_util_compress_impl(compress_method_t method) tt_int_op(len2, OP_GT, 5); tt_int_op(len2, OP_LE, len1); tt_assert(fast_memeq(buf1, buf3, len2)); + tt_int_op(buf3[len2], OP_EQ, 0); + /* when we demand a complete output, this must fail. */ tor_free(buf3); tt_assert(tor_uncompress(&buf3, &len2, buf2, len1-16,

1 0