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

[tor/master] Merge branch 'mr_347_squashed' into maint-0.4.6
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit 0ceacb5482848a4029eaf26095619ad09ff22c52 Merge: d162b98548 6281c90885 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 19 11:40:44 2021 -0400 Merge branch 'mr_347_squashed' into maint-0.4.6 changes/ticket40290 | 3 +++ src/app/config/resolve_addr.c | 12 ++++++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/master] relay: Emit log warning if Address is internal and can't be used
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit 6281c90885b09d3c5faad51cbb4cee686a4bb8ff Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Mar 25 10:15:50 2021 -0400 relay: Emit log warning if Address is internal and can't be used Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40290 | 3 +++ src/app/config/resolve_addr.c | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/changes/ticket40290 b/changes/ticket40290 new file mode 100644 index 0000000000..3d3a64be93 --- /dev/null +++ b/changes/ticket40290 @@ -0,0 +1,3 @@ + o Minor bugfix (logging, relay): + - Emit a warning if an Address is found to be internal and tor can't use it. + Fixes bug 40290; bugfix on 0.4.5.1-alpha. diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index 43a3eb39de..09d4b800f6 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -343,6 +343,18 @@ get_address_from_config(const or_options_t *options, int warn_severity, * used, custom authorities must be defined else it is a fatal error. * Furthermore, if the Address was resolved to an internal interface, we * stop immediately. */ + if (ret == ERR_ADDRESS_IS_INTERNAL) { + static bool logged_once = false; + if (!logged_once) { + log_warn(LD_CONFIG, "Address set with an internal address. Tor will " + "not work unless custom directory authorities " + "are defined (AlternateDirAuthority). It is also " + "possible to use an internal address if " + "PublishServerDescriptor is set to 0 and " + "AssumeReachable(IPv6) to 1."); + logged_once = true; + } + } tor_free(*hostname_out); return FN_RET_BAIL; }

1 0

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

19 Apr '21

commit cbf71c4fa7a05033c068844ce9f214eeff5bb939 Merge: 07237b484e 0ceacb5482 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 19 11:43:39 2021 -0400 Merge branch 'maint-0.4.6' changes/ticket40290 | 3 +++ src/app/config/resolve_addr.c | 12 ++++++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/maint-0.4.6] Merge branch 'mr_347_squashed' into maint-0.4.6
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit 0ceacb5482848a4029eaf26095619ad09ff22c52 Merge: d162b98548 6281c90885 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 19 11:40:44 2021 -0400 Merge branch 'mr_347_squashed' into maint-0.4.6 changes/ticket40290 | 3 +++ src/app/config/resolve_addr.c | 12 ++++++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/maint-0.4.6] relay: Emit log warning if Address is internal and can't be used
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit 6281c90885b09d3c5faad51cbb4cee686a4bb8ff Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Mar 25 10:15:50 2021 -0400 relay: Emit log warning if Address is internal and can't be used Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40290 | 3 +++ src/app/config/resolve_addr.c | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/changes/ticket40290 b/changes/ticket40290 new file mode 100644 index 0000000000..3d3a64be93 --- /dev/null +++ b/changes/ticket40290 @@ -0,0 +1,3 @@ + o Minor bugfix (logging, relay): + - Emit a warning if an Address is found to be internal and tor can't use it. + Fixes bug 40290; bugfix on 0.4.5.1-alpha. diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index 43a3eb39de..09d4b800f6 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -343,6 +343,18 @@ get_address_from_config(const or_options_t *options, int warn_severity, * used, custom authorities must be defined else it is a fatal error. * Furthermore, if the Address was resolved to an internal interface, we * stop immediately. */ + if (ret == ERR_ADDRESS_IS_INTERNAL) { + static bool logged_once = false; + if (!logged_once) { + log_warn(LD_CONFIG, "Address set with an internal address. Tor will " + "not work unless custom directory authorities " + "are defined (AlternateDirAuthority). It is also " + "possible to use an internal address if " + "PublishServerDescriptor is set to 0 and " + "AssumeReachable(IPv6) to 1."); + logged_once = true; + } + } tor_free(*hostname_out); return FN_RET_BAIL; }

1 0

[tor/release-0.4.6] Merge branch 'mr_347_squashed' into maint-0.4.6
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit 0ceacb5482848a4029eaf26095619ad09ff22c52 Merge: d162b98548 6281c90885 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 19 11:40:44 2021 -0400 Merge branch 'mr_347_squashed' into maint-0.4.6 changes/ticket40290 | 3 +++ src/app/config/resolve_addr.c | 12 ++++++++++++ 2 files changed, 15 insertions(+)

1 0

[tor/release-0.4.6] relay: Emit log warning if Address is internal and can't be used
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit 6281c90885b09d3c5faad51cbb4cee686a4bb8ff Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Mar 25 10:15:50 2021 -0400 relay: Emit log warning if Address is internal and can't be used Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40290 | 3 +++ src/app/config/resolve_addr.c | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/changes/ticket40290 b/changes/ticket40290 new file mode 100644 index 0000000000..3d3a64be93 --- /dev/null +++ b/changes/ticket40290 @@ -0,0 +1,3 @@ + o Minor bugfix (logging, relay): + - Emit a warning if an Address is found to be internal and tor can't use it. + Fixes bug 40290; bugfix on 0.4.5.1-alpha. diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index 43a3eb39de..09d4b800f6 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -343,6 +343,18 @@ get_address_from_config(const or_options_t *options, int warn_severity, * used, custom authorities must be defined else it is a fatal error. * Furthermore, if the Address was resolved to an internal interface, we * stop immediately. */ + if (ret == ERR_ADDRESS_IS_INTERNAL) { + static bool logged_once = false; + if (!logged_once) { + log_warn(LD_CONFIG, "Address set with an internal address. Tor will " + "not work unless custom directory authorities " + "are defined (AlternateDirAuthority). It is also " + "possible to use an internal address if " + "PublishServerDescriptor is set to 0 and " + "AssumeReachable(IPv6) to 1."); + logged_once = true; + } + } tor_free(*hostname_out); return FN_RET_BAIL; }

1 0

[tor/master] Merge remote-tracking branch 'jigsaw/fix-40317_046-saveconf-sandbox-one-backup'
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit 07237b484e051afe93b8115c673f2ffb4864edf0 Merge: de33be6e32 bbd558a6eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 19 11:32:21 2021 -0400 Merge remote-tracking branch 'jigsaw/fix-40317_046-saveconf-sandbox-one-backup' 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] Make SAVECONF keep only one backup and add sandbox rules for it. #40317
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit bbd558a6eb2745a3b42ad8875604c3ecc2de84be 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 5115835a0c..bfa258c904 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -6856,7 +6856,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 @@ -6900,17 +6900,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 e534bcbcbe..de198e203d 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 c113e0183d..89564490e6 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -852,7 +852,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")); @@ -938,10 +937,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/maint-0.4.5] scripts/build/combine_libs: use $AR rather than ar
by nickm＠torproject.org 19 Apr '21

19 Apr '21

commit f47c6c3d1b38a7770da007f904925a50cf687906 Author: Emery Hemingway <ehmry(a)posteo.net> Date: Fri Apr 16 15:17:43 2021 +0200 scripts/build/combine_libs: use $AR rather than ar Using a custom ar at $AR may be necessary for cross-compilation. Closes #40369 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40369 | 2 ++ scripts/build/combine_libs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changes/ticket40369 b/changes/ticket40369 new file mode 100644 index 0000000000..b08088c97b --- /dev/null +++ b/changes/ticket40369 @@ -0,0 +1,2 @@ + o Minor feature (build, cross-compilation): + - Allow a custom ar for cross-compilation purposes. Closes ticket 40369. diff --git a/scripts/build/combine_libs b/scripts/build/combine_libs index fb311552fe..9c87f68248 100755 --- a/scripts/build/combine_libs +++ b/scripts/build/combine_libs @@ -25,7 +25,7 @@ for input in "$@"; do dir="$TMPDIR"/$(basename "$input" .a) mkdir "$dir" cd "$dir">/dev/null - ar x "$abs" + "${AR:-ar}" x "$abs" done cd "$TMPDIR" >/dev/null

1 0