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

[tor/master] Merge branch 'ticket25997'
by nickm＠torproject.org 02 May '18

02 May '18

commit eb00eff09defc607f4dc4b6fec7b3c80dc8b439f Merge: 1ef1ed76d e386d61c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 2 16:03:57 2018 -0400 Merge branch 'ticket25997' changes/ticket25997 | 5 +++++ src/test/test_hs_common.c | 13 +++++-------- 2 files changed, 10 insertions(+), 8 deletions(-)

1 0

[tor/master] Make hs_get_responsible_hsdirs() deterministic.
by nickm＠torproject.org 02 May '18

02 May '18

commit e386d61c9be44e82694d523d48591056984bb319 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 2 10:16:23 2018 -0400 Make hs_get_responsible_hsdirs() deterministic. This test was using the current time to pick the time period number, and a randomly generated hs key. Therefore, it sometimes picked an index that would wrap around the example dht, and sometimes would not. The fix here is just to fix the time period and the public key. Fixes bug 25997; bugfix on 0.3.2.1-alpha. --- changes/ticket25997 | 5 +++++ src/test/test_hs_common.c | 13 +++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/changes/ticket25997 b/changes/ticket25997 new file mode 100644 index 000000000..2c802c856 --- /dev/null +++ b/changes/ticket25997 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing, coverage): + - Remove randomness from the hs_common/responsible_hsdirs test, + so that it always takes the same path through the function it tests. + Fixes bug 25997; bugfix on 0.3.2.1-alpha. + diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index dcca5713e..94d3d52e9 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -360,11 +360,8 @@ mock_networkstatus_get_live_consensus(time_t now) static void test_responsible_hsdirs(void *arg) { - time_t now = approx_time(); smartlist_t *responsible_dirs = smartlist_new(); networkstatus_t *ns = NULL; - int retval; - (void) arg; hs_init(); @@ -386,12 +383,12 @@ test_responsible_hsdirs(void *arg) helper_add_hsdir_to_networkstatus(ns, 3, "spyro", 0); } - ed25519_keypair_t kp; - retval = ed25519_keypair_generate(&kp, 0); - tt_int_op(retval, OP_EQ , 0); + /* Use a fixed time period and pub key so we always take the same path */ + ed25519_public_key_t pubkey; + uint64_t time_period_num = 17653; // 2 May, 2018, 14:00. + memset(&pubkey, 42, sizeof(pubkey)); - uint64_t time_period_num = hs_get_time_period_num(now); - hs_get_responsible_hsdirs(&kp.pubkey, time_period_num, + hs_get_responsible_hsdirs(&pubkey, time_period_num, 0, 0, responsible_dirs); /* Make sure that we only found 2 responsible HSDirs.

1 0

[policies/master] Fix a couple of vote counts
by atagar＠torproject.org 02 May '18

02 May '18

commit 4e05a14e2c8955d057a213b2500d8eb6c4d7222e Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 2 12:32:51 2018 -0700 Fix a couple of vote counts Miscounted, correction thanks to Karsten. --- votes/18-05-02_council_membership/summary.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/votes/18-05-02_council_membership/summary.txt b/votes/18-05-02_council_membership/summary.txt index be7926c..52183e6 100644 --- a/votes/18-05-02_council_membership/summary.txt +++ b/votes/18-05-02_council_membership/summary.txt @@ -136,8 +136,8 @@ on the new Community Council. ===================================================================== dgoulet: 38 (79%) -gman999: 27 (56%) -ggus: 25 (52%) +gman999: 28 (58%) +ggus: 24 (50%) juris: 16 (33%) hiro: 42 (88%) catalyst: 23 (48%)

1 0

[policies/master] Recent council membership vote
by atagar＠torproject.org 02 May '18

02 May '18

commit 642c01d9951ed3e95cd1d7ab91d31f31eef963ea Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 2 10:00:26 2018 -0700 Recent council membership vote --- votes/18-05-02_council_membership/summary.txt | 169 ++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) diff --git a/votes/18-05-02_council_membership/summary.txt b/votes/18-05-02_council_membership/summary.txt new file mode 100644 index 0000000..be7926c --- /dev/null +++ b/votes/18-05-02_council_membership/summary.txt @@ -0,0 +1,169 @@ +===================================================================== +Summary +===================================================================== + +Topic: Community Council Membership +Date taken: 17/4/16 - 18/5/2 +Vote count: 48 (of 96, 50%) + +Secretary: Karsten Loesing + +Topic put to a vote were... + + Question 1: List up to five of these individuals you'd like to see + on the new Community Council. + + * David Goulet (dgoulet) + * George Rosamond (gman999) + * Gus (ggus) + * Juris (juris) + * Silvia Puglisi (hiro) + * Taylor Yu (catalyst) + + Question 2: Would you be uncomfortable having any of these people + adjudicate your issues? + +Results were... + + * The next council will be composed of David, George, Gus, Silvia, and + Taylor. + +===================================================================== +Votes +===================================================================== + +Alexander Færøy +Alison Macrina +Allen Gunn +Antonela Debiasi +Arthur D. Edelstein +Arturo Filastò +chelsea komlo +Colin Childs +Damian Johnson +David Goulet +Georg Koppen +George Kadianakis +george +gus +hiro +Ian Goldberg +isabela +isis +Jens Kubieziel +Julius Mittenzwei +juris +kat +Kathleen Brade +Linus Nordberg +Mark Smith +Matthew Finkel +micah +Micah Lee +Nick Mathewson +Nicolas Vigier +Nima Fatemi +Parinishtha Yadav +Paul Syverson +Philipp Winter +Rabbi Rob Thomas +Richard Pospesel +Roger Dingledine +S. Banerian +Sebastian Hahn +Stephanie A. Whited +Steven Murdoch +Sukhbir Singh +Taylor Yu +teor +Tom Ritter +Tommy Collison +Vasilis +Yawning Angel + +1412;dgoulet,gman999,juris,hiro,catalyst;<abstain> +1713;juris,hiro,catalyst;<abstain> +2149;dgoulet,gman999,juris;ggus,catalyst +2372;dgoulet,gman999,ggus,hiro,catalyst;juris +2434;dgoulet,juris,hiro;<abstain> +2871;dgoulet,gman999,hiro,catalyst;juris +3162;dgoulet,gman999,juris,hiro;<abstain> +3865;dgoulet,ggus,hiro;<none> +4288;gman999,hiro;<abstain> +7734;dgoulet,ggus,juris,hiro;<abstain> +8522;dgoulet,ggus,hiro,catalyst;juris +8836;dgoulet,gman999,ggus,hiro;catalyst +9019;dgoulet,gman999,hiro,catalyst;<abstain> +9893;dgoulet,gman999,juris;ggus,hiro,catalyst +10034;<abstain>;<abstain> +10628;dgoulet,hiro;catalyst +10671;dgoulet,gman999,ggus,hiro;<abstain> +10715;ggus,hiro,catalyst;<abstain> +10863;<abstain>;<abstain> +11021;dgoulet,gman999,ggus,juris,hiro;<abstain> +11794;ggus,juris,hiro,catalyst;<abstain> +11993;dgoulet,gman999,ggus,hiro,catalyst;juris +12683;<abstain>;juris +13400;dgoulet,gman999,hiro,catalyst;<abstain> +13870;dgoulet,hiro,catalyst;<abstain> +14713;dgoulet,hiro,catalyst;juris +16888;dgoulet,gman999,ggus,hiro,catalyst;<abstain> +17557;hiro,catalyst,dgoulet,ggus,gman999;<abstain> +17906;dgoulet,hiro,catalyst;juris +21292;hiro,dgoulet;<abstain> +21386;dgoulet,gman999,ggus,juris,hiro;<abstain> +21862;dgoulet,ggus,hiro,catalyst;juris +22010;dgoulet,gman999,ggus,hiro,catalyst;<abstain> +22399;dgoulet,juris,hiro;<abstain> +22453;dgoulet,gman999,ggus,juris,hiro;<abstain> +23113;dgoulet,gman999,ggus,hiro,catalyst;juris +23924;dgoulet,gman999,ggus,hiro;<abstain> +24360;dgoulet,gman999;<abstain> +25072;dgoulet,gman999,ggus,juris,hiro;catalyst +25158;hiro,catalyst;<abstain> +25180;dgoulet,gman999,ggus,hiro;<abstain> +25876;dgoulet,hiro,catalyst;<abstain> +27396;gman999,ggus,juris,hiro,catalyst;dgoulet +27943;dgoulet,juris,hiro;catalyst,george +30151;dgoulet,gman999,ggus,hiro,catalyst;<abstain> +31618;gman999,hiro;<abstain> +31819;dgoulet,gman999,ggus,juris,hiro;catalyst +32262;dgoulet,gman999,ggus,hiro,catalyst;<abstain> + +===================================================================== +Question 1: List up to five of these individuals you'd like to see +on the new Community Council. +===================================================================== + +dgoulet: 38 (79%) +gman999: 27 (56%) +ggus: 25 (52%) +juris: 16 (33%) +hiro: 42 (88%) +catalyst: 23 (48%) + +--------------------------------------------------------------------- +Result: +--------------------------------------------------------------------- + +The next council will be composed of David, George, Gus, Silvia, and +Taylor. + +===================================================================== +Question 2: Would you be uncomfortable having any of these people +adjudicate your issues? +===================================================================== + +dgoulet: 1 (2%) +gman999: 1 (2%) +ggus: 2 (4%) +juris: 9 (19%) +hiro: 1 (2%) +catalyst: 7 (15%) + +--------------------------------------------------------------------- +Result: +--------------------------------------------------------------------- + +Nobody reached 25% so everyone's eligible to be on the council. +

1 0

[tor/master] dirvote: Fix typo in comment
by dgoulet＠torproject.org 02 May '18

02 May '18

commit 1ef1ed76d864b6c3147c0444d9114ebcc53c18b5 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed May 2 09:06:40 2018 -0400 dirvote: Fix typo in comment Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/dirauth/dirvote.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/dirauth/dirvote.c b/src/or/dirauth/dirvote.c index fd629ca6f..66a530b6d 100644 --- a/src/or/dirauth/dirvote.c +++ b/src/or/dirauth/dirvote.c @@ -3972,7 +3972,7 @@ dirvote_clear_commits(networkstatus_t *ns) } } -/* The given url is the /tor/status-gove GET directory request. Populates the +/* The given url is the /tor/status-vote GET directory request. Populates the * items list with strings that we can compress on the fly and dir_items with * cached_dir_t objects that have a precompressed deflated version. */ void

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 02 May '18

02 May '18

commit 246765342e681ae6f8c35709f9acd9a78d7048d2 Merge: 7c3f87eb4 993e314c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 2 08:46:28 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26007 | 5 +++++ src/or/dirserv.c | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 02 May '18

02 May '18

commit c66b512671cf1711c7325db664335f1694bb3109 Merge: b116710e3 246765342 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 2 08:46:28 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26007 | 5 +++++ src/or/dirserv.c | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 02 May '18

02 May '18

commit 8625f36de1085cb24e532adb0bb76d3d2b6b5808 Merge: f26d6ead2 c66b51267 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 2 08:46:28 2018 -0400 Merge branch 'maint-0.3.3' changes/bug26007 | 5 +++++ src/or/dirserv.c | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 02 May '18

02 May '18

commit 993e314c6f08d587480070e9f19d313b81b39a09 Merge: bb35405d2 d465bd27e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 2 08:46:28 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26007 | 5 +++++ src/or/dirserv.c | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.1] Stop logging stack contents when reading a zero-length bandwidth file
by nickm＠torproject.org 02 May '18

02 May '18

commit d465bd27ed79b1924cf893d4e810786a491ee613 Author: teor <teor2345(a)gmail.com> Date: Wed May 2 22:33:21 2018 +1000 Stop logging stack contents when reading a zero-length bandwidth file When directory authorities read a zero-byte bandwidth file, they log a warning with the contents of an uninitialised buffer. Log a warning about the empty file instead. Fixes bug 26007; bugfix on 0.2.2.1-alpha. --- changes/bug26007 | 5 +++++ src/or/dirserv.c | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/changes/bug26007 b/changes/bug26007 new file mode 100644 index 000000000..efcd15084 --- /dev/null +++ b/changes/bug26007 @@ -0,0 +1,5 @@ + o Major bugfixes (directory authorities, security): + - When directory authorities read a zero-byte bandwidth file, they log + a warning with the contents of an uninitialised buffer. Log a warning + about the empty file instead. + Fixes bug 26007; bugfix on 0.2.2.1-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 41c6bf3dc..94290d5dd 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2750,14 +2750,23 @@ dirserv_read_measured_bandwidths(const char *from_file, time_t file_time, now; int ok; + /* Initialise line, so that we can't possibly run off the end. */ + memset(line, 0, sizeof(line)); + if (fp == NULL) { log_warn(LD_CONFIG, "Can't open bandwidth file at configured location: %s", from_file); return -1; } - if (!fgets(line, sizeof(line), fp) - || !strlen(line) || line[strlen(line)-1] != '\n') { + /* If fgets fails, line is either unmodified, or indeterminate. */ + if (!fgets(line, sizeof(line), fp)) { + log_warn(LD_DIRSERV, "Empty bandwidth file"); + fclose(fp); + return -1; + } + + if (!strlen(line) || line[strlen(line)-1] != '\n') { log_warn(LD_DIRSERV, "Long or truncated time in bandwidth file: %s", escaped(line)); fclose(fp);

1 0