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

[tor/master] Merge branch 'bug27003_034_v2' into maint-0.3.4
by nickm＠torproject.org 07 Aug '18

07 Aug '18

commit 882b2ad0aa46702e8420ef0d4bd788daff6f3ffd Merge: a54e94878 176999fd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 7 08:05:51 2018 -0400 Merge branch 'bug27003_034_v2' into maint-0.3.4 changes/bug27003 | 6 ++++++ src/or/periodic.c | 9 +++++---- src/test/test_periodic_event.c | 8 ++------ 3 files changed, 13 insertions(+), 10 deletions(-)

1 0

[tor/maint-0.3.4] Merge branch 'bug27003_034_v2' into maint-0.3.4
by nickm＠torproject.org 07 Aug '18

07 Aug '18

commit 882b2ad0aa46702e8420ef0d4bd788daff6f3ffd Merge: a54e94878 176999fd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 7 08:05:51 2018 -0400 Merge branch 'bug27003_034_v2' into maint-0.3.4 changes/bug27003 | 6 ++++++ src/or/periodic.c | 9 +++++---- src/test/test_periodic_event.c | 8 ++------ 3 files changed, 13 insertions(+), 10 deletions(-)

1 0

[tor/maint-0.3.4] When enabling periodic events, schedule but don't run them immediately.
by nickm＠torproject.org 07 Aug '18

07 Aug '18

commit 176999fd955dea5916a560374db7d4efd3a1dad1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 2 10:03:24 2018 -0400 When enabling periodic events, schedule but don't run them immediately. When we fixed 25939 in f7633c1fcaefe72bf97c001bab9062132c919996, we introduced a call to rescan_periodic_events() from inside the onion service logic. But this meant that we could rescan the event list -- thereby running event callbacks! -- from inside the hidden service code. This could cause us to run some of our event callbacks from an inconsistent state, if we were in the middle of changing options. A related bug (#25761) prevented us from rescanning our periodic events as appropriate, but when we fixed THAT one, this bug reared its ugly head. The fix here is that "enabling" an event should cause us to run it from the event loop, but not immediately from the point where we enable it. Fixes bug 27003; bugfix on 0.3.4.1-alpha. --- changes/bug27003 | 6 ++++++ src/or/periodic.c | 9 +++++---- src/test/test_periodic_event.c | 8 ++------ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/changes/bug27003 b/changes/bug27003 new file mode 100644 index 000000000..4f2045afc --- /dev/null +++ b/changes/bug27003 @@ -0,0 +1,6 @@ + o Major bugfixes (event scheduler): + - When we enable a periodic event, schedule it in the event loop + rather than running it immediately. Previously, we would re-run + periodic events immediately in the middle of (for example) + changing our options, with unpredictable effects. Fixes bug + 27003; bugfix on 0.3.4.1-alpha. diff --git a/src/or/periodic.c b/src/or/periodic.c index 92fa677f8..9470376d0 100644 --- a/src/or/periodic.c +++ b/src/or/periodic.c @@ -140,8 +140,8 @@ periodic_event_destroy(periodic_event_item_t *event) event->last_action_time = 0; } -/** Enable the given event which means the event is launched and then the - * event's enabled flag is set. This can be called for an event that is +/** Enable the given event by setting its "enabled" flag and scheduling it to + * run immediately in the event loop. This can be called for an event that is * already enabled. */ void periodic_event_enable(periodic_event_item_t *event) @@ -152,7 +152,9 @@ periodic_event_enable(periodic_event_item_t *event) return; } - periodic_event_launch(event); + tor_assert(event->ev); + event->enabled = 1; + mainloop_event_activate(event->ev); } /** Disable the given event which means the event is destroyed and then the @@ -169,4 +171,3 @@ periodic_event_disable(periodic_event_item_t *event) mainloop_event_cancel(event->ev); event->enabled = 0; } - diff --git a/src/test/test_periodic_event.c b/src/test/test_periodic_event.c index 34689b64f..f159c4f83 100644 --- a/src/test/test_periodic_event.c +++ b/src/test/test_periodic_event.c @@ -106,11 +106,11 @@ test_pe_launch(void *arg) periodic_event_item_t *item = &periodic_events[i]; if (item->roles & PERIODIC_EVENT_ROLE_CLIENT) { tt_int_op(periodic_event_is_enabled(item), OP_EQ, 1); - tt_u64_op(item->last_action_time, OP_NE, 0); } else { tt_int_op(periodic_event_is_enabled(item), OP_EQ, 0); - tt_u64_op(item->last_action_time, OP_EQ, 0); } + // enabled or not, the event has not yet been run. + tt_u64_op(item->last_action_time, OP_EQ, 0); } /* Remove Client but become a Relay. */ @@ -127,12 +127,9 @@ test_pe_launch(void *arg) /* Only Client role should be disabled. */ if (item->roles == PERIODIC_EVENT_ROLE_CLIENT) { tt_int_op(periodic_event_is_enabled(item), OP_EQ, 0); - /* Was previously enabled so they should never be to 0. */ - tt_u64_op(item->last_action_time, OP_NE, 0); } if (item->roles & PERIODIC_EVENT_ROLE_RELAY) { tt_int_op(periodic_event_is_enabled(item), OP_EQ, 1); - tt_u64_op(item->last_action_time, OP_NE, 0); } /* Non Relay role should be disabled, except for Dirserver. */ if (!(item->roles & roles)) { @@ -330,4 +327,3 @@ struct testcase_t periodic_event_tests[] = { END_OF_TESTCASES }; -

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 07 Aug '18

07 Aug '18

commit 5e86a2868319f8aa55d2858fdb4d83e6f9f69120 Merge: abf88af48 882b2ad0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 7 08:05:56 2018 -0400 Merge branch 'maint-0.3.4' changes/bug27003 | 6 ++++++ src/core/mainloop/periodic.c | 8 +++++--- src/test/test_periodic_event.c | 8 ++------ 3 files changed, 13 insertions(+), 9 deletions(-) diff --cc src/core/mainloop/periodic.c index c17c0c56d,000000000..df5317eb3 mode 100644,000000..100644 --- a/src/core/mainloop/periodic.c +++ b/src/core/mainloop/periodic.c @@@ -1,172 -1,0 +1,174 @@@ +/* Copyright (c) 2015-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file periodic.c + * + * \brief Generic backend for handling periodic events. + * + * The events in this module are used by main.c to track items that need + * to fire once every N seconds, possibly picking a new interval each time + * that they fire. See periodic_events[] in main.c for examples. + */ + +#include "core/or/or.h" +#include "lib/evloop/compat_libevent.h" +#include "app/config/config.h" +#include "core/mainloop/main.h" +#include "core/mainloop/periodic.h" +#include "lib/evloop/compat_libevent.h" + +/** We disable any interval greater than this number of seconds, on the + * grounds that it is probably an absolute time mistakenly passed in as a + * relative time. + */ +static const int MAX_INTERVAL = 10 * 365 * 86400; + +/** Set the event event to run in next_interval seconds from + * now. */ +static void +periodic_event_set_interval(periodic_event_item_t *event, + time_t next_interval) +{ + tor_assert(next_interval < MAX_INTERVAL); + struct timeval tv; + tv.tv_sec = next_interval; + tv.tv_usec = 0; + mainloop_event_schedule(event->ev, &tv); +} + +/** Wraps dispatches for periodic events, data will be a pointer to the + * event that needs to be called */ +static void +periodic_event_dispatch(mainloop_event_t *ev, void *data) +{ + periodic_event_item_t *event = data; + tor_assert(ev == event->ev); + + if (BUG(!periodic_event_is_enabled(event))) { + return; + } + + time_t now = time(NULL); + update_current_time(now); + const or_options_t *options = get_options(); +// log_debug(LD_GENERAL, "Dispatching %s", event->name); + int r = event->fn(now, options); + int next_interval = 0; + + if (!periodic_event_is_enabled(event)) { + /* The event got disabled from inside its callback; no need to + * reschedule. */ + return; + } + + /* update the last run time if action was taken */ + if (r==0) { + log_err(LD_BUG, "Invalid return value for periodic event from %s.", + event->name); + tor_assert(r != 0); + } else if (r > 0) { + event->last_action_time = now; + /* If the event is meant to happen after ten years, that's likely + * a bug, and somebody gave an absolute time rather than an interval. + */ + tor_assert(r < MAX_INTERVAL); + next_interval = r; + } else { + /* no action was taken, it is likely a precondition failed, + * we should reschedule for next second incase the precondition + * passes then */ + next_interval = 1; + } + +// log_debug(LD_GENERAL, "Scheduling %s for %d seconds", event->name, +// next_interval); + struct timeval tv = { next_interval , 0 }; + mainloop_event_schedule(ev, &tv); +} + +/** Schedules event to run as soon as possible from now. */ +void +periodic_event_reschedule(periodic_event_item_t *event) +{ + /* Don't reschedule a disabled event. */ + if (periodic_event_is_enabled(event)) { + periodic_event_set_interval(event, 1); + } +} + +/** Initializes the libevent backend for a periodic event. */ +void +periodic_event_setup(periodic_event_item_t *event) +{ + if (event->ev) { /* Already setup? This is a bug */ + log_err(LD_BUG, "Initial dispatch should only be done once."); + tor_assert(0); + } + + event->ev = mainloop_event_new(periodic_event_dispatch, + event); + tor_assert(event->ev); +} + +/** Handles initial dispatch for periodic events. It should happen 1 second + * after the events are created to mimic behaviour before #3199's refactor */ +void +periodic_event_launch(periodic_event_item_t *event) +{ + if (! event->ev) { /* Not setup? This is a bug */ + log_err(LD_BUG, "periodic_event_launch without periodic_event_setup"); + tor_assert(0); + } + /* Event already enabled? This is a bug */ + if (periodic_event_is_enabled(event)) { + log_err(LD_BUG, "periodic_event_launch on an already enabled event"); + tor_assert(0); + } + + // Initial dispatch + event->enabled = 1; + periodic_event_dispatch(event->ev, event); +} + +/** Release all storage associated with event */ +void +periodic_event_destroy(periodic_event_item_t *event) +{ + if (!event) + return; + mainloop_event_free(event->ev); + event->last_action_time = 0; +} + - /** Enable the given event which means the event is launched and then the - * event's enabled flag is set. This can be called for an event that is ++/** Enable the given event by setting its "enabled" flag and scheduling it to ++ * run immediately in the event loop. This can be called for an event that is + * already enabled. */ +void +periodic_event_enable(periodic_event_item_t *event) +{ + tor_assert(event); + /* Safely and silently ignore if this event is already enabled. */ + if (periodic_event_is_enabled(event)) { + return; + } + - periodic_event_launch(event); ++ tor_assert(event->ev); ++ event->enabled = 1; ++ mainloop_event_activate(event->ev); +} + +/** Disable the given event which means the event is destroyed and then the + * event's enabled flag is unset. This can be called for an event that is + * already disabled. */ +void +periodic_event_disable(periodic_event_item_t *event) +{ + tor_assert(event); + /* Safely and silently ignore if this event is already disabled. */ + if (!periodic_event_is_enabled(event)) { + return; + } + mainloop_event_cancel(event->ev); + event->enabled = 0; +}

1 0

[tor/release-0.3.4] Merge branch 'bug27003_034_v2' into maint-0.3.4
by nickm＠torproject.org 07 Aug '18

07 Aug '18

commit 882b2ad0aa46702e8420ef0d4bd788daff6f3ffd Merge: a54e94878 176999fd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 7 08:05:51 2018 -0400 Merge branch 'bug27003_034_v2' into maint-0.3.4 changes/bug27003 | 6 ++++++ src/or/periodic.c | 9 +++++---- src/test/test_periodic_event.c | 8 ++------ 3 files changed, 13 insertions(+), 10 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 07 Aug '18

07 Aug '18

commit 258759547b305a76b3985177698425d51b5d2d03 Merge: 40deb99c5 882b2ad0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 7 08:05:56 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug27003 | 6 ++++++ src/or/periodic.c | 9 +++++---- src/test/test_periodic_event.c | 8 ++------ 3 files changed, 13 insertions(+), 10 deletions(-)

1 0

[tor/release-0.3.4] When enabling periodic events, schedule but don't run them immediately.
by nickm＠torproject.org 07 Aug '18

07 Aug '18

commit 176999fd955dea5916a560374db7d4efd3a1dad1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 2 10:03:24 2018 -0400 When enabling periodic events, schedule but don't run them immediately. When we fixed 25939 in f7633c1fcaefe72bf97c001bab9062132c919996, we introduced a call to rescan_periodic_events() from inside the onion service logic. But this meant that we could rescan the event list -- thereby running event callbacks! -- from inside the hidden service code. This could cause us to run some of our event callbacks from an inconsistent state, if we were in the middle of changing options. A related bug (#25761) prevented us from rescanning our periodic events as appropriate, but when we fixed THAT one, this bug reared its ugly head. The fix here is that "enabling" an event should cause us to run it from the event loop, but not immediately from the point where we enable it. Fixes bug 27003; bugfix on 0.3.4.1-alpha. --- changes/bug27003 | 6 ++++++ src/or/periodic.c | 9 +++++---- src/test/test_periodic_event.c | 8 ++------ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/changes/bug27003 b/changes/bug27003 new file mode 100644 index 000000000..4f2045afc --- /dev/null +++ b/changes/bug27003 @@ -0,0 +1,6 @@ + o Major bugfixes (event scheduler): + - When we enable a periodic event, schedule it in the event loop + rather than running it immediately. Previously, we would re-run + periodic events immediately in the middle of (for example) + changing our options, with unpredictable effects. Fixes bug + 27003; bugfix on 0.3.4.1-alpha. diff --git a/src/or/periodic.c b/src/or/periodic.c index 92fa677f8..9470376d0 100644 --- a/src/or/periodic.c +++ b/src/or/periodic.c @@ -140,8 +140,8 @@ periodic_event_destroy(periodic_event_item_t *event) event->last_action_time = 0; } -/** Enable the given event which means the event is launched and then the - * event's enabled flag is set. This can be called for an event that is +/** Enable the given event by setting its "enabled" flag and scheduling it to + * run immediately in the event loop. This can be called for an event that is * already enabled. */ void periodic_event_enable(periodic_event_item_t *event) @@ -152,7 +152,9 @@ periodic_event_enable(periodic_event_item_t *event) return; } - periodic_event_launch(event); + tor_assert(event->ev); + event->enabled = 1; + mainloop_event_activate(event->ev); } /** Disable the given event which means the event is destroyed and then the @@ -169,4 +171,3 @@ periodic_event_disable(periodic_event_item_t *event) mainloop_event_cancel(event->ev); event->enabled = 0; } - diff --git a/src/test/test_periodic_event.c b/src/test/test_periodic_event.c index 34689b64f..f159c4f83 100644 --- a/src/test/test_periodic_event.c +++ b/src/test/test_periodic_event.c @@ -106,11 +106,11 @@ test_pe_launch(void *arg) periodic_event_item_t *item = &periodic_events[i]; if (item->roles & PERIODIC_EVENT_ROLE_CLIENT) { tt_int_op(periodic_event_is_enabled(item), OP_EQ, 1); - tt_u64_op(item->last_action_time, OP_NE, 0); } else { tt_int_op(periodic_event_is_enabled(item), OP_EQ, 0); - tt_u64_op(item->last_action_time, OP_EQ, 0); } + // enabled or not, the event has not yet been run. + tt_u64_op(item->last_action_time, OP_EQ, 0); } /* Remove Client but become a Relay. */ @@ -127,12 +127,9 @@ test_pe_launch(void *arg) /* Only Client role should be disabled. */ if (item->roles == PERIODIC_EVENT_ROLE_CLIENT) { tt_int_op(periodic_event_is_enabled(item), OP_EQ, 0); - /* Was previously enabled so they should never be to 0. */ - tt_u64_op(item->last_action_time, OP_NE, 0); } if (item->roles & PERIODIC_EVENT_ROLE_RELAY) { tt_int_op(periodic_event_is_enabled(item), OP_EQ, 1); - tt_u64_op(item->last_action_time, OP_NE, 0); } /* Non Relay role should be disabled, except for Dirserver. */ if (!(item->roles & roles)) { @@ -330,4 +327,3 @@ struct testcase_t periodic_event_tests[] = { END_OF_TESTCASES }; -

1 0

[translation-tools/master] add tba-androidstrings.dtd to the translation bot
by emmapeel＠torproject.org 07 Aug '18

07 Aug '18

commit fb66fac110275a0af382856fb0918eef9ff58de7 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Aug 7 10:08:42 2018 +0000 add tba-androidstrings.dtd to the translation bot --- config | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config b/config index ded0f14..4a42fc7 100644 --- a/config +++ b/config @@ -13,15 +13,13 @@ exoneratorproperties exoneratorproperties_completed https_everywhere https_everywhere_completed liveusb-creator liveusb-creator_completed mat-gui mat-gui_completed -tor-launcher-properties tor-launcher-properties_completed -tor-launcher-progress tor-launcher-progress_completed -tor-launcher-network-settings tor-launcher-network-settings_completed tails-misc tails-misc_completed tails-iuk tails-iuk_completed tails-perl5lib tails-perl5lib_completed tails-greeter-2 tails-greeter-2_completed tails-openpgp-applet tails-openpgp-applet_completed tails-onioncircuits tails-onioncircuits_completed tails-persistence-setup tails-persistence-setup_completed +tba-android_stringsdtd tba-android_stringsdtd_completed tor-and-https tor-and-https_completed tor_animation tor_animation_completed torbirdy torbirdy_completed @@ -34,6 +32,9 @@ torbutton-aboutdialogdtd torbutton-aboutdialogdtd_completed torbutton-abouttorproperties torbutton-abouttorproperties_completed torbutton-abouttbupdatedtd torbutton-abouttbupdatedtd_completed torcheck torcheck_completed +tor-launcher-properties tor-launcher-properties_completed +tor-launcher-progress tor-launcher-progress_completed +tor-launcher-network-settings tor-launcher-network-settings_completed whisperback whisperback_completed support-portal support-portal_completed"

1 0

[translation-tools/master] order components
by emmapeel＠torproject.org 07 Aug '18

07 Aug '18

commit 92aaa75d1a9cb47cb2f72eb516133887ff5335cf Author: emma peel <emma.peel(a)riseup.net> Date: Tue Aug 7 08:22:59 2018 +0000 order components --- config | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/config b/config index 89ea432..ded0f14 100644 --- a/config +++ b/config @@ -7,28 +7,34 @@ TRANSLATION_REPO=/srv/translation.torproject.org/translations/ TX=/usr/bin/tx -PROJECTS="bridgedb bridgedb_completed -torcheck torcheck_completed whisperback -whisperback_completed https_everywhere https_everywhere_completed -liveusb-creator liveusb-creator_completed tails-persistence-setup -tails-persistence-setup_completed torbirdy torbirdy_completed mat-gui mat-gui_completed +PROJECTS="abouttor-homepage abouttor-homepage_completed +bridgedb bridgedb_completed +exoneratorproperties exoneratorproperties_completed +https_everywhere https_everywhere_completed +liveusb-creator liveusb-creator_completed +mat-gui mat-gui_completed tor-launcher-properties tor-launcher-properties_completed tor-launcher-progress tor-launcher-progress_completed tor-launcher-network-settings tor-launcher-network-settings_completed -tails-misc tails-misc_completed abouttor-homepage -abouttor-homepage_completed torbutton-brandproperties -torbutton-brandproperties_completed torbutton-branddtd -torbutton-branddtd_completed torbutton-torbuttonproperties torbutton-torbuttonproperties_completed -torbutton-torbuttondtd torbutton-torbuttondtd_completed tails-iuk tails-iuk_completed tails-perl5lib -tails-perl5lib_completed tor-and-https tor-and-https_completed -tor_animation tor_animation_completed torbutton-aboutdialogdtd -torbutton-aboutdialogdtd_completed torbutton-abouttorproperties -torbutton-abouttorproperties_completed tails-openpgp-applet -tails-openpgp-applet_completed torbutton-abouttbupdatedtd -torbutton-abouttbupdatedtd_completed tails-onioncircuits tails-onioncircuits_completed -tails-greeter-2 tails-greeter-2_completed exoneratorproperties -exoneratorproperties_completed tor-browser-manual -tor-browser-manual_completed +tails-misc tails-misc_completed +tails-iuk tails-iuk_completed tails-perl5lib tails-perl5lib_completed +tails-greeter-2 tails-greeter-2_completed +tails-openpgp-applet tails-openpgp-applet_completed +tails-onioncircuits tails-onioncircuits_completed +tails-persistence-setup tails-persistence-setup_completed +tor-and-https tor-and-https_completed +tor_animation tor_animation_completed +torbirdy torbirdy_completed +tor-browser-manual tor-browser-manual_completed +torbutton-brandproperties torbutton-brandproperties_completed +torbutton-branddtd torbutton-branddtd_completed +torbutton-torbuttonproperties torbutton-torbuttonproperties_completed +torbutton-torbuttondtd torbutton-torbuttondtd_completed +torbutton-aboutdialogdtd torbutton-aboutdialogdtd_completed +torbutton-abouttorproperties torbutton-abouttorproperties_completed +torbutton-abouttbupdatedtd torbutton-abouttbupdatedtd_completed +torcheck torcheck_completed +whisperback whisperback_completed support-portal support-portal_completed" PIDFILE=/srv/translation.torproject.org/run/update_translations.pid

1 0

[translation-tools/master] delete support files, merged in support-portal
by emmapeel＠torproject.org 07 Aug '18

07 Aug '18

commit c2b738fdb8b7c320292d66d91148ae8075dc8613 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Aug 7 08:15:17 2018 +0000 delete support files, merged in support-portal --- config | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/config b/config index 91fedc7..89ea432 100644 --- a/config +++ b/config @@ -28,11 +28,8 @@ tails-openpgp-applet_completed torbutton-abouttbupdatedtd torbutton-abouttbupdatedtd_completed tails-onioncircuits tails-onioncircuits_completed tails-greeter-2 tails-greeter-2_completed exoneratorproperties exoneratorproperties_completed tor-browser-manual -tor-browser-manual_completed support-censorship support-censorship_completed -support-connecting support-connecting_completed support-faq support-faq_completed -support-gettor support-gettor_completed support-https support-https_completed -support-miscellaneous support-miscellaneous_completed support-tbb support-tbb_completed support-portal support-portal_completed -support-topics support-topics_completed support-tormobile support-tormobile_completed" +tor-browser-manual_completed +support-portal support-portal_completed" PIDFILE=/srv/translation.torproject.org/run/update_translations.pid

1 0