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

[tor/master] Fix a couple of documentation comments related to #40094
by asn＠torproject.org 15 Dec '20

15 Dec '20

commit baef0843a424116026f3f97185dae89271903041 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 8 14:59:28 2020 -0500 Fix a couple of documentation comments related to #40094 --- src/lib/fs/conffile.c | 8 ++++---- src/lib/sandbox/sandbox.c | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/lib/fs/conffile.c b/src/lib/fs/conffile.c index 1f58a3590c..acd8dfb8cc 100644 --- a/src/lib/fs/conffile.c +++ b/src/lib/fs/conffile.c @@ -53,10 +53,… [View More]

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/205'
by asn＠torproject.org 15 Dec '20

15 Dec '20

commit c05ae61f26e74e9f7f74ccca7b190ce64490f603 Merge: 04b271af9f bd0046c9ec Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Dec 15 16:28:04 2020 +0200 Merge remote-tracking branch 'tor-gitlab/mr/205' src/lib/fs/conffile.c | 41 +++++++++++++++++++++++++++++++---------- src/lib/fs/path.c | 15 ++++++++++++++- src/lib/sandbox/sandbox.c | 39 ++++++++++++++++++++++++++++++++++++--- src/lib/sandbox/sandbox.h | 5 ++--- 4 files changed, 83 insertions(+), 17 deletions(-)

1 0

[tor/release-0.4.5] Avoid sandbox bug warning when unglobbing patterns #40094
by asn＠torproject.org 15 Dec '20

15 Dec '20

commit bd0046c9ec5bf6556d4ecf6b111b0de4c0266ebd Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Fri Nov 13 01:08:56 2020 +0000 Avoid sandbox bug warning when unglobbing patterns #40094 Adds a more user-friendly error message when the configuration is reloaded and a new %include is added that makes its unglobbing access files/folders not allowed by the seccomp sandbox. --- src/lib/fs/conffile.c | 6 ++++++ src/lib/fs/path.c | 15 ++++++++++++++- 2 files … [View More]changed, 20 insertions(+), 1 deletion(-) diff --git a/src/lib/fs/conffile.c b/src/lib/fs/conffile.c index acd8dfb8cc..0d0bdf09a6 100644 --- a/src/lib/fs/conffile.c +++ b/src/lib/fs/conffile.c @@ -23,6 +23,7 @@ #include "lib/string/printf.h" #include <stdbool.h> +#include <errno.h> static smartlist_t *config_get_file_list(const char *path, smartlist_t *opened_files); @@ -68,6 +69,11 @@ expand_glob(const char *pattern, smartlist_t *opened_files) smartlist_t *matches = tor_glob(pattern); if (!matches) { + if (errno == EPERM) { + log_err(LD_CONFIG, "Sandbox is active, but the configuration pattern " + "\"%s\" listed with %%include would access files or folders not " + "allowed by it. Cannot proceed.", pattern); + } return NULL; } diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c index 2eef4bded7..af421d0413 100644 --- a/src/lib/fs/path.c +++ b/src/lib/fs/path.c @@ -537,6 +537,10 @@ unglob_win32(const char *pattern, int prev_sep, int next_sep) static DIR * prot_opendir(const char *name) { + if (sandbox_interned_string_is_missing(name)) { + errno = EPERM; + return NULL; + } return opendir(sandbox_intern_string(name)); } @@ -544,6 +548,10 @@ prot_opendir(const char *name) static int prot_stat(const char *pathname, struct stat *buf) { + if (sandbox_interned_string_is_missing(pathname)) { + errno = EPERM; + return -1; + } return stat(sandbox_intern_string(pathname), buf); } @@ -551,6 +559,10 @@ prot_stat(const char *pathname, struct stat *buf) static int prot_lstat(const char *pathname, struct stat *buf) { + if (sandbox_interned_string_is_missing(pathname)) { + errno = EPERM; + return -1; + } return lstat(sandbox_intern_string(pathname), buf); } /** As closedir, but has the right type for gl_closedir */ @@ -563,7 +575,8 @@ wrap_closedir(void *arg) /** Return a new list containing the paths that match the pattern * <b>pattern</b>. Return NULL on error. On POSIX systems, errno is set by the - * glob function. + * glob function or is set to EPERM if glob tried to access a file not allowed + * by the seccomp sandbox. */ struct smartlist_t * tor_glob(const char *pattern) [View Less]

1 0

[tor/release-0.4.5] When handling includes, detect missing interned strings earlier.
by asn＠torproject.org 15 Dec '20

15 Dec '20

commit dbc8d2a4e476c06f59db3ff79b66afc8bc4ea27c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 12 11:55:55 2020 -0500 When handling includes, detect missing interned strings earlier. There were three separate places where we were hitting a sandbox Bug warning before we actually exited. Fixes #40094; bugfix on 0.3.1.1-alpha when %includes were introduced. --- src/lib/fs/conffile.c | 27 +++++++++++++++++++++------ src/lib/sandbox/sandbox.c | … [View More]37 ++++++++++++++++++++++++++++++++++--- src/lib/sandbox/sandbox.h | 5 ++--- 3 files changed, 57 insertions(+), 12 deletions(-) diff --git a/src/lib/fs/conffile.c b/src/lib/fs/conffile.c index f1f6d8ae5f..1f58a3590c 100644 --- a/src/lib/fs/conffile.c +++ b/src/lib/fs/conffile.c @@ -19,6 +19,7 @@ #include "lib/fs/path.h" #include "lib/log/log.h" #include "lib/malloc/malloc.h" +#include "lib/sandbox/sandbox.h" #include "lib/string/printf.h" #include <stdbool.h> @@ -59,14 +60,14 @@ config_get_lines_include(const char *string, config_line_t **result, static smartlist_t * expand_glob(const char *pattern, smartlist_t *opened_files) { - smartlist_t *matches = tor_glob(pattern); - if (!matches) { - return NULL; + if (! has_glob(pattern)) { + smartlist_t *matches = smartlist_new(); + smartlist_add_strdup(matches, pattern); + return matches; } - // if it is not a glob, return error when the path is missing - if (!has_glob(pattern) && smartlist_len(matches) == 0) { - smartlist_free(matches); + smartlist_t *matches = tor_glob(pattern); + if (!matches) { return NULL; } @@ -107,6 +108,13 @@ config_get_file_list(const char *pattern, smartlist_t *opened_files) if (opened_files) { smartlist_add_strdup(opened_files, path); } + if (sandbox_interned_string_is_missing(path)) { + log_err(LD_CONFIG, "Sandbox is active, but a new configuration " + "file \"%s\" has been listed with %%include. Cannot proceed.", + path); + error_found = true; + break; + } file_status_t file_type = file_status(path); if (file_type == FN_FILE) { @@ -201,6 +209,13 @@ config_process_include(const char *pattern, int recursion_level, int extended, int rv = -1; SMARTLIST_FOREACH_BEGIN(config_files, const char *, config_file) { + if (sandbox_interned_string_is_missing(config_file)) { + log_err(LD_CONFIG, "Sandbox is active, but a new configuration " + "file \"%s\" has been listed with %%include. Cannot proceed.", + config_file); + goto done; + } + log_notice(LD_CONFIG, "Including configuration file \"%s\".", config_file); config_line_t *included_config = NULL; config_line_t *included_config_last = NULL; diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index 8d467c516e..d9ad8ec2c6 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -310,6 +310,8 @@ static int filter_nopar_gen[] = { #define seccomp_rule_add_4(ctx,act,call,f1,f2,f3,f4) \ seccomp_rule_add((ctx),(act),(call),4,(f1),(f2),(f3),(f4)) +static const char *sandbox_get_interned_string(const char *str); + /** * Function responsible for setting up the rt_sigaction syscall for * the seccomp filter sandbox. @@ -1224,8 +1226,39 @@ static sandbox_filter_func_t filter_func[] = { sb_kill }; +/** + * Return the interned (and hopefully sandbox-permitted) string equal + * to @a str. + */ const char * sandbox_intern_string(const char *str) +{ + const char *interned = sandbox_get_interned_string(str); + + if (sandbox_active && str != NULL && interned == NULL) { + log_warn(LD_BUG, "No interned sandbox parameter found for %s", str); + } + + return interned ? interned : str; +} + +/** + * Return true if the sandbox is running and we are missing an interned string + * equal to @a str. + */ +bool +sandbox_interned_string_is_missing(const char *str) +{ + return sandbox_active && sandbox_get_interned_string(str) == NULL; +} + +/** + * Try to find and return the interned string equal to @a str. + * + * If there is no such string, return NULL. + **/ +static const char * +sandbox_get_interned_string(const char *str) { sandbox_cfg_t *elem; @@ -1245,9 +1278,7 @@ sandbox_intern_string(const char *str) } } - if (sandbox_active) - log_warn(LD_BUG, "No interned sandbox parameter found for %s", str); - return str; + return NULL; } /* DOCDOC */ diff --git a/src/lib/sandbox/sandbox.h b/src/lib/sandbox/sandbox.h index a2b3227b90..eba99afbde 100644 --- a/src/lib/sandbox/sandbox.h +++ b/src/lib/sandbox/sandbox.h @@ -104,12 +104,11 @@ typedef struct { #endif /* defined(USE_LIBSECCOMP) */ #ifdef USE_LIBSECCOMP -/** Returns a registered protected string used with the sandbox, given that - * it matches the parameter. - */ const char* sandbox_intern_string(const char *param); +bool sandbox_interned_string_is_missing(const char *s); #else /* !defined(USE_LIBSECCOMP) */ #define sandbox_intern_string(s) (s) +#define sandbox_interned_string_is_missing(s) (false) #endif /* defined(USE_LIBSECCOMP) */ /** Creates an empty sandbox configuration file.*/ [View Less]

1 0

[tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/205' into maint-0.4.5
by asn＠torproject.org 15 Dec '20

15 Dec '20

commit c731a4efec3c7206bbbb8d2ba39c970fcb0c9f36 Merge: e74f168bb4 bd0046c9ec Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Dec 15 16:28:49 2020 +0200 Merge remote-tracking branch 'tor-gitlab/mr/205' into maint-0.4.5 src/lib/fs/conffile.c | 41 +++++++++++++++++++++++++++++++---------- src/lib/fs/path.c | 15 ++++++++++++++- src/lib/sandbox/sandbox.c | 39 ++++++++++++++++++++++++++++++++++++--- src/lib/sandbox/sandbox.h | 5 ++--- 4 files changed, 83 insertions(+), 17 deletions(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by asn＠torproject.org 15 Dec '20

15 Dec '20

commit 6a167d21236c5437d03296daaf48fd9268e014ed Merge: 8970d7f7ae c731a4efec Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Dec 15 16:29:01 2020 +0200 Merge branch 'maint-0.4.5' into release-0.4.5 src/lib/fs/conffile.c | 41 +++++++++++++++++++++++++++++++---------- src/lib/fs/path.c | 15 ++++++++++++++- src/lib/sandbox/sandbox.c | 39 ++++++++++++++++++++++++++++++++++++--- src/lib/sandbox/sandbox.h | 5 ++--- 4 files changed, 83 insertions(+), 17 deletions(-)

1 0

[sbws/maint-1.1] fix: doc: Add bwauthealth tool
by juga＠torproject.org 15 Dec '20

15 Dec '20

commit 3ddc9f1e4648bcab2ed59059e6f6bdf29f3ce982 Author: juga0 <juga(a)riseup.net> Date: Sun Sep 27 10:40:58 2020 +0000 fix: doc: Add bwauthealth tool --- docs/source/monitoring_bandwidth.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/source/monitoring_bandwidth.rst b/docs/source/monitoring_bandwidth.rst index dedf90d..09326c4 100644 --- a/docs/source/monitoring_bandwidth.rst +++ b/docs/source/monitoring_bandwidth.rst @@ -24,6 +24,13 @@ It should be … [View More]

1 0

[sbws/maint-1.1] fix: doc: Add consensus health page
by juga＠torproject.org 15 Dec '20

15 Dec '20

commit 6e6a8f3ba534cbd93b830fe3ffd5ce40abe8e77d Author: juga0 <juga(a)riseup.net> Date: Sun Sep 27 10:32:12 2020 +0000 fix: doc: Add consensus health page about bwauths measured relays. --- docs/source/monitoring_bandwidth.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/source/monitoring_bandwidth.rst b/docs/source/monitoring_bandwidth.rst index 54d1219..dedf90d 100644 --- a/docs/source/monitoring_bandwidth.rst +++ b/docs/source/… [View More]

1 0

[sbws/maint-1.1] fix: doc: Move consensus weight to top
by juga＠torproject.org 15 Dec '20

15 Dec '20

commit 75af5c3575670121cb933135ab79ce49e7eb0f7b Author: juga0 <juga(a)riseup.net> Date: Sun Sep 27 10:08:15 2020 +0000 fix: doc: Move consensus weight to top and explain what to check. --- docs/source/monitoring_bandwidth.rst | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/docs/source/monitoring_bandwidth.rst b/docs/source/monitoring_bandwidth.rst index 888d544..54d1219 100644 --- a/docs/source/monitoring_bandwidth.rst +++ b/… [View More]

1 0

[sbws/maint-1.1] fix: doc: Add the bwauths timeline wiki
by juga＠torproject.org 15 Dec '20

15 Dec '20

commit 81d2bea0008a4ef2fc6ded2ee0bd56a6aa7cbdd7 Author: juga0 <juga(a)riseup.net> Date: Sun Sep 27 10:43:53 2020 +0000 fix: doc: Add the bwauths timeline wiki Closes #40013. --- docs/source/monitoring_bandwidth.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/source/monitoring_bandwidth.rst b/docs/source/monitoring_bandwidth.rst index 09326c4..d9ebdf2 100644 --- a/docs/source/monitoring_bandwidth.rst +++ b/docs/source/monitoring_bandwidth.rst @@ -1,6 +… [View More]

1 0