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

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/387' into maint-0.4.5
by nickm＠torproject.org 17 May '21

17 May '21

commit 97b61e21a9a713ecd672ff106428286238ae05e4 Merge: 5f009a59da e0a8454691 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 17 09:09:42 2021 -0400 Merge remote-tracking branch 'tor-gitlab/mr/387' into maint-0.4.5 changes/bug40317 | 5 +++++ src/app/config/config.c | 17 +++++++++-------- src/app/config/config.h | 3 +++ src/app/main/main.c | 22 +++++++++++++++++----- 4 files changed, 34 insertions(+), 13 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 17 May '21

17 May '21

commit debede5e501667bc20666e3c2f5d62d7bc888c8b Merge: fbd47a5078 97b61e21a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 17 09:09:49 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/bug40317 | 5 +++++ src/app/config/config.c | 17 +++++++++-------- src/app/config/config.h | 3 +++ src/app/main/main.c | 22 +++++++++++++++++----- 4 files changed, 34 insertions(+), 13 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.6'
by nickm＠torproject.org 17 May '21

17 May '21

commit e247aab4eceeb3920f1667bf5a11d5bc83b950cc Merge: 11ac256a44 debede5e50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 17 09:09:49 2021 -0400 Merge branch 'maint-0.4.6'

1 0

[tor/master] Make SAVECONF keep only one backup and add sandbox rules for it. #40317
by nickm＠torproject.org 17 May '21

17 May '21

commit e0a84546916bdf1ffb3058970eee5011484980f5 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Wed Apr 7 23:46:59 2021 +0100 Make SAVECONF keep only one backup and add sandbox rules for it. #40317 When seccomp sandbox is active, SAVECONF failed because it was not able to save the backup files for torrc. This commit simplifies the implementation of SAVECONF and sandbox by making it keep only one backup of the configuration file. --- changes/bug40317 | 5 +++++ src/app/config/config.c | 17 +++++++++-------- src/app/config/config.h | 3 +++ src/app/main/main.c | 22 +++++++++++++++++----- 4 files changed, 34 insertions(+), 13 deletions(-) diff --git a/changes/bug40317 b/changes/bug40317 new file mode 100644 index 0000000000..18ec499a51 --- /dev/null +++ b/changes/bug40317 @@ -0,0 +1,5 @@ + o Minor bugfixes (control, sandbox): + - Allows the control command SAVECONF to succeed when the seccomp + sandbox is enabled. Makes SAVECONF keep only one backup file to + simplify implementation. Fixes bug 40317; bugfix on 0.2.5.4-alpha. + Patch by Daniel Pinto. diff --git a/src/app/config/config.c b/src/app/config/config.c index fa74907b3d..abc64ee92d 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -6827,7 +6827,7 @@ validate_data_directories(or_options_t *options) /** This string can change; it tries to give the reader an idea * that editing this file by hand is not a good plan. */ #define GENERATED_FILE_COMMENT "# The old torrc file was renamed " \ - "to torrc.orig.1 or similar, and Tor will ignore it" + "to torrc.orig.1, and Tor will ignore it" /** Save a configuration file for the configuration in <b>options</b> * into the file <b>fname</b>. If the file already exists, and @@ -6871,17 +6871,18 @@ write_configuration_file(const char *fname, const or_options_t *options) GENERATED_FILE_PREFIX, GENERATED_FILE_COMMENT, new_conf); if (rename_old) { - int i = 1; char *fn_tmp = NULL; - while (1) { - tor_asprintf(&fn_tmp, "%s.orig.%d", fname, i); - if (file_status(fn_tmp) == FN_NOENT) - break; + tor_asprintf(&fn_tmp, CONFIG_BACKUP_PATTERN, fname); + file_status_t fn_tmp_status = file_status(fn_tmp); + if (fn_tmp_status == FN_DIR || fn_tmp_status == FN_ERROR) { + log_warn(LD_CONFIG, + "Config backup file \"%s\" is not a file? Failing.", fn_tmp); tor_free(fn_tmp); - ++i; + goto err; } + log_notice(LD_CONFIG, "Renaming old configuration file to \"%s\"", fn_tmp); - if (tor_rename(fname, fn_tmp) < 0) {//XXXX sandbox doesn't allow + if (replace_file(fname, fn_tmp) < 0) { log_warn(LD_FS, "Couldn't rename configuration file \"%s\" to \"%s\": %s", fname, fn_tmp, strerror(errno)); diff --git a/src/app/config/config.h b/src/app/config/config.h index e95ef4a728..ee78d1e0f7 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -44,6 +44,9 @@ int get_protocol_warning_severity_level(void); #define LOG_PROTOCOL_WARN (get_protocol_warning_severity_level()) +/** Pattern for backing up configuration files */ +#define CONFIG_BACKUP_PATTERN "%s.orig.1" + /** An error from options_trial_assign() or options_init_from_string(). */ typedef enum setopt_err_t { SETOPT_OK = 0, diff --git a/src/app/main/main.c b/src/app/main/main.c index 56478a0f71..7c6feb77fe 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -831,7 +831,6 @@ sandbox_init_filter(void) { const or_options_t *options = get_options(); sandbox_cfg_t *cfg = sandbox_cfg_new(); - int i; sandbox_cfg_allow_openat_filename(&cfg, get_cachedir_fname("cached-status")); @@ -917,10 +916,23 @@ sandbox_init_filter(void) else sandbox_cfg_allow_open_filename(&cfg, tor_strdup("/etc/resolv.conf")); - for (i = 0; i < 2; ++i) { - if (get_torrc_fname(i)) { - sandbox_cfg_allow_open_filename(&cfg, tor_strdup(get_torrc_fname(i))); - } + const char *torrc_defaults_fname = get_torrc_fname(1); + if (torrc_defaults_fname) { + sandbox_cfg_allow_open_filename(&cfg, tor_strdup(torrc_defaults_fname)); + } + const char *torrc_fname = get_torrc_fname(0); + if (torrc_fname) { + sandbox_cfg_allow_open_filename(&cfg, tor_strdup(torrc_fname)); + // allow torrc backup and torrc.tmp to make SAVECONF work + char *torrc_bck = NULL; + tor_asprintf(&torrc_bck, CONFIG_BACKUP_PATTERN, torrc_fname); + sandbox_cfg_allow_rename(&cfg, tor_strdup(torrc_fname), torrc_bck); + char *torrc_tmp = NULL; + tor_asprintf(&torrc_tmp, "%s.tmp", torrc_fname); + sandbox_cfg_allow_rename(&cfg, torrc_tmp, tor_strdup(torrc_fname)); + sandbox_cfg_allow_open_filename(&cfg, tor_strdup(torrc_tmp)); + // we need to stat the existing backup file + sandbox_cfg_allow_stat_filename(&cfg, tor_strdup(torrc_bck)); } SMARTLIST_FOREACH(options->FilesOpenedByIncludes, char *, f, {

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/387'
by nickm＠torproject.org 17 May '21

17 May '21

commit 11ac256a4413dbf89e02227e30b040c50d14652e Merge: af560f21ec e0a8454691 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 17 09:08:49 2021 -0400 Merge remote-tracking branch 'tor-gitlab/mr/387'

1 0

[tor/master] conn: MetricsPort listener is a listener port
by nickm＠torproject.org 17 May '21

17 May '21

commit 5f009a59dab69f4e46572e2ef4fd40b1bb053d67 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed May 12 15:13:50 2021 -0400 conn: MetricsPort listener is a listener port The connection type for the listener part was missing from the "is connection a listener" function. This lead to our periodic event that retries our listeners to keep trying to bind() again on an already opened MetricsPort. Closes #40370 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40370 | 4 ++++ src/core/mainloop/connection.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/ticket40370 b/changes/ticket40370 new file mode 100644 index 0000000000..fcdb0eb173 --- /dev/null +++ b/changes/ticket40370 @@ -0,0 +1,4 @@ + o Minor bugfix (metrics port): + - Fix a bug that made tor try to re-bind() every 60 seconds on an already + open MetricsPort. Fixes bug 40370; bugfix on 0.4.5.1-alpha. + diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index ada542629a..c827af7a9a 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -4944,6 +4944,7 @@ connection_is_listener(connection_t *conn) conn->type == CONN_TYPE_AP_NATD_LISTENER || conn->type == CONN_TYPE_AP_HTTP_CONNECT_LISTENER || conn->type == CONN_TYPE_DIR_LISTENER || + conn->type == CONN_TYPE_METRICS_LISTENER || conn->type == CONN_TYPE_CONTROL_LISTENER) return 1; return 0;

1 0

[tor/maint-0.4.6] conn: MetricsPort listener is a listener port
by nickm＠torproject.org 17 May '21

17 May '21

commit 5f009a59dab69f4e46572e2ef4fd40b1bb053d67 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed May 12 15:13:50 2021 -0400 conn: MetricsPort listener is a listener port The connection type for the listener part was missing from the "is connection a listener" function. This lead to our periodic event that retries our listeners to keep trying to bind() again on an already opened MetricsPort. Closes #40370 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40370 | 4 ++++ src/core/mainloop/connection.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/ticket40370 b/changes/ticket40370 new file mode 100644 index 0000000000..fcdb0eb173 --- /dev/null +++ b/changes/ticket40370 @@ -0,0 +1,4 @@ + o Minor bugfix (metrics port): + - Fix a bug that made tor try to re-bind() every 60 seconds on an already + open MetricsPort. Fixes bug 40370; bugfix on 0.4.5.1-alpha. + diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index ada542629a..c827af7a9a 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -4944,6 +4944,7 @@ connection_is_listener(connection_t *conn) conn->type == CONN_TYPE_AP_NATD_LISTENER || conn->type == CONN_TYPE_AP_HTTP_CONNECT_LISTENER || conn->type == CONN_TYPE_DIR_LISTENER || + conn->type == CONN_TYPE_METRICS_LISTENER || conn->type == CONN_TYPE_CONTROL_LISTENER) return 1; return 0;

1 0

[tor/master] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 17 May '21

17 May '21

commit fbd47a50783c79a553510091df09dce7632e02f6 Merge: 8851861ff0 5f009a59da Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 17 09:04:22 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40370 | 4 ++++ src/core/mainloop/connection.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 17 May '21

17 May '21

commit fbd47a50783c79a553510091df09dce7632e02f6 Merge: 8851861ff0 5f009a59da Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 17 09:04:22 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40370 | 4 ++++ src/core/mainloop/connection.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/maint-0.4.5] conn: MetricsPort listener is a listener port
by nickm＠torproject.org 17 May '21

17 May '21

commit 5f009a59dab69f4e46572e2ef4fd40b1bb053d67 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed May 12 15:13:50 2021 -0400 conn: MetricsPort listener is a listener port The connection type for the listener part was missing from the "is connection a listener" function. This lead to our periodic event that retries our listeners to keep trying to bind() again on an already opened MetricsPort. Closes #40370 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40370 | 4 ++++ src/core/mainloop/connection.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/ticket40370 b/changes/ticket40370 new file mode 100644 index 0000000000..fcdb0eb173 --- /dev/null +++ b/changes/ticket40370 @@ -0,0 +1,4 @@ + o Minor bugfix (metrics port): + - Fix a bug that made tor try to re-bind() every 60 seconds on an already + open MetricsPort. Fixes bug 40370; bugfix on 0.4.5.1-alpha. + diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index ada542629a..c827af7a9a 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -4944,6 +4944,7 @@ connection_is_listener(connection_t *conn) conn->type == CONN_TYPE_AP_NATD_LISTENER || conn->type == CONN_TYPE_AP_HTTP_CONNECT_LISTENER || conn->type == CONN_TYPE_DIR_LISTENER || + conn->type == CONN_TYPE_METRICS_LISTENER || conn->type == CONN_TYPE_CONTROL_LISTENER) return 1; return 0;

1 0