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

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

09 May '18

commit abde29824ceb76bd21e728260796ecb4ff55151a Merge: a639a6784 394f102ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 9 11:53:18 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25761 | 3 +++ src/or/hs_service.c | 5 ----- src/or/rendservice.c | 5 +++-- 3 files changed, 6 insertions(+), 7 deletions(-)

1 0

[tor/master] Detect when v2 services get disabled after HUP.
by nickm＠torproject.org 09 May '18

09 May '18

commit 5dc00c06615ef1e99e1d82dfdf41823c0d4bf7f6 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue May 8 18:07:08 2018 +0300 Detect when v2 services get disabled after HUP. During service configuration, rend_service_prune_list_impl_() sets rend_service_staging_list to NULL, which blocked pruning after a HUP. This patch initializes rend_service_staging_list when needed, so that HUP can detect disabled onion services. Fixes bug #25761. --- src/or/rendservice.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 2c5c5840a..fed8c97eb 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -618,10 +618,11 @@ void rend_service_prune_list(void) { smartlist_t *old_service_list = rend_service_list; - /* Don't try to prune anything if we have no staging list. */ + if (!rend_service_staging_list) { - return; + rend_service_staging_list = smartlist_new(); } + rend_service_prune_list_impl_(); if (old_service_list) { /* Every remaining service in the old list have been removed from the

1 0

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

09 May '18

commit abde29824ceb76bd21e728260796ecb4ff55151a Merge: a639a6784 394f102ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 9 11:53:18 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug25761 | 3 +++ src/or/hs_service.c | 5 ----- src/or/rendservice.c | 5 +++-- 3 files changed, 6 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.2] Detect when v3 services get disabled after HUP.
by nickm＠torproject.org 09 May '18

09 May '18

commit 7e8c5e36622d4581840bb0a037a66d9504c433a5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue May 8 18:14:02 2018 +0300 Detect when v3 services get disabled after HUP. Remove v3 optimization which made Tor not detect disabling services. This optimization is not so needed because we only call that function after HUP anyway. Fixes bug #25761. --- changes/bug25761 | 3 +++ src/or/hs_service.c | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/changes/bug25761 b/changes/bug25761 new file mode 100644 index 000000000..096fadcf0 --- /dev/null +++ b/changes/bug25761 @@ -0,0 +1,3 @@ + o Major bugfixes (onion service): + - Correctly detect when onion services get disabled after HUP. + Fixes bug 25761; bugfix on 0.3.2.1. diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 8ddd68c69..b9a1dfc36 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -859,11 +859,6 @@ register_all_services(void) tor_assert(hs_service_staging_list); - /* We'll save us some allocation and computing time. */ - if (smartlist_len(hs_service_staging_list) == 0) { - return; - } - /* Allocate a new map that will replace the current one. */ new_service_map = tor_malloc_zero(sizeof(*new_service_map)); HT_INIT(hs_service_ht, new_service_map);

1 0

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

09 May '18

commit 61d5ce83a1ecc459798b530730316bfebe3bb192 Merge: 9df20f607 abde29824 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 9 11:53:18 2018 -0400 Merge branch 'maint-0.3.3' changes/bug25761 | 3 +++ src/or/hs_service.c | 5 ----- src/or/rendservice.c | 5 +++-- 3 files changed, 6 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2
by nickm＠torproject.org 09 May '18

09 May '18

commit 394f102ea6b0494cde97769a99d75e91b5743616 Merge: be5b4415c 7e8c5e366 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 9 11:53:15 2018 -0400 Merge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2 changes/bug25761 | 3 +++ src/or/hs_service.c | 5 ----- src/or/rendservice.c | 5 +++-- 3 files changed, 6 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 09 May '18

09 May '18

commit 7e1102ff25ae23d86afe3eacac890eb7743fac16 Merge: a1243864f 394f102ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 9 11:53:18 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25761 | 3 +++ src/or/hs_service.c | 5 ----- src/or/rendservice.c | 5 +++-- 3 files changed, 6 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.3] Detect when v2 services get disabled after HUP.
by nickm＠torproject.org 09 May '18

09 May '18

commit 5dc00c06615ef1e99e1d82dfdf41823c0d4bf7f6 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue May 8 18:07:08 2018 +0300 Detect when v2 services get disabled after HUP. During service configuration, rend_service_prune_list_impl_() sets rend_service_staging_list to NULL, which blocked pruning after a HUP. This patch initializes rend_service_staging_list when needed, so that HUP can detect disabled onion services. Fixes bug #25761. --- src/or/rendservice.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 2c5c5840a..fed8c97eb 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -618,10 +618,11 @@ void rend_service_prune_list(void) { smartlist_t *old_service_list = rend_service_list; - /* Don't try to prune anything if we have no staging list. */ + if (!rend_service_staging_list) { - return; + rend_service_staging_list = smartlist_new(); } + rend_service_prune_list_impl_(); if (old_service_list) { /* Every remaining service in the old list have been removed from the

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2
by nickm＠torproject.org 09 May '18

09 May '18

commit 394f102ea6b0494cde97769a99d75e91b5743616 Merge: be5b4415c 7e8c5e366 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 9 11:53:15 2018 -0400 Merge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2 changes/bug25761 | 3 +++ src/or/hs_service.c | 5 ----- src/or/rendservice.c | 5 +++-- 3 files changed, 6 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.3] Detect when v3 services get disabled after HUP.
by nickm＠torproject.org 09 May '18

09 May '18

commit 7e8c5e36622d4581840bb0a037a66d9504c433a5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue May 8 18:14:02 2018 +0300 Detect when v3 services get disabled after HUP. Remove v3 optimization which made Tor not detect disabling services. This optimization is not so needed because we only call that function after HUP anyway. Fixes bug #25761. --- changes/bug25761 | 3 +++ src/or/hs_service.c | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/changes/bug25761 b/changes/bug25761 new file mode 100644 index 000000000..096fadcf0 --- /dev/null +++ b/changes/bug25761 @@ -0,0 +1,3 @@ + o Major bugfixes (onion service): + - Correctly detect when onion services get disabled after HUP. + Fixes bug 25761; bugfix on 0.3.2.1. diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 8ddd68c69..b9a1dfc36 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -859,11 +859,6 @@ register_all_services(void) tor_assert(hs_service_staging_list); - /* We'll save us some allocation and computing time. */ - if (smartlist_len(hs_service_staging_list) == 0) { - return; - } - /* Allocate a new map that will replace the current one. */ new_service_map = tor_malloc_zero(sizeof(*new_service_map)); HT_INIT(hs_service_ht, new_service_map);

1 0