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

[tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit d1c2597096cac27eb9ee842f52384ca4cb28a195 Merge: 8b0b850ef 33d9889a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 16:17:04 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' changes/bug24952 | 5 +++++ src/or/channeltls.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] channel_tls_get_remote_addr_method now returns real_addr.
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 33d9889a2bdd611bcc255c68c43d60b8919ab663 Author: Fernando Fernandez Mancera <ffmancera(a)riseup.net> Date: Mon Jan 22 15:20:17 2018 +0100 channel_tls_get_remote_addr_method now returns real_addr. The accurate address of a connection is real_addr, not the addr member. channel_tls_get_remote_addr_method() now returns real_addr instead. Fixes #24952; bugfix on 707c1e2 in 0.2.4.11-alpha. Signed-off-by: Fernando Fernandez Mancera <ffmancera(a)riseup.net> --- changes/bug24952 | 5 +++++ src/or/channeltls.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug24952 b/changes/bug24952 new file mode 100644 index 000000000..93174c04f --- /dev/null +++ b/changes/bug24952 @@ -0,0 +1,5 @@ + o Minor bugfix (channel connection): + - The accurate address of a connection is real_addr, not the addr member. + TLS Channel remote address is now real_addr content instead of addr + member. Fixes bug 24952; bugfix on 707c1e2e26 in 0.2.4.11-alpha. + Patch by "ffmancera". diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 09cca95b6..890646989 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -514,7 +514,7 @@ channel_tls_get_remote_addr_method(channel_t *chan, tor_addr_t *addr_out) tor_assert(addr_out); if (tlschan->conn) { - tor_addr_copy(addr_out, &(TO_CONN(tlschan->conn)->addr)); + tor_addr_copy(addr_out, &(tlschan->conn->real_addr)); rv = 1; } else tor_addr_make_unspec(addr_out);

1 0

[tor/master] Change the sandbox behavior on all failed opens() to EACCES
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 9a06282546418b2e9d21559d4853bcf124b953f4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 26 12:18:43 2018 -0500 Change the sandbox behavior on all failed opens() to EACCES Previously, most disallowed open(O_RDONLY) attempts would EACCES, but others would fail with a crash. --- changes/bug16106 | 6 ++++++ src/common/sandbox.c | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/changes/bug16106 b/changes/bug16106 new file mode 100644 index 000000000..9142a37e3 --- /dev/null +++ b/changes/bug16106 @@ -0,0 +1,6 @@ + o Minor bugfixes (linux seccomp2 sandbox): + - Cause a wider variety of unpermitted open() calls to fail with the + EACCES error when the sandbox is running. This won't enable any + previously non-working functionality, but it should turn several cases + from crashes into sandbox warnings. Fixes bug 16106; bugfix on + 0.2.5.1-alpha. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 37f582048..043b8bf14 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -481,18 +481,14 @@ sb_open(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } } - rc = seccomp_rule_add_1(ctx, SCMP_ACT_ERRNO(EACCES), SCMP_SYS(open), - SCMP_CMP_MASKED(1, O_CLOEXEC|O_NONBLOCK|O_NOCTTY|O_NOFOLLOW, - O_RDONLY)); + rc = seccomp_rule_add_0(ctx, SCMP_ACT_ERRNO(EACCES), SCMP_SYS(open)); if (rc != 0) { log_err(LD_BUG,"(Sandbox) failed to add open syscall, received libseccomp " "error %d", rc); return rc; } - rc = seccomp_rule_add_1(ctx, SCMP_ACT_ERRNO(EACCES), SCMP_SYS(openat), - SCMP_CMP_MASKED(2, O_CLOEXEC|O_NONBLOCK|O_NOCTTY|O_NOFOLLOW, - O_RDONLY)); + rc = seccomp_rule_add_0(ctx, SCMP_ACT_ERRNO(EACCES), SCMP_SYS(openat)); if (rc != 0) { log_err(LD_BUG,"(Sandbox) failed to add openat syscall, received " "libseccomp error %d", rc);

1 0

[tor/master] Merge remote-tracking branch 'public/bug16106_02_nm'
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 8b0b850efa0f77b627f31e9907acc6d29482f362 Merge: a846fd267 9a0628254 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 15:51:58 2018 -0500 Merge remote-tracking branch 'public/bug16106_02_nm' changes/bug16106 | 6 ++++++ src/common/sandbox.c | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-)

1 0

[torspec/master] control: Merge prop284 into control-spec.txt
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 6bd0a699a0856240480a4bc339722db142beec0a Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jan 31 14:55:28 2018 -0500 control: Merge prop284 into control-spec.txt The proposal 284 is now effectively Closed. Closes #24847 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- control-spec.txt | 70 +++++++++++++++++++++++++++++-------- proposals/000-index.txt | 4 +-- proposals/284-hsv3-control-port.txt | 2 +- 3 files changed, 59 insertions(+), 17 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index e961daa..e085519 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -918,6 +918,7 @@ returned. [New in Tor 0.2.7.1-alpha] + [HS v3 support added 0.3.3.1-alpha] "hs/service/desc/id/<ADDR>" Prints the content of the hidden service descriptor corresponding to @@ -930,6 +931,7 @@ returned. [New in Tor 0.2.7.2-alpha] + [HS v3 support added 0.3.3.1-alpha] "onions/current" "onions/detached" @@ -941,6 +943,7 @@ The format of each line is: HSAddress [New in Tor 0.2.7.1-alpha.] + [HS v3 support added 0.3.3.1-alpha] "network-liveness" The string "up" or "down", indicating whether we currently believe the @@ -1477,13 +1480,14 @@ "HSFETCH" SP (HSAddress / "v" Version "-" DescId) *[SP "SERVER=" Server] CRLF - HSAddress = 16*Base32Character - Version = 2 - DescId = 32*Base32Character + HSAddress = (16*Base32Character / 56*Base32Character) + Version = "2" / "3" + DescId = (32*Base32Character / 32*Base64Character) Server = LongName This command launches hidden service descriptor fetch(es) for the given - HSAddress or DescId. + HSAddress or DescId. For v3, "DescId" is the descriptor blinded key used as + an index to query the directory. It can only be used with "Version=3". If a DescId is specified, at least one Server MUST also be provided, otherwise a 512 error is returned. If no DescId and Server(s) are specified, @@ -1511,6 +1515,7 @@ S: 250 OK [HSFETCH was added in Tor 0.2.7.1-alpha] + [HS v3 support added 0.3.3.1-alpha] 3.27. ADD_ONION @@ -1523,14 +1528,18 @@ KeyType = "NEW" / ; The server should generate a key of algorithm KeyBlob - "RSA1024" ; The server should use the 1024 bit RSA key provided + "RSA1024" / ; The server should use the 1024 bit RSA key provided in as KeyBlob + "ED25519-V3"; The server should use the ed25519 v3 key provided in as + KeyBlob KeyBlob = "BEST" / ; The server should generate a key using the "best" supported algorithm (KeyType == "NEW") "RSA1024" / ; The server should generate a 1024 bit RSA key (KeyType == "NEW") + "ED25519-V3"; The server should generate an ed25519 private key + (KeyType == "NEW") String ; A serialized private key (without whitespace) Flag = @@ -1612,7 +1621,11 @@ (The KeyBlob format is left intentionally opaque, however for "RSA1024" keys it is currently the Base64 encoded DER representation of a PKCS#1 - RSAPrivateKey, with all newlines removed.) + RSAPrivateKey, with all newlines removed. For a "ED25519-V3" key is a Base64 + encoded ed25519 private key.) + + (The "NEW:BEST" option obeys the HiddenServiceVersion torrc option default + value. Currently it is 2.) Examples: C: ADD_ONION NEW:BEST Flags=DiscardPK Port=80 @@ -1656,6 +1669,7 @@ [ClientAuth was added in Tor 0.2.9.1-alpha.] [NonAnonymous was added in Tor 0.2.9.3-alpha.] [MaxStreams and MaxStreamsCloseCircuit were added in Tor 0.2.7.2-alpha] + [HS v3 support added 0.3.3.1-alpha] 3.28. DEL_ONION @@ -1682,16 +1696,22 @@ number of arguments, or a 552 if it doesn't recognize the ServiceID. [DEL_ONION was added in Tor 0.2.7.1-alpha.] + [HS v3 support added 0.3.3.1-alpha] 3.29. HSPOST The syntax is: - "+HSPOST" *[SP "SERVER=" Server] CRLF Descriptor CRLF "." CRLF + "+HSPOST" *[SP "SERVER=" Server] [SP "HSADDRESS=" HSAddress] + CRLF Descriptor CRLF "." CRLF Server = LongName + HSAddress = 56*Base32Character Descriptor = The text of the descriptor formatted as specified in rend-spec.txt section 1.3. + The "HSAddress" key is optional and only applies for v3 descriptors. A 513 + error is returned if used with v2. + This command launches a hidden service descriptor upload to the specified HSDirs. If one or more Server arguments are provided, an upload is triggered on each of them in parallel. If no Server options are provided, it behaves @@ -1712,6 +1732,7 @@ S: 250 OK [HSPOST was added in Tor 0.2.7.1-alpha] + [HS v3 support added 0.3.3.1-alpha] 4. Replies @@ -1882,7 +1903,7 @@ EscapedUsername = QuotedString EscapedPassword = QuotedString - HSAddress = 16*Base32Character + HSAddress = 16*Base32Character / 56*Base32Character Base32Character = ALPHA / "2" / "3" / "4" / "5" / "6" / "7" TimeCreated = ISOTime2Frac @@ -3036,16 +3057,18 @@ "650" SP "HS_DESC" SP Action SP HSAddress SP AuthType SP HsDir [SP DescriptorID] [SP "REASON=" Reason] [SP "REPLICA=" Replica] + [SP "HSDIR_INDEX=" HSDirIndex] Action = "REQUESTED" / "UPLOAD" / "RECEIVED" / "UPLOADED" / "IGNORE" / "FAILED" / "CREATED" - HSAddress = 16*Base32Character / "UNKNOWN" + HSAddress = 16*Base32Character / 56*Base32Character / "UNKNOWN" AuthType = "NO_AUTH" / "BASIC_AUTH" / "STEALTH_AUTH" / "UNKNOWN" HsDir = LongName / Fingerprint / "UNKNOWN" - DescriptorID = 32*Base32Character + DescriptorID = 32*Base32Character / 43*Base64Character Reason = "BAD_DESC" / "QUERY_REJECTED" / "UPLOAD_REJECTED" / "NOT_FOUND" / "UNEXPECTED" / "QUERY_NO_HSDIR" Replica = 1*DIGIT + HSDirIndex = 64*HEXDIG These events will be triggered when required HiddenService descriptor is not found in the cache and a fetch or upload with the network is performed. @@ -3079,18 +3102,36 @@ number is specified in rend-spec.txt section 1.3 and determines the descriptor ID of the descriptor. + For hidden service v3, the following applies: + + The "HSDIR_INDEX=" is an optional field that is only for version 3 + which contains the computed index of the HsDir the descriptor was + uploaded to or fetched from. + + The "DescriptorID" key is the descriptor blinded key used for the index + value at the "HsDir". + + The "REPLICA=" field is not used for the "CREATED" event because v3 + doesn't use the replica number in the descriptor ID computation. + + Because client authentication is not yet implemented, the "AuthType" + field is always "NO_AUTH". + + [HS v3 support added 0.3.3.1-alpha] + 4.1.26. HiddenService descriptors content The syntax is: "650" "+" "HS_DESC_CONTENT" SP HSAddress SP DescId SP HsDir CRLF - Descriptor CRLF "." CRLF "650" SP "OK" CRLF + Descriptor CRLF "." CRLF "650" SP "OK" CRLF - HSAddress = 16*Base32Character / "UNKNOWN" - DescId = 32*Base32Character + HSAddress = 16*Base32Character / 56*Base32Character / "UNKNOWN" + DescId = 32*Base32Character / 32*Base64Character HsDir = LongName / "UNKNOWN" Descriptor = The text of the descriptor formatted as specified in - rend-spec.txt section 1.3 or empty string on failure. + rend-spec.txt section 1.3 (v2) or rend-spec-v3.txt + section 2.4 (v3) or empty string on failure. This event is triggered when a successfully fetched HS descriptor is received. The text of that descriptor is then replied. If the HS_DESC @@ -3109,6 +3150,7 @@ this event will reply either the descriptor's content or an empty one. [HS_DESC_CONTENT was added in Tor 0.2.7.1-alpha] + [HS v3 support added 0.3.3.1-alpha] 4.1.27. Network liveness has changed diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 8506966..688e2f7 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -204,7 +204,7 @@ Proposals by number: 281 Downloading microdescriptors in bulk [DRAFT] 282 Remove "Named" and "Unnamed" handling from consensus voting [OPEN] 283 Move IPv6 ORPorts from microdescriptors to the microdesc consensus [ACCEPTED] -284 Hidden Service v3 Control Port [FINISHED] +284 Hidden Service v3 Control Port [CLOSED] 285 Directory documents should be standardized as UTF-8 [OPEN] 286 Controller APIs for hibernation access on mobile [OPEN] 287 Reduce circuit lifetime without overloading the network [OPEN] @@ -288,7 +288,6 @@ Proposals by status: 232 Pluggable Transport through SOCKS proxy [in 0.2.6] 260 Rendezvous Single Onion Services [in 0.2.9.3-alpha] 278 Directory Compression Scheme Negotiation [in 0.3.1.1-alpha] - 284 Hidden Service v3 Control Port CLOSED: 101 Voting on the Tor Directory System [in 0.2.0.x] 102 Dropping "opt" from the directory format [in 0.2.0.x] @@ -368,6 +367,7 @@ Proposals by status: 271 Another algorithm for guard selection [in 0.3.0.1-alpha] 272 Listed routers should be Valid, Running, and treated as such [in 0.2.9.3-alpha, 0.2.9.4-alpha] 274 Rotate onion keys less frequently [in 0.3.1.1-alpha] + 284 Hidden Service v3 Control Port SUPERSEDED: 112 Bring Back Pathlen Coin Weight 113 Simplifying directory authority administration diff --git a/proposals/284-hsv3-control-port.txt b/proposals/284-hsv3-control-port.txt index ee26853..1ff20bb 100644 --- a/proposals/284-hsv3-control-port.txt +++ b/proposals/284-hsv3-control-port.txt @@ -2,7 +2,7 @@ Filename: 284-hsv3-control-port.txt Title: Hidden Service v3 Control Port Author: David Goulet Created: 02-November-2017 -Status: Finished +Status: Closed 1. Summary

1 0

[tor/master] Use thread-safe types to store the LOG_PROTOCOL_WARN severity
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit da778f2921d0ae49c47abb4ba4ebe5f92a999ae2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 24 12:02:44 2018 -0500 Use thread-safe types to store the LOG_PROTOCOL_WARN severity Fixes a race condition; resolves 23954. --- changes/bug23954 | 4 ++++ src/or/config.c | 49 +++++++++++++++++++++++++++++++++++------- src/or/config.h | 1 + src/or/main.c | 1 + src/test/fuzz/fuzzing_common.c | 2 ++ src/test/testing_common.c | 1 + 6 files changed, 50 insertions(+), 8 deletions(-) diff --git a/changes/bug23954 b/changes/bug23954 new file mode 100644 index 000000000..185814f12 --- /dev/null +++ b/changes/bug23954 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging, race conditions): + - Fix a (mostly harmless) race condition when invoking + LOG_PROTOCOL_WARN message from a subthread while the options are + changing. Fixes bug 23954; bugfix on 0.1.1.9-alpha. diff --git a/src/or/config.c b/src/or/config.c index afaf86785..f035bbaba 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -766,6 +766,8 @@ static int options_validate_cb(void *old_options, void *options, int from_setconf, char **msg); static uint64_t compute_real_max_mem_in_queues(const uint64_t val, int log_guess); +static void cleanup_protocol_warning_severity_level(void); +static void set_protocol_warning_severity_level(int warning_severity); /** Magic value for or_options_t. */ #define OR_OPTIONS_MAGIC 9090909 @@ -999,6 +1001,8 @@ config_free_all(void) tor_free(the_short_tor_version); tor_free(the_tor_version); + cleanup_protocol_warning_severity_level(); + have_parsed_cmdline = 0; libevent_initialized = 0; } @@ -1064,17 +1068,46 @@ escaped_safe_str(const char *address) * The severity level that should be used for warnings of severity * LOG_PROTOCOL_WARN. * - * We keep this outside the options, in case somebody needs to use - * LOG_PROTOCOL_WARN while an option transition is happening. + * We keep this outside the options, and we use an atomic_counter_t, in case + * one thread needs to use LOG_PROTOCOL_WARN while an option transition is + * happening in the main thread. */ -static int protocol_warning_severity_level = LOG_WARN; +static atomic_counter_t protocol_warning_severity_level; /** Return the severity level that should be used for warnings of severity * LOG_PROTOCOL_WARN. */ int get_protocol_warning_severity_level(void) { - return protocol_warning_severity_level; + return (int) atomic_counter_get(&protocol_warning_severity_level); +} + +/** Set the protocol warning severity level to severity. */ +static void +set_protocol_warning_severity_level(int warning_severity) +{ + atomic_counter_exchange(&protocol_warning_severity_level, + warning_severity); +} + +/** + * Initialize the log warning severity level for protocol warnings. Call + * only once at startup. + */ +void +init_protocol_warning_severity_level(void) +{ + atomic_counter_init(&protocol_warning_severity_level); + set_protocol_warning_severity_level(LOG_WARN); +} + +/** + * Tear down protocol_warning_severity_level. + */ +static void +cleanup_protocol_warning_severity_level(void) +{ + atomic_counter_destroy(&protocol_warning_severity_level); } /** List of default directory authorities */ @@ -1794,10 +1827,10 @@ options_act(const or_options_t *old_options) return -1; } - if (options->ProtocolWarnings) - protocol_warning_severity_level = LOG_WARN; - else - protocol_warning_severity_level = LOG_INFO; + { + int warning_severity = options->ProtocolWarnings ? LOG_WARN : LOG_INFO; + set_protocol_warning_severity_level(warning_severity); + } if (consider_adding_dir_servers(options, old_options) < 0) { // XXXX This should get validated earlier, and committed here, to diff --git a/src/or/config.h b/src/or/config.h index 7c7ef1825..2f23809b2 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -31,6 +31,7 @@ const char *safe_str_client(const char *address); const char *safe_str(const char *address); const char *escaped_safe_str_client(const char *address); const char *escaped_safe_str(const char *address); +void init_protocol_warning_severity_level(void); int get_protocol_warning_severity_level(void); const char *get_version(void); const char *get_short_version(void); diff --git a/src/or/main.c b/src/or/main.c index 10e606f3a..841a37255 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -4009,6 +4009,7 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) #endif /* defined(_WIN32) */ configure_backtrace_handler(get_version()); + init_protocol_warning_severity_level(); update_approx_time(time(NULL)); tor_threads_init(); diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c index 1d54e41db..7c9fac748 100644 --- a/src/test/fuzz/fuzzing_common.c +++ b/src/test/fuzz/fuzzing_common.c @@ -152,6 +152,8 @@ main(int argc, char **argv) } } + init_protocol_warning_severity_level(); + { log_severity_list_t s; memset(&s, 0, sizeof(s)); diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 142c68107..52729147b 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -278,6 +278,7 @@ main(int c, const char **v) s.masks[LOG_WARN-LOG_ERR] |= LD_BUG; add_stream_log(&s, "", fileno(stdout)); } + init_protocol_warning_severity_level(); options->command = CMD_RUN_UNITTESTS; if (crypto_global_init(accel_crypto, NULL, NULL)) {

1 0

[tor/master] Merge branch 'bug23954_squashed'
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit a846fd267edf5a457d6647b37ad7ef2ac62a1612 Merge: d44080a09 da778f292 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 14:37:48 2018 -0500 Merge branch 'bug23954_squashed' changes/bug23954 | 4 ++++ src/or/config.c | 49 +++++++++++++++++++++++++++++++++++------- src/or/config.h | 1 + src/or/main.c | 1 + src/test/fuzz/fuzzing_common.c | 2 ++ src/test/testing_common.c | 1 + 6 files changed, 50 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.3.2] Look at the correct protocol for supports_v3_rendezvous_point
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 31f2a8771cf0075f4a0ef5625d3947a683305ff9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 14:01:49 2018 -0500 Look at the correct protocol for supports_v3_rendezvous_point Fixes bug 25105; bugfix on 0.3.2.1-alpha. (This is a backport of bbf2d9cf6bb97c3e15ada58 for 0.3.2.) --- changes/bug25105 | 5 +++++ src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug25105 b/changes/bug25105 new file mode 100644 index 000000000..36d1a5f16 --- /dev/null +++ b/changes/bug25105 @@ -0,0 +1,5 @@ + o Minor bugfixes (v3 onion services): + - Look at the "HSRend" protocol version, not the "HSDir" protocol + version, when deciding whether a consensus entry can support + the v3 onion service protocol as a rendezvous point. + Fixes bug 25105; bugfix on 0.3.2.1-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 15cdb0bbd..3eda024f0 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2709,7 +2709,7 @@ routerstatus_parse_entry_from_string(memarea_t *area, protocol_list_supports_protocol(tok->args[0], PRT_HSDIR, PROTOVER_HSDIR_V3); rs->supports_v3_rendezvous_point = - protocol_list_supports_protocol(tok->args[0], PRT_HSDIR, + protocol_list_supports_protocol(tok->args[0], PRT_HSREND, PROTOVER_HS_RENDEZVOUS_POINT_V3); } if ((tok = find_opt_by_keyword(tokens, K_V))) {

1 0

[tor/master] Extract protover summary flags into a new structure
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit d9fbd34f42274050a67f6fb6f7ad449d60af7e66 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 24 13:26:50 2018 -0500 Extract protover summary flags into a new structure This will let us use them on routerinfo_t as well as on routerstatus_t, and save some time on relays. No behavioral changes here. --- src/or/nodelist.c | 16 +++++------ src/or/or.h | 68 ++++++++++++++++++++++++++--------------------- src/or/routerlist.c | 4 +-- src/or/routerparse.c | 20 +++++++------- src/test/test_hs_common.c | 2 +- 5 files changed, 59 insertions(+), 51 deletions(-) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 2f039a9a5..7cdf28a37 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -447,7 +447,7 @@ nodelist_set_routerinfo(routerinfo_t *ri, routerinfo_t **ri_old_out) /* Setting the HSDir index requires the ed25519 identity key which can * only be found either in the ri or md. This is why this is called here. * Only nodes supporting HSDir=2 protocol version needs this index. */ - if (node->rs && node->rs->supports_v3_hsdir) { + if (node->rs && node->rs->pv.supports_v3_hsdir) { node_set_hsdir_index(node, networkstatus_get_latest_consensus()); } @@ -487,7 +487,7 @@ nodelist_add_microdesc(microdesc_t *md) /* Setting the HSDir index requires the ed25519 identity key which can * only be found either in the ri or md. This is why this is called here. * Only nodes supporting HSDir=2 protocol version needs this index. */ - if (rs->supports_v3_hsdir) { + if (rs->pv.supports_v3_hsdir) { node_set_hsdir_index(node, ns); } node_add_to_ed25519_map(node); @@ -531,7 +531,7 @@ nodelist_set_consensus(networkstatus_t *ns) } } - if (rs->supports_v3_hsdir) { + if (rs->pv.supports_v3_hsdir) { node_set_hsdir_index(node, ns); } node_set_country(node); @@ -980,9 +980,9 @@ node_supports_ed25519_link_authentication(const node_t *node, } if (node->rs) { if (compatible_with_us) - return node->rs->supports_ed25519_link_handshake_compat; + return node->rs->pv.supports_ed25519_link_handshake_compat; else - return node->rs->supports_ed25519_link_handshake_any; + return node->rs->pv.supports_ed25519_link_handshake_any; } tor_assert_nonfatal_unreached_once(); return 0; @@ -996,7 +996,7 @@ node_supports_v3_hsdir(const node_t *node) tor_assert(node); if (node->rs) { - return node->rs->supports_v3_hsdir; + return node->rs->pv.supports_v3_hsdir; } if (node->ri) { if (node->ri->protocol_list == NULL) { @@ -1026,7 +1026,7 @@ node_supports_ed25519_hs_intro(const node_t *node) tor_assert(node); if (node->rs) { - return node->rs->supports_ed25519_hs_intro; + return node->rs->pv.supports_ed25519_hs_intro; } if (node->ri) { if (node->ri->protocol_list == NULL) { @@ -1047,7 +1047,7 @@ node_supports_v3_rendezvous_point(const node_t *node) tor_assert(node); if (node->rs) { - return node->rs->supports_v3_rendezvous_point; + return node->rs->pv.supports_v3_rendezvous_point; } if (node->ri) { if (node->ri->protocol_list == NULL) { diff --git a/src/or/or.h b/src/or/or.h index c81e29c95..0be19fdbd 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2196,6 +2196,41 @@ typedef struct signed_descriptor_t { /** A signed integer representing a country code. */ typedef int16_t country_t; +/** Flags used to summarize the declared protocol versions of a relay, + * so we don't need to parse them again and again. */ +typedef struct protover_summary_flags_t { + /** True iff we have a proto line for this router, or a versions line + * from which we could infer the protocols. */ + unsigned int protocols_known:1; + + /** True iff this router has a version or protocol list that allows it to + * accept EXTEND2 cells */ + unsigned int supports_extend2_cells:1; + + /** True iff this router has a protocol list that allows it to negotiate + * ed25519 identity keys on a link handshake with us. */ + unsigned int supports_ed25519_link_handshake_compat:1; + + /** True iff this router has a protocol list that allows it to negotiate + * ed25519 identity keys on a link handshake, at all. */ + unsigned int supports_ed25519_link_handshake_any:1; + + /** True iff this router has a protocol list that allows it to be an + * introduction point supporting ed25519 authentication key which is part of + * the v3 protocol detailed in proposal 224. This requires HSIntro=4. */ + unsigned int supports_ed25519_hs_intro : 1; + + /** True iff this router has a protocol list that allows it to be an hidden + * service directory supporting version 3 as seen in proposal 224. This + * requires HSDir=2. */ + unsigned int supports_v3_hsdir : 1; + + /** True iff this router has a protocol list that allows it to be an hidden + * service rendezvous point supporting version 3 as seen in proposal 224. + * This requires HSRend=2. */ + unsigned int supports_v3_rendezvous_point: 1; +} protover_summary_flags_t; + /** Information about another onion router in the network. */ typedef struct { signed_descriptor_t cache_info; @@ -2342,42 +2377,15 @@ typedef struct routerstatus_t { unsigned int is_v2_dir:1; /** True iff this router publishes an open DirPort * or it claims to accept tunnelled dir requests. */ - /** True iff we have a proto line for this router, or a versions line - * from which we could infer the protocols. */ - unsigned int protocols_known:1; - - /** True iff this router has a version or protocol list that allows it to - * accept EXTEND2 cells */ - unsigned int supports_extend2_cells:1; - - /** True iff this router has a protocol list that allows it to negotiate - * ed25519 identity keys on a link handshake with us. */ - unsigned int supports_ed25519_link_handshake_compat:1; - - /** True iff this router has a protocol list that allows it to negotiate - * ed25519 identity keys on a link handshake, at all. */ - unsigned int supports_ed25519_link_handshake_any:1; - - /** True iff this router has a protocol list that allows it to be an - * introduction point supporting ed25519 authentication key which is part of - * the v3 protocol detailed in proposal 224. This requires HSIntro=4. */ - unsigned int supports_ed25519_hs_intro : 1; - - /** True iff this router has a protocol list that allows it to be an hidden - * service directory supporting version 3 as seen in proposal 224. This - * requires HSDir=2. */ - unsigned int supports_v3_hsdir : 1; - - /** True iff this router has a protocol list that allows it to be an hidden - * service rendezvous point supporting version 3 as seen in proposal 224. - * This requires HSRend=2. */ - unsigned int supports_v3_rendezvous_point: 1; unsigned int has_bandwidth:1; /**< The vote/consensus had bw info */ unsigned int has_exitsummary:1; /**< The vote/consensus had exit summaries */ unsigned int bw_is_unmeasured:1; /**< This is a consensus entry, with * the Unmeasured flag set. */ + /** Flags to summarize the protocol versions for this routerstatus_t. */ + protover_summary_flags_t pv; + uint32_t bandwidth_kb; /**< Bandwidth (capacity) of the router as reported in * the vote/consensus, in kilobytes/sec. */ diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 2815c6096..061eba2d2 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5665,11 +5665,11 @@ routerstatus_version_supports_extend2_cells(const routerstatus_t *rs, return allow_unknown_versions; } - if (!rs->protocols_known) { + if (!rs->pv.protocols_known) { return allow_unknown_versions; } - return rs->supports_extend2_cells; + return rs->pv.supports_extend2_cells; } /** Assert that the internal representation of rl is diff --git a/src/or/routerparse.c b/src/or/routerparse.c index f1895ce31..b8f7e166a 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2698,19 +2698,19 @@ routerstatus_parse_entry_from_string(memarea_t *area, int found_protocol_list = 0; if ((tok = find_opt_by_keyword(tokens, K_PROTO))) { found_protocol_list = 1; - rs->protocols_known = 1; - rs->supports_extend2_cells = + rs->pv.protocols_known = 1; + rs->pv.supports_extend2_cells = protocol_list_supports_protocol(tok->args[0], PRT_RELAY, 2); - rs->supports_ed25519_link_handshake_compat = + rs->pv.supports_ed25519_link_handshake_compat = protocol_list_supports_protocol(tok->args[0], PRT_LINKAUTH, 3); - rs->supports_ed25519_link_handshake_any = + rs->pv.supports_ed25519_link_handshake_any = protocol_list_supports_protocol_or_later(tok->args[0], PRT_LINKAUTH, 3); - rs->supports_ed25519_hs_intro = + rs->pv.supports_ed25519_hs_intro = protocol_list_supports_protocol(tok->args[0], PRT_HSINTRO, 4); - rs->supports_v3_hsdir = + rs->pv.supports_v3_hsdir = protocol_list_supports_protocol(tok->args[0], PRT_HSDIR, PROTOVER_HSDIR_V3); - rs->supports_v3_rendezvous_point = + rs->pv.supports_v3_rendezvous_point = protocol_list_supports_protocol(tok->args[0], PRT_HSDIR, PROTOVER_HS_RENDEZVOUS_POINT_V3); } @@ -2720,14 +2720,14 @@ routerstatus_parse_entry_from_string(memarea_t *area, /* We only do version checks like this in the case where * the version is a "Tor" version, and where there is no * list of protocol versions that we should be looking at instead. */ - rs->supports_extend2_cells = + rs->pv.supports_extend2_cells = tor_version_as_new_as(tok->args[0], "0.2.4.8-alpha"); - rs->protocols_known = 1; + rs->pv.protocols_known = 1; } if (!strcmpstart(tok->args[0], "Tor ") && found_protocol_list) { /* Bug #22447 forces us to filter on this version. */ if (!tor_version_as_new_as(tok->args[0], "0.3.0.8")) { - rs->supports_v3_hsdir = 0; + rs->pv.supports_v3_hsdir = 0; } } if (vote_rs) { diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index 21daa58ab..8c273c963 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -289,7 +289,7 @@ helper_add_hsdir_to_networkstatus(networkstatus_t *ns, memcpy(rs->identity_digest, identity, DIGEST_LEN); rs->is_hs_dir = is_hsdir; - rs->supports_v3_hsdir = 1; + rs->pv.supports_v3_hsdir = 1; strlcpy(rs->nickname, nickname, sizeof(rs->nickname)); tor_addr_parse(&ipv4_addr, "1.2.3.4"); ri->addr = tor_addr_to_ipv4h(&ipv4_addr);

1 0

[tor/master] Always look at the subprotocol versions summary flags
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 7e504515b326fe2f302d2c1550e3a46bec29b9f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 24 13:52:51 2018 -0500 Always look at the subprotocol versions summary flags Previously, we wouldn't do this when running with a routerinfo_t in some cases, leading to many needless calls to the protover module. This change also cleans up the code in nodelist.c a bit. Fixes bug 25008; bugfix on 0.2.9.4-alpha. --- changes/bug25008 | 9 ++++++ src/or/nodelist.c | 97 +++++++++++++++++++------------------------------------ 2 files changed, 43 insertions(+), 63 deletions(-) diff --git a/changes/bug25008 b/changes/bug25008 new file mode 100644 index 000000000..5ddc06298 --- /dev/null +++ b/changes/bug25008 @@ -0,0 +1,9 @@ + o Minor bugfixes (performance): + - Avoid calling protocol_list_supports_protocol() from inside tight loops + when running with cached routerinfo_t objects. Instead, + summarize the relevant protocols as flags in the routerinfo_t, as we do + for routerstatus_t objects. This change simplifies our code a little, + and saves a large amount of short-term memory allocation operations. + Fixes bug 25008; bugfix on 0.2.9.4-alpha. + + diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 7cdf28a37..c2bc0d1f7 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -959,6 +959,30 @@ node_ed25519_id_matches(const node_t *node, const ed25519_public_key_t *id) } } +/** Dummy object that should be unreturnable. Used to ensure that + * node_get_protover_summary_flags() always returns non-NULL. */ +static const protover_summary_flags_t zero_protover_flags = { + 0,0,0,0,0,0,0 +}; + +/** Return the protover_summary_flags for a given node. */ +static const protover_summary_flags_t * +node_get_protover_summary_flags(const node_t *node) +{ + if (node->rs) { + return &node->rs->pv; + } else if (node->ri) { + return &node->ri->pv; + } else { + /* This should be impossible: every node should have a routerstatus or a + * router descriptor or both. But just in case we've messed up somehow, + * return a nice empty set of flags to indicate "this node supports + * nothing." */ + tor_assert_nonfatal_unreached_once(); + return &zero_protover_flags; + } +} + /** Return true iff node supports authenticating itself * by ed25519 ID during the link handshake. If compatible_with_us, * it needs to be using a link authentication method that we understand. @@ -969,23 +993,13 @@ node_supports_ed25519_link_authentication(const node_t *node, { if (! node_get_ed25519_id(node)) return 0; - if (node->ri) { - const char *protos = node->ri->protocol_list; - if (protos == NULL) - return 0; - if (compatible_with_us) - return protocol_list_supports_protocol(protos, PRT_LINKAUTH, 3); - else - return protocol_list_supports_protocol_or_later(protos, PRT_LINKAUTH, 3); - } - if (node->rs) { - if (compatible_with_us) - return node->rs->pv.supports_ed25519_link_handshake_compat; - else - return node->rs->pv.supports_ed25519_link_handshake_any; - } - tor_assert_nonfatal_unreached_once(); - return 0; + + const protover_summary_flags_t *pv = node_get_protover_summary_flags(node); + + if (compatible_with_us) + return pv->supports_ed25519_link_handshake_compat; + else + return pv->supports_ed25519_link_handshake_any; } /** Return true iff node supports the hidden service directory version @@ -995,27 +1009,7 @@ node_supports_v3_hsdir(const node_t *node) { tor_assert(node); - if (node->rs) { - return node->rs->pv.supports_v3_hsdir; - } - if (node->ri) { - if (node->ri->protocol_list == NULL) { - return 0; - } - /* Bug #22447 forces us to filter on tor version: - * If platform is a Tor version, and older than 0.3.0.8, return False. - * Else, obey the protocol list. */ - if (node->ri->platform) { - if (!strcmpstart(node->ri->platform, "Tor ") && - !tor_version_as_new_as(node->ri->platform, "0.3.0.8")) { - return 0; - } - } - return protocol_list_supports_protocol(node->ri->protocol_list, - PRT_HSDIR, PROTOVER_HSDIR_V3); - } - tor_assert_nonfatal_unreached_once(); - return 0; + return node_get_protover_summary_flags(node)->supports_v3_hsdir; } /** Return true iff node supports ed25519 authentication as an hidden @@ -1025,18 +1019,7 @@ node_supports_ed25519_hs_intro(const node_t *node) { tor_assert(node); - if (node->rs) { - return node->rs->pv.supports_ed25519_hs_intro; - } - if (node->ri) { - if (node->ri->protocol_list == NULL) { - return 0; - } - return protocol_list_supports_protocol(node->ri->protocol_list, - PRT_HSINTRO, PROTOVER_HS_INTRO_V3); - } - tor_assert_nonfatal_unreached_once(); - return 0; + return node_get_protover_summary_flags(node)->supports_ed25519_hs_intro; } /** Return true iff node supports to be a rendezvous point for hidden @@ -1046,19 +1029,7 @@ node_supports_v3_rendezvous_point(const node_t *node) { tor_assert(node); - if (node->rs) { - return node->rs->pv.supports_v3_rendezvous_point; - } - if (node->ri) { - if (node->ri->protocol_list == NULL) { - return 0; - } - return protocol_list_supports_protocol(node->ri->protocol_list, - PRT_HSREND, - PROTOVER_HS_RENDEZVOUS_POINT_V3); - } - tor_assert_nonfatal_unreached_once(); - return 0; + return node_get_protover_summary_flags(node)->supports_v3_rendezvous_point; } /** Return the RSA ID key's SHA1 digest for the provided node. */

1 0