July 2016 - tor-commits - lists.torproject.org

[tor/maint-0.2.8] Repair unit test that assumed we have 9 dirauths.
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit e99cc8740f793ba3796408c6f23bf35f12572193 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:52:19 2016 -0400 Repair unit test that assumed we have 9 dirauths. --- src/test/test_config.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 6d9b491..90ea4da 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -1630,10 +1630,10 @@ test_config_adding_default_trusted_dir_servers(void *arg) tt_assert(get_n_authorities(BRIDGE_DIRINFO) == 1); tt_assert(smartlist_len(router_get_fallback_dir_servers()) == 1); - /* Assume we have nine V3 authorities */ + /* Assume we have eight V3 authorities */ add_default_trusted_dir_authorities(V3_DIRINFO); - tt_assert(get_n_authorities(V3_DIRINFO) == 9); - tt_assert(smartlist_len(router_get_fallback_dir_servers()) == 10); + tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 8); + tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 9); done: clear_dir_servers();

1 0

[tor/release-0.2.8] sandboxing: allow writing to stats/hidserv-stats
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 55d380f3dfbc2e0c1c4aa748e38d73593454069b Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Jul 3 18:03:26 2016 +0200 sandboxing: allow writing to stats/hidserv-stats Our sandboxing code would not allow us to write to stats/hidserv-stats, causing tor to abort while trying to write stats. This was previously masked by bug#19556. --- changes/bug19557 | 4 ++++ src/or/main.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug19557 b/changes/bug19557 new file mode 100644 index 0000000..9036cdc --- /dev/null +++ b/changes/bug19557 @@ -0,0 +1,4 @@ + o Major bugfixes (sandboxing): + - Our sandboxing code would not allow us to write to stats/hidserv-stats, + causing tor to abort while trying to write stats. This was previously + masked by bug 19556. Fixes bug 19557. diff --git a/src/or/main.c b/src/or/main.c index 0562f84..6b5619c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3530,6 +3530,7 @@ sandbox_init_filter(void) OPEN_DATADIR2_SUFFIX("stats", "exit-stats", ".tmp"); OPEN_DATADIR2_SUFFIX("stats", "buffer-stats", ".tmp"); OPEN_DATADIR2_SUFFIX("stats", "conn-stats", ".tmp"); + OPEN_DATADIR2_SUFFIX("stats", "hidserv-stats", ".tmp"); OPEN_DATADIR("approved-routers"); OPEN_DATADIR_SUFFIX("fingerprint", ".tmp");

1 0

[tor/master] Merge remote-tracking branch 'weasel/bug19556' into maint-0.2.8
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 74cbbda86e01a40e5cbf7889d5a5bc3445f68510 Merge: 3f33a5b 51b5d09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:39:40 2016 -0400 Merge remote-tracking branch 'weasel/bug19556' into maint-0.2.8 changes/bug19556 | 7 +++++++ src/or/main.c | 1 + 2 files changed, 8 insertions(+)

1 0

[tor/release-0.2.8] Merge remote-tracking branch 'weasel/bug19556' into maint-0.2.8
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 74cbbda86e01a40e5cbf7889d5a5bc3445f68510 Merge: 3f33a5b 51b5d09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:39:40 2016 -0400 Merge remote-tracking branch 'weasel/bug19556' into maint-0.2.8 changes/bug19556 | 7 +++++++ src/or/main.c | 1 + 2 files changed, 8 insertions(+)

1 0

[tor/master] sandboxing: allow writing to stats/hidserv-stats
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 55d380f3dfbc2e0c1c4aa748e38d73593454069b Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Jul 3 18:03:26 2016 +0200 sandboxing: allow writing to stats/hidserv-stats Our sandboxing code would not allow us to write to stats/hidserv-stats, causing tor to abort while trying to write stats. This was previously masked by bug#19556. --- changes/bug19557 | 4 ++++ src/or/main.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug19557 b/changes/bug19557 new file mode 100644 index 0000000..9036cdc --- /dev/null +++ b/changes/bug19557 @@ -0,0 +1,4 @@ + o Major bugfixes (sandboxing): + - Our sandboxing code would not allow us to write to stats/hidserv-stats, + causing tor to abort while trying to write stats. This was previously + masked by bug 19556. Fixes bug 19557. diff --git a/src/or/main.c b/src/or/main.c index 0562f84..6b5619c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3530,6 +3530,7 @@ sandbox_init_filter(void) OPEN_DATADIR2_SUFFIX("stats", "exit-stats", ".tmp"); OPEN_DATADIR2_SUFFIX("stats", "buffer-stats", ".tmp"); OPEN_DATADIR2_SUFFIX("stats", "conn-stats", ".tmp"); + OPEN_DATADIR2_SUFFIX("stats", "hidserv-stats", ".tmp"); OPEN_DATADIR("approved-routers"); OPEN_DATADIR_SUFFIX("fingerprint", ".tmp");

1 0

[tor/master] sandboxing: allow open() of stats dir
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 2c4e78d95b2bc42c43ba09163e9c2d0744d9ac7b Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Jul 3 17:47:45 2016 +0200 sandboxing: allow open() of stats dir When sandboxing is enabled, we could not write any stats to disk. check_or_create_data_subdir("stats"), which prepares the private stats directory, calls check_private_dir(), which also opens and not just stats() the directory. Therefore, we need to also allow open() for the stats dir in our sandboxing setup. --- changes/bug19556 | 6 ++++++ src/or/main.c | 1 + 2 files changed, 7 insertions(+) diff --git a/changes/bug19556 b/changes/bug19556 new file mode 100644 index 0000000..fb1e601 --- /dev/null +++ b/changes/bug19556 @@ -0,0 +1,6 @@ + o Minor bugfixes (sandboxing): + - When sandboxing is enabled, we could not write any stats to + disk. check_or_create_data_subdir("stats"), which prepares the + private stats directory, calls check_private_dir(), which also + opens and not just stats() the directory. Therefore, we need to + also allow open() for the stats dir in our sandboxing setup. diff --git a/src/or/main.c b/src/or/main.c index f585f0b..0562f84 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3568,6 +3568,7 @@ sandbox_init_filter(void) get_datadir_fname2("keys", "secret_onion_key_ntor.old")); STAT_DATADIR("keys"); + OPEN_DATADIR("stats"); STAT_DATADIR("stats"); STAT_DATADIR2("stats", "dirreq-stats"); }

1 0

[tor/release-0.2.8] Merge remote-tracking branch 'weasel/bug19557' into maint-0.2.8
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 8d25ab6347910784ee100b6b4a784c7a6779277b Merge: 74cbbda 55d380f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:40:25 2016 -0400 Merge remote-tracking branch 'weasel/bug19557' into maint-0.2.8 changes/bug19557 | 4 ++++ src/or/main.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 8cae4abbacbda313081b1a567cb87d74bb9cea82 Merge: f54ffa4 8d25ab6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:43:17 2016 -0400 Merge branch 'maint-0.2.8' changes/asciidoc-UTC | 4 ++++ changes/bug19556 | 7 +++++++ changes/bug19557 | 4 ++++ doc/asciidoc-helper.sh | 2 +- src/or/main.c | 2 ++ 5 files changed, 18 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.8] sandboxing: allow writing to stats/hidserv-stats
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 55d380f3dfbc2e0c1c4aa748e38d73593454069b Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Jul 3 18:03:26 2016 +0200 sandboxing: allow writing to stats/hidserv-stats Our sandboxing code would not allow us to write to stats/hidserv-stats, causing tor to abort while trying to write stats. This was previously masked by bug#19556. --- changes/bug19557 | 4 ++++ src/or/main.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug19557 b/changes/bug19557 new file mode 100644 index 0000000..9036cdc --- /dev/null +++ b/changes/bug19557 @@ -0,0 +1,4 @@ + o Major bugfixes (sandboxing): + - Our sandboxing code would not allow us to write to stats/hidserv-stats, + causing tor to abort while trying to write stats. This was previously + masked by bug 19556. Fixes bug 19557. diff --git a/src/or/main.c b/src/or/main.c index 0562f84..6b5619c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3530,6 +3530,7 @@ sandbox_init_filter(void) OPEN_DATADIR2_SUFFIX("stats", "exit-stats", ".tmp"); OPEN_DATADIR2_SUFFIX("stats", "buffer-stats", ".tmp"); OPEN_DATADIR2_SUFFIX("stats", "conn-stats", ".tmp"); + OPEN_DATADIR2_SUFFIX("stats", "hidserv-stats", ".tmp"); OPEN_DATADIR("approved-routers"); OPEN_DATADIR_SUFFIX("fingerprint", ".tmp");

1 0

[tor/master] Note which bug this fixes in the changes entry
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 51b5d09c9406ad58a2ae45b036c381637379fc0a Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Jul 3 18:04:33 2016 +0200 Note which bug this fixes in the changes entry --- changes/bug19556 | 1 + 1 file changed, 1 insertion(+) diff --git a/changes/bug19556 b/changes/bug19556 index fb1e601..f4ac894 100644 --- a/changes/bug19556 +++ b/changes/bug19556 @@ -4,3 +4,4 @@ private stats directory, calls check_private_dir(), which also opens and not just stats() the directory. Therefore, we need to also allow open() for the stats dir in our sandboxing setup. + Fixes bug 19556.

1 0