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

[tor/master] Remove responsibility for flushing log cbs from mainloop
by nickm＠torproject.org 03 May '18

03 May '18

commit 77b7eb2795208ad5c5f66a5626a89b14b03de6f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 1 10:38:46 2018 -0400 Remove responsibility for flushing log cbs from mainloop This is now handled as-needed as the control module is flushing its own callbacks. Closes ticket 25951. --- changes/ticket25951 | 9 +++++++++ src/or/main.c | 3 --- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changes/ticket25951 b/changes/ticket25951 new file mode 100644 index 000000000..b6cfc2091 --- /dev/null +++ b/changes/ticket25951 @@ -0,0 +1,9 @@ + o Minor features (mainloop): + - Move responsibility for + flushing log callbacks + from a once-per-second callback to a callback that is only scheduled as + needed. Once enough items are removed from our once-per-second + callback, we can eliminate it entirely to conserve CPU when idle. + Closes ticket + 25951. + diff --git a/src/or/main.c b/src/or/main.c index f1b830830..e68f72d1e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1701,9 +1701,6 @@ run_scheduled_events(time_t now) signewnym_impl(now); } - /* 0c. If we've deferred log messages for the controller, handle them now */ - flush_pending_log_callbacks(); - /* Maybe enough time elapsed for us to reconsider a circuit. */ circuit_upgrade_circuits_from_guard_wait();

1 0

[tor/master] Give queued_events_flush_all() responsibility for flushing log cbs
by nickm＠torproject.org 03 May '18

03 May '18

commit 0d8604c76306ea95e7918af67cf268d630aea941 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 1 10:26:04 2018 -0400 Give queued_events_flush_all() responsibility for flushing log cbs This requires that when a log cb happens, the event for flushing queued events is scheduled, so we also add the necessary machinery to have that happen. Note that this doesn't actually help with logs from outside the main thread, but those were already suppressed: see #25987 for a ticket tracking that issue. --- src/or/config.c | 1 + src/or/control.c | 22 +++++++++++++++++++++- src/or/control.h | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 54f3930fc..208680060 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1547,6 +1547,7 @@ options_act_reversible(const or_options_t *old_options, char **msg) tor_malloc_zero(sizeof(log_severity_list_t)); close_temp_logs(); add_callback_log(severity, control_event_logmsg); + logs_set_pending_callback_callback(control_event_logmsg_pending); control_adjust_event_log_severity(); tor_free(severity); tor_log_update_sigsafe_err_fds(); diff --git a/src/or/control.c b/src/or/control.c index dda887218..7ad9460cc 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -803,6 +803,9 @@ queued_event_free_(queued_event_t *ev) static void queued_events_flush_all(int force) { + /* Make sure that we get all the pending log events, if there are any. */ + flush_pending_log_callbacks(); + if (PREDICT_UNLIKELY(queued_control_events == NULL)) { return; } @@ -6186,7 +6189,7 @@ control_event_logmsg(int severity, uint32_t domain, const char *msg) int event; /* Don't even think of trying to add stuff to a buffer from a cpuworker - * thread. */ + * thread. (See #25987 for plan to fix.) */ if (! in_main_thread()) return; @@ -6232,6 +6235,23 @@ control_event_logmsg(int severity, uint32_t domain, const char *msg) } } +/** + * Logging callback: called when there is a queued pending log callback. + */ +void +control_event_logmsg_pending(void) +{ + if (! in_main_thread()) { + /* We can't handle this case yet, since we're using a + * mainloop_event_t to invoke queued_events_flush_all. We ought to + * use a different mechanism instead: see #25987. + **/ + return; + } + tor_assert(flush_queued_events_event); + mainloop_event_activate(flush_queued_events_event); +} + /** Called whenever we receive new router descriptors: tell any * interested control connections. <b>routers</b> is a list of * routerinfo_t's. diff --git a/src/or/control.h b/src/or/control.h index 2f312a663..7f8a0bdb5 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -60,6 +60,7 @@ int control_event_conn_bandwidth(connection_t *conn); int control_event_conn_bandwidth_used(void); int control_event_circuit_cell_stats(void); void control_event_logmsg(int severity, uint32_t domain, const char *msg); +void control_event_logmsg_pending(void); int control_event_descriptors_changed(smartlist_t *routers); int control_event_address_mapped(const char *from, const char *to, time_t expires, const char *error,

1 0

[tor/master] Merge remote-tracking branch 'github/ticket25951'
by nickm＠torproject.org 03 May '18

03 May '18

commit ed636de4cc71fb2936358da27f211fb6a255cd9d Merge: be9f0e5f2 77b7eb279 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 11:59:31 2018 -0400 Merge remote-tracking branch 'github/ticket25951' changes/ticket25951 | 9 +++++++++ src/common/log.c | 25 +++++++++++++++++++++++++ src/common/torlog.h | 2 ++ src/or/config.c | 1 + src/or/control.c | 22 +++++++++++++++++++++- src/or/control.h | 1 + src/or/main.c | 3 --- 7 files changed, 59 insertions(+), 4 deletions(-) diff --cc src/or/main.c index b492166f8,e68f72d1e..02be5e054 --- a/src/or/main.c +++ b/src/or/main.c @@@ -1711,9 -1693,14 +1711,6 @@@ run_scheduled_events(time_t now */ consider_hibernation(now); - /* 0c. If we've deferred log messages for the controller, handle them now */ - flush_pending_log_callbacks(); - /* 0b. If we've deferred a signewnym, make sure it gets handled - * eventually. */ - if (signewnym_is_pending && - time_of_last_signewnym + MAX_SIGNEWNYM_RATE <= now) { - log_info(LD_CONTROL, "Honoring delayed NEWNYM request"); - signewnym_impl(now); - } -- /* Maybe enough time elapsed for us to reconsider a circuit. */ circuit_upgrade_circuits_from_guard_wait();

1 0

[tor/master] Merge remote-tracking branch 'github/ticket25949'
by nickm＠torproject.org 03 May '18

03 May '18

commit be9f0e5f20e37d2176ce0663b71b532c44c10c28 Merge: 319505d38 57f557747 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 11:57:09 2018 -0400 Merge remote-tracking branch 'github/ticket25949' changes/ticket25949 | 9 +++++++++ src/or/main.c | 37 ++++++++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 11 deletions(-)

1 0

[tor/master] Move responsibility for deferred SIGNEWNYM into a mainloop event
by nickm＠torproject.org 03 May '18

03 May '18

commit 57f557747d7d357e3b7190070f648887831f10a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 27 10:45:12 2018 -0400 Move responsibility for deferred SIGNEWNYM into a mainloop event Closes ticket 25949. --- changes/ticket25949 | 9 +++++++++ src/or/main.c | 37 ++++++++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/changes/ticket25949 b/changes/ticket25949 new file mode 100644 index 000000000..fd8737341 --- /dev/null +++ b/changes/ticket25949 @@ -0,0 +1,9 @@ + o Minor features (mainloop): + - Move responsibility for + honoring delayed SIGNEWNYM requests + from a once-per-second callback to a callback that is only scheduled as + needed. Once enough items are removed from our once-per-second + callback, we can eliminate it entirely to conserve CPU when idle. + Closes ticket + 25949. + diff --git a/src/or/main.c b/src/or/main.c index c1103edb3..47275c84f 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -186,6 +186,8 @@ static uint64_t stats_n_main_loop_idle = 0; static time_t time_of_last_signewnym = 0; /** Is there a signewnym request we're currently waiting to handle? */ static int signewnym_is_pending = 0; +/** Mainloop event for the deferred signewnym call. */ +static mainloop_event_t *handle_deferred_signewnym_ev = NULL; /** How many times have we called newnym? */ static unsigned newnym_epoch = 0; @@ -1314,6 +1316,16 @@ signewnym_impl(time_t now) control_event_signal(SIGNEWNYM); } +/** Callback: run a deferred signewnym. */ +static void +handle_deferred_signewnym_cb(mainloop_event_t *event, void *arg) +{ + (void)event; + (void)arg; + log_info(LD_CONTROL, "Honoring delayed NEWNYM request"); + signewnym_impl(time(NULL)); +} + /** Return the number of times that signewnym has been called. */ unsigned get_signewnym_epoch(void) @@ -1677,14 +1689,6 @@ run_scheduled_events(time_t now) */ consider_hibernation(now); - /* 0b. If we've deferred a signewnym, make sure it gets handled - * eventually. */ - if (signewnym_is_pending && - time_of_last_signewnym + MAX_SIGNEWNYM_RATE <= now) { - log_info(LD_CONTROL, "Honoring delayed NEWNYM request"); - signewnym_impl(now); - } - /* 0c. If we've deferred log messages for the controller, handle them now */ flush_pending_log_callbacks(); @@ -2999,10 +3003,20 @@ process_signal(int sig) case SIGNEWNYM: { time_t now = time(NULL); if (time_of_last_signewnym + MAX_SIGNEWNYM_RATE > now) { - signewnym_is_pending = 1; + const time_t delay_sec = + time_of_last_signewnym + MAX_SIGNEWNYM_RATE - now; + if (! signewnym_is_pending) { + signewnym_is_pending = 1; + if (!handle_deferred_signewnym_ev) { + handle_deferred_signewnym_ev = + mainloop_event_postloop_new(handle_deferred_signewnym_cb, NULL); + } + const struct timeval delay_tv = { delay_sec, 0 }; + mainloop_event_schedule(handle_deferred_signewnym_ev, &delay_tv); + } log_notice(LD_CONTROL, - "Rate limiting NEWNYM request: delaying by %d second(s)", - (int)(MAX_SIGNEWNYM_RATE+time_of_last_signewnym-now)); + "Rate limiting NEWNYM request: delaying by %d second(s)", + (int)(delay_sec)); } else { signewnym_impl(now); } @@ -3540,6 +3554,7 @@ tor_free_all(int postfork) mainloop_event_free(directory_all_unreachable_cb_event); mainloop_event_free(schedule_active_linked_connections_event); mainloop_event_free(postloop_cleanup_ev); + mainloop_event_free(handle_deferred_signewnym_ev); #ifdef HAVE_SYSTEMD_209 periodic_timer_free(systemd_watchdog_timer);

1 0

[webwml/master] signing-keys: fix display of arthuredelstein and tails emails
by boklm＠torproject.org 03 May '18

03 May '18

commit ade62e952c7ec18302fcd6d7961d4ffce32d6caf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu May 3 17:28:11 2018 +0200 signing-keys: fix display of arthuredelstein and tails emails --- docs/en/signing-keys.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml index 20257b9f..0b24d553 100644 --- a/docs/en/signing-keys.wml +++ b/docs/en/signing-keys.wml @@ -128,7 +128,7 @@ pub 2048R/D752F538C0D38C3A 2014-12-10 Key fingerprint = 20B2 4CEF E6AF D615 0B6A 6F18 D752 F538 C0D3 8C3A - uid [ full ] Arthur Edelstein <arthuredelstein(a)gmail.com> + uid [ full ] Arthur Edelstein <arthuredelstein(a)gmail.com> sub 2048R/3306E88D27211E0B 2014-12-10 pub 4096R/0x4E2C6E8793298290 2014-12-15 [expires: 2020-08-24] @@ -152,7 +152,7 @@ pub 4096R/58ACD84F 2015-01-18 [expires: 2017-01-11] Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F - uid Tails developers <tails(a)boum.org> + uid Tails developers <tails(a)boum.org> sub 4096R/752A3DB6 2015-01-18 [expires: 2017-01-11] sub 4096R/2F699C56 2015-01-18 [expires: 2017-01-11] </pre>

1 0

[webwml/master] Bug 25847: add boklm's new key to the signing-keys page
by boklm＠torproject.org 03 May '18

03 May '18

commit c1074e32a8d216feae706eb6524af38e156cac52 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu May 3 17:23:47 2018 +0200 Bug 25847: add boklm's new key to the signing-keys page --- docs/en/signing-keys.wml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml index e05c1fbf..20257b9f 100644 --- a/docs/en/signing-keys.wml +++ b/docs/en/signing-keys.wml @@ -121,6 +121,11 @@ Key fingerprint = 4A90 646C 0BAE D9D4 56AB 3111 E5B8 1856 D022 0E4B uid Nicolas Vigier (TBB Builds Signing Key) <boklm(a)torproject.org> + pub 4096R/3E39CEABFC69F6F7 2015-09-24 + Key fingerprint = 6AB6 AEE9 776E 7827 23C8 ACE8 3E39 CEAB FC69 F6F7 + uid [ unknown] Nicolas Vigier (boklm) <boklm(a)torproject.org> + sub 4096R/07B7CFD7A0FBA062 2017-01-25 [expires: 2019-01-22] + pub 2048R/D752F538C0D38C3A 2014-12-10 Key fingerprint = 20B2 4CEF E6AF D615 0B6A 6F18 D752 F538 C0D3 8C3A uid [ full ] Arthur Edelstein <arthuredelstein(a)gmail.com>

1 0

[tor/master] Optimize legacy intro point digest calculation.
by dgoulet＠torproject.org 03 May '18

03 May '18

commit af70d3c459d3b11b04e49c1b659183fe2e96e252 Author: Neel Chauhan <neel(a)neelc.org> Date: Fri Apr 27 17:45:16 2018 -0400 Optimize legacy intro point digest calculation. --- changes/bug23107 | 6 ++++++ src/or/hs_circuit.c | 19 ++++--------------- src/or/hs_service.c | 4 ++++ src/or/hs_service.h | 3 +++ 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/changes/bug23107 b/changes/bug23107 new file mode 100644 index 000000000..70d1856bb --- /dev/null +++ b/changes/bug23107 @@ -0,0 +1,6 @@ + o Code simplification and refactoring: + - Put a SHA1 public key digest in hs_service_intro_point_t, and use it in + register_intro_circ() and service_intro_point_new(). This prevents the + digest from being re-calculated each time. Fixes bug 23107. Patch by + Neel Chauhan. + diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c index 3a674f622..417447063 100644 --- a/src/or/hs_circuit.c +++ b/src/or/hs_circuit.c @@ -193,11 +193,8 @@ register_intro_circ(const hs_service_intro_point_t *ip, tor_assert(circ); if (ip->base.is_only_legacy) { - uint8_t digest[DIGEST_LEN]; - if (BUG(crypto_pk_get_digest(ip->legacy_key, (char *) digest) < 0)) { - return; - } - hs_circuitmap_register_intro_circ_v2_service_side(circ, digest); + hs_circuitmap_register_intro_circ_v2_service_side(circ, + ip->legacy_key_digest); } else { hs_circuitmap_register_intro_circ_v3_service_side(circ, &ip->auth_key_kp.pubkey); @@ -675,22 +672,14 @@ setup_introduce1_data(const hs_desc_intro_point_t *ip, origin_circuit_t * hs_circ_service_get_intro_circ(const hs_service_intro_point_t *ip) { - origin_circuit_t *circ = NULL; - tor_assert(ip); if (ip->base.is_only_legacy) { - uint8_t digest[DIGEST_LEN]; - if (BUG(crypto_pk_get_digest(ip->legacy_key, (char *) digest) < 0)) { - goto end; - } - circ = hs_circuitmap_get_intro_circ_v2_service_side(digest); + return hs_circuitmap_get_intro_circ_v2_service_side(ip->legacy_key_digest); } else { - circ = hs_circuitmap_get_intro_circ_v3_service_side( + return hs_circuitmap_get_intro_circ_v3_service_side( &ip->auth_key_kp.pubkey); } - end: - return circ; } /* Called when we fail building a rendezvous circuit at some point other than diff --git a/src/or/hs_service.c b/src/or/hs_service.c index e40e9203e..cf2760760 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -441,6 +441,10 @@ service_intro_point_new(const extend_info_t *ei, unsigned int is_legacy) if (crypto_pk_generate_key(ip->legacy_key) < 0) { goto err; } + if (crypto_pk_get_digest(ip->legacy_key, + (char *) ip->legacy_key_digest) < 0) { + goto err; + } } if (ei == NULL) { diff --git a/src/or/hs_service.h b/src/or/hs_service.h index 2e27d8a89..ea7ee9ecf 100644 --- a/src/or/hs_service.h +++ b/src/or/hs_service.h @@ -51,6 +51,9 @@ typedef struct hs_service_intro_point_t { * the base object legacy flag is set. */ crypto_pk_t *legacy_key; + /* Legacy key SHA1 public key digest. */ + uint8_t legacy_key_digest[DIGEST_LEN]; + /* Amount of INTRODUCE2 cell accepted from this intro point. */ uint64_t introduce2_count;

1 0

[tor/master] Merge remote-tracking branch 'asn/bug23107'
by dgoulet＠torproject.org 03 May '18

03 May '18

commit 2e8eb1d5e32cc5849fc0676b5fa92b1606f2cae5 Merge: eb00eff09 0c346bdd6 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu May 3 09:33:42 2018 -0400 Merge remote-tracking branch 'asn/bug23107' changes/bug23107 | 6 ++++++ src/or/hs_circuit.c | 19 ++++--------------- src/or/hs_service.c | 4 ++++ src/or/hs_service.h | 3 +++ 4 files changed, 17 insertions(+), 15 deletions(-)

1 0

[tor/master] squash! Optimize legacy intro point digest calculation.
by dgoulet＠torproject.org 03 May '18

03 May '18

commit 0c346bdd689e84f92202476d96748ad9fe9d519f Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed May 2 14:09:15 2018 +0300 squash! Optimize legacy intro point digest calculation. --- changes/bug23107 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug23107 b/changes/bug23107 index 70d1856bb..55885e10f 100644 --- a/changes/bug23107 +++ b/changes/bug23107 @@ -1,6 +1,6 @@ o Code simplification and refactoring: - Put a SHA1 public key digest in hs_service_intro_point_t, and use it in register_intro_circ() and service_intro_point_new(). This prevents the - digest from being re-calculated each time. Fixes bug 23107. Patch by + digest from being re-calculated each time. Closes ticket 23107. Patch by Neel Chauhan.

1 0