tor-commits December 2020

tor-commits@lists.torproject.org

19 participants
1639 discussions

[tor/master] Fix timestamp parser in new load_stats_file.
by nickm＠torproject.org 21 Dec '20

21 Dec '20

commit 5dd6304f36a9cb9b7f778abe5b84cf6a4e9890a6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 16 09:58:19 2020 +0100 Fix timestamp parser in new load_stats_file. The previous parser only considered stats files _starting_ with the timestamp tag, not stats files having the timestamp tag in a later position. While this applies to all current stats files, a future stats file might look differently. Better to fix the function now than be surprised in another 9 years from now. This commit also adds a test case for such future stats, and it fixes stats file paths in newly added unit tests. --- src/feature/relay/router.c | 4 ++-- src/test/test_stats.c | 26 +++++++++++++++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index abe23f9aae..e018561556 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -3176,12 +3176,12 @@ load_stats_file(const char *filename, const char *ts_tag, time_t now, goto end; } /* Do we have enough for parsing a timestamp? */ - if (strlen(contents) < strlen(ts_tag) + 1 + sizeof(timestr)) { + if (strlen(ts_tok) < strlen(ts_tag) + 1 + sizeof(timestr)) { log_warn(LD_BUG, "Token %s malformed in file %s", ts_tag, filename); goto end; } /* Parse timestamp in order to validate it is not too old. */ - strlcpy(timestr, contents + strlen(ts_tag) + 1, sizeof(timestr)); + strlcpy(timestr, ts_tok + strlen(ts_tag) + 1, sizeof(timestr)); if (parse_iso_time(timestr, &written) < 0) { log_warn(LD_BUG, "Token %s has a malformed timestamp in file %s", ts_tag, filename); diff --git a/src/test/test_stats.c b/src/test/test_stats.c index 154acd4f9f..7262477d77 100644 --- a/src/test/test_stats.c +++ b/src/test/test_stats.c @@ -499,13 +499,12 @@ static void test_load_stats_file(void *arg) { int ret; - char *content = NULL, *read_file_content = NULL; - const char *fname = NULL; + char *content = NULL, *read_file_content = NULL, *fname = NULL; (void) arg; /* Load conn-stats. */ - fname = get_fname("conn-stats"); + fname = get_datadir_fname("conn-stats"); tt_assert(fname); read_file_content = tor_strdup( "conn-bi-direct 2020-12-13 15:48:53 (86400 s) 12,34,56,78\n" @@ -516,7 +515,7 @@ test_load_stats_file(void *arg) tt_str_op(read_file_content, OP_EQ, content); /* Load hidserv-stats. */ - fname = get_fname("hidserv-stats"); + fname = get_datadir_fname("hidserv-stats"); tt_assert(fname); tor_free(read_file_content); read_file_content = tor_strdup( @@ -525,6 +524,7 @@ test_load_stats_file(void *arg) "bin_size=1024\n" "hidserv-dir-onions-seen 53 delta_f=8 epsilon=0.30 bin_size=8\n"); write_str_to_file(fname, read_file_content, 0); + tor_free(fname); tor_free(content); ret = load_stats_file("hidserv-stats", "hidserv-stats-end", 1607874000, &content); @@ -532,7 +532,7 @@ test_load_stats_file(void *arg) tt_str_op(read_file_content, OP_EQ, content); /* Load dirreq-stats. */ - fname = get_fname("dirreq-stats"); + fname = get_datadir_fname("dirreq-stats"); tt_assert(fname); tor_free(read_file_content); read_file_content = tor_strdup( @@ -546,13 +546,29 @@ test_load_stats_file(void *arg) "d1=133653,d2=221050,q1=261242,d3=300622,d4=399758,md=539051,d6=721322," "d7=959866,q3=1103363,d8=1302035,d9=2046125,max=113404000\n"); write_str_to_file(fname, read_file_content, 0); + tor_free(fname); tor_free(content); ret = load_stats_file("dirreq-stats", "dirreq-stats-end", 1607874000, &content); tt_int_op(ret, OP_EQ, 1); tt_str_op(read_file_content, OP_EQ, content); + /* Attempt to load future-stats file not starting with timestamp tag. */ + fname = get_datadir_fname("future-stats"); + tt_assert(fname); + tor_free(read_file_content); + read_file_content = tor_strdup( + "future-stuff-at-file-start\n" + "future-stats 2020-12-13 15:48:53 (86400 s)\n"); + write_str_to_file(fname, read_file_content, 0); + tor_free(fname); + tor_free(content); + ret = load_stats_file("future-stats", "future-stats", 1607874000, &content); + tt_int_op(ret, OP_EQ, 1); + tt_str_op(read_file_content, OP_EQ, content); + done: + tor_free(fname); tor_free(read_file_content); tor_free(content); }

1 0

[tor/master] test: Fix memleak in test/load_stats_file
by nickm＠torproject.org 21 Dec '20

21 Dec '20

commit f4cbcde2da39dec4be26aa1d2ffcb4d26603e1fa Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Dec 21 13:10:58 2020 -0500 test: Fix memleak in test/load_stats_file Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_stats.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_stats.c b/src/test/test_stats.c index 7262477d77..d45afc7b15 100644 --- a/src/test/test_stats.c +++ b/src/test/test_stats.c @@ -515,6 +515,7 @@ test_load_stats_file(void *arg) tt_str_op(read_file_content, OP_EQ, content); /* Load hidserv-stats. */ + tor_free(fname); fname = get_datadir_fname("hidserv-stats"); tt_assert(fname); tor_free(read_file_content); @@ -524,7 +525,6 @@ test_load_stats_file(void *arg) "bin_size=1024\n" "hidserv-dir-onions-seen 53 delta_f=8 epsilon=0.30 bin_size=8\n"); write_str_to_file(fname, read_file_content, 0); - tor_free(fname); tor_free(content); ret = load_stats_file("hidserv-stats", "hidserv-stats-end", 1607874000, &content); @@ -532,6 +532,7 @@ test_load_stats_file(void *arg) tt_str_op(read_file_content, OP_EQ, content); /* Load dirreq-stats. */ + tor_free(fname); fname = get_datadir_fname("dirreq-stats"); tt_assert(fname); tor_free(read_file_content); @@ -546,7 +547,6 @@ test_load_stats_file(void *arg) "d1=133653,d2=221050,q1=261242,d3=300622,d4=399758,md=539051,d6=721322," "d7=959866,q3=1103363,d8=1302035,d9=2046125,max=113404000\n"); write_str_to_file(fname, read_file_content, 0); - tor_free(fname); tor_free(content); ret = load_stats_file("dirreq-stats", "dirreq-stats-end", 1607874000, &content); @@ -554,6 +554,7 @@ test_load_stats_file(void *arg) tt_str_op(read_file_content, OP_EQ, content); /* Attempt to load future-stats file not starting with timestamp tag. */ + tor_free(fname); fname = get_datadir_fname("future-stats"); tt_assert(fname); tor_free(read_file_content); @@ -561,7 +562,6 @@ test_load_stats_file(void *arg) "future-stuff-at-file-start\n" "future-stats 2020-12-13 15:48:53 (86400 s)\n"); write_str_to_file(fname, read_file_content, 0); - tor_free(fname); tor_free(content); ret = load_stats_file("future-stats", "future-stats", 1607874000, &content); tt_int_op(ret, OP_EQ, 1);

1 0

[tor/master] relay: Report the entire content of a stats file
by nickm＠torproject.org 21 Dec '20

21 Dec '20

commit c934fced31a2dd6d53b129b6270109bc48c1ebb0 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Dec 15 11:41:42 2020 -0500 relay: Report the entire content of a stats file It turns out that 9 years ago, we stopped appending data into stats file and rather overwrite everytime we have new stats (see commit a6a127c833eace1100aca7ab8ad118862bb8a8b9) The load_stats_file() function was still thinking that we could have the same line many times in the file which turns out to be false since 9 years ago. However, that did not cause problem until IPv6 connection stats came along which introduced a new line in conn-stats: "ipv6-conn-bi-direct ...". Before, that file contained a single line starting with the tag "conn-bi-direct". That very tag appears also in the IPv6 tag (see above) so the load_stats_file() function would consider that the IPv6 line as the last tag to be appeneded to the file and fail to report the line above (for IPv4). It would actually truncate the IPv6 line and report it (removing the "ipv6-" part). In other words, "conn-bi-direct" was not reported and instead "ipv6-conn-bi-direct" was used without the "ipv6-" part. This commit refactors the entire function so that now it looks for a "timestamp tag" to validate and then if everything is fine, returns the entire content of the file. The refactor simplifies the function, adds logging in case of failures and modernize it in terms of coding standard. Unit tests are also added that makes sure the loaded content matches the entire file if timestamp validation passes. Fixes #40226 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40226 | 5 +++ src/feature/relay/router.c | 106 +++++++++++++++++++++++++++------------------ src/feature/relay/router.h | 2 + src/test/test_stats.c | 65 +++++++++++++++++++++++++++ 4 files changed, 135 insertions(+), 43 deletions(-) diff --git a/changes/ticket40226 b/changes/ticket40226 new file mode 100644 index 0000000000..4775438f63 --- /dev/null +++ b/changes/ticket40226 @@ -0,0 +1,5 @@ + o Minor bugfixes (relay, statistics): + - The connection statistics were wrongly exported in the extrainfo document + due to a problem in the file loading function which would wrongly truncate + the file reporting the wrong information. It is now fixed. Fixes bug + 40226; bugfix on 0.4.5.1-alpha. diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 3aa9561f4f..abe23f9aae 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -3139,57 +3139,77 @@ router_dump_exit_policy_to_string(const routerinfo_t *router, include_ipv6); } -/** Load the contents of filename, find the last line starting with - * end_line, ensure that its timestamp is not more than 25 hours in - * the past or more than 1 hour in the future with respect to now, - * and write the file contents starting with that line to *out. - * Return 1 for success, 0 if the file does not exist or is empty, or -1 - * if the file does not contain a line matching these criteria or other - * failure. */ -static int -load_stats_file(const char *filename, const char *end_line, time_t now, +/** Load the contents of filename, find a line starting with + * timestamp tag ts_tag, ensure that its timestamp is not more than 25 + * hours in the past or more than 1 hour in the future with respect to + * now, and write the entire file contents into out. + * + * The timestamp expected should be an ISO-formatted UTC time value which is + * parsed using our parse_iso_time() function. + * + * In case more than one tag are found in the file, the very first one is + * used. + * + * Return 1 for success, 0 if the file does not exist or is empty, or -1 if + * the file does not contain a line with the timestamp tag. */ +STATIC int +load_stats_file(const char *filename, const char *ts_tag, time_t now, char **out) { int r = -1; char *fname = get_datadir_fname(filename); - char *contents, *start = NULL, *tmp, timestr[ISO_TIME_LEN+1]; + char *contents = NULL, timestr[ISO_TIME_LEN+1]; time_t written; + switch (file_status(fname)) { - case FN_FILE: - /* X022 Find an alternative to reading the whole file to memory. */ - if ((contents = read_file_to_str(fname, 0, NULL))) { - tmp = strstr(contents, end_line); - /* Find last block starting with end_line */ - while (tmp) { - start = tmp; - tmp = strstr(tmp + 1, end_line); - } - if (!start) - goto notfound; - if (strlen(start) < strlen(end_line) + 1 + sizeof(timestr)) - goto notfound; - strlcpy(timestr, start + 1 + strlen(end_line), sizeof(timestr)); - if (parse_iso_time(timestr, &written) < 0) - goto notfound; - if (written < now - (25*60*60) || written > now + (1*60*60)) - goto notfound; - *out = tor_strdup(start); - r = 1; - } - notfound: - tor_free(contents); - break; - /* treat empty stats files as if the file doesn't exist */ - case FN_NOENT: - case FN_EMPTY: - r = 0; - break; - case FN_ERROR: - case FN_DIR: - default: - break; + case FN_FILE: + contents = read_file_to_str(fname, 0, NULL); + if (contents == NULL) { + log_debug(LD_BUG, "Unable to read content of %s", filename); + goto end; + } + /* Find the timestamp tag to validate that the file is not too old or if + * exists. */ + const char *ts_tok = find_str_at_start_of_line(contents, ts_tag); + if (!ts_tok) { + log_warn(LD_BUG, "Token %s not found in file %s", ts_tag, filename); + goto end; + } + /* Do we have enough for parsing a timestamp? */ + if (strlen(contents) < strlen(ts_tag) + 1 + sizeof(timestr)) { + log_warn(LD_BUG, "Token %s malformed in file %s", ts_tag, filename); + goto end; + } + /* Parse timestamp in order to validate it is not too old. */ + strlcpy(timestr, contents + strlen(ts_tag) + 1, sizeof(timestr)); + if (parse_iso_time(timestr, &written) < 0) { + log_warn(LD_BUG, "Token %s has a malformed timestamp in file %s", + ts_tag, filename); + goto end; + } + if (written < now - (25*60*60) || written > now + (1*60*60)) { + /* This can happen normally so don't log. */ + goto end; + } + /* Success. Put in the entire content. */ + *out = contents; + contents = NULL; /* Must not free it. */ + r = 1; + break; + /* treat empty stats files as if the file doesn't exist */ + case FN_NOENT: + case FN_EMPTY: + r = 0; + break; + case FN_ERROR: + case FN_DIR: + default: + break; } + + end: tor_free(fname); + tor_free(contents); return r; } diff --git a/src/feature/relay/router.h b/src/feature/relay/router.h index f71ada8eb7..2648bb5112 100644 --- a/src/feature/relay/router.h +++ b/src/feature/relay/router.h @@ -129,6 +129,8 @@ void router_free_all(void); STATIC void get_platform_str(char *platform, size_t len); STATIC int router_write_fingerprint(int hashed, int ed25519_identity); STATIC smartlist_t *get_my_declared_family(const or_options_t *options); +STATIC int load_stats_file(const char *filename, const char *ts_tag, + time_t now, char **out); #ifdef TOR_UNIT_TESTS extern time_t desc_clean_since; diff --git a/src/test/test_stats.c b/src/test/test_stats.c index b6849b0b6d..154acd4f9f 100644 --- a/src/test/test_stats.c +++ b/src/test/test_stats.c @@ -31,6 +31,7 @@ #define MAINLOOP_PRIVATE #define STATEFILE_PRIVATE #define BWHIST_PRIVATE +#define ROUTER_PRIVATE #include "core/or/or.h" #include "lib/err/backtrace.h" @@ -45,6 +46,7 @@ #include "app/config/statefile.h" #include "feature/stats/bwhist.h" #include "feature/stats/bw_array_st.h" +#include "feature/relay/router.h" /** Run unit tests for some stats code. */ static void @@ -493,6 +495,68 @@ test_get_bandwidth_lines(void *arg) bwhist_free_all(); } +static void +test_load_stats_file(void *arg) +{ + int ret; + char *content = NULL, *read_file_content = NULL; + const char *fname = NULL; + + (void) arg; + + /* Load conn-stats. */ + fname = get_fname("conn-stats"); + tt_assert(fname); + read_file_content = tor_strdup( + "conn-bi-direct 2020-12-13 15:48:53 (86400 s) 12,34,56,78\n" + "ipv6-conn-bi-direct 2020-12-14 15:48:53 (86400 s) 21,43,65,87\n"); + write_str_to_file(fname, read_file_content, 0); + ret = load_stats_file("conn-stats", "conn-bi-direct", 1607874000, &content); + tt_int_op(ret, OP_EQ, 1); + tt_str_op(read_file_content, OP_EQ, content); + + /* Load hidserv-stats. */ + fname = get_fname("hidserv-stats"); + tt_assert(fname); + tor_free(read_file_content); + read_file_content = tor_strdup( + "hidserv-stats-end 2020-12-13 15:48:53 (86400 s)\n" + "hidserv-rend-relayed-cells 48754891 delta_f=2048 epsilon=0.30 " + "bin_size=1024\n" + "hidserv-dir-onions-seen 53 delta_f=8 epsilon=0.30 bin_size=8\n"); + write_str_to_file(fname, read_file_content, 0); + tor_free(content); + ret = load_stats_file("hidserv-stats", "hidserv-stats-end", 1607874000, + &content); + tt_int_op(ret, OP_EQ, 1); + tt_str_op(read_file_content, OP_EQ, content); + + /* Load dirreq-stats. */ + fname = get_fname("dirreq-stats"); + tt_assert(fname); + tor_free(read_file_content); + read_file_content = tor_strdup( + "dirreq-stats-end 2020-12-13 15:48:53 (86400 s)\n" + "dirreq-v3-ips ru=1728,us=1144,de=696,ir=432,gb=328,fr=304,in=296,ua=232\n" + "dirreq-v3-reqs ru=3616,us=3576,de=1896,fr=800,gb=632,ir=616\n" + "dirreq-v3-resp ok=18472,not-enough-sigs=0,unavailable=0,not-found=0," + "not-modified=3136,busy=0\n" + "dirreq-v3-direct-dl complete=0,timeout=0,running=0\n" + "dirreq-v3-tunneled-dl complete=18124,timeout=348,running=4,min=257," + "d1=133653,d2=221050,q1=261242,d3=300622,d4=399758,md=539051,d6=721322," + "d7=959866,q3=1103363,d8=1302035,d9=2046125,max=113404000\n"); + write_str_to_file(fname, read_file_content, 0); + tor_free(content); + ret = load_stats_file("dirreq-stats", "dirreq-stats-end", 1607874000, + &content); + tt_int_op(ret, OP_EQ, 1); + tt_str_op(read_file_content, OP_EQ, content); + + done: + tor_free(read_file_content); + tor_free(content); +} + #define ENT(name) \ { #name, test_ ## name , 0, NULL, NULL } #define FORK(name) \ @@ -506,6 +570,7 @@ struct testcase_t stats_tests[] = { FORK(add_obs), FORK(fill_bandwidth_history), FORK(get_bandwidth_lines), + FORK(load_stats_file), END_OF_TESTCASES };

1 0

[tor/master] Merge branch 'mr_240_squashed'
by nickm＠torproject.org 21 Dec '20

21 Dec '20

commit cce7d1edafd6c509d1fae9e2328f3fb923317523 Merge: db5f7b4250 f4cbcde2da Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 21 13:23:42 2020 -0500 Merge branch 'mr_240_squashed' changes/ticket40226 | 5 +++ src/feature/relay/router.c | 106 +++++++++++++++++++++++++++------------------ src/feature/relay/router.h | 2 + src/test/test_stats.c | 81 ++++++++++++++++++++++++++++++++++ 4 files changed, 151 insertions(+), 43 deletions(-) diff --cc src/feature/relay/router.h index f9df1f5637,2648bb5112..93239a7484 --- a/src/feature/relay/router.h +++ b/src/feature/relay/router.h @@@ -129,7 -129,8 +129,9 @@@ void router_free_all(void) STATIC void get_platform_str(char *platform, size_t len); STATIC int router_write_fingerprint(int hashed, int ed25519_identity); STATIC smartlist_t *get_my_declared_family(const or_options_t *options); +STATIC void router_announce_bridge_status_page(void); + STATIC int load_stats_file(const char *filename, const char *ts_tag, + time_t now, char **out); #ifdef TOR_UNIT_TESTS extern time_t desc_clean_since; diff --cc src/test/test_stats.c index 25ee837f2f,d45afc7b15..617a36faba --- a/src/test/test_stats.c +++ b/src/test/test_stats.c @@@ -33,7 -31,7 +33,8 @@@ #define MAINLOOP_PRIVATE #define STATEFILE_PRIVATE #define BWHIST_PRIVATE +#define REPHIST_PRIVATE + #define ROUTER_PRIVATE #include "core/or/or.h" #include "lib/err/backtrace.h" @@@ -496,133 -495,84 +498,211 @@@ test_get_bandwidth_lines(void *arg bwhist_free_all(); } +static bool +mock_should_collect_v3_stats(void) +{ + return true; +} + +/* Test v3 metrics */ +static void +test_rephist_v3_onions(void *arg) +{ + int ret; + + char *stats_string = NULL; + char *desc1_str = NULL; + ed25519_keypair_t signing_kp1; + hs_descriptor_t *desc1 = NULL; + + const hs_v3_stats_t *hs_v3_stats = NULL; + + (void) arg; + + MOCK(should_collect_v3_stats, mock_should_collect_v3_stats); + + get_options_mutable()->HiddenServiceStatistics = 1; + + /* Initialize the subsystems */ + hs_cache_init(); + rep_hist_hs_stats_init(0); + + /* Change time to 03-01-2002 23:36 UTC */ + update_approx_time(1010101010); + + /* HS stats should be zero here */ + hs_v3_stats = rep_hist_get_hs_v3_stats(); + tt_int_op(digest256map_size(hs_v3_stats->v3_onions_seen_this_period), + OP_EQ, 0); + + /* Generate a valid descriptor */ + ret = ed25519_keypair_generate(&signing_kp1, 0); + tt_int_op(ret, OP_EQ, 0); + desc1 = hs_helper_build_hs_desc_with_rev_counter(&signing_kp1, 42); + tt_assert(desc1); + ret = hs_desc_encode_descriptor(desc1, &signing_kp1, NULL, &desc1_str); + tt_int_op(ret, OP_EQ, 0); + + /* Store descriptor and check that stats got updated */ + ret = hs_cache_store_as_dir(desc1_str); + tt_int_op(ret, OP_EQ, 0); + hs_v3_stats = rep_hist_get_hs_v3_stats(); + tt_int_op(digest256map_size(hs_v3_stats->v3_onions_seen_this_period), + OP_EQ, 1); + + /* cleanup */ + hs_descriptor_free(desc1); + tor_free(desc1_str); + + /* Generate another valid descriptor */ + ret = ed25519_keypair_generate(&signing_kp1, 0); + tt_int_op(ret, OP_EQ, 0); + desc1 = hs_helper_build_hs_desc_with_rev_counter(&signing_kp1, 42); + tt_assert(desc1); + ret = hs_desc_encode_descriptor(desc1, &signing_kp1, NULL, &desc1_str); + tt_int_op(ret, OP_EQ, 0); + + /* Store descriptor and check that stats are updated */ + ret = hs_cache_store_as_dir(desc1_str); + tt_int_op(ret, OP_EQ, 0); + hs_v3_stats = rep_hist_get_hs_v3_stats(); + tt_int_op(digest256map_size(hs_v3_stats->v3_onions_seen_this_period), + OP_EQ, 2); + + /* Check that storing the same descriptor twice does not work */ + ret = hs_cache_store_as_dir(desc1_str); + tt_int_op(ret, OP_EQ, -1); + + /* cleanup */ + hs_descriptor_free(desc1); + tor_free(desc1_str); + + /* Create a descriptor with the same identity key but diff rev counter and + same blinded key */ + desc1 = hs_helper_build_hs_desc_with_rev_counter(&signing_kp1, 43); + tt_assert(desc1); + ret = hs_desc_encode_descriptor(desc1, &signing_kp1, NULL, &desc1_str); + tt_int_op(ret, OP_EQ, 0); + + /* Store descriptor and check that stats are updated */ + ret = hs_cache_store_as_dir(desc1_str); + tt_int_op(ret, OP_EQ, 0); + tt_int_op(digest256map_size(hs_v3_stats->v3_onions_seen_this_period), + OP_EQ, 2); + + /* cleanup */ + hs_descriptor_free(desc1); + tor_free(desc1_str); + + /* Now let's skip to four days forward so that the blinded key rolls + forward */ + update_approx_time(approx_time() + 345600); + + /* Now create a descriptor with the same identity key but diff rev counter + and different blinded key */ + desc1 = hs_helper_build_hs_desc_with_rev_counter(&signing_kp1, 44); + tt_assert(desc1); + ret = hs_desc_encode_descriptor(desc1, &signing_kp1, NULL, &desc1_str); + tt_int_op(ret, OP_EQ, 0); + + /* Store descriptor and check that stats are updated */ + ret = hs_cache_store_as_dir(desc1_str); + tt_int_op(ret, OP_EQ, 0); + tt_int_op(digest256map_size(hs_v3_stats->v3_onions_seen_this_period), + OP_EQ, 3); + + /* cleanup */ + hs_descriptor_free(desc1); + tor_free(desc1_str); + + /* Because of differential privacy we can't actually check the stat value, + but let's just check that it's formatted correctly. */ + stats_string = rep_hist_format_hs_stats(approx_time(), true); + tt_assert(strstr(stats_string, "hidserv-dir-v3-onions-seen")); + + done: + UNMOCK(should_collect_v3_stats); + tor_free(stats_string); +} + + static void + test_load_stats_file(void *arg) + { + int ret; + char *content = NULL, *read_file_content = NULL, *fname = NULL; + + (void) arg; + + /* Load conn-stats. */ + fname = get_datadir_fname("conn-stats"); + tt_assert(fname); + read_file_content = tor_strdup( + "conn-bi-direct 2020-12-13 15:48:53 (86400 s) 12,34,56,78\n" + "ipv6-conn-bi-direct 2020-12-14 15:48:53 (86400 s) 21,43,65,87\n"); + write_str_to_file(fname, read_file_content, 0); + ret = load_stats_file("conn-stats", "conn-bi-direct", 1607874000, &content); + tt_int_op(ret, OP_EQ, 1); + tt_str_op(read_file_content, OP_EQ, content); + + /* Load hidserv-stats. */ + tor_free(fname); + fname = get_datadir_fname("hidserv-stats"); + tt_assert(fname); + tor_free(read_file_content); + read_file_content = tor_strdup( + "hidserv-stats-end 2020-12-13 15:48:53 (86400 s)\n" + "hidserv-rend-relayed-cells 48754891 delta_f=2048 epsilon=0.30 " + "bin_size=1024\n" + "hidserv-dir-onions-seen 53 delta_f=8 epsilon=0.30 bin_size=8\n"); + write_str_to_file(fname, read_file_content, 0); + tor_free(content); + ret = load_stats_file("hidserv-stats", "hidserv-stats-end", 1607874000, + &content); + tt_int_op(ret, OP_EQ, 1); + tt_str_op(read_file_content, OP_EQ, content); + + /* Load dirreq-stats. */ + tor_free(fname); + fname = get_datadir_fname("dirreq-stats"); + tt_assert(fname); + tor_free(read_file_content); + read_file_content = tor_strdup( + "dirreq-stats-end 2020-12-13 15:48:53 (86400 s)\n" + "dirreq-v3-ips ru=1728,us=1144,de=696,ir=432,gb=328,fr=304,in=296,ua=232\n" + "dirreq-v3-reqs ru=3616,us=3576,de=1896,fr=800,gb=632,ir=616\n" + "dirreq-v3-resp ok=18472,not-enough-sigs=0,unavailable=0,not-found=0," + "not-modified=3136,busy=0\n" + "dirreq-v3-direct-dl complete=0,timeout=0,running=0\n" + "dirreq-v3-tunneled-dl complete=18124,timeout=348,running=4,min=257," + "d1=133653,d2=221050,q1=261242,d3=300622,d4=399758,md=539051,d6=721322," + "d7=959866,q3=1103363,d8=1302035,d9=2046125,max=113404000\n"); + write_str_to_file(fname, read_file_content, 0); + tor_free(content); + ret = load_stats_file("dirreq-stats", "dirreq-stats-end", 1607874000, + &content); + tt_int_op(ret, OP_EQ, 1); + tt_str_op(read_file_content, OP_EQ, content); + + /* Attempt to load future-stats file not starting with timestamp tag. */ + tor_free(fname); + fname = get_datadir_fname("future-stats"); + tt_assert(fname); + tor_free(read_file_content); + read_file_content = tor_strdup( + "future-stuff-at-file-start\n" + "future-stats 2020-12-13 15:48:53 (86400 s)\n"); + write_str_to_file(fname, read_file_content, 0); + tor_free(content); + ret = load_stats_file("future-stats", "future-stats", 1607874000, &content); + tt_int_op(ret, OP_EQ, 1); + tt_str_op(read_file_content, OP_EQ, content); + + done: + tor_free(fname); + tor_free(read_file_content); + tor_free(content); + } + #define ENT(name) \ { #name, test_ ## name , 0, NULL, NULL } #define FORK(name) \ @@@ -636,7 -586,7 +716,8 @@@ struct testcase_t stats_tests[] = FORK(add_obs), FORK(fill_bandwidth_history), FORK(get_bandwidth_lines), + FORK(rephist_v3_onions), + FORK(load_stats_file), END_OF_TESTCASES };

1 0

[tpo/master] Add EOY url last chance announcement
by gus＠torproject.org 21 Dec '20

21 Dec '20

commit 6a4baaecba23c4be2fd4e123f20ce8fff585fc0f Author: gus <gus(a)torproject.org> Date: Mon Dec 21 12:49:43 2020 -0500 Add EOY url last chance announcement --- .htaccess | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.htaccess b/.htaccess index f0aebd34..a6af184b 100644 --- a/.htaccess +++ b/.htaccess @@ -183,3 +183,12 @@ RewriteRule ^donate/donate-usetor-ig-ny(.*) https://donate.torproject.org/ [R=30 RewriteRule ^donate/donate-usetor-md-ny(.*) https://donate.torproject.org/ [R=302,L] RewriteRule ^donate/donate-usetor-em-ny(.*) https://donate.torproject.org/ [R=302,L] RewriteRule ^donate/donate-usetor-tn-ny(.*) https://donate.torproject.org/ [R=302,L] +# last chance +RewriteRule ^donate/donate-usetor-tw-lc(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-fb-lc(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ld-lc(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ig-lc(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-md-lc(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-em-lc(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-tn-lc(.*) https://donate.torproject.org/ [R=302,L] +#

1 0

[tpo/master] Update Lego
by gus＠torproject.org 21 Dec '20

21 Dec '20

commit 8675ba93046ddb5d8bde26c08ccb572fdef4ddf3 Author: gus <gus(a)torproject.org> Date: Mon Dec 21 11:59:59 2020 -0500 Update Lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index c55b8645..6fb6429d 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit c55b86456c19f5f652b1ed24026009e327713254 +Subproject commit 6fb6429d4ed88b213dce9876d37b7e244ed00513

1 0

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

21 Dec '20

commit 24ce02d9ac646c93edb6c48a3d1e033f1ece239f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 21 16:18:28 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index fb771f8653..2c90d7a5c0 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -1958,6 +1958,8 @@ msgid "" "It offers you the option to connect directly to the [Tor network](../tor-" "tor-network-core-tor), or to configure Tor Browser for your connection." msgstr "" +"Вам предлагается работать с [сетью Tor](../tor-tor-network-core-tor) " +"напрямую или настроить Tor Browser." #: https//support.torproject.org/glossary/tor-launcher/ #: (content/glossary/tor-launcher/contents+en.lrword.definition) @@ -3841,6 +3843,12 @@ msgid "" "2019](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-" "fingerprinting-technique-called-letterboxing/)." msgstr "" +"В Tor Browser версии 9 есть защита от создания отпечатков и таких сценариев." +" Технология называется " +"[Letterboxing](https://en.wikipedia.org/wiki/Letterboxing_(filming). Она " +"принадлежит Mozilla и впервые была показана [в 2019 " +"году](https://www.zdnet.com/article/firefox-to-add-tor-browser-anti-" +"fingerprinting-technique-called-letterboxing/)." #: https//support.torproject.org/tbb/maximized-torbrowser-window/ #: (content/tbb/maximized-torbrowser-window/contents+en.lrquestion.description) @@ -7334,11 +7342,13 @@ msgstr "```" #: (content/operators/hibernation/contents+en.lrquestion.description) msgid "Bandwidth soft limit reached; commencing hibernation." msgstr "" +"Достигнут мягкий предел пропускной способности; приступаем к гибернации. " +"Новые" #: https//support.torproject.org/operators/hibernation/ #: (content/operators/hibernation/contents+en.lrquestion.description) msgid "No new connections will be accepted" -msgstr "" +msgstr "Новые подключения не допускаются" #: https//support.torproject.org/operators/hibernation/ #: (content/operators/hibernation/contents+en.lrquestion.description) @@ -8829,6 +8839,8 @@ msgid "" "But I noticed that the last data point went up/down a bit since I last " "looked a few hours ago. Why is that?" msgstr "" +"Я вижу, что последняя точка доступа за несколько часов изменила свое " +"положение. Как так?" #: https//support.torproject.org/metrics/graph-data-point/ #: (content/metrics/graph-data-point/contents+en.lrquestion.description) @@ -8836,6 +8848,8 @@ msgid "" "The reason is that we publish user numbers once we're confident enough that " "they won't change significantly anymore." msgstr "" +"Причина в следующем. Мы публикуем статистику пользователей, когда уверены, " +"что больше она существенно не изменится." #: https//support.torproject.org/metrics/graph-data-point/ #: (content/metrics/graph-data-point/contents+en.lrquestion.description) @@ -8843,11 +8857,13 @@ msgid "" "But it's always possible that a directory reports data a few hours after we " "were confident enough, but which then slightly changed the graph." msgstr "" +"Но всегда остается вероятность, что вскоре после публикации директория " +"сообщит новые данные, и они изменят статистику." #: https//support.torproject.org/metrics/graphs/ #: (content/metrics/graphs/contents+en.lrquestion.title) msgid "Why do the graphs end 2 days in the past and not today?" -msgstr "" +msgstr "Почему графики заканчиваются за два дня до сегодняшней даты?" #: https//support.torproject.org/metrics/graphs/ #: (content/metrics/graphs/contents+en.lrquestion.description) @@ -8855,6 +8871,8 @@ msgid "" "Relays and bridges report some of the data in 24-hour intervals which may " "end at any time of the day." msgstr "" +"Узлы и мосты сообщают некоторые данные с промежутками в 24 часа. Эти " +"промежутки могут сменяться в любое время суток." #: https//support.torproject.org/metrics/graphs/ #: (content/metrics/graphs/contents+en.lrquestion.description) @@ -8862,6 +8880,8 @@ msgid "" "And after such an interval is over relays and bridges might take another 18 " "hours to report the data." msgstr "" +"По окончании такого промежутка мосту может понадобиться до 18 часов, чтобы " +"сообщить данные." #: https//support.torproject.org/metrics/graphs/ #: (content/metrics/graphs/contents+en.lrquestion.description) @@ -8870,6 +8890,9 @@ msgid "" "the last data point in a graph indicates a recent trend change which is in " "fact just an artifact of the algorithm." msgstr "" +"Мы отбрасываем два последних дня сознательно. Мы не хотим, чтобы в последних" +" значениях \"обнаружился\" новый тренд, который фактически отражает лишь " +"погрешность алгоритма." #: https//support.torproject.org/metrics/methodology/ #: (content/metrics/methodology/contents+en.lrquestion.title) @@ -8877,6 +8900,8 @@ msgid "" "Why do you believe the current approach to estimate user numbers is more " "accurate?" msgstr "" +"Почему вы считаете, что ваш подход позволяет достоверно оценивать число " +"пользователей?" #: https//support.torproject.org/metrics/methodology/ #: (content/metrics/methodology/contents+en.lrquestion.description) @@ -8884,6 +8909,8 @@ msgid "" "For direct users, we include all directories which we didn't do in the old " "approach." msgstr "" +"Для наших непосредственных пользователей мы включаем все директории, чего не" +" было в прошлом." #: https//support.torproject.org/metrics/methodology/ #: (content/metrics/methodology/contents+en.lrquestion.description) @@ -8898,6 +8925,7 @@ msgid "" "Are there more fine-grained numbers available, for example, on the number of" " users per hour?" msgstr "" +"А есть более подробная статистика? Например, количество пользователей в час?" #: https//support.torproject.org/metrics/stats-report/ #: (content/metrics/stats-report/contents+en.lrquestion.description)

1 0

[tpo/master] Change TechLector link to Techreen - closes #123
by gus＠torproject.org 21 Dec '20

21 Dec '20

commit df6a0c01d416193cce9a5fc8976e091cf3b032af Author: Paul Walker <paul(a)blacksun.org.uk> Date: Sat Dec 19 18:31:05 2020 +0000 Change TechLector link to Techreen - closes #123 --- .../contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/press/tor-project-will-transfer-to-azure-to-continue-offering-domain-fronting/contents.lr b/content/press/tor-project-will-transfer-to-azure-to-continue-offering-domain-fronting/contents.lr index 411cc27a..264cde9f 100644 --- a/content/press/tor-project-will-transfer-to-azure-to-continue-offering-domain-fronting/contents.lr +++ b/content/press/tor-project-will-transfer-to-azure-to-continue-offering-domain-fronting/contents.lr @@ -6,11 +6,11 @@ active: True --- type: snippet --- -publisher: TechLector +publisher: Techreen --- title: Tor Project will transfer to Azure to continue offering domain fronting --- -link: https://techlector.com/tor-project-will-transfer-to-azure-to-continue-offer… +link: https://techreen.com/tor-project-will-transfer-to-azure-to-continue-offerin… --- pub_date: 2018-05-08 ---

1 0

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

21 Dec '20

commit d2097091cb2d63ddb2d78896810f02e8443c3d43 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 21 15:48:23 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index 2c96140953..fb771f8653 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -1997,6 +1997,10 @@ msgid "" "/hamburger-menu), then click on \"Preferences\", and finally on \"Tor\" in " "the side bar." msgstr "" +"Если вы не видите эту опцию, а [Tor Browser](../tor-browser) открыт, " +"загляните в меню по кнопке [с тремя полосками (\"≡\")](../../glossary" +"/hamburger-menu), затем выберите \"Настройки\", затем в левом столбце " +"\"Tor\"." #: https//support.torproject.org/glossary/tor-log/ #: (content/glossary/tor-log/contents+en.lrword.definition) @@ -2052,7 +2056,7 @@ msgstr "" #: https//support.torproject.org/glossary/tor-tor-network-core-tor/ #: (content/glossary/tor-tor-network-core-tor/contents+en.lrword.term) msgid "Tor / Tor network/ Core Tor" -msgstr "" +msgstr "Tor / Tor network/ Core Tor" #: https//support.torproject.org/glossary/tor-tor-network-core-tor/ #: (content/glossary/tor-tor-network-core-tor/contents+en.lrword.definition) @@ -2216,7 +2220,7 @@ msgstr "" #: https//support.torproject.org/glossary/web-browser/ #: (content/glossary/web-browser/contents+en.lrword.term) msgid "web browser" -msgstr "" +msgstr "web browser" #: https//support.torproject.org/glossary/web-browser/ #: (content/glossary/web-browser/contents+en.lrword.definition)

1 0

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

21 Dec '20

commit 09190339c72ab61e4fe7e53db2161df5d9c128e2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 21 15:18:04 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contents+ru.po b/contents+ru.po index 5026322090..2c96140953 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -1935,6 +1935,8 @@ msgid "" "Some languages such as Arabic *transliterate* the word Tor, تور. That is, " "they write Tor with other characters." msgstr "" +"В некоторых языках, например, в арабском, слово Tor подвергается " +"*транслитерации*: تور. Фактически, слово записано другими буквами." #: https//support.torproject.org/glossary/tor-launcher/ #: (content/glossary/tor-launcher/contents+en.lrword.term) @@ -1967,7 +1969,7 @@ msgstr "Если вы выберете второй вариант, Tor Launcher #: https//support.torproject.org/glossary/tor-log/ #: (content/glossary/tor-log/contents+en.lrword.term) msgid "Tor log" -msgstr "" +msgstr "Tor log" #: https//support.torproject.org/glossary/tor-log/ #: (content/glossary/tor-log/contents+en.lrword.definition)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2020