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

[tor/master] Merge branch 'ticket32209'
by nickm＠torproject.org 21 Nov '19

21 Nov '19

commit da15448eb873e0787760bd7c7e47a138a1493d1f Merge: d8ff7d023 55fac8daf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 21 08:26:20 2019 -0500 Merge branch 'ticket32209' src/lib/conf/config.md | 126 +++++++++++++++++++++++++++++++++++++++++++++++++ src/mainpage.md | 3 +- 2 files changed, 128 insertions(+), 1 deletion(-)

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 21 Nov '19

21 Nov '19

commit bd6ea511b2cab7a5a3070db085edb7e9514f3b09 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 21 13:16:52 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- ar/messages.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ar/messages.json b/ar/messages.json index 42a4af8a6..77c9d6d91 100644 --- a/ar/messages.json +++ b/ar/messages.json @@ -30,19 +30,19 @@ "message": "ملفات تعريف الارتباط (كوكيز) غير مفعلة." }, "websiteIntro": { - "message": "Snowflake is a system to defeat internet censorship. People who are censored can use Snowflake to access the internet. Their connection goes through Snowflake proxies, which are run by volunteers. For more detailed information about how Snowflake works see our <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">documentation wiki</a>." + "message": "Snowflake هو نظام لهزيمة الرقابة على الانترنت. الأشخاص المراقبين يمكنهم استخدام Snowflake للدخول على الإنترنت. إتصالهم يمر عبر بروكسيهات Snowflake التى يتم تشغيلها عن طريق متطوعين. للمزيد من المعلومات التفصيلية عن طريقة عمل Snowflake اذهب إلى <a href=\"https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\" data-msgid=\"__MSG_docWiki__\">توثيق الويكى</a> الخاص بنا." }, "docWiki": { - "message": "documentation wiki" + "message": "توثيق الويكى" }, "browser": { "message": "المتصفح" }, "censoredUsers": { - "message": "If your internet access is censored, you should download <a href=\"https://www.torproject.org/download/\">Tor Browser</a>." + "message": "اذا كان اتصالك بالانترنت مراقب، فيجب عليك تحميل <a href=\"https://www.torproject.org/download/\">متصفح تور Tor Browser</a>." }, "extension": { - "message": "Extension" + "message": "إضافة" }, "installExtension": { "message": "If your internet access is not censored, you should consider installing the Snowflake extension to help users in censored networks. There is no need to worry about which websites people are accessing through your proxy. Their visible browsing IP address will match their Tor exit node, not yours."

1 0

[metrics-web/master] Remove unnecessary declaration.
by karsten＠torproject.org 21 Nov '19

21 Nov '19

commit b1a6c60a81ab39192cac4841f3fce7cdf82a0568 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Nov 21 13:55:24 2019 +0100 Remove unnecessary declaration. --- src/main/java/org/torproject/metrics/web/NewsServlet.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/main/java/org/torproject/metrics/web/NewsServlet.java b/src/main/java/org/torproject/metrics/web/NewsServlet.java index f47f189..4175659 100644 --- a/src/main/java/org/torproject/metrics/web/NewsServlet.java +++ b/src/main/java/org/torproject/metrics/web/NewsServlet.java @@ -10,9 +10,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.SortedMap; import java.util.TimeZone; -import java.util.TreeMap; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -24,8 +22,6 @@ public class NewsServlet extends AnyServlet { protected List<News> sortedNews; - protected SortedMap<String, String> countries; - @Override public void init() throws ServletException { super.init(); @@ -37,11 +33,6 @@ public class NewsServlet extends AnyServlet { } sortedNews.sort((o1, o2) -> o1.getStart().compareTo(o2.getStart()) * -1); this.sortedNews = sortedNews; - SortedMap<String, String> countries = new TreeMap<>(); - for (String[] country : Countries.getInstance().getCountryList()) { - countries.put(country[0], country[1]); - } - this.countries = countries; } @Override

1 0

[tor/master] Make KeyDirectory's GroupReadable behave the same as CacheDirectory's.
by nickm＠torproject.org 21 Nov '19

21 Nov '19

commit a30d143228b4211fd24093c244117e07e9409de5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 19 11:59:21 2019 -0500 Make KeyDirectory's GroupReadable behave the same as CacheDirectory's. In #26913 we solved a bug where CacheDirectoryGroupReadable would override DataDirectoryGroupReadable when the two directories are the same. We never did the same for KeyDirectory, though, because that's a rare setting. Now that I'm testing this code, though, fixing this issue seems fine. Fixes bug #27992; bugfix on 0.3.3.1-alpha. --- changes/ticket27992 | 5 ++++ doc/tor.1.txt | 8 +++--- src/app/config/config.c | 65 ++++++++++++++++++++++++++++++++------------- src/app/config/config.h | 2 ++ src/test/test_options_act.c | 6 +---- 5 files changed, 59 insertions(+), 27 deletions(-) diff --git a/changes/ticket27992 b/changes/ticket27992 new file mode 100644 index 000000000..9329a7891 --- /dev/null +++ b/changes/ticket27992 @@ -0,0 +1,5 @@ + o Minor bugfixes (configuration): + - When creating a KeyDirectory with the same location as the + DataDirectory (not recommended), respect the DataDirectory's + group-readable setting if one has not been set for the KeyDirectory. + Fixes bug 27992; bugfix on 0.3.3.1-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ed9efb6fc..4cbfa01a0 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2589,10 +2589,12 @@ is non-zero): running. (Default: the "keys" subdirectory of DataDirectory.) -[[KeyDirectoryGroupReadable]] **KeyDirectoryGroupReadable** **0**|**1**:: +[[KeyDirectoryGroupReadable]] **KeyDirectoryGroupReadable** **0**|**1**|**auto**:: If this option is set to 0, don't allow the filesystem group to read the - KeywDirectory. If the option is set to 1, make the KeyDirectory readable - by the default GID. (Default: 0) + KeyDirectory. If the option is set to 1, make the KeyDirectory readable + by the default GID. If the option is "auto", then we use the + setting for DataDirectoryGroupReadable when the KeyDirectory is the + same as the DataDirectory, and 0 otherwise. (Default: auto) [[RephistTrackTime]] **RephistTrackTime** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**:: Tells an authority, or other node tracking node reliability and history, diff --git a/src/app/config/config.c b/src/app/config/config.c index edab684d7..e0a334c79 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -540,7 +540,7 @@ static const config_var_t option_vars_[] = { V(Socks5ProxyUsername, STRING, NULL), V(Socks5ProxyPassword, STRING, NULL), VAR_IMMUTABLE("KeyDirectory", FILENAME, KeyDirectory_option, NULL), - V(KeyDirectoryGroupReadable, BOOL, "0"), + V(KeyDirectoryGroupReadable, AUTOBOOL, "auto"), VAR_D("HSLayer2Nodes", ROUTERSET, HSLayer2Nodes, NULL), VAR_D("HSLayer3Nodes", ROUTERSET, HSLayer3Nodes, NULL), V(KeepalivePeriod, INTERVAL, "5 minutes"), @@ -1516,10 +1516,38 @@ options_switch_id(char **msg_out) } /** + * Helper. Given a data directory (datadir) and another directory + * (subdir) with respective group-writable permissions + * datadir_gr and subdir_gr, compute whether the subdir should + * be group-writeable. + **/ +static int +compute_group_readable_flag(const char *datadir, + const char *subdir, + int datadir_gr, + int subdir_gr) +{ + if (subdir_gr != -1) { + /* The user specified a default for "subdir", so we always obey it. */ + return subdir_gr; + } + + /* The user left the subdir_gr option on "auto." */ + if (0 == strcmp(subdir, datadir)) { + /* The directories are the same, so we use the group-readable flag from + * the datadirectory */ + return datadir_gr; + } else { + /* The directores are different, so we default to "not group-readable" */ + return 0; + } +} + +/** * Create our DataDirectory, CacheDirectory, and KeyDirectory, and * set their permissions correctly. */ -static int +STATIC int options_create_directories(char **msg_out) { const or_options_t *options = get_options(); @@ -1536,30 +1564,29 @@ options_create_directories(char **msg_out) msg_out) < 0) { return -1; } + + /* We need to handle the group-readable flag for the cache directory and key + * directory specially, since they may be the same as the data directory */ + const int key_dir_group_readable = compute_group_readable_flag( + options->DataDirectory, + options->KeyDirectory, + options->DataDirectoryGroupReadable, + options->KeyDirectoryGroupReadable); + if (check_and_create_data_directory(running_tor /* create */, options->KeyDirectory, - options->KeyDirectoryGroupReadable, + key_dir_group_readable, options->User, msg_out) < 0) { return -1; } - /* 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; - } + const int cache_dir_group_readable = compute_group_readable_flag( + options->DataDirectory, + options->CacheDirectory, + options->DataDirectoryGroupReadable, + options->CacheDirectoryGroupReadable); + if (check_and_create_data_directory(running_tor /* create */, options->CacheDirectory, cache_dir_group_readable, diff --git a/src/app/config/config.h b/src/app/config/config.h index 0af96a0c2..c6c03329b 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -303,6 +303,8 @@ STATIC int open_and_add_file_log(const log_severity_list_t *severity, STATIC int options_init_logs(const or_options_t *old_options, const or_options_t *options, int validate_only); +STATIC int options_create_directories(char **msg_out); + #ifdef TOR_UNIT_TESTS int options_validate(const or_options_t *old_options, or_options_t *options, diff --git a/src/test/test_options_act.c b/src/test/test_options_act.c index aaef1d911..abc1c6548 100644 --- a/src/test/test_options_act.c +++ b/src/test/test_options_act.c @@ -109,11 +109,7 @@ test_options_act_create_dirs(void *arg) opts->KeyDirectory = tor_strdup(fn); opts->DataDirectoryGroupReadable = 1; opts->CacheDirectoryGroupReadable = -1; /* default. */ -#if 1 - /* Bug 27992: this setting shouldn't be needed, but for now it is, in the - * unusual case that DataDirectory == KeyDirectory */ - opts->KeyDirectoryGroupReadable = 1; -#endif + opts->KeyDirectoryGroupReadable = -1; /* default */ r = options_create_directories(&msg); tt_int_op(r, OP_EQ, 0); tt_ptr_op(msg, OP_EQ, NULL);

1 0

[tor/master] New unit tests for options_create_directories().
by nickm＠torproject.org 21 Nov '19

21 Nov '19

commit 3094651fa3c71429e8efb0e23087a78addd6728f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 19 11:52:10 2019 -0500 New unit tests for options_create_directories(). --- src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_options_act.c | 181 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 184 insertions(+) diff --git a/src/test/include.am b/src/test/include.am index bd7ab71a2..6697dbb17 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -177,6 +177,7 @@ src_test_test_SOURCES += \ src/test/test_oom.c \ src/test/test_oos.c \ src/test/test_options.c \ + src/test/test_options_act.c \ src/test/test_pem.c \ src/test/test_periodic_event.c \ src/test/test_policy.c \ diff --git a/src/test/test.c b/src/test/test.c index 90c0058be..292082d4f 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -732,6 +732,7 @@ struct testgroup_t testgroups[] = { { "oom/", oom_tests }, { "oos/", oos_tests }, { "options/", options_tests }, + { "options/act/", options_act_tests }, { "parsecommon/", parsecommon_tests }, { "periodic-event/" , periodic_event_tests }, { "policy/" , policy_tests }, diff --git a/src/test/test.h b/src/test/test.h index 967562890..45c22d70f 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -252,6 +252,7 @@ extern struct testcase_t nodelist_tests[]; extern struct testcase_t oom_tests[]; extern struct testcase_t oos_tests[]; extern struct testcase_t options_tests[]; +extern struct testcase_t options_act_tests[]; extern struct testcase_t parsecommon_tests[]; extern struct testcase_t pem_tests[]; extern struct testcase_t periodic_event_tests[]; diff --git a/src/test/test_options_act.c b/src/test/test_options_act.c new file mode 100644 index 000000000..aaef1d911 --- /dev/null +++ b/src/test/test_options_act.c @@ -0,0 +1,181 @@ +/* Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2019, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#define CONFIG_PRIVATE +#include "core/or/or.h" +#include "app/config/config.h" + +#include "test/test.h" +#include "test/log_test_helpers.h" +#include "test/test_helpers.h" + +#ifndef _WIN32 +#include <sys/stat.h> + +/** + * Check whether fname is readable. On success set + * *is_group_readable_out to as appropriate and return 0. On failure + * return -1. + */ +static int +get_file_mode(const char *fname, unsigned *permissions_out) +{ + struct stat st; + int r = stat(fname, &st); + if (r < 0) + return -1; + *permissions_out = (unsigned) st.st_mode; + return 0; +} +#define assert_mode(fn,mask,expected) STMT_BEGIN \ + unsigned mode_; \ + int tmp_ = get_file_mode((fn), &mode_); \ + if (tmp_ < 0) { \ + TT_DIE(("Couldn't stat %s: %s", (fn), strerror(errno))); \ + } \ + if ((mode_ & (mask)) != (expected)) { \ + TT_DIE(("Bad mode %o on %s", mode_, (fn))); \ + } \ + STMT_END +#else +/* "group-readable" isn't meaningful on windows */ +#define assert_mode(fn,mask,expected) STMT_NIL +#endif + +static or_options_t *mock_opts; +static const or_options_t * +mock_get_options(void) +{ + return mock_opts; +} + +static void +test_options_act_create_dirs(void *arg) +{ + (void)arg; + MOCK(get_options, mock_get_options); + char *msg = NULL; + or_options_t *opts = mock_opts = options_new(); + + /* We're testing options_create_directories(), which assumes that + validate_data_directories() has already been called, and all of + KeyDirectory, DataDirectory, and CacheDirectory are set. */ + + /* Success case 1: all directories are the default */ + char *fn; + fn = tor_strdup(get_fname_rnd("ddir")); + opts->DataDirectory = tor_strdup(fn); + opts->CacheDirectory = tor_strdup(fn); + tor_asprintf(&opts->KeyDirectory, "%s/keys", fn); + opts->DataDirectoryGroupReadable = 1; + opts->CacheDirectoryGroupReadable = -1; /* default. */ + int r = options_create_directories(&msg); + tt_int_op(r, OP_EQ, 0); + tt_ptr_op(msg, OP_EQ, NULL); + tt_int_op(FN_DIR, OP_EQ, file_status(opts->DataDirectory)); + tt_int_op(FN_DIR, OP_EQ, file_status(opts->CacheDirectory)); + tt_int_op(FN_DIR, OP_EQ, file_status(opts->KeyDirectory)); + assert_mode(opts->DataDirectory, 0777, 0750); + assert_mode(opts->KeyDirectory, 0777, 0700); + tor_free(fn); + tor_free(opts->KeyDirectory); + or_options_free(opts); + + /* Success case 2: all directories are different. */ + opts = mock_opts = options_new(); + opts->DataDirectory = tor_strdup(get_fname_rnd("ddir")); + opts->CacheDirectory = tor_strdup(get_fname_rnd("cdir")); + opts->KeyDirectory = tor_strdup(get_fname_rnd("kdir")); + opts->CacheDirectoryGroupReadable = 1; // cache directory group readable + r = options_create_directories(&msg); + tt_int_op(r, OP_EQ, 0); + tt_ptr_op(msg, OP_EQ, NULL); + tt_int_op(FN_DIR, OP_EQ, file_status(opts->DataDirectory)); + tt_int_op(FN_DIR, OP_EQ, file_status(opts->CacheDirectory)); + tt_int_op(FN_DIR, OP_EQ, file_status(opts->KeyDirectory)); + assert_mode(opts->DataDirectory, 0777, 0700); + assert_mode(opts->KeyDirectory, 0777, 0700); + assert_mode(opts->CacheDirectory, 0777, 0750); + tor_free(fn); + or_options_free(opts); + + /* Success case 3: all directories are the same. */ + opts = mock_opts = options_new(); + fn = tor_strdup(get_fname_rnd("ddir")); + opts->DataDirectory = tor_strdup(fn); + opts->CacheDirectory = tor_strdup(fn); + opts->KeyDirectory = tor_strdup(fn); + opts->DataDirectoryGroupReadable = 1; + opts->CacheDirectoryGroupReadable = -1; /* default. */ +#if 1 + /* Bug 27992: this setting shouldn't be needed, but for now it is, in the + * unusual case that DataDirectory == KeyDirectory */ + opts->KeyDirectoryGroupReadable = 1; +#endif + r = options_create_directories(&msg); + tt_int_op(r, OP_EQ, 0); + tt_ptr_op(msg, OP_EQ, NULL); + tt_int_op(FN_DIR, OP_EQ, file_status(opts->DataDirectory)); + tt_int_op(FN_DIR, OP_EQ, file_status(opts->CacheDirectory)); + tt_int_op(FN_DIR, OP_EQ, file_status(opts->KeyDirectory)); + assert_mode(opts->DataDirectory, 0777, 0750); + assert_mode(opts->KeyDirectory, 0777, 0750); + assert_mode(opts->CacheDirectory, 0777, 0750); + tor_free(fn); + or_options_free(opts); + + /* Failure case 1: Can't make datadir. */ + opts = mock_opts = options_new(); + opts->DataDirectory = tor_strdup(get_fname_rnd("ddir")); + opts->CacheDirectory = tor_strdup(get_fname_rnd("cdir")); + opts->KeyDirectory = tor_strdup(get_fname_rnd("kdir")); + write_str_to_file(opts->DataDirectory, "foo", 0); + r = options_create_directories(&msg); + tt_int_op(r, OP_LT, 0); + tt_assert(!strcmpstart(msg, "Couldn't create private data directory")); + or_options_free(opts); + tor_free(msg); + + /* Failure case 2: Can't make keydir. */ + opts = mock_opts = options_new(); + opts->DataDirectory = tor_strdup(get_fname_rnd("ddir")); + opts->CacheDirectory = tor_strdup(get_fname_rnd("cdir")); + opts->KeyDirectory = tor_strdup(get_fname_rnd("kdir")); + write_str_to_file(opts->KeyDirectory, "foo", 0); + r = options_create_directories(&msg); + tt_int_op(r, OP_LT, 0); + tt_assert(!strcmpstart(msg, "Couldn't create private data directory")); + or_options_free(opts); + tor_free(msg); + + /* Failure case 3: Can't make cachedir. */ + opts = mock_opts = options_new(); + opts->DataDirectory = tor_strdup(get_fname_rnd("ddir")); + opts->CacheDirectory = tor_strdup(get_fname_rnd("cdir")); + opts->KeyDirectory = tor_strdup(get_fname_rnd("kdir")); + write_str_to_file(opts->CacheDirectory, "foo", 0); + r = options_create_directories(&msg); + tt_int_op(r, OP_LT, 0); + tt_assert(!strcmpstart(msg, "Couldn't create private data directory")); + tor_free(fn); + or_options_free(opts); + tor_free(msg); + + done: + UNMOCK(get_options); + or_options_free(opts); + mock_opts = NULL; + tor_free(fn); + tor_free(msg); +} + +#ifndef COCCI +#define T(name) { #name, test_options_act_##name, TT_FORK, NULL, NULL } +#endif + +struct testcase_t options_act_tests[] = { + T(create_dirs), + END_OF_TESTCASES +};

1 0

[tor/master] Some tests for log changes, commit, and rollback
by nickm＠torproject.org 21 Nov '19

21 Nov '19

commit 89c355b38601e0eda4e999219946bf2431d5de51 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 19 15:45:12 2019 -0500 Some tests for log changes, commit, and rollback --- src/app/config/config.c | 8 ++-- src/app/config/config.h | 6 +++ src/test/test_options_act.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 5 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index e0a334c79..8c5a53209 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -862,8 +862,6 @@ static void options_clear_cb(const config_mgr_t *mgr, void *opts); static setopt_err_t options_validate_and_set(const or_options_t *old_options, or_options_t *new_options, char **msg_out); -struct log_transaction_t; -static void options_rollback_log_transaction(struct log_transaction_t *xn); struct listener_transaction_t; static void options_rollback_listener_transaction( struct listener_transaction_t *xn); @@ -1801,7 +1799,7 @@ typedef struct log_transaction_t { * On failure return NULL and write a message into a newly allocated string in * *msg_out. **/ -static log_transaction_t * +STATIC log_transaction_t * options_start_log_transaction(const or_options_t *old_options, char **msg_out) { @@ -1837,7 +1835,7 @@ options_start_log_transaction(const or_options_t *old_options, * Finish configuring the logs that started to get configured with xn. * Frees xn. **/ -static void +STATIC void options_commit_log_transaction(log_transaction_t *xn) { const or_options_t *options = get_options(); @@ -1891,7 +1889,7 @@ options_commit_log_transaction(log_transaction_t *xn) * Revert the log configuration changes that that started to get configured * with xn. Frees xn. **/ -static void +STATIC void options_rollback_log_transaction(log_transaction_t *xn) { if (!xn) diff --git a/src/app/config/config.h b/src/app/config/config.h index c6c03329b..15c935246 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -304,6 +304,12 @@ STATIC int options_init_logs(const or_options_t *old_options, const or_options_t *options, int validate_only); STATIC int options_create_directories(char **msg_out); +struct log_transaction_t; +STATIC struct log_transaction_t *options_start_log_transaction( + const or_options_t *old_options, + char **msg_out); +STATIC void options_commit_log_transaction(struct log_transaction_t *xn); +STATIC void options_rollback_log_transaction(struct log_transaction_t *xn); #ifdef TOR_UNIT_TESTS int options_validate(const or_options_t *old_options, diff --git a/src/test/test_options_act.c b/src/test/test_options_act.c index abc1c6548..0a9be28c5 100644 --- a/src/test/test_options_act.c +++ b/src/test/test_options_act.c @@ -6,6 +6,7 @@ #define CONFIG_PRIVATE #include "core/or/or.h" #include "app/config/config.h" +#include "lib/encoding/confline.h" #include "test/test.h" #include "test/log_test_helpers.h" @@ -167,11 +168,105 @@ test_options_act_create_dirs(void *arg) tor_free(msg); } +static void +test_options_act_log_transition(void *arg) +{ + (void)arg; + or_options_t *opts = mock_opts = options_new(); + or_options_t *old_opts = NULL; + opts->LogTimeGranularity = 1000; + opts->SafeLogging_ = SAFELOG_SCRUB_ALL; + struct log_transaction_t *lt = NULL; + char *msg = NULL; + MOCK(get_options, mock_get_options); + + tt_ptr_op(opts->Logs, OP_EQ, NULL); + config_line_append(&opts->Logs, "Log", "notice stdout"); + lt = options_start_log_transaction(NULL, &msg); + tt_assert(lt); + tt_assert(!msg); + + // commit, see that there is a change. + options_commit_log_transaction(lt); + lt=NULL; + tt_int_op(get_min_log_level(), OP_EQ, LOG_NOTICE); + + // Now drop to debug. + old_opts = opts; + opts = mock_opts = options_new(); + opts->LogTimeGranularity = 1000; + opts->SafeLogging_ = SAFELOG_SCRUB_ALL; + config_line_append(&opts->Logs, "Log", "debug stdout"); + lt = options_start_log_transaction(old_opts, &msg); + tt_assert(lt); + tt_assert(!msg); + + setup_full_capture_of_logs(LOG_NOTICE); + options_commit_log_transaction(lt); + lt=NULL; + expect_single_log_msg_containing("may contain sensitive information"); + tt_int_op(get_min_log_level(), OP_EQ, LOG_DEBUG); + + // Turn off SafeLogging + or_options_free(old_opts); + mock_clean_saved_logs(); + old_opts = opts; + opts = mock_opts = options_new(); + opts->SafeLogging_ = SAFELOG_SCRUB_NONE; + opts->LogTimeGranularity = 1000; + config_line_append(&opts->Logs, "Log", "debug stdout"); + lt = options_start_log_transaction(old_opts, &msg); + tt_assert(lt); + tt_assert(!msg); + options_commit_log_transaction(lt); + lt=NULL; + expect_single_log_msg_containing("may contain sensitive information"); + tt_int_op(get_min_log_level(), OP_EQ, LOG_DEBUG); + + // Try rolling back. + or_options_free(old_opts); + mock_clean_saved_logs(); + old_opts = opts; + opts = mock_opts = options_new(); + opts->SafeLogging_ = SAFELOG_SCRUB_NONE; + opts->LogTimeGranularity = 1000; + config_line_append(&opts->Logs, "Log", "notice stdout"); + lt = options_start_log_transaction(old_opts, &msg); + tt_assert(lt); + tt_assert(!msg); + options_rollback_log_transaction(lt); + expect_no_log_entry(); + lt = NULL; + tt_int_op(get_min_log_level(), OP_EQ, LOG_DEBUG); + + // Now try some bad options. + or_options_free(opts); + mock_clean_saved_logs(); + opts = mock_opts = options_new(); + opts->LogTimeGranularity = 1000; + config_line_append(&opts->Logs, "Log", "warn blaznert"); + lt = options_start_log_transaction(old_opts, &msg); + tt_assert(!lt); + tt_str_op(msg, OP_EQ, "Failed to init Log options. See logs for details."); + expect_single_log_msg_containing("Couldn't parse"); + tt_int_op(get_min_log_level(), OP_EQ, LOG_DEBUG); + + done: + UNMOCK(get_options); + or_options_free(opts); + or_options_free(old_opts); + tor_free(msg); + if (lt) + options_rollback_log_transaction(lt); + teardown_capture_of_logs(); +} + #ifndef COCCI #define T(name) { #name, test_options_act_##name, TT_FORK, NULL, NULL } #endif struct testcase_t options_act_tests[] = { T(create_dirs), + T(log_transition), END_OF_TESTCASES };

1 0

[tor/master] Typo/grammar fixes.
by nickm＠torproject.org 21 Nov '19

21 Nov '19

commit a3d06179ce8b60ee598fa806354cee497d1840b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 20 09:27:33 2019 -0500 Typo/grammar fixes. --- src/app/config/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 06e45361c..1bd70889c 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -1770,7 +1770,7 @@ options_rollback_listener_transaction(listener_transaction_t *xn) tor_free(xn); } -/** Structure to represent an incompleted configuration of a set of logs. +/** Structure to represent an incomplete configuration of a set of logs. * * This structure is generated by options_start_log_transaction(), and is * either committed by options_commit_log_transaction() or rolled back by @@ -1912,7 +1912,7 @@ options_rollback_log_transaction(log_transaction_t *xn) * * Option changes should only be marked as "reversible" if they cannot * be validated before switching them, but they can be switched back if - * some other validateion fails. + * some other validation fails. * * Return 0 if all goes well, return -1 if things went badly. */

1 0

[tor/master] Merge branch 'reversible_3'
by nickm＠torproject.org 21 Nov '19

21 Nov '19

commit d8ff7d0236d46621822162a2fbd21c8c97b4880a Merge: f23d4df09 b33f3c960 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 21 07:49:18 2019 -0500 Merge branch 'reversible_3' changes/ticket27992 | 5 + doc/tor.1.txt | 8 +- scripts/maint/practracker/exceptions.txt | 2 +- src/app/config/config.c | 656 ++++++++++++++++++++++--------- src/app/config/config.h | 10 +- src/test/conf_examples/controlsock/error | 1 + src/test/conf_examples/controlsock/torrc | 1 + src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_options_act.c | 272 +++++++++++++ 11 files changed, 759 insertions(+), 199 deletions(-)

1 0

[tor/master] log config: Set safelogging_changed even if we aren't running Tor.
by nickm＠torproject.org 21 Nov '19

21 Nov '19

commit acb97cfa689577b9d3a22eab7673bda6e47918f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 20 08:26:37 2019 -0500 log config: Set safelogging_changed even if we aren't running Tor. --- src/app/config/config.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 8c5a53209..06e45361c 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -1808,6 +1808,8 @@ options_start_log_transaction(const or_options_t *old_options, log_transaction_t *xn = tor_malloc_zero(sizeof(log_transaction_t)); xn->old_min_log_level = get_min_log_level(); + xn->safelogging_changed = !old_options || + old_options->SafeLogging_ != options->SafeLogging_; if (! running_tor) goto done; @@ -1822,9 +1824,6 @@ options_start_log_transaction(const or_options_t *old_options, goto done; } - xn->safelogging_changed = !old_options || - old_options->SafeLogging_ != options->SafeLogging_; - xn->logs_initialized = true; done:

1 0

[tor/master] options_act_reversible: add more comments to explain ordering
by nickm＠torproject.org 21 Nov '19

21 Nov '19

commit b33f3c960db2195906eaafa02798ebefa30c2116 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 20 09:49:25 2019 -0500 options_act_reversible: add more comments to explain ordering --- src/app/config/config.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 1bd70889c..5b7b79854 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -1902,8 +1902,10 @@ options_rollback_log_transaction(log_transaction_t *xn) tor_free(xn); } -/** Fetch the active option list, and take actions based on it. All of the - * things we do should survive being done repeatedly. If present, +/** + * Fetch the active option list, and take actions based on it. All of + * the things we do in this function should survive being done + * repeatedly, OR be done only once when starting Tor. If present, * old_options contains the previous value of the options. * * This function is only truly "reversible" _after_ the first time it @@ -1924,9 +1926,19 @@ options_act_reversible,(const or_options_t *old_options, char **msg)) listener_transaction_t *listener_transaction = NULL; int r = -1; + /* The ordering of actions in this function is not free, sadly. + * + * First of all, we _must_ daemonize before we take all kinds of + * initialization actions, since they need to happen in the + * subprocess. + */ if (options_act_once_on_startup(msg) < 0) goto rollback; + /* Once we've handled most of once-off initialization, we need to + * open our listeners before we switch IDs. (If we open listeners first, + * we might not be able to bind to low ports.) + */ listener_transaction = options_start_listener_transaction(old_options, msg); if (listener_transaction == NULL) goto rollback; @@ -1934,7 +1946,13 @@ options_act_reversible,(const or_options_t *old_options, char **msg)) if (first_time) { if (options_switch_id(msg) < 0) goto done; + } + /* On the other hand, we need to touch the file system _after_ we + * switch IDs: otherwise, we'll be making directories and opening files + * with the wrong permissions. + */ + if (first_time) { if (options_create_directories(msg) < 0) goto done; }

1 0