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

[tor/release-0.3.3] Make CacheDirectoryGroupReadable an autobool.
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 4fd761a418558c05716b4a04a5306dc67ce53dfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 17 11:36:59 2018 -0400 Make CacheDirectoryGroupReadable an autobool. Since the default cache directory is the same as the default data directory, we don't want the default CacheDirectoryGroupReadable value (0) to override an explicitly set "DataDirectoryGroupReadable 1". To fix this, I'm making CacheDirectoryGroupReadable into an autobool, and having the default (auto) value mean "Use the value of DataDirectoryGroupReadable if the directories are the same, and 0 otherwise." Fixes bug 26913; bugfix on 0.3.3.1-alpha when the CacheDirectory option was introduced. --- changes/ticket26913 | 7 +++++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 21 +++++++++++++++++++-- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/changes/ticket26913 b/changes/ticket26913 new file mode 100644 index 000000000..d6555764e --- /dev/null +++ b/changes/ticket26913 @@ -0,0 +1,7 @@ + o Minor bugfixes (directory permissions): + - When a user requests a group-readable DataDirectory, give it to + them. Previously, when the DataDirectory and the CacheDirectory + were the same, the default setting (0) for + CacheDirectoryGroupReadable would always override the setting for + DataDirectoryGroupReadable. Fixes bug 26913; bugfix on + 0.3.3.1-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f89406180..c089bffbb 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -423,10 +423,12 @@ GENERAL OPTIONS running. (Default: uses the value of DataDirectory.) -[[CacheDirectoryGroupReadable]] **CacheDirectoryGroupReadable** **0**|**1**:: +[[CacheDirectoryGroupReadable]] **CacheDirectoryGroupReadable** **0**|**1**|**auto**:: If this option is set to 0, don't allow the filesystem group to read the CacheDirectory. If the option is set to 1, make the CacheDirectory readable - by the default GID. (Default: 0) + by the default GID. If the option is "auto", then we use the + setting for DataDirectoryGroupReadable when the CacheDirectory is the + same as the DataDirectory, and 0 otherwise. (Default: auto) [[FallbackDir]] **FallbackDir** __ipv4address__:__port__ orport=__port__ id=__fingerprint__ [weight=__num__] [ipv6=**[**__ipv6address__**]**:__orport__]:: When we're unable to connect to any directory cache for directory info diff --git a/src/or/config.c b/src/or/config.c index 58080c65e..e50e6efa2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -259,7 +259,7 @@ static config_var_t option_vars_[] = { V(BridgeRelay, BOOL, "0"), V(BridgeDistribution, STRING, NULL), VAR("CacheDirectory", FILENAME, CacheDirectory_option, NULL), - V(CacheDirectoryGroupReadable, BOOL, "0"), + V(CacheDirectoryGroupReadable, AUTOBOOL, "auto"), V(CellStatistics, BOOL, "0"), V(PaddingStatistics, BOOL, "1"), V(LearnCircuitBuildTimeout, BOOL, "1"), @@ -1516,9 +1516,26 @@ options_act_reversible(const or_options_t *old_options, char **msg) msg) < 0) { goto done; } + + /* We need to handle the group-readable flag for the cache directory + * specially, since the directory defaults to being the same as the + * DataDirectory. */ + int cache_dir_group_readable; + if (options->CacheDirectoryGroupReadable != -1) { + /* If the user specified a value, use their setting */ + cache_dir_group_readable = options->CacheDirectoryGroupReadable; + } else if (!strcmp(options->CacheDirectory, options->DataDirectory)) { + /* If the user left the value as "auto", and the cache is the same as the + * datadirectory, use the datadirectory setting. + */ + cache_dir_group_readable = options->DataDirectoryGroupReadable; + } else { + /* Otherwise, "auto" means "not group readable". */ + cache_dir_group_readable = 0; + } if (check_and_create_data_directory(running_tor /* create */, options->CacheDirectory, - options->CacheDirectoryGroupReadable, + cache_dir_group_readable, options->User, msg) < 0) { goto done;

1 0

[tor/release-0.2.9] Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 8569166c70f99bf908e78ce272e71eb60cdc84d0 Merge: 7f042cbc0 81f422332 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:43:50 2018 -0500 Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9 Resolved conflicts with the 26269 fix in 015fcd0e1191aa6f. changes/bug24104 | 4 ++ src/or/rephist.c | 6 +- src/or/rephist.h | 4 +- src/or/router.c | 25 ++++++-- src/test/include.am | 1 + src/test/log_test_helpers.c | 22 ++++++- src/test/log_test_helpers.h | 7 ++- src/test/test.c | 1 + src/test/test_router.c | 142 ++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 200 insertions(+), 12 deletions(-) diff --cc src/or/router.c index 35b6bd203,f1a99364e..c41647422 --- a/src/or/router.c +++ b/src/or/router.c @@@ -2433,15 -2440,21 +2441,23 @@@ check_descriptor_bandwidth_changed(time { static time_t last_changed = 0; uint64_t prev, cur; + const routerinfo_t *my_ri = router_get_my_routerinfo(); ++ + int hibernating = we_are_hibernating(); + + /* If the relay uptime is bigger than MAX_UPTIME_BANDWIDTH_CHANGE, + * the next regularly scheduled descriptor update (18h) will be enough */ + if (get_uptime() > MAX_UPTIME_BANDWIDTH_CHANGE && !hibernating) + return; + - if (!router_get_my_routerinfo()) + if (!my_ri) /* make sure routerinfo exists */ return; - prev = router_get_my_routerinfo()->bandwidthcapacity; + prev = my_ri->bandwidthcapacity; - cur = we_are_hibernating() ? 0 : rep_hist_bandwidth_assess(); + cur = hibernating ? 0 : rep_hist_bandwidth_assess(); if ((prev != cur && (!prev || !cur)) || - cur > prev*2 || - cur < prev/2) { + cur > (prev * BANDWIDTH_CHANGE_FACTOR) || + cur < (prev / BANDWIDTH_CHANGE_FACTOR) ) { if (last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now || !prev) { log_info(LD_GENERAL, "Measured bandwidth has changed; rebuilding descriptor."); @@@ -3640,4 -3652,4 +3656,3 @@@ router_get_all_orports(const routerinfo fake_node.ri = (routerinfo_t *)ri; return node_get_all_orports(&fake_node); } --

1 0

[tor/release-0.2.9] Test for descriptor does not change when hibernating
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 81f4223329a709e5138532b037a58c118b30dd7f Author: juga0 <juga(a)riseup.net> Date: Mon Jul 2 09:02:32 2018 +0000 Test for descriptor does not change when hibernating --- src/test/test_router.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/test/test_router.c b/src/test/test_router.c index a4921da9b..51055a336 100644 --- a/src/test/test_router.c +++ b/src/test/test_router.c @@ -41,6 +41,12 @@ mock_rep_hist_bandwidth_assess(void) } static int +mock_we_are_not_hibernating(void) +{ + return 0; +} + +static int mock_we_are_hibernating(void) { return 0; @@ -54,7 +60,7 @@ test_router_check_descriptor_bandwidth_changed(void *arg) memset(&routerinfo, 0, sizeof(routerinfo)); mock_router_get_my_routerinfo_result = NULL; - MOCK(we_are_hibernating, mock_we_are_hibernating); + MOCK(we_are_hibernating, mock_we_are_not_hibernating); MOCK(router_get_my_routerinfo, mock_router_get_my_routerinfo); mock_router_get_my_routerinfo_result = &routerinfo; @@ -78,6 +84,21 @@ test_router_check_descriptor_bandwidth_changed(void *arg) "Measured bandwidth has changed; rebuilding descriptor."); teardown_capture_of_logs(); + /* When uptime is less than 24h, previous bandwidth, + * last_changed more than 3h ago, and hibernating + * Uptime: 10800, last_changed: 0, Previous bw: 10000, Current bw: 0 */ + + UNMOCK(we_are_hibernating); + MOCK(we_are_hibernating, mock_we_are_hibernating); + routerinfo.bandwidthcapacity = 10000; + setup_full_capture_of_logs(LOG_INFO); + check_descriptor_bandwidth_changed(time(NULL)); + expect_log_msg_not_containing( + "Measured bandwidth has changed; rebuilding descriptor."); + teardown_capture_of_logs(); + UNMOCK(we_are_hibernating); + MOCK(we_are_hibernating, mock_we_are_not_hibernating); + /* When uptime is less than 24h, last_changed is not more than 3h ago * Uptime: 10800, last_changed: x, Previous bw: 10000, Current bw: 0 */ setup_full_capture_of_logs(LOG_INFO); @@ -103,11 +124,12 @@ test_router_check_descriptor_bandwidth_changed(void *arg) check_descriptor_bandwidth_changed(time(NULL)); expect_log_msg_not_containing( "Measured bandwidth has changed; rebuilding descriptor."); - UNMOCK(get_uptime); teardown_capture_of_logs(); done: + UNMOCK(get_uptime); UNMOCK(router_get_my_routerinfo); + UNMOCK(we_are_hibernating); } #define ROUTER_TEST(name, flags) \

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 63312e0299090bb61de62cd5ed45166a70b7f698 Merge: 1e6ffeaea aebe8a82c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:47:25 2018 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/ticket26913 | 7 +++++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 21 +++++++++++++++++++-- 3 files changed, 30 insertions(+), 4 deletions(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit ea890d7def3c3058f2aad7243118e80b5fa794df Merge: 7651775b8 8569166c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:45:30 2018 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug24104 | 4 ++ src/or/rephist.c | 6 +- src/or/rephist.h | 4 +- src/or/router.c | 25 ++++++-- src/test/include.am | 1 + src/test/log_test_helpers.c | 22 ++++++- src/test/log_test_helpers.h | 7 ++- src/test/test.c | 1 + src/test/test_router.c | 142 ++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 200 insertions(+), 12 deletions(-)

1 0

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

15 Nov '18

commit e8708c2fbdbdcd751de74991f5bd1d15cc296362 Merge: b120d8b83 aebe8a82c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:47:25 2018 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 changes/ticket26913 | 7 +++++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 21 +++++++++++++++++++-- 3 files changed, 30 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.4] Make CacheDirectoryGroupReadable an autobool.
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 4fd761a418558c05716b4a04a5306dc67ce53dfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 17 11:36:59 2018 -0400 Make CacheDirectoryGroupReadable an autobool. Since the default cache directory is the same as the default data directory, we don't want the default CacheDirectoryGroupReadable value (0) to override an explicitly set "DataDirectoryGroupReadable 1". To fix this, I'm making CacheDirectoryGroupReadable into an autobool, and having the default (auto) value mean "Use the value of DataDirectoryGroupReadable if the directories are the same, and 0 otherwise." Fixes bug 26913; bugfix on 0.3.3.1-alpha when the CacheDirectory option was introduced. --- changes/ticket26913 | 7 +++++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 21 +++++++++++++++++++-- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/changes/ticket26913 b/changes/ticket26913 new file mode 100644 index 000000000..d6555764e --- /dev/null +++ b/changes/ticket26913 @@ -0,0 +1,7 @@ + o Minor bugfixes (directory permissions): + - When a user requests a group-readable DataDirectory, give it to + them. Previously, when the DataDirectory and the CacheDirectory + were the same, the default setting (0) for + CacheDirectoryGroupReadable would always override the setting for + DataDirectoryGroupReadable. Fixes bug 26913; bugfix on + 0.3.3.1-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f89406180..c089bffbb 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -423,10 +423,12 @@ GENERAL OPTIONS running. (Default: uses the value of DataDirectory.) -[[CacheDirectoryGroupReadable]] **CacheDirectoryGroupReadable** **0**|**1**:: +[[CacheDirectoryGroupReadable]] **CacheDirectoryGroupReadable** **0**|**1**|**auto**:: If this option is set to 0, don't allow the filesystem group to read the CacheDirectory. If the option is set to 1, make the CacheDirectory readable - by the default GID. (Default: 0) + by the default GID. If the option is "auto", then we use the + setting for DataDirectoryGroupReadable when the CacheDirectory is the + same as the DataDirectory, and 0 otherwise. (Default: auto) [[FallbackDir]] **FallbackDir** __ipv4address__:__port__ orport=__port__ id=__fingerprint__ [weight=__num__] [ipv6=**[**__ipv6address__**]**:__orport__]:: When we're unable to connect to any directory cache for directory info diff --git a/src/or/config.c b/src/or/config.c index 58080c65e..e50e6efa2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -259,7 +259,7 @@ static config_var_t option_vars_[] = { V(BridgeRelay, BOOL, "0"), V(BridgeDistribution, STRING, NULL), VAR("CacheDirectory", FILENAME, CacheDirectory_option, NULL), - V(CacheDirectoryGroupReadable, BOOL, "0"), + V(CacheDirectoryGroupReadable, AUTOBOOL, "auto"), V(CellStatistics, BOOL, "0"), V(PaddingStatistics, BOOL, "1"), V(LearnCircuitBuildTimeout, BOOL, "1"), @@ -1516,9 +1516,26 @@ options_act_reversible(const or_options_t *old_options, char **msg) msg) < 0) { goto done; } + + /* We need to handle the group-readable flag for the cache directory + * specially, since the directory defaults to being the same as the + * DataDirectory. */ + int cache_dir_group_readable; + if (options->CacheDirectoryGroupReadable != -1) { + /* If the user specified a value, use their setting */ + cache_dir_group_readable = options->CacheDirectoryGroupReadable; + } else if (!strcmp(options->CacheDirectory, options->DataDirectory)) { + /* If the user left the value as "auto", and the cache is the same as the + * datadirectory, use the datadirectory setting. + */ + cache_dir_group_readable = options->DataDirectoryGroupReadable; + } else { + /* Otherwise, "auto" means "not group readable". */ + cache_dir_group_readable = 0; + } if (check_and_create_data_directory(running_tor /* create */, options->CacheDirectory, - options->CacheDirectoryGroupReadable, + cache_dir_group_readable, options->User, msg) < 0) { goto done;

1 0

[tor/release-0.3.3] Merge branch 'bug26913_033' into maint-0.3.3
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit aebe8a82c9a1a8ee1df9d1dbb82807d342f49203 Merge: 34e4d5a78 4fd761a41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:47:22 2018 -0500 Merge branch 'bug26913_033' into maint-0.3.3 changes/ticket26913 | 7 +++++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 21 +++++++++++++++++++-- 3 files changed, 30 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'bug26913_033' into maint-0.3.3
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit aebe8a82c9a1a8ee1df9d1dbb82807d342f49203 Merge: 34e4d5a78 4fd761a41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:47:22 2018 -0500 Merge branch 'bug26913_033' into maint-0.3.3 changes/ticket26913 | 7 +++++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 21 +++++++++++++++++++-- 3 files changed, 30 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 15 Nov '18

15 Nov '18

commit 57ff37430385a7f21e04071eb5805b1381ef7a42 Merge: 115fb2a84 63312e029 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 15 16:47:25 2018 -0500 Merge branch 'maint-0.3.4' into release-0.3.4 changes/ticket26913 | 7 +++++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 21 +++++++++++++++++++-- 3 files changed, 30 insertions(+), 4 deletions(-)

1 0