December 2017 - tor-commits - lists.torproject.org

[tor/master] Add remove file function and remove ephemeral files.
by nickm＠torproject.org 20 Dec '17

20 Dec '17

commit 61c721f1458c9779541aa6e07e5e59404cf31dc4 Author: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> Date: Fri Dec 15 17:01:22 2017 +0100 Add remove file function and remove ephemeral files. Adding tor_remove_file(filename) and refactoring tor_cleanup(). Removing CookieAuthFile and ExtORPortCookieAuthFile when tor_cleanup() is called. Fixes #23271. Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> --- changes/ticket23271 | 6 ++++++ src/or/main.c | 33 ++++++++++++++++++++------------- src/or/main.h | 2 ++ 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/changes/ticket23271 b/changes/ticket23271 new file mode 100644 index 000000000..42d5921a7 --- /dev/null +++ b/changes/ticket23271 @@ -0,0 +1,6 @@ + o Code simplification and refactoring: + - Separate the function that deletes ephemeral files when Tor stops + gracefully. + o Minor features (cleanup): + - Tor now deletes the CookieAuthFile and ExtORPortCookieAuthFile when it + stops. Closes ticket 23271. diff --git a/src/or/main.c b/src/or/main.c index c340e4128..9d9391fc0 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3303,6 +3303,18 @@ tor_free_all(int postfork) } } +/** Remove the specified file. */ +void +tor_remove_file(const char *filename) +{ + if (file_status(filename) == FN_FILE) { + if (tor_unlink(filename) != 0) { + log_warn(LD_FS, "Couldn't unlink %s: %s", + filename, strerror(errno)); + } + } +} + /** Do whatever cleanup is necessary before shutting Tor down. */ void tor_cleanup(void) @@ -3312,19 +3324,14 @@ tor_cleanup(void) time_t now = time(NULL); /* Remove our pid file. We don't care if there was an error when we * unlink, nothing we could do about it anyways. */ - if (options->PidFile) { - if (unlink(options->PidFile) != 0) { - log_warn(LD_FS, "Couldn't unlink pid file %s: %s", - options->PidFile, strerror(errno)); - } - } - if (options->ControlPortWriteToFile) { - if (unlink(options->ControlPortWriteToFile) != 0) { - log_warn(LD_FS, "Couldn't unlink control port file %s: %s", - options->ControlPortWriteToFile, - strerror(errno)); - } - } + tor_remove_file(options->PidFile); + /* Remove control port file */ + tor_remove_file(options->ControlPortWriteToFile); + /* Remove cookie authentication file */ + tor_remove_file(get_controller_cookie_file_name()); + /* Remove Extended ORPort cookie authentication file */ + tor_remove_file(get_ext_or_auth_cookie_file_name()); + if (accounting_is_enabled(options)) accounting_record_bandwidth_usage(now, get_or_state()); or_state_mark_dirty(get_or_state(), 0); /* force an immediate save. */ diff --git a/src/or/main.h b/src/or/main.h index 132ab12bb..d05800f93 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -71,6 +71,8 @@ int try_locking(const or_options_t *options, int err_if_locked); int have_lockfile(void); void release_lockfile(void); +void tor_remove_file(const char *filename); + void tor_cleanup(void); void tor_free_all(int postfork);

1 0

[tor/master] expand documentation on tor_remove_file
by nickm＠torproject.org 20 Dec '17

20 Dec '17

commit c99ec36defadf763034b82107f6168987668862f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 20 10:43:27 2017 -0500 expand documentation on tor_remove_file --- src/or/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c index f4050d3a5..2c8dfae2f 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3397,7 +3397,10 @@ tor_free_all(int postfork) } } -/** Remove the specified file. */ +/** + * Remove the specified file, and log a warning if the operation fails for + * any reason other than the file not existing. + */ void tor_remove_file(const char *filename) {

1 0

[tor/master] Merge remote-tracking branch 'ffmancera/github/bug23271'
by nickm＠torproject.org 20 Dec '17

20 Dec '17

commit 18543c2c9b7b2a2b23b25b2e64262d60a5c448c5 Merge: 3bc580633 61c721f14 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 20 10:40:32 2017 -0500 Merge remote-tracking branch 'ffmancera/github/bug23271' changes/ticket23271 | 6 ++++++ src/or/main.c | 33 ++++++++++++++++++++------------- src/or/main.h | 2 ++ 3 files changed, 28 insertions(+), 13 deletions(-)

1 0

[tor/master] Remove pre-unlink check tor_remove_file; check errno instead.
by nickm＠torproject.org 20 Dec '17

20 Dec '17

commit 4b7b305bf0513a9b010ab0fc75060dce8d29206a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 20 10:42:02 2017 -0500 Remove pre-unlink check tor_remove_file; check errno instead. This removes a time-of-check/time-of-use issue, though in this case it would probably be harmless. --- src/or/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index e66167fe4..f4050d3a5 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3401,11 +3401,9 @@ tor_free_all(int postfork) void tor_remove_file(const char *filename) { - if (file_status(filename) == FN_FILE) { - if (tor_unlink(filename) != 0) { - log_warn(LD_FS, "Couldn't unlink %s: %s", + if (tor_unlink(filename) != 0 && errno != ENOENT) { + log_warn(LD_FS, "Couldn't unlink %s: %s", filename, strerror(errno)); - } } }

1 0

[metrics-web/master] Update Onionoo specification for version 5.0.
by karsten＠torproject.org 20 Dec '17

20 Dec '17

commit ca85dbd8cc479556ae56a420e213619468933443 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 20 11:36:56 2017 +0100 Update Onionoo specification for version 5.0. --- src/main/resources/web/jsps/onionoo.jsp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/resources/web/jsps/onionoo.jsp b/src/main/resources/web/jsps/onionoo.jsp index 8f9bfad..b31b469 100644 --- a/src/main/resources/web/jsps/onionoo.jsp +++ b/src/main/resources/web/jsps/onionoo.jsp @@ -292,9 +292,8 @@ Extended the "version" parameter to bridges, added a 28, 2017. <a href="#versions_4_4" class="anchor">#</a></li> <li><a id="versions_5_0"></a>5.0 -(scheduled, but not deployed yet!): Remove $ from fingerprints in -"effective_family", "alleged_family", and "indirect_family" fields, to -be deployed after December 17, 2017. +Removed the $ from fingerprints in fields "effective_family", "alleged_family", +and "indirect_family" on December 20, 2017. <a href="#versions_5_0" class="anchor">#</a></li> </ul> @@ -1496,8 +1495,7 @@ These relays are part of this relay's family and they consider this relay to be part of their family. Omitted if empty or if descriptor containing this information cannot be found. -Protocol version 5.0 is going to -remove the $ prefix from fingerprints, to be deployed after December 17, +Removed the $ prefix from fingerprintson December 20, 2017. </li> @@ -1515,8 +1513,7 @@ These relays are part of this relay's family but they don't consider this relay to be part of their family. Omitted if empty or if descriptor containing this information cannot be found. -Protocol version 5.0 is going to -remove the $ prefix from fingerprints, to be deployed after December 17, +Removed the $ prefix from fingerprintson December 20, 2017. </li> @@ -1533,8 +1530,7 @@ mutual family relationship with this relay but that can be reached by following effective, mutual family relationships starting at this relay. Omitted if empty or if descriptor containing this information cannot be found. -Protocol version 5.0 is going to -remove the $ prefix from fingerprints, to be deployed after December 17, +Removed the $ prefix from fingerprintson December 20, 2017. </li>

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 20 Dec '17

20 Dec '17

commit 3bc580633968ab38ddecb86c866bf95d116afccb Merge: 8e5450b75 0a1b1430c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 20 10:39:38 2017 -0500 Merge branch 'maint-0.3.2' src/test/test_hs_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 20 Dec '17

20 Dec '17

commit 2824413f40e20bb1c02eb6e180208eca203645f3 Merge: 64c88c719 0a1b1430c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 20 10:39:38 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/test/test_hs_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/master] Update the unit tests to reflect the change of 24425
by nickm＠torproject.org 20 Dec '17

20 Dec '17

commit 0a1b1430c87824d5f5922827b6ca770a43e709ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 20 10:39:19 2017 -0500 Update the unit tests to reflect the change of 24425 --- src/test/test_hs_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index b435a93e3..b9b76d15b 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -1053,7 +1053,7 @@ are_responsible_hsdirs_equal(void) { int count = 0; tt_int_op(smartlist_len(client_responsible_hsdirs), OP_EQ, 6); - tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 6); + tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 8); SMARTLIST_FOREACH_BEGIN(client_responsible_hsdirs, const routerstatus_t *, c_rs) { @@ -1415,7 +1415,7 @@ run_reachability_scenario(const reachability_cfg_t *cfg, int num_scenario) cfg->client_fetch_next_desc, 0, service_responsible_hsdirs); cleanup_nodelist(); - tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 6); + tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 8); UNMOCK(networkstatus_get_latest_consensus); UNMOCK(networkstatus_get_live_consensus); @@ -1605,7 +1605,7 @@ helper_test_hsdir_sync(networkstatus_t *ns, /* Cleanup right now so we don't memleak on error. */ cleanup_nodelist(); /* Check that previous hsdirs were populated */ - tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 6); + tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 8); /* 3) Initialize client time */ helper_set_consensus_and_system_time(ns, client_position);

1 0

[tor/release-0.3.2] Update the unit tests to reflect the change of 24425
by nickm＠torproject.org 20 Dec '17

20 Dec '17

commit 0a1b1430c87824d5f5922827b6ca770a43e709ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 20 10:39:19 2017 -0500 Update the unit tests to reflect the change of 24425 --- src/test/test_hs_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index b435a93e3..b9b76d15b 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -1053,7 +1053,7 @@ are_responsible_hsdirs_equal(void) { int count = 0; tt_int_op(smartlist_len(client_responsible_hsdirs), OP_EQ, 6); - tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 6); + tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 8); SMARTLIST_FOREACH_BEGIN(client_responsible_hsdirs, const routerstatus_t *, c_rs) { @@ -1415,7 +1415,7 @@ run_reachability_scenario(const reachability_cfg_t *cfg, int num_scenario) cfg->client_fetch_next_desc, 0, service_responsible_hsdirs); cleanup_nodelist(); - tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 6); + tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 8); UNMOCK(networkstatus_get_latest_consensus); UNMOCK(networkstatus_get_live_consensus); @@ -1605,7 +1605,7 @@ helper_test_hsdir_sync(networkstatus_t *ns, /* Cleanup right now so we don't memleak on error. */ cleanup_nodelist(); /* Check that previous hsdirs were populated */ - tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 6); + tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 8); /* 3) Initialize client time */ helper_set_consensus_and_system_time(ns, client_position);

1 0

[tor/maint-0.3.2] Update the unit tests to reflect the change of 24425
by nickm＠torproject.org 20 Dec '17

20 Dec '17

commit 0a1b1430c87824d5f5922827b6ca770a43e709ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 20 10:39:19 2017 -0500 Update the unit tests to reflect the change of 24425 --- src/test/test_hs_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index b435a93e3..b9b76d15b 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -1053,7 +1053,7 @@ are_responsible_hsdirs_equal(void) { int count = 0; tt_int_op(smartlist_len(client_responsible_hsdirs), OP_EQ, 6); - tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 6); + tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 8); SMARTLIST_FOREACH_BEGIN(client_responsible_hsdirs, const routerstatus_t *, c_rs) { @@ -1415,7 +1415,7 @@ run_reachability_scenario(const reachability_cfg_t *cfg, int num_scenario) cfg->client_fetch_next_desc, 0, service_responsible_hsdirs); cleanup_nodelist(); - tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 6); + tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 8); UNMOCK(networkstatus_get_latest_consensus); UNMOCK(networkstatus_get_live_consensus); @@ -1605,7 +1605,7 @@ helper_test_hsdir_sync(networkstatus_t *ns, /* Cleanup right now so we don't memleak on error. */ cleanup_nodelist(); /* Check that previous hsdirs were populated */ - tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 6); + tt_int_op(smartlist_len(desc->previous_hsdirs), OP_EQ, 8); /* 3) Initialize client time */ helper_set_consensus_and_system_time(ns, client_position);

1 0