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

[tor/master] Rename to pre-push.git-hook
by nickm＠torproject.org 01 Dec '18

01 Dec '18

commit e2b418bab5c3249fba7b430b942da67ddf8a43dc Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Thu Nov 29 10:56:56 2018 +0200 Rename to pre-push.git-hook --- scripts/maint/{pre-push => pre-push.git-hook} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/scripts/maint/pre-push b/scripts/maint/pre-push.git-hook similarity index 100% rename from scripts/maint/pre-push rename to scripts/maint/pre-push.git-hook

1 0

[tor/master] Improve comment at the top
by nickm＠torproject.org 01 Dec '18

01 Dec '18

commit 7c6dc2888144e587bc8d62c7b2bddae4fb6606b9 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Thu Nov 29 11:10:30 2018 +0200 Improve comment at the top --- scripts/maint/pre-push.git-hook | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/maint/pre-push.git-hook b/scripts/maint/pre-push.git-hook index 26c48c4e2..11f062b53 100755 --- a/scripts/maint/pre-push.git-hook +++ b/scripts/maint/pre-push.git-hook @@ -1,8 +1,10 @@ #!/bin/bash -# git pre-push hook script to prevent "fixup!" and "squash!" commit -# from ending up in master, or in any branch if CUR_BRANCH check is removed. -# It is meant to be placed in .git/hooks directory. +# To install this script, copy it into .git/hooks/pre-push path in your +# local copy of git repository. Make sure it has permission to execute. +# +# This is git pre-push hook script to prevent "fixup!" and "squash!" commits +# from ending up in upstream branches (master, release-* or maint-*). # # The following sample script was used as starting point: # https://github.com/git/git/blob/master/templates/hooks--pre-push.sample

1 0

[tor/master] Mention --no-verify in error message
by nickm＠torproject.org 01 Dec '18

01 Dec '18

commit 9c90bddc42467396909812746d5b4256adcb5d2d Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Thu Nov 29 11:10:48 2018 +0200 Mention --no-verify in error message --- scripts/maint/pre-push.git-hook | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/maint/pre-push.git-hook b/scripts/maint/pre-push.git-hook index 11f062b53..26296023f 100755 --- a/scripts/maint/pre-push.git-hook +++ b/scripts/maint/pre-push.git-hook @@ -42,6 +42,7 @@ do if [ -n "$commit" ] then echo >&2 "Found fixup! commit in $local_ref, not pushing" + echo >&2 "If you really want to push this, use --no-verify." exit 1 fi @@ -50,6 +51,7 @@ do if [ -n "$commit" ] then echo >&2 "Found squash! commit in $local_ref, not pushing" + echo >&2 "If you really want to push this, use --no-verify." exit 1 fi fi

1 0

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

01 Dec '18

commit c63d951e7f093f3a97748f96314b669d0cd1da54 Merge: 51d94cea3 9c90bddc4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Dec 1 11:28:22 2018 -0500 Merge remote-tracking branch 'tor-github/pr/530' changes/ticket27993 | 3 ++ scripts/maint/pre-push.git-hook | 61 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+)

1 0

[tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/554' into maint-0.3.5
by nickm＠torproject.org 01 Dec '18

01 Dec '18

commit 1a97379e5e5d349b4debd5ac61bedcca623dd386 Merge: 11a91ef72 d18a167ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Dec 1 11:26:52 2018 -0500 Merge remote-tracking branch 'tor-github/pr/554' into maint-0.3.5 changes/ticket19566 | 6 ++++++ src/feature/dirauth/shared_random.c | 3 ++- src/feature/dirauth/shared_random_state.c | 18 ++++++++++++------ 3 files changed, 20 insertions(+), 7 deletions(-)

1 0

[tor/master] sr: Switch from tor_assert() to BUG()
by nickm＠torproject.org 01 Dec '18

01 Dec '18

commit d18a167ff38799ea5cd846dd80acccab6404952a Author: Neel Chauhan <neel(a)neelc.org> Date: Tue Sep 19 16:08:24 2017 -0400 sr: Switch from tor_assert() to BUG() Closes #19566 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket19566 | 6 ++++++ src/feature/dirauth/shared_random.c | 3 ++- src/feature/dirauth/shared_random_state.c | 18 ++++++++++++------ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/changes/ticket19566 b/changes/ticket19566 new file mode 100644 index 000000000..bf7071e66 --- /dev/null +++ b/changes/ticket19566 @@ -0,0 +1,6 @@ + o Code simplification and refactoring (shared random, dirauth): + - Change many tor_assert() to use BUG() instead. The idea is to not crash + a dirauth but rather scream loudly with a stacktrace and let it continue + run. The shared random subsystem is very resilient and if anything wrong + happens with it, at worst a non coherent value will be put in the vote + and discarded by the other authorities. Closes ticket 19566. diff --git a/src/feature/dirauth/shared_random.c b/src/feature/dirauth/shared_random.c index db4f9d328..b027d9e37 100644 --- a/src/feature/dirauth/shared_random.c +++ b/src/feature/dirauth/shared_random.c @@ -949,7 +949,8 @@ sr_compute_srv(void) /* Computing a shared random value in the commit phase is very wrong. This * should only happen at the very end of the reveal phase when a new * protocol run is about to start. */ - tor_assert(sr_state_get_phase() == SR_PHASE_REVEAL); + if (BUG(sr_state_get_phase() != SR_PHASE_REVEAL)) + return; state_commits = sr_state_get_commits(); commits = smartlist_new(); diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index 38c7fd76d..7ae4a5dc8 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -594,8 +594,10 @@ disk_state_update(void) { config_line_t **next, *line; - tor_assert(sr_disk_state); - tor_assert(sr_state); + if (BUG(!sr_disk_state)) + return; + if (BUG(!sr_state)) + return; /* Reset current disk state. */ disk_state_reset(); @@ -759,7 +761,8 @@ disk_state_save_to_disk(void) STATIC void reset_state_for_new_protocol_run(time_t valid_after) { - tor_assert(sr_state); + if (BUG(!sr_state)) + return; /* Keep counters in track */ sr_state->n_reveal_rounds = 0; @@ -1091,7 +1094,8 @@ sr_state_update(time_t valid_after) { sr_phase_t next_phase; - tor_assert(sr_state); + if (BUG(!sr_state)) + return; /* Don't call this function twice in the same voting period. */ if (valid_after <= sr_state->valid_after) { @@ -1130,7 +1134,8 @@ sr_state_update(time_t valid_after) /* Count the current round */ if (sr_state->phase == SR_PHASE_COMMIT) { /* invariant check: we've not entered reveal phase yet */ - tor_assert(sr_state->n_reveal_rounds == 0); + if (BUG(sr_state->n_reveal_rounds != 0)) + return; sr_state->n_commit_rounds++; } else { sr_state->n_reveal_rounds++; @@ -1320,7 +1325,8 @@ sr_state_init(int save_to_disk, int read_from_disk) void set_sr_phase(sr_phase_t phase) { - tor_assert(sr_state); + if (BUG(!sr_state)) + return; sr_state->phase = phase; }

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 01 Dec '18

01 Dec '18

commit 51d94cea3370c0ddc7c18993f2a81eea11e51e36 Merge: 7e9985b75 1a97379e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Dec 1 11:26:55 2018 -0500 Merge branch 'maint-0.3.5' changes/ticket19566 | 6 ++++++ src/feature/dirauth/shared_random.c | 3 ++- src/feature/dirauth/shared_random_state.c | 18 ++++++++++++------ 3 files changed, 20 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/554' into maint-0.3.5
by nickm＠torproject.org 01 Dec '18

01 Dec '18

commit 1a97379e5e5d349b4debd5ac61bedcca623dd386 Merge: 11a91ef72 d18a167ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Dec 1 11:26:52 2018 -0500 Merge remote-tracking branch 'tor-github/pr/554' into maint-0.3.5 changes/ticket19566 | 6 ++++++ src/feature/dirauth/shared_random.c | 3 ++- src/feature/dirauth/shared_random_state.c | 18 ++++++++++++------ 3 files changed, 20 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 01 Dec '18

01 Dec '18

commit c811ae3bd6ef12b909419ebda1a561995cb561c7 Merge: 6267ea5fb 1a97379e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Dec 1 11:26:55 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket19566 | 6 ++++++ src/feature/dirauth/shared_random.c | 3 ++- src/feature/dirauth/shared_random_state.c | 18 ++++++++++++------ 3 files changed, 20 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/554' into maint-0.3.5
by nickm＠torproject.org 01 Dec '18

01 Dec '18

commit 1a97379e5e5d349b4debd5ac61bedcca623dd386 Merge: 11a91ef72 d18a167ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Dec 1 11:26:52 2018 -0500 Merge remote-tracking branch 'tor-github/pr/554' into maint-0.3.5 changes/ticket19566 | 6 ++++++ src/feature/dirauth/shared_random.c | 3 ++- src/feature/dirauth/shared_random_state.c | 18 ++++++++++++------ 3 files changed, 20 insertions(+), 7 deletions(-)

1 0