June 2016 - tor-commits - lists.torproject.org

[tor/master] Also check if the sandbox is configured as well as if it's active; sandbox_init() runs rather late in the startup process
by nickm＠torproject.org 30 Jun '16

30 Jun '16

commit 13a16e001164581b687dae2d3377f77eedb701ff Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Jun 30 09:37:23 2016 +0000 Also check if the sandbox is configured as well as if it's active; sandbox_init() runs rather late in the startup process --- src/or/routerparse.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index def6373..875bb60 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1073,7 +1073,11 @@ dump_desc(const char *desc, const char *type) DESC_DUMP_BASE_FILENAME ".%s", digest_sha256_hex); debugfile = get_datadir_fname2(DESC_DUMP_DATADIR_SUBDIR, debugfile_base); - if (!sandbox_is_active()) { + /* + * Check if the sandbox is active or will become active; see comment + * below at the log message for why. + */ + if (!(sandbox_is_active() || get_options()->Sandbox)) { if (len <= get_options()->MaxUnparseableDescSizeToLog) { if (!dump_desc_fifo_bump_hash(digest_sha256)) { /* Create the directory if needed */ @@ -1128,7 +1132,7 @@ dump_desc(const char *desc, const char *type) log_info(LD_DIR, "Unable to parse descriptor of type %s with hash %s and " "length %lu. Descriptor not dumped because the sandbox is " - "active", + "configured", type, digest_sha256_hex, (unsigned long)len); } @@ -6001,7 +6005,12 @@ rend_parse_client_keys(strmap_t *parsed_clients, const char *ckstr) void routerparse_init(void) { - if (!(sandbox_is_active())) { + /* + * Check both if the sandbox is active and whether it's configured; no + * point in loading all that if we won't be able to use it after the + * sandbox becomes active. + */ + if (!(sandbox_is_active() || get_options()->Sandbox)) { dump_desc_init(); } }

1 0

[tor/master] Unit test for dump_desc_populate_one_file()
by nickm＠torproject.org 30 Jun '16

30 Jun '16

commit 42f089473a50613ae62875ede386861e91123b78 Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Jun 30 06:13:44 2016 +0000 Unit test for dump_desc_populate_one_file() --- src/common/util.c | 4 +- src/common/util.h | 5 +- src/or/routerparse.c | 14 +--- src/or/routerparse.h | 14 ++++ src/test/test_dir.c | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 216 insertions(+), 17 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index d60380c..97837f5 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2676,8 +2676,8 @@ read_file_to_str_until_eof(int fd, size_t max_bytes_to_read, size_t *sz_out) * the call to stat and the call to read_all: the resulting string will * be truncated. */ -char * -read_file_to_str(const char *filename, int flags, struct stat *stat_out) +MOCK_IMPL(char *, +read_file_to_str, (const char *filename, int flags, struct stat *stat_out)) { int fd; /* router file */ struct stat statbuf; diff --git a/src/common/util.h b/src/common/util.h index 70483bb..157d25a 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -367,8 +367,9 @@ int write_bytes_to_new_file(const char *fname, const char *str, size_t len, #ifndef _WIN32 struct stat; #endif -char *read_file_to_str(const char *filename, int flags, struct stat *stat_out) - ATTR_MALLOC; +MOCK_DECL_ATTR(char *, read_file_to_str, + (const char *filename, int flags, struct stat *stat_out), + ATTR_MALLOC); char *read_file_to_str_until_eof(int fd, size_t max_bytes_to_read, size_t *sz_out) ATTR_MALLOC; diff --git a/src/or/routerparse.c b/src/or/routerparse.c index cedcfe0..f3f003e 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -601,18 +601,6 @@ static int problem_with_dump_desc_dir = 0; #define DESC_DUMP_DATADIR_SUBDIR "unparseable-descs" #define DESC_DUMP_BASE_FILENAME "unparseable-desc" -/* - * One entry in the list of dumped descriptors; filename dumped to, length - * and SHA-256. - */ - -typedef struct { - char *filename; - size_t len; - uint8_t digest_sha256[DIGEST256_LEN]; - time_t when; -} dumped_desc_t; - /** Find the dump directory and check if we'll be able to create it */ static void dump_desc_init(void) @@ -835,7 +823,7 @@ dump_desc_fifo_cleanup(void) * the filename is sensibly formed and matches the file content, and either * return a dumped_desc_t for it or remove the file and return NULL. */ -static dumped_desc_t * +STATIC dumped_desc_t * dump_desc_populate_one_file(const char *dirname, const char *f) { dumped_desc_t *ent = NULL; diff --git a/src/or/routerparse.h b/src/or/routerparse.h index a96146a..6167e51 100644 --- a/src/or/routerparse.h +++ b/src/or/routerparse.h @@ -89,12 +89,26 @@ void routerparse_init(void); void routerparse_free_all(void); #ifdef ROUTERPARSE_PRIVATE +/* + * One entry in the list of dumped descriptors; filename dumped to, length, + * SHA-256 and timestamp. + */ + +typedef struct { + char *filename; + size_t len; + uint8_t digest_sha256[DIGEST256_LEN]; + time_t when; +} dumped_desc_t; + EXTERN(size_t, len_descs_dumped); EXTERN(smartlist_t *, descs_dumped); STATIC int routerstatus_parse_guardfraction(const char *guardfraction_str, networkstatus_t *vote, vote_routerstatus_t *vote_rs, routerstatus_t *rs); +STATIC dumped_desc_t * dump_desc_populate_one_file(const char *dirname, + const char *f); STATIC void dump_desc(const char *desc, const char *type); STATIC void dump_desc_fifo_cleanup(void); #endif diff --git a/src/test/test_dir.c b/src/test/test_dir.c index b4fc615..2c398e3 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -4801,6 +4801,201 @@ test_dir_dump_unparseable_descriptors(void *data) return; } +/* Variables for reset_read_file_to_str_mock() */ + +static char *expected_filename = NULL; +static char *file_content = NULL; +static size_t file_content_len = 0; +static struct stat file_stat; +static int read_count = 0, read_call_count = 0; + +static void +reset_read_file_to_str_mock(void) +{ + tor_free(expected_filename); + tor_free(file_content); + file_content_len = 0; + memset(&file_stat, 0, sizeof(file_stat)); + read_count = 0; + read_call_count = 0; +} + +static char * +read_file_to_str_mock(const char *filename, int flags, + struct stat *stat_out) { + char *result = NULL; + + /* Insist we got a filename */ + tt_assert(filename != NULL); + + /* We ignore flags */ + (void)flags; + + /* Bump the call count */ + ++read_call_count; + + if (expected_filename != NULL && + file_content != NULL && + strcmp(filename, expected_filename) == 0) { + /* You asked for it, you got it */ + + /* + * This is the same behavior as the real read_file_to_str(); + * if there's a NUL, the real size ends up in stat_out. + */ + result = tor_malloc(file_content_len + 1); + if (file_content_len > 0) { + memcpy(result, file_content, file_content_len); + } + result[file_content_len] = '\0'; + + /* Do we need to set up stat_out? */ + if (stat_out != NULL) { + memcpy(stat_out, &file_stat, sizeof(file_stat)); + /* We always return the correct length here */ + stat_out->st_size = file_content_len; + } + + /* Wooo, we have a return value - bump the counter */ + ++read_count; + } + /* else no match, return NULL */ + + done: + return result; +} + +static void +test_dir_populate_dump_desc_fifo(void *data) +{ + const char *dirname = "foo"; + const char *fname = NULL; + dumped_desc_t *ent; + + (void)data; + + /* + * Set up unlink and read_file_to_str mocks + */ + MOCK(tor_unlink, mock_unlink); + mock_unlink_reset(); + MOCK(read_file_to_str, read_file_to_str_mock); + reset_read_file_to_str_mock(); + + /* Check state of unlink mock */ + tt_int_op(unlinked_count, ==, 0); + + /* Some cases that should fail before trying to read the file */ + ent = dump_desc_populate_one_file(dirname, "bar"); + tt_assert(ent == NULL); + tt_int_op(unlinked_count, ==, 1); + tt_int_op(read_count, ==, 0); + tt_int_op(read_call_count, ==, 0); + + ent = dump_desc_populate_one_file(dirname, "unparseable-desc"); + tt_assert(ent == NULL); + tt_int_op(unlinked_count, ==, 2); + tt_int_op(read_count, ==, 0); + tt_int_op(read_call_count, ==, 0); + + ent = dump_desc_populate_one_file(dirname, "unparseable-desc.baz"); + tt_assert(ent == NULL); + tt_int_op(unlinked_count, ==, 3); + tt_int_op(read_count, ==, 0); + tt_int_op(read_call_count, ==, 0); + + ent = dump_desc_populate_one_file( + dirname, + "unparseable-desc.08AE85E90461F59E"); + tt_assert(ent == NULL); + tt_int_op(unlinked_count, ==, 4); + tt_int_op(read_count, ==, 0); + tt_int_op(read_call_count, ==, 0); + + ent = dump_desc_populate_one_file( + dirname, + "unparseable-desc.08AE85E90461F59EDF0981323F3A70D02B55AB54B44B04F" + "287D72F7B72F242E85C8CB0EDA8854A99"); + tt_assert(ent == NULL); + tt_int_op(unlinked_count, ==, 5); + tt_int_op(read_count, ==, 0); + tt_int_op(read_call_count, ==, 0); + + /* This is a correct-length digest but base16_decode() will fail */ + ent = dump_desc_populate_one_file( + dirname, + "unparseable-desc.68219B8BGE64B705A6FFC728C069DC596216D60A7D7520C" + "D5ECE250D912E686B"); + tt_assert(ent == NULL); + tt_int_op(unlinked_count, ==, 6); + tt_int_op(read_count, ==, 0); + tt_int_op(read_call_count, ==, 0); + + /* This one has a correctly formed filename and should try reading */ + + /* Read fails */ + ent = dump_desc_populate_one_file( + dirname, + "unparseable-desc.DF0981323F3A70D02B55AB54B44B04F287D72F7B72F242E" + "85C8CB0EDA8854A99"); + tt_assert(ent == NULL); + tt_int_op(unlinked_count, ==, 7); + tt_int_op(read_count, ==, 0); + tt_int_op(read_call_count, ==, 1); + + /* This read will succeed but the digest won't match the file content */ + fname = + "unparseable-desc." + "DF0981323F3A70D02B55AB54B44B04F287D72F7B72F242E85C8CB0EDA8854A99"; + tor_asprintf(&expected_filename, "%s/%s", dirname, fname); + file_content = tor_strdup("hanc culpam maiorem an illam dicam?"); + file_content_len = strlen(file_content); + file_stat.st_mtime = 123456; + ent = dump_desc_populate_one_file(dirname, fname); + tt_assert(ent == NULL); + tt_int_op(unlinked_count, ==, 8); + tt_int_op(read_count, ==, 1); + tt_int_op(read_call_count, ==, 2); + tor_free(expected_filename); + + /* This one will match */ + fname = + "unparseable-desc." + "0786C7173447B7FB033FFCA2FC47C3CF71C30DD47CA8236D3FC7FF35853271C6"; + tor_asprintf(&expected_filename, "%s/%s", dirname, fname); + file_content = tor_strdup("hanc culpam maiorem an illam dicam?"); + file_content_len = strlen(file_content); + file_stat.st_mtime = 789012; + ent = dump_desc_populate_one_file(dirname, fname); + tt_assert(ent != NULL); + tt_int_op(unlinked_count, ==, 8); + tt_int_op(read_count, ==, 2); + tt_int_op(read_call_count, ==, 3); + tt_str_op(ent->filename, OP_EQ, expected_filename); + tt_int_op(ent->len, ==, file_content_len); + tt_int_op(ent->when, ==, file_stat.st_mtime); + tor_free(ent->filename); + tor_free(ent); + tor_free(expected_filename); + + /* + * Reset the mocks and check their state + */ + mock_unlink_reset(); + tt_int_op(unlinked_count, ==, 0); + reset_read_file_to_str_mock(); + tt_int_op(read_count, ==, 0); + + done: + + UNMOCK(tor_unlink); + mock_unlink_reset(); + UNMOCK(read_file_to_str); + reset_read_file_to_str_mock(); + + return; +} + static int mock_networkstatus_consensus_is_bootstrapping_value = 0; static int mock_networkstatus_consensus_is_bootstrapping(time_t now) @@ -5011,6 +5206,7 @@ struct testcase_t dir_tests[] = { DIR(should_init_request_to_dir_auths, 0), DIR(choose_compression_level, 0), DIR(dump_unparseable_descriptors, 0), + DIR(populate_dump_desc_fifo, 0), DIR_ARG(find_dl_schedule, TT_FORK, "bf"), DIR_ARG(find_dl_schedule, TT_FORK, "ba"), DIR_ARG(find_dl_schedule, TT_FORK, "cf"),

1 0

[tor/master] Add unit test for dump_desc_populate_fifo_from_directory()
by nickm＠torproject.org 30 Jun '16

30 Jun '16

commit 9580b99dab217cc14b3dab78962bfb3bfd51922a Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Jun 30 06:59:29 2016 +0000 Add unit test for dump_desc_populate_fifo_from_directory() --- src/or/routerparse.c | 4 +-- src/or/routerparse.h | 1 + src/test/test_dir.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 3 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 3436bfb..2260693 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -588,8 +588,6 @@ static int check_signature_token(const char *digest, /* Dump mechanism for unparseable descriptors */ -static void dump_desc_populate_fifo_from_directory(const char *dirname); - /** List of dumped descriptors for FIFO cleanup purposes */ STATIC smartlist_t *descs_dumped = NULL; /** Total size of dumped descriptors for FIFO cleanup */ @@ -972,7 +970,7 @@ dump_desc_compare_fifo_entries(const void **a_v, const void **b_v) * reconstructed order will be wrong, but will always be a permutation of * the original. */ -static void +STATIC void dump_desc_populate_fifo_from_directory(const char *dirname) { smartlist_t *files = NULL; diff --git a/src/or/routerparse.h b/src/or/routerparse.h index 131f158..2eb9932 100644 --- a/src/or/routerparse.h +++ b/src/or/routerparse.h @@ -109,6 +109,7 @@ STATIC int routerstatus_parse_guardfraction(const char *guardfraction_str, routerstatus_t *rs); MOCK_DECL(STATIC dumped_desc_t *, dump_desc_populate_one_file, (const char *dirname, const char *f)); +STATIC void dump_desc_populate_fifo_from_directory(const char *dirname); STATIC void dump_desc(const char *desc, const char *type); STATIC void dump_desc_fifo_cleanup(void); #endif diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 2c398e3..873426c 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -4865,6 +4865,7 @@ read_file_to_str_mock(const char *filename, int flags, return result; } +/* This one tests dump_desc_populate_one_file() */ static void test_dir_populate_dump_desc_fifo(void *data) { @@ -4996,6 +4997,97 @@ test_dir_populate_dump_desc_fifo(void *data) return; } +static smartlist_t * +listdir_mock(const char *dname) +{ + smartlist_t *l; + + /* Ignore the name, always return this list */ + (void)dname; + + l = smartlist_new(); + smartlist_add(l, tor_strdup("foo")); + smartlist_add(l, tor_strdup("bar")); + smartlist_add(l, tor_strdup("baz")); + + return l; +} + +static dumped_desc_t * +pop_one_mock(const char *dirname, const char *f) +{ + dumped_desc_t *ent = NULL; + + if (dirname != NULL && strcmp(dirname, "d") == 0) { + if (f != NULL && strcmp(f, "foo") == 0) { + ent = tor_malloc_zero(sizeof(*ent)); + ent->filename = strdup("d/foo"); + ent->len = 123; + ent->digest_sha256[0] = 1; + ent->when = 1024; + } else if (f != NULL && strcmp(f, "bar") == 0) { + ent = tor_malloc_zero(sizeof(*ent)); + ent->filename = strdup("d/bar"); + ent->len = 456; + ent->digest_sha256[0] = 2; + /* + * Note that the timestamps are in a different order than + * listdir_mock() returns; we're testing the sort order. + */ + ent->when = 512; + } else if (f != NULL && strcmp(f, "baz") == 0) { + ent = tor_malloc_zero(sizeof(*ent)); + ent->filename = strdup("d/baz"); + ent->len = 789; + ent->digest_sha256[0] = 3; + ent->when = 768; + } + } + + return ent; +} + +/* This one tests dump_desc_populate_fifo_from_directory() */ +static void +test_dir_populate_dump_desc_fifo_2(void *data) +{ + dumped_desc_t *ent = NULL; + + (void)data; + + /* Set up the mocks */ + MOCK(tor_listdir, listdir_mock); + MOCK(dump_desc_populate_one_file, pop_one_mock); + + /* Run dump_desc_populate_fifo_from_directory() */ + descs_dumped = NULL; + len_descs_dumped = 0; + dump_desc_populate_fifo_from_directory("d"); + tt_assert(descs_dumped != NULL); + tt_int_op(smartlist_len(descs_dumped), OP_EQ, 3); + tt_int_op(len_descs_dumped, OP_EQ, 1368); + ent = smartlist_get(descs_dumped, 0); + tt_str_op(ent->filename, OP_EQ, "d/bar"); + tt_int_op(ent->len, OP_EQ, 456); + tt_int_op(ent->when, OP_EQ, 512); + ent = smartlist_get(descs_dumped, 1); + tt_str_op(ent->filename, OP_EQ, "d/baz"); + tt_int_op(ent->len, OP_EQ, 789); + tt_int_op(ent->when, OP_EQ, 768); + ent = smartlist_get(descs_dumped, 2); + tt_str_op(ent->filename, OP_EQ, "d/foo"); + tt_int_op(ent->len, OP_EQ, 123); + tt_int_op(ent->when, OP_EQ, 1024); + + done: + dump_desc_fifo_cleanup(); + + UNMOCK(dump_desc_populate_one_file); + UNMOCK(tor_listdir); + + return; +} + static int mock_networkstatus_consensus_is_bootstrapping_value = 0; static int mock_networkstatus_consensus_is_bootstrapping(time_t now) @@ -5207,6 +5299,7 @@ struct testcase_t dir_tests[] = { DIR(choose_compression_level, 0), DIR(dump_unparseable_descriptors, 0), DIR(populate_dump_desc_fifo, 0), + DIR(populate_dump_desc_fifo_2, 0), DIR_ARG(find_dl_schedule, TT_FORK, "bf"), DIR_ARG(find_dl_schedule, TT_FORK, "ba"), DIR_ARG(find_dl_schedule, TT_FORK, "cf"),

1 0

[tor/master] Reload unparseable descriptor dump FIFO state from on-disk dumped descriptors at startup
by nickm＠torproject.org 30 Jun '16

30 Jun '16

commit 421cf21b3cc7c0d4a9c64eb992b991019103a7f3 Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Jun 30 04:36:23 2016 +0000 Reload unparseable descriptor dump FIFO state from on-disk dumped descriptors at startup --- src/or/routerparse.c | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 232 insertions(+), 1 deletion(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 75c09d2..cedcfe0 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -588,6 +588,8 @@ static int check_signature_token(const char *digest, /* Dump mechanism for unparseable descriptors */ +static void dump_desc_populate_fifo_from_directory(const char *dirname); + /** List of dumped descriptors for FIFO cleanup purposes */ STATIC smartlist_t *descs_dumped = NULL; /** Total size of dumped descriptors for FIFO cleanup */ @@ -597,6 +599,7 @@ static int have_dump_desc_dir = 0; static int problem_with_dump_desc_dir = 0; #define DESC_DUMP_DATADIR_SUBDIR "unparseable-descs" +#define DESC_DUMP_BASE_FILENAME "unparseable-desc" /* * One entry in the list of dumped descriptors; filename dumped to, length @@ -607,6 +610,7 @@ typedef struct { char *filename; size_t len; uint8_t digest_sha256[DIGEST256_LEN]; + time_t when; } dumped_desc_t; /** Find the dump directory and check if we'll be able to create it */ @@ -660,6 +664,10 @@ dump_desc_init(void) problem_with_dump_desc_dir = 1; } + if (have_dump_desc_dir && !problem_with_dump_desc_dir) { + dump_desc_populate_fifo_from_directory(dump_desc_dir); + } + tor_free(dump_desc_dir); } @@ -718,6 +726,7 @@ dump_desc_fifo_add_and_clean(char *filename, const uint8_t *digest_sha256, ent = tor_malloc_zero(sizeof(*ent)); ent->filename = filename; ent->len = len; + ent->when = time(NULL); memcpy(ent->digest_sha256, digest_sha256, DIGEST256_LEN); /* Do we need to do some cleanup? */ @@ -790,6 +799,8 @@ dump_desc_fifo_bump_hash(const uint8_t *digest_sha256) } SMARTLIST_FOREACH_END(ent); if (match) { + /* Update the timestamp */ + match->when = time(NULL); /* Add it back at the end of the list */ smartlist_add(descs_dumped, match); @@ -820,6 +831,225 @@ dump_desc_fifo_cleanup(void) } } +/** Handle one file for dump_desc_populate_fifo_from_directory(); make sure + * the filename is sensibly formed and matches the file content, and either + * return a dumped_desc_t for it or remove the file and return NULL. + */ +static dumped_desc_t * +dump_desc_populate_one_file(const char *dirname, const char *f) +{ + dumped_desc_t *ent = NULL; + char *path = NULL, *desc = NULL; + const char *digest_str; + char digest[DIGEST256_LEN], content_digest[DIGEST256_LEN]; + /* Expected prefix before digest in filenames */ + const char *f_pfx = DESC_DUMP_BASE_FILENAME "."; + /* + * Stat while reading; this is important in case the file + * contains a NUL character. + */ + struct stat st; + + /* Sanity-check args */ + tor_assert(dirname != NULL); + tor_assert(f != NULL); + + /* Form the full path */ + tor_asprintf(&path, "%s" PATH_SEPARATOR "%s", dirname, f); + + /* Check that f has the form DESC_DUMP_BASE_FILENAME.<digest256> */ + + if (!strcmpstart(f, f_pfx)) { + /* It matches the form, but is the digest parseable as such? */ + digest_str = f + strlen(f_pfx); + if (base16_decode(digest, DIGEST256_LEN, + digest_str, strlen(digest_str)) != DIGEST256_LEN) { + /* We failed to decode it */ + digest_str = NULL; + } + } else { + /* No match */ + digest_str = NULL; + } + + if (!digest_str) { + /* We couldn't get a sensible digest */ + log_notice(LD_DIR, + "Removing unrecognized filename %s from unparseable " + "descriptors directory", f); + tor_unlink(path); + /* We're done */ + goto done; + } + + /* + * The filename has the form DESC_DUMP_BASE_FILENAME "." <digest256> and + * we've decoded the digest. Next, check that we can read it and the + * content matches this digest. We are relying on the fact that if the + * file contains a '\0', read_file_to_str() will allocate space for and + * read the entire file and return the correct size in st. + */ + desc = read_file_to_str(path, RFTS_IGNORE_MISSING, &st); + if (!desc) { + /* We couldn't read it */ + log_notice(LD_DIR, + "Failed to read %s from unparseable descriptors directory; " + "attempting to remove it.", f); + tor_unlink(path); + /* We're done */ + goto done; + } + + /* + * We got one; now compute its digest and check that it matches the + * filename. + */ + if (crypto_digest256((char *)content_digest, desc, st.st_size, + DIGEST_SHA256) != 0) { + /* Weird, but okay */ + log_info(LD_DIR, + "Unable to hash content of %s from unparseable descriptors " + "directory", f); + tor_unlink(path); + /* We're done */ + goto done; + } + + /* Compare the digests */ + if (memcmp(digest, content_digest, DIGEST256_LEN) != 0) { + /* No match */ + log_info(LD_DIR, + "Hash of %s from unparseable descriptors directory didn't " + "match its filename; removing it", f); + tor_unlink(path); + /* We're done */ + goto done; + } + + /* Okay, it's a match, we should prepare ent */ + ent = tor_malloc_zero(sizeof(dumped_desc_t)); + ent->filename = path; + memcpy(ent->digest_sha256, digest, DIGEST256_LEN); + ent->len = st.st_size; + ent->when = st.st_mtime; + /* Null out path so we don't free it out from under ent */ + path = NULL; + + done: + /* Free allocations if we had them */ + tor_free(desc); + tor_free(path); + + return ent; +} + +/** Sort helper for dump_desc_populate_fifo_from_directory(); compares + * the when field of dumped_desc_ts in a smartlist to put the FIFO in + * the correct order after reconstructing it from the directory. + */ +static int +dump_desc_compare_fifo_entries(const void **a_v, const void **b_v) +{ + const dumped_desc_t **a = (const dumped_desc_t **)a_v; + const dumped_desc_t **b = (const dumped_desc_t **)b_v; + + if ((a != NULL) && (*a != NULL)) { + if ((b != NULL) && (*b != NULL)) { + /* We have sensible dumped_desc_ts to compare */ + if ((*a)->when < (*b)->when) { + return -1; + } else if ((*a)->when == (*b)->when) { + return 0; + } else { + return 1; + } + } else { + /* + * We shouldn't see this, but what the hell, NULLs precede everythin + * else + */ + return 1; + } + } else { + return -1; + } +} + +/** Scan the contents of the directory, and update FIFO/counters; this will + * consistency-check descriptor dump filenames against hashes of descriptor + * dump file content, and remove any inconsistent/unreadable dumps, and then + * reconstruct the dump FIFO as closely as possible for the last time the + * tor process shut down. If a previous dump was repeated more than once and + * moved ahead in the FIFO, the mtime will not have been updated and the + * reconstructed order will be wrong, but will always be a permutation of + * the original. + */ +static void +dump_desc_populate_fifo_from_directory(const char *dirname) +{ + smartlist_t *files = NULL; + dumped_desc_t *ent = NULL; + + tor_assert(dirname != NULL); + + /* Get a list of files */ + files = tor_listdir(dirname); + if (!files) { + log_notice(LD_DIR, + "Unable to get contents of unparseable descriptor dump " + "directory %s", + dirname); + return; + } + + /* + * Iterate through the list and decide which files should go in the + * FIFO and which should be purged. + */ + + SMARTLIST_FOREACH_BEGIN(files, char *, f) { + /* Try to get a FIFO entry */ + ent = dump_desc_populate_one_file(dirname, f); + if (ent) { + /* + * We got one; add it to the FIFO. No need for duplicate checking + * here since we just verified the name and digest match. + */ + + /* Make sure we have a list to add it to */ + if (!descs_dumped) { + descs_dumped = smartlist_new(); + len_descs_dumped = 0; + } + + /* Add it and adjust the counter */ + smartlist_add(descs_dumped, ent); + len_descs_dumped += ent->len; + } + /* + * If we didn't, we will have unlinked the file if necessary and + * possible, and emitted a log message about it, so just go on to + * the next. + */ + } SMARTLIST_FOREACH_END(f); + + /* Did we get anything? */ + if (descs_dumped != NULL) { + /* Sort the FIFO in order of increasing timestamp */ + smartlist_sort(descs_dumped, dump_desc_compare_fifo_entries); + + /* Log some stats */ + log_info(LD_DIR, + "Reloaded unparseable descriptor dump FIFO with %d dump(s) " + "totaling " U64_FORMAT " bytes", + smartlist_len(descs_dumped), U64_PRINTF_ARG(len_descs_dumped)); + } + + /* Free the original list */ + SMARTLIST_FOREACH(files, char *, f, tor_free(f)); + smartlist_free(files); +} + /** For debugging purposes, dump unparseable descriptor *<b>desc</b> of * type *<b>type</b> to file $DATADIR/unparseable-desc. Do not write more * than one descriptor to disk per minute. If there is already such a @@ -853,7 +1083,8 @@ dump_desc(const char *desc, const char *type) * We mention type and hash in the main log; don't clutter up the files * with anything but the exact dump. */ - tor_asprintf(&debugfile_base, "unparseable-desc.%s", digest_sha256_hex); + tor_asprintf(&debugfile_base, + DESC_DUMP_BASE_FILENAME ".%s", digest_sha256_hex); debugfile = get_datadir_fname2(DESC_DUMP_DATADIR_SUBDIR, debugfile_base); if (!sandbox_is_active()) {

1 0

[tor/master] Fix bug19483: avoid range checks when they are always true
by nickm＠torproject.org 30 Jun '16

30 Jun '16

commit aae14f83466364187dd04334e2f8b02e06002a88 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Jun 30 09:19:33 2016 +1000 Fix bug19483: avoid range checks when they are always true Some compilers are smart enough to work out that comparisons to LONG_MAX are a no-op on L64. --- src/common/util.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 613e000..fce99ee 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1451,11 +1451,14 @@ tv_udiff(const struct timeval *start, const struct timeval *end) * between 0 and TV_USEC_PER_SEC. */ udiff = secdiff*1000000 + ((int64_t)end->tv_usec - (int64_t)start->tv_usec); + /* Some compilers are smart enough to work out this is a no-op on L64 */ +#if SIZEOF_LONG < 8 if (udiff > (int64_t)LONG_MAX || udiff < (int64_t)LONG_MIN) { return LONG_MAX; - } else { - return (long)udiff; } +#endif + + return (long)udiff; } /** Return the number of milliseconds elapsed between *start and *end. @@ -1507,11 +1510,14 @@ tv_mdiff(const struct timeval *start, const struct timeval *end) ((int64_t)end->tv_usec - (int64_t)start->tv_usec + 500 + 1000000) / 1000 - 1000; + /* Some compilers are smart enough to work out this is a no-op on L64 */ +#if SIZEOF_LONG < 8 if (mdiff > (int64_t)LONG_MAX || mdiff < (int64_t)LONG_MIN) { return LONG_MAX; - } else { - return (long)mdiff; } +#endif + + return (long)mdiff; } /**

1 0

[tor/master] Add tv_udiff and tv_mdiff unit tests with negative values
by nickm＠torproject.org 30 Jun '16

30 Jun '16

commit 69535f12841aa8041863c81d1c6ac7eb7a95e0c6 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Jun 30 09:22:29 2016 +1000 Add tv_udiff and tv_mdiff unit tests with negative values --- src/test/test_util.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 8951292..c331a66 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -303,6 +303,23 @@ test_util_time(void *arg) tt_int_op(1005000L,OP_EQ, tv_udiff(&end, &start)); tt_int_op(1005L,OP_EQ, tv_mdiff(&end, &start)); + /* Negative tv_sec values, these will break on platforms where tv_sec is + * unsigned */ + + end.tv_sec = -10; + + tt_int_op(-15005000L,OP_EQ, tv_udiff(&start, &end)); + tt_int_op(-15005L,OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(15005000L,OP_EQ, tv_udiff(&end, &start)); + tt_int_op(15005L,OP_EQ, tv_mdiff(&end, &start)); + + start.tv_sec = -100; + + tt_int_op(89995000L,OP_EQ, tv_udiff(&start, &end)); + tt_int_op(89995L,OP_EQ, tv_mdiff(&start, &end)); + tt_int_op(-89995000L,OP_EQ, tv_udiff(&end, &start)); + tt_int_op(-89995L,OP_EQ, tv_mdiff(&end, &start)); + /* Test that tv_usec values round away from zero when converted to msec */ start.tv_sec = 0; start.tv_usec = 0;

1 0

[tor/master] Merge remote-tracking branch 'teor/bug19483-fix-v2'
by nickm＠torproject.org 30 Jun '16

30 Jun '16

commit a31f55b16ba26c5c3720640bf27157fd7ab45c40 Merge: 4dc7b3c 69535f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 30 11:04:13 2016 -0400 Merge remote-tracking branch 'teor/bug19483-fix-v2' src/common/util.c | 14 ++++++++++---- src/test/test_util.c | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-)

1 0

[onionoo/master] Remove Globe from list of maintained clients.
by karsten＠torproject.org 30 Jun '16

30 Jun '16

commit 43ffb86c2885b462b3ed3266e45e19ddca5354f1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jun 30 13:33:02 2016 +0200 Remove Globe from list of maintained clients. --- web/index.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/web/index.html b/web/index.html index 124c7b2..c7095ec 100644 --- a/web/index.html +++ b/web/index.html @@ -32,11 +32,6 @@ relays running in the same country or same autonomous system.</li> Hidden Services. It uses Onionoo to get the list of currently running Tor Exits to detect if the client is a Tor user and if so redirect them to the .onion address.</li> -<li><a href="https://globe.torproject.org/">Globe</a> is a web -application -that allows you to search for Tor relays and bridges. It gives you a -detailed overview of properties and configurations of a relay or -bridge.</li> <li>The <a href="https://nos-oignons.net/Services/index.en.html">Nos oignons</a> website uses Onionoo to visualize bandwidth histories of their relays.</li>

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 30 Jun '16

30 Jun '16

commit 904df0d9b0613ae26c30727957187cdb92d0e4a4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 30 06:17:51 2016 +0000 Update translations for tor-messenger-fingerdtd --- el/finger.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el/finger.dtd b/el/finger.dtd index aabc595..56c06af 100644 --- a/el/finger.dtd +++ b/el/finger.dtd @@ -11,5 +11,5 @@ <!ENTITY addFingerDialog.title "Προσθήκη αποτυπώματος"> <!ENTITY addFingerDialog.finger "Αποτύπωμα"> <!ENTITY addFingerDialog.accept "Οκ"> -<!ENTITY addFingerDialog.cancel "Skip"> +<!ENTITY addFingerDialog.cancel "Παράβλεψη"> <!ENTITY addFingerDialog.tooltip "If you know the 40 hex char fingerprint of your contact's OTR private key, enter it now."> \ No newline at end of file

1 0

[chutney/master] Allow specifying the Chutney listen address.
by teor＠torproject.org 30 Jun '16

30 Jun '16

commit 83ca28cbf95aa95ae5dd93e41a23deb71bb19c7c Author: anonym <anonym(a)riseup.net> Date: Thu Jul 16 22:51:08 2015 +0200 Allow specifying the Chutney listen address. It's controlled via the CHUTNEY_LISTEN_ADDRESS environment variable (default: localhost). Setting it to some interface's IP address allows us to make the simulated Tor network available on the network. --- lib/chutney/TorNet.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 0eb4a76..a952944 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -673,7 +673,7 @@ DEFAULTS = { 'tor': os.environ.get('CHUTNEY_TOR', 'tor'), 'tor-gencert': os.environ.get('CHUTNEY_TOR_GENCERT', None), 'auth_cert_lifetime': 12, - 'ip': '127.0.0.1', + 'ip': os.environ.get('CHUTNEY_LISTEN_ADDRESS', '127.0.0.1'), 'ipv6_addr': None, 'dirserver_flags': 'no-v2', 'chutney_dir': '.', @@ -918,7 +918,7 @@ class Network(object): and verify what is received.""" LISTEN_PORT = 4747 # FIXME: Do better! Note the default exit policy. # HSs must have a HiddenServiceDir with - # "HiddenServicePort <HS_PORT> 127.0.0.1:<LISTEN_PORT>" + # "HiddenServicePort <HS_PORT> <CHUTNEY_LISTEN_ADDRESS>:<LISTEN_PORT>" HS_PORT = 5858 # The amount of data to send between each source-sink pair, # each time the source connects. @@ -946,7 +946,7 @@ class Network(object): dot_reps = 0 tmpdata = {} # now make the connections - bind_to = ('127.0.0.1', LISTEN_PORT) + bind_to = (DEFAULTS['ip'], LISTEN_PORT) tt = chutney.Traffic.TrafficTester(bind_to, tmpdata, TIMEOUT, reps, dot_reps) client_list = filter(lambda n: @@ -1012,7 +1012,8 @@ class Network(object): # if there are any exits, each client / bridge client transmits # via 4 nodes (including the client) to an arbitrary exit - # Each client binds directly to 127.0.0.1:LISTEN_PORT via an Exit relay + # Each client binds directly to <CHUTNEY_LISTEN_ADDRESS>:LISTEN_PORT + # via an Exit relay def _configure_exits(self, tt, bind_to, tmpdata, reps, client_list, exit_list, LISTEN_PORT): CLIENT_EXIT_PATH_NODES = 4 @@ -1024,7 +1025,7 @@ class Network(object): connection_count) for op in client_list: print(" Exit to %s:%d via client %s:%s" - % ('127.0.0.1', LISTEN_PORT, + % (DEFAULTS['ip'], LISTEN_PORT, 'localhost', op._env['socksport'])) for i in range(connection_count): proxy = ('localhost', int(op._env['socksport'])) @@ -1033,7 +1034,7 @@ class Network(object): return exit_path_node_count # The HS redirects .onion connections made to hs_hostname:HS_PORT - # to the Traffic Tester's 127.0.0.1:LISTEN_PORT + # to the Traffic Tester's CHUTNEY_LISTEN_ADDRESS:LISTEN_PORT # an arbitrary client / bridge client transmits via 8 nodes # (including the client and hs) to each hidden service # Instead of binding directly to LISTEN_PORT via an Exit relay, @@ -1057,7 +1058,7 @@ class Network(object): for client in hs_client_list: print(" HS to %s:%d (%s:%d) via client %s:%s" % (hs._env['hs_hostname'], HS_PORT, - '127.0.0.1', LISTEN_PORT, + DEFAULTS['ip'], LISTEN_PORT, 'localhost', client._env['socksport'])) for i in range(connection_count): proxy = ('localhost', int(client._env['socksport']))

1 0