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

[tor/master] Merge branch 'prop293_squashed'
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit 1f95e80351cdb45de0994a0a3aba277267d41ad0 Merge: d4f558e38 a2f81b644 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 5 09:24:51 2018 -0500 Merge branch 'prop293_squashed' changes/ticket26770 | 8 ++ src/feature/dirauth/dirvote.c | 19 +++- src/feature/dirauth/dirvote.h | 3 + src/feature/dirauth/voteflags.c | 8 +- src/feature/dirauth/voteflags.h | 6 +- src/feature/dirparse/ns_parse.c | 2 + src/feature/nodelist/fmt_routerstatus.c | 3 +- src/feature/nodelist/networkstatus.c | 4 +- src/feature/nodelist/networkstatus.h | 5 +- src/feature/nodelist/routerstatus_st.h | 2 + src/feature/relay/router.c | 11 +- src/feature/relay/router.h | 4 + src/test/fuzz/fuzz_vrs.c | 8 +- src/test/include.am | 1 + src/test/test.c | 3 +- src/test/test.h | 1 + src/test/test_dir.c | 75 +++++++++++++ src/test/test_router.c | 98 ++++++++++++++++ src/test/test_voting_flags.c | 192 ++++++++++++++++++++++++++++++++ 19 files changed, 438 insertions(+), 15 deletions(-)

1 0

[tor/master] Write tests for mark_my_descriptor_dirty_if_too_old()
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit a2f81b644b2a4679c634744d3830cdb6397f0814 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 3 14:06:53 2018 -0500 Write tests for mark_my_descriptor_dirty_if_too_old() --- src/feature/nodelist/networkstatus.c | 4 +- src/feature/nodelist/networkstatus.h | 5 +- src/feature/relay/router.c | 4 +- src/feature/relay/router.h | 4 ++ src/test/test_router.c | 98 ++++++++++++++++++++++++++++++++++++ 5 files changed, 109 insertions(+), 6 deletions(-) diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index f1def9afb..a730f7d83 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -724,8 +724,8 @@ networkstatus_vote_find_mutable_entry(networkstatus_t *ns, const char *digest) /** Return the entry in <b>ns</b> for the identity digest <b>digest</b>, or * NULL if none was found. */ -const routerstatus_t * -networkstatus_vote_find_entry(networkstatus_t *ns, const char *digest) +MOCK_IMPL(const routerstatus_t *, +networkstatus_vote_find_entry,(networkstatus_t *ns, const char *digest)) { return networkstatus_vote_find_mutable_entry(ns, digest); } diff --git a/src/feature/nodelist/networkstatus.h b/src/feature/nodelist/networkstatus.h index 8802de2d6..3fd151cf3 100644 --- a/src/feature/nodelist/networkstatus.h +++ b/src/feature/nodelist/networkstatus.h @@ -40,8 +40,9 @@ int compare_digest_to_routerstatus_entry(const void *_key, const void **_member); int compare_digest_to_vote_routerstatus_entry(const void *_key, const void **_member); -const routerstatus_t *networkstatus_vote_find_entry(networkstatus_t *ns, - const char *digest); +MOCK_DECL(const routerstatus_t *,networkstatus_vote_find_entry,( + networkstatus_t *ns, + const char *digest)); routerstatus_t *networkstatus_vote_find_mutable_entry(networkstatus_t *ns, const char *digest); int networkstatus_vote_find_entry_idx(networkstatus_t *ns, diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 2d4ab9b0a..ef433db8b 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -1471,9 +1471,9 @@ static extrainfo_t *desc_extrainfo = NULL; static const char *desc_gen_reason = "uninitialized reason"; /** Since when has our descriptor been "clean"? 0 if we need to regenerate it * now. */ -static time_t desc_clean_since = 0; +STATIC time_t desc_clean_since = 0; /** Why did we mark the descriptor dirty? */ -static const char *desc_dirty_reason = "Tor just started"; +STATIC const char *desc_dirty_reason = "Tor just started"; /** Boolean: do we need to regenerate the above? */ static int desc_needs_upload = 0; diff --git a/src/feature/relay/router.h b/src/feature/relay/router.h index 4575172af..217511df9 100644 --- a/src/feature/relay/router.h +++ b/src/feature/relay/router.h @@ -117,6 +117,10 @@ void router_free_all(void); /* Used only by router.c and test.c */ STATIC void get_platform_str(char *platform, size_t len); STATIC int router_write_fingerprint(int hashed); +#ifdef TOR_UNIT_TESTS +extern time_t desc_clean_since; +extern const char *desc_dirty_reason; +#endif #endif #endif /* !defined(TOR_ROUTER_H) */ diff --git a/src/test/test_router.c b/src/test/test_router.c index 921ec4290..18740dcb8 100644 --- a/src/test/test_router.c +++ b/src/test/test_router.c @@ -7,12 +7,17 @@ * \brief Unittests for code in router.c **/ +#define ROUTER_PRIVATE + #include "core/or/or.h" #include "app/config/config.h" #include "core/mainloop/mainloop.h" #include "feature/hibernate/hibernate.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/networkstatus_st.h" #include "feature/nodelist/routerinfo_st.h" #include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerstatus_st.h" #include "feature/relay/router.h" #include "feature/stats/rephist.h" #include "lib/crypt_ops/crypto_curve25519.h" @@ -231,11 +236,104 @@ test_router_check_descriptor_bandwidth_changed(void *arg) UNMOCK(we_are_hibernating); } +static networkstatus_t *mock_ns = NULL; +static networkstatus_t * +mock_networkstatus_get_live_consensus(time_t now) +{ + (void)now; + return mock_ns; +} + +static routerstatus_t *mock_rs = NULL; +static const routerstatus_t * +mock_networkstatus_vote_find_entry(networkstatus_t *ns, const char *digest) +{ + (void)ns; + (void)digest; + return mock_rs; +} + +static void +test_router_mark_if_too_old(void *arg) +{ + (void)arg; + time_t now = approx_time(); + MOCK(networkstatus_get_live_consensus, + mock_networkstatus_get_live_consensus); + MOCK(networkstatus_vote_find_entry, mock_networkstatus_vote_find_entry); + + routerstatus_t rs; + networkstatus_t ns; + memset(&rs, 0, sizeof(rs)); + memset(&ns, 0, sizeof(ns)); + mock_ns = &ns; + mock_ns->valid_after = now-3600; + mock_rs = &rs; + mock_rs->published_on = now - 10; + + // no reason to mark this time. + desc_clean_since = now-10; + desc_dirty_reason = NULL; + mark_my_descriptor_dirty_if_too_old(now); + tt_i64_op(desc_clean_since, OP_EQ, now-10); + + // Doesn't appear in consensus? Still don't mark it. + mock_ns = NULL; + mark_my_descriptor_dirty_if_too_old(now); + tt_i64_op(desc_clean_since, OP_EQ, now-10); + mock_ns = &ns; + + // No new descriptor in a long time? Mark it. + desc_clean_since = now - 3600 * 96; + mark_my_descriptor_dirty_if_too_old(now); + tt_i64_op(desc_clean_since, OP_EQ, 0); + tt_str_op(desc_dirty_reason, OP_EQ, "time for new descriptor"); + + // Version in consensus published a long time ago? We won't mark it + // if it's been clean for only a short time. + desc_clean_since = now - 10; + desc_dirty_reason = NULL; + mock_rs->published_on = now - 3600 * 96; + mark_my_descriptor_dirty_if_too_old(now); + tt_i64_op(desc_clean_since, OP_EQ, now - 10); + + // ... but if it's been clean a while, we mark. + desc_clean_since = now - 2 * 3600; + mark_my_descriptor_dirty_if_too_old(now); + tt_i64_op(desc_clean_since, OP_EQ, 0); + tt_str_op(desc_dirty_reason, OP_EQ, + "version listed in consensus is quite old"); + + // same deal if we're marked stale. + desc_clean_since = now - 2 * 3600; + desc_dirty_reason = NULL; + mock_rs->published_on = now - 10; + mock_rs->is_staledesc = 1; + mark_my_descriptor_dirty_if_too_old(now); + tt_i64_op(desc_clean_since, OP_EQ, 0); + tt_str_op(desc_dirty_reason, OP_EQ, + "listed as stale in consensus"); + + // same deal if we're absent from the consensus. + desc_clean_since = now - 2 * 3600; + desc_dirty_reason = NULL; + mock_rs = NULL; + mark_my_descriptor_dirty_if_too_old(now); + tt_i64_op(desc_clean_since, OP_EQ, 0); + tt_str_op(desc_dirty_reason, OP_EQ, + "not listed in consensus"); + + done: + UNMOCK(networkstatus_get_live_consensus); + UNMOCK(networkstatus_vote_find_entry); +} + #define ROUTER_TEST(name, flags) \ { #name, test_router_ ## name, flags, NULL, NULL } struct testcase_t router_tests[] = { ROUTER_TEST(check_descriptor_bandwidth_changed, TT_FORK), ROUTER_TEST(dump_router_to_string_no_bridge_distribution_method, TT_FORK), + ROUTER_TEST(mark_if_too_old, TT_FORK), END_OF_TESTCASES };

1 0

[tor/master] Add tests for parsing each routerstatus flag.
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit 31a6d9f49997cfb1266a55b742a15706ae16db5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 3 13:40:08 2018 -0500 Add tests for parsing each routerstatus flag. --- src/test/test_dir.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 26ba269ab..5cdbd877c 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -6053,6 +6053,80 @@ test_dir_find_dl_min_delay(void* data) } static void +test_dir_matching_flags(void *arg) +{ + (void) arg; + routerstatus_t *rs_noflags = NULL; + routerstatus_t *rs = NULL; + char *s = NULL; + + smartlist_t *tokens = smartlist_new(); + memarea_t *area = memarea_new(); + + int expected_val_when_unused = 0; + + const char *ex_noflags = + "r example hereiswhereyouridentitygoes 2015-08-30 12:00:00 " + "192.168.0.1 9001 0\n" + "m thisoneislongerbecauseitisa256bitmddigest33\n" + "s\n"; + const char *cp = ex_noflags; + rs_noflags = routerstatus_parse_entry_from_string( + area, &cp, + cp + strlen(cp), + tokens, NULL, NULL, + MAX_SUPPORTED_CONSENSUS_METHOD, FLAV_MICRODESC); + tt_assert(rs_noflags); + +#define FLAG(string, field) STMT_BEGIN { \ + tor_asprintf(&s,\ + "r example hereiswhereyouridentitygoes 2015-08-30 12:00:00 " \ + "192.168.0.1 9001 0\n" \ + "m thisoneislongerbecauseitisa256bitmddigest33\n" \ + "s %s\n", string); \ + cp = s; \ + rs = routerstatus_parse_entry_from_string( \ + area, &cp, \ + cp + strlen(cp), \ + tokens, NULL, NULL, \ + MAX_SUPPORTED_CONSENSUS_METHOD, FLAV_MICRODESC); \ + /* the field should usually be 0 when no flags are listed */ \ + tt_int_op(rs_noflags->field, OP_EQ, expected_val_when_unused); \ + /* the field should be 1 when this flags islisted */ \ + tt_int_op(rs->field, OP_EQ, 1); \ + tor_free(s); \ + routerstatus_free(rs); \ +} STMT_END + + FLAG("Authority", is_authority); + FLAG("BadExit", is_bad_exit); + FLAG("Exit", is_exit); + FLAG("Fast", is_fast); + FLAG("Guard", is_possible_guard); + FLAG("HSDir", is_hs_dir); + FLAG("Stable", is_stable); + FLAG("StaleDesc", is_staledesc); + FLAG("V2Dir", is_v2_dir); + + // These flags are assumed to be set whether they're declared or not. + expected_val_when_unused = 1; + FLAG("Running", is_flagged_running); + FLAG("Valid", is_valid); + expected_val_when_unused = 0; + + // These flags are no longer used, but still parsed. + FLAG("Named", is_named); + FLAG("Unnamed", is_unnamed); + + done: + tor_free(s); + routerstatus_free(rs); + routerstatus_free(rs_noflags); + memarea_drop_all(area); + smartlist_free(tokens); +} + +static void test_dir_assumed_flags(void *arg) { (void)arg; @@ -6377,6 +6451,7 @@ struct testcase_t dir_tests[] = { DIR_ARG(find_dl_min_delay, TT_FORK, "cfr"), DIR_ARG(find_dl_min_delay, TT_FORK, "car"), DIR(assumed_flags, 0), + DIR(matching_flags, 0), DIR(networkstatus_compute_bw_weights_v10, 0), DIR(platform_str, 0), DIR(networkstatus_consensus_has_ipv6, TT_FORK),

1 0

[tor/master] Fix SC2046 and SC2086 warnings
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit 27e982b470f4d401a9be687609897ab3320591e1 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Nov 20 16:55:35 2018 +0200 Fix SC2046 and SC2086 warnings --- scripts/maint/updateRustDependencies.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/maint/updateRustDependencies.sh b/scripts/maint/updateRustDependencies.sh index 1e927dd0b..0b303d538 100755 --- a/scripts/maint/updateRustDependencies.sh +++ b/scripts/maint/updateRustDependencies.sh @@ -20,8 +20,8 @@ set -e -HERE=$(dirname $(realpath $0)) -TOPLEVEL=$(dirname $(dirname $HERE)) +HERE=$(dirname "$(realpath "$0")") +TOPLEVEL=$(dirname "$(dirname "$HERE")") TOML="$TOPLEVEL/src/rust/Cargo.toml" VENDORED="$TOPLEVEL/src/ext/rust/crates" CARGO=$(which cargo) @@ -38,8 +38,8 @@ if test -z "$CARGO" ; then printf "Error: cargo must be installed and in your \$PATH\\n" fi -if test -z $(cargo --list | grep vendor) ; then +if test -z "$(cargo --list | grep vendor)" ; then printf "Error: cargo-vendor not installed\\n" fi -$CARGO vendor -v --locked --explicit-version --no-delete --sync $TOML $VENDORED +$CARGO vendor -v --locked --explicit-version --no-delete --sync "$TOML" "$VENDORED"

1 0

[tor/master] Fix SC2230 warning
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit ba2a9988ccd40b9c2ef1f16cb7960191b4131d78 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Nov 20 16:57:57 2018 +0200 Fix SC2230 warning --- scripts/maint/updateRustDependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/updateRustDependencies.sh b/scripts/maint/updateRustDependencies.sh index 0b303d538..6d0587351 100755 --- a/scripts/maint/updateRustDependencies.sh +++ b/scripts/maint/updateRustDependencies.sh @@ -24,7 +24,7 @@ HERE=$(dirname "$(realpath "$0")") TOPLEVEL=$(dirname "$(dirname "$HERE")") TOML="$TOPLEVEL/src/rust/Cargo.toml" VENDORED="$TOPLEVEL/src/ext/rust/crates" -CARGO=$(which cargo) +CARGO=$(command -v cargo) if ! test -f "$TOML" ; then printf "Error: Couldn't find workspace Cargo.toml in expected location: %s\\n" "$TOML"

1 0

[tor/master] Fix all instances of shellcheck warning SC2006
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit 5b48af9c4cc591d4db00cc1060de4d519a80023b Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Nov 4 19:34:46 2018 +0200 Fix all instances of shellcheck warning SC2006 --- scripts/maint/updateRustDependencies.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/maint/updateRustDependencies.sh b/scripts/maint/updateRustDependencies.sh index a5a92579d..d2680856b 100755 --- a/scripts/maint/updateRustDependencies.sh +++ b/scripts/maint/updateRustDependencies.sh @@ -20,11 +20,11 @@ set -e -HERE=`dirname $(realpath $0)` -TOPLEVEL=`dirname $(dirname $HERE)` +HERE=$(dirname $(realpath $0)) +TOPLEVEL=$(dirname $(dirname $HERE)) TOML="$TOPLEVEL/src/rust/Cargo.toml" VENDORED="$TOPLEVEL/src/ext/rust/crates" -CARGO=`which cargo` +CARGO=$(which cargo) if ! test -f "$TOML" ; then printf "Error: Couldn't find workspace Cargo.toml in expected location: %s\n" "$TOML" @@ -38,7 +38,7 @@ if test -z "$CARGO" ; then printf "Error: cargo must be installed and in your \$PATH\n" fi -if test -z `cargo --list | grep vendor` ; then +if test -z $(cargo --list | grep vendor) ; then printf "Error: cargo-vendor not installed\n" fi

1 0

[tor/master] Silence SC1117 warnings
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit 7dd515b0e0a12cfd9a324a878f7ca6b6b84b24cb Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Nov 20 16:22:47 2018 +0200 Silence SC1117 warnings --- scripts/maint/updateRustDependencies.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/maint/updateRustDependencies.sh b/scripts/maint/updateRustDependencies.sh index d2680856b..1e927dd0b 100755 --- a/scripts/maint/updateRustDependencies.sh +++ b/scripts/maint/updateRustDependencies.sh @@ -27,19 +27,19 @@ VENDORED="$TOPLEVEL/src/ext/rust/crates" CARGO=$(which cargo) if ! test -f "$TOML" ; then - printf "Error: Couldn't find workspace Cargo.toml in expected location: %s\n" "$TOML" + printf "Error: Couldn't find workspace Cargo.toml in expected location: %s\\n" "$TOML" fi if ! test -d "$VENDORED" ; then - printf "Error: Couldn't find directory for Rust dependencies! Expected location: %s\n" "$VENDORED" + printf "Error: Couldn't find directory for Rust dependencies! Expected location: %s\\n" "$VENDORED" fi if test -z "$CARGO" ; then - printf "Error: cargo must be installed and in your \$PATH\n" + printf "Error: cargo must be installed and in your \$PATH\\n" fi if test -z $(cargo --list | grep vendor) ; then - printf "Error: cargo-vendor not installed\n" + printf "Error: cargo-vendor not installed\\n" fi $CARGO vendor -v --locked --explicit-version --no-delete --sync $TOML $VENDORED

1 0

[tor/master] Add changes file for #28012
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit befcd6ab7f53e8d5d825949547e2530fdc91b177 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Nov 20 17:00:32 2018 +0200 Add changes file for #28012 --- changes/ticket28012 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket28012 b/changes/ticket28012 new file mode 100644 index 000000000..b2fe83e02 --- /dev/null +++ b/changes/ticket28012 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Fix issues that shellcheck found in updateRustDependencies.sh. + Resolves ticket 28012.

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/531'
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit d4f558e385fd9e3f757278653d22290c3816c39e Merge: 4002a84ff befcd6ab7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 5 09:02:49 2018 -0500 Merge remote-tracking branch 'tor-github/pr/531' changes/ticket28012 | 3 +++ scripts/maint/updateRustDependencies.sh | 18 +++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-)

1 0

[tor/master] manpage: Mention that adding new HS is unsupported if Sandbox is enabled
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit 894d207f844cf5fa5816432abfe8d1c02763cd59 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Dec 3 15:19:33 2018 +0200 manpage: Mention that adding new HS is unsupported if Sandbox is enabled --- changes/doc28560 | 3 +++ doc/tor.1.txt | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/doc28560 b/changes/doc28560 new file mode 100644 index 000000000..c3356bda0 --- /dev/null +++ b/changes/doc28560 @@ -0,0 +1,3 @@ + o Documentation (hidden service manpage, sandbox): + - Mention that you cannot add new Onion Service if Tor is already + running with Sandbox enabled. Closes ticket 28560. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8e6ec7f1a..dbfb6358c 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -610,7 +610,8 @@ GENERAL OPTIONS Logs ServerDNSResolvConfFile Tor must remain in client or server mode (some changes to ClientOnly and - ORPort are not allowed). + ORPort are not allowed). Launching new Onion Services through Control + Port is not supported with current syscall sandboxing implementation. ClientOnionAuthDir and any files in it won't reload on HUP signal. (Default: 0) @@ -2821,6 +2822,8 @@ The following options are used to configure a hidden service. Store data files for a hidden service in DIRECTORY. Every hidden service must have a separate directory. You may use this option multiple times to specify multiple services. If DIRECTORY does not exist, Tor will create it. + Please note that you cannot add new Onion Service to already running Tor + instance if **Sandbox** is enabled. (Note: in current versions of Tor, if DIRECTORY is a relative path, it will be relative to the current working directory of Tor instance, not to its DataDirectory. Do not

1 0