tor-commits December 2020

tor-commits@lists.torproject.org

19 participants
1639 discussions

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 15 Dec '20

15 Dec '20

commit 35f4c8d9aa4c8308d06fe5f1ace6db91d7bd9497 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 15 16:18:49 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+hi.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contents+hi.po b/contents+hi.po index 51bce3cfa1..d6ffdbf237 100644 --- a/contents+hi.po +++ b/contents+hi.po @@ -5,7 +5,8 @@ # erinm, 2020 # Kalyan Dikshit <dikshitrocks93(a)gmail.com>, 2020 # Mruga Shah <mruga30(a)gmail.com>, 2020 -# Karan Saini, 2020 +# Karan S, 2020 +# James Bond <python07(a)tuta.io>, 2020 # msgid "" msgstr "" @@ -13,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-02-24 13:39+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Karan Saini, 2020\n" +"Last-Translator: James Bond <python07(a)tuta.io>, 2020\n" "Language-Team: Hindi (https://www.transifex.com/otf/teams/1519/hi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -114,7 +115,7 @@ msgstr "दस्तावेज़ीकरण" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Press" -msgstr "" +msgstr "दबाएँ" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Support" @@ -142,7 +143,7 @@ msgstr "" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Community" -msgstr "" +msgstr "समुदाय" #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title)

1 0

[tor/maint-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/maint-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 | 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.*/

1 0

[tor/maint-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 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 * pattern. 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)

1 0

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

15 Dec '20

1 0

[tor/maint-0.4.5] 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,10 @@ config_get_lines_include(const char *string, config_line_t **result, opened_lst, 1, NULL, config_process_include); } -/** Returns a list of paths obtained when expading globs in pattern. If - * pattern has no globs, returns a list with pattern if it is an - * existing path or NULL otherwise. If opened_files is provided, adds - * paths opened by glob to it. Returns NULL on failure. */ +/** Return a list of paths obtained when expading globs in pattern. + * If pattern has no globs, return a list with pattern in it. + * If opened_files is provided, add paths opened by glob to it. + * Return NULL on failure. */ static smartlist_t * expand_glob(const char *pattern, smartlist_t *opened_files) { diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index d9ad8ec2c6..168dfd943c 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -1229,7 +1229,9 @@ static sandbox_filter_func_t filter_func[] = { /** * Return the interned (and hopefully sandbox-permitted) string equal * to @a str. - */ + * + * Return NULL if `str` is NULL, or `str` is not an interned string. + **/ const char * sandbox_intern_string(const char *str) {

1 0

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

15 Dec '20

1 0

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

15 Dec '20

commit 93f2de85237dce9abb8ec66ad5a4eecad5848734 Merge: c05ae61f26 c731a4efec Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Dec 15 16:29:01 2020 +0200 Merge branch 'maint-0.4.5'

1 0

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

15 Dec '20

1 0

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

15 Dec '20

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2020