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

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

20 Mar '18

commit 2c36a02bb148e7331675f65628939dec448a8db1 Merge: cae7387ef b06997914 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 20 12:55:46 2018 -0400 Merge branch 'maint-0.3.3' changes/bug25306 | 6 ++++++ src/or/hs_service.c | 32 ++++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.3.3] Merge branch 'bug25306_032_01_squashed_v2' into maint-0.3.3
by nickm＠torproject.org 20 Mar '18

20 Mar '18

commit b06997914207c7877f09736bebb9e500019a0555 Merge: 74c767af2 5804ccc90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 20 12:54:51 2018 -0400 Merge branch 'bug25306_032_01_squashed_v2' into maint-0.3.3 changes/bug25306 | 6 ++++++ src/or/hs_service.c | 32 ++++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-)

1 0

[tor/master] hs-v3: BUG() on missing descriptors during rotation
by nickm＠torproject.org 20 Mar '18

20 Mar '18

commit 5804ccc9070dc5443f1c6ce565dbf17572812764 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Feb 26 10:45:58 2018 -0500 hs-v3: BUG() on missing descriptors during rotation Because of #25306 for which we are unable to reproduce nor understand how it is possible, this commit removes the asserts() and BUG() on the missing descriptors instead when rotating them. This allows us to log more data on error but also to let tor recover gracefully instead of dying. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug25306 | 6 ++++++ src/or/hs_service.c | 32 ++++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/changes/bug25306 b/changes/bug25306 new file mode 100644 index 000000000..a2e6306f4 --- /dev/null +++ b/changes/bug25306 @@ -0,0 +1,6 @@ + o Minor bugfixes (hidden service v3): + - Avoid asserting when building descriptors in the next rotation time is + out of sync with the consensus valid after time. Instead, log a bug + warning with extra information to hunt down the cause of this assert. + Fixes bug 25306; bugfix on 0.3.2.1-alpha. + diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 45810c5c5..b6338ae6b 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -1508,7 +1508,9 @@ build_all_descriptors(time_t now) * empty, we'll try to build it for the next time period. This only * happens when we rotate meaning that we are guaranteed to have a new SRV * at that point for the next time period. */ - tor_assert(service->desc_current); + if (BUG(service->desc_current == NULL)) { + continue; + } if (service->desc_next == NULL) { build_service_descriptor(service, now, hs_get_next_time_period_num(0), @@ -1925,6 +1927,31 @@ should_rotate_descriptors(hs_service_t *service, time_t now) } if (ns->valid_after >= service->state.next_rotation_time) { + /* In theory, we should never get here with no descriptors. We can never + * have a NULL current descriptor except when tor starts up. The next + * descriptor can be NULL after a rotation but we build a new one right + * after. + * + * So, when tor starts, the next rotation time is set to the start of the + * next SRV period using the consensus valid after time so it should + * always be set to a future time value. This means that we should never + * reach this point at bootup that is this check safeguards tor in never + * allowing a rotation if the valid after time is smaller than the next + * rotation time. + * + * This is all good in theory but we've had a NULL descriptor issue here + * so this is why we BUG() on both with extra logging to try to understand + * how this can possibly happens. We'll simply ignore and tor should + * recover from this by skipping rotation and building the missing + * descriptors just after this. */ + if (BUG(service->desc_current == NULL || service->desc_next == NULL)) { + log_warn(LD_BUG, "Service descriptor is NULL (%p/%p). Next rotation " + "time is %ld (now: %ld). Valid after time from " + "consensus is %ld", + service->desc_current, service->desc_next, + service->state.next_rotation_time, now, ns->valid_after); + goto no_rotation; + } goto rotation; } @@ -1977,9 +2004,6 @@ rotate_all_descriptors(time_t now) continue; } - tor_assert(service->desc_current); - tor_assert(service->desc_next); - log_info(LD_REND, "Time to rotate our descriptors (%p / %p) for %s", service->desc_current, service->desc_next, safe_str_client(service->onion_address));

1 0

[tor/master] Merge branch 'bug25306_032_01_squashed_v2' into maint-0.3.3
by nickm＠torproject.org 20 Mar '18

20 Mar '18

commit b06997914207c7877f09736bebb9e500019a0555 Merge: 74c767af2 5804ccc90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 20 12:54:51 2018 -0400 Merge branch 'bug25306_032_01_squashed_v2' into maint-0.3.3 changes/bug25306 | 6 ++++++ src/or/hs_service.c | 32 ++++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.3] hs-v3: BUG() on missing descriptors during rotation
by nickm＠torproject.org 20 Mar '18

20 Mar '18

commit 5804ccc9070dc5443f1c6ce565dbf17572812764 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Feb 26 10:45:58 2018 -0500 hs-v3: BUG() on missing descriptors during rotation Because of #25306 for which we are unable to reproduce nor understand how it is possible, this commit removes the asserts() and BUG() on the missing descriptors instead when rotating them. This allows us to log more data on error but also to let tor recover gracefully instead of dying. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug25306 | 6 ++++++ src/or/hs_service.c | 32 ++++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/changes/bug25306 b/changes/bug25306 new file mode 100644 index 000000000..a2e6306f4 --- /dev/null +++ b/changes/bug25306 @@ -0,0 +1,6 @@ + o Minor bugfixes (hidden service v3): + - Avoid asserting when building descriptors in the next rotation time is + out of sync with the consensus valid after time. Instead, log a bug + warning with extra information to hunt down the cause of this assert. + Fixes bug 25306; bugfix on 0.3.2.1-alpha. + diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 45810c5c5..b6338ae6b 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -1508,7 +1508,9 @@ build_all_descriptors(time_t now) * empty, we'll try to build it for the next time period. This only * happens when we rotate meaning that we are guaranteed to have a new SRV * at that point for the next time period. */ - tor_assert(service->desc_current); + if (BUG(service->desc_current == NULL)) { + continue; + } if (service->desc_next == NULL) { build_service_descriptor(service, now, hs_get_next_time_period_num(0), @@ -1925,6 +1927,31 @@ should_rotate_descriptors(hs_service_t *service, time_t now) } if (ns->valid_after >= service->state.next_rotation_time) { + /* In theory, we should never get here with no descriptors. We can never + * have a NULL current descriptor except when tor starts up. The next + * descriptor can be NULL after a rotation but we build a new one right + * after. + * + * So, when tor starts, the next rotation time is set to the start of the + * next SRV period using the consensus valid after time so it should + * always be set to a future time value. This means that we should never + * reach this point at bootup that is this check safeguards tor in never + * allowing a rotation if the valid after time is smaller than the next + * rotation time. + * + * This is all good in theory but we've had a NULL descriptor issue here + * so this is why we BUG() on both with extra logging to try to understand + * how this can possibly happens. We'll simply ignore and tor should + * recover from this by skipping rotation and building the missing + * descriptors just after this. */ + if (BUG(service->desc_current == NULL || service->desc_next == NULL)) { + log_warn(LD_BUG, "Service descriptor is NULL (%p/%p). Next rotation " + "time is %ld (now: %ld). Valid after time from " + "consensus is %ld", + service->desc_current, service->desc_next, + service->state.next_rotation_time, now, ns->valid_after); + goto no_rotation; + } goto rotation; } @@ -1977,9 +2004,6 @@ rotate_all_descriptors(time_t now) continue; } - tor_assert(service->desc_current); - tor_assert(service->desc_next); - log_info(LD_REND, "Time to rotate our descriptors (%p / %p) for %s", service->desc_current, service->desc_next, safe_str_client(service->onion_address));

1 0

[tor/release-0.3.3] Merge branch 'bug25306_032_01_squashed_v2' into maint-0.3.3
by nickm＠torproject.org 20 Mar '18

20 Mar '18

commit b06997914207c7877f09736bebb9e500019a0555 Merge: 74c767af2 5804ccc90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 20 12:54:51 2018 -0400 Merge branch 'bug25306_032_01_squashed_v2' into maint-0.3.3 changes/bug25306 | 6 ++++++ src/or/hs_service.c | 32 ++++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 20 Mar '18

20 Mar '18

commit 5b32475fb0ee8c51cd5a032facbeec6c01434203 Merge: 0aff795b7 b06997914 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 20 12:55:46 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25306 | 6 ++++++ src/or/hs_service.c | 32 ++++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-)

1 0

[webwml/master] Fix community liaison job post
by hiro＠torproject.org 20 Mar '18

20 Mar '18

commit ea56810d9392bf0376e0c49f74de7e83d04f0ea4 Author: hiro <hiro(a)torproject.org> Date: Tue Mar 20 14:55:14 2018 +0100 Fix community liaison job post --- about/en/jobs-communityliaison.wml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/about/en/jobs-communityliaison.wml b/about/en/jobs-communityliaison.wml index 09b2396d..b36a59c6 100644 --- a/about/en/jobs-communityliaison.wml +++ b/about/en/jobs-communityliaison.wml @@ -28,6 +28,5 @@ </ul> The Tor Project, Inc., is a 501(c)(3) organization headquartered in Seattle that provides the technical infrastructure for privacy protection over the Internet, helping millions of activists, journalists and others around the world communicate securely. With paid staff and contractors of around 35 engineers and operational support people, plus many volunteers all over the world who contribute to our work, the Tor Project is funded in part by government grants and contracts, as well as by individual, foundation, and corporate donations. Our mission is “To advance human rights and freedoms by creating and deploying free and open anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.” Salary is commensurate with experience and other qualifications. The Tor Project has a competitive benefits package, including a generous PTO policy; 14 paid holidays per year (including the week between Christmas and New Year's, when the office is closed); health, vision, dental, disability, and life insurance paid in full for employee; flexible work schedule; and occasional travel opportunities. The Tor Project, Inc., is an equal opportunity, affirmative action employer. - This is a part-time position working remotely. To apply, send a cover letter explaining why you believe you should be our Community Liaison, along with your resume, to hr(a)torproject.org with “Community Liaison” in the subject line. No phone calls please! - + This is a full-time position working remotely. To apply, send a cover letter explaining why you believe you should be our Community Liaison, along with your resume, to hr(a)torproject.org with “Community Liaison” in the subject line. No phone calls please!

1 0

[tor/maint-0.3.3] Note that we require latest stable rust.
by nickm＠torproject.org 20 Mar '18

20 Mar '18

commit 74c767af29e793749e697eba8a206850b156521e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 20 07:58:29 2018 -0400 Note that we require latest stable rust. --- doc/HACKING/CodingStandardsRust.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/HACKING/CodingStandardsRust.md b/doc/HACKING/CodingStandardsRust.md index d0b17c160..ad8cd9d04 100644 --- a/doc/HACKING/CodingStandardsRust.md +++ b/doc/HACKING/CodingStandardsRust.md @@ -54,13 +54,17 @@ If you have any external modules as dependencies (e.g. `extern crate libc;`), you MUST declare them in your crate's `lib.rs` and NOT in any other module. - Dependencies --------------- + Dependencies and versions +--------------------------- In general, we use modules from only the Rust standard library whenever possible. We will review including external crates on a case-by-case basis. +Currently, Tor requires that you use the latest stable Rust version. At +some point in the future, we will freeze on a given stable Rust version, +to ensure backward compatibility with stable distributions that ship it. + Documentation ---------------

1 0

[tor/master] Note that we require latest stable rust.
by nickm＠torproject.org 20 Mar '18

20 Mar '18

commit 74c767af29e793749e697eba8a206850b156521e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 20 07:58:29 2018 -0400 Note that we require latest stable rust. --- doc/HACKING/CodingStandardsRust.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/HACKING/CodingStandardsRust.md b/doc/HACKING/CodingStandardsRust.md index d0b17c160..ad8cd9d04 100644 --- a/doc/HACKING/CodingStandardsRust.md +++ b/doc/HACKING/CodingStandardsRust.md @@ -54,13 +54,17 @@ If you have any external modules as dependencies (e.g. `extern crate libc;`), you MUST declare them in your crate's `lib.rs` and NOT in any other module. - Dependencies --------------- + Dependencies and versions +--------------------------- In general, we use modules from only the Rust standard library whenever possible. We will review including external crates on a case-by-case basis. +Currently, Tor requires that you use the latest stable Rust version. At +some point in the future, we will freeze on a given stable Rust version, +to ensure backward compatibility with stable distributions that ship it. + Documentation ---------------

1 0