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

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/354'
by asn＠torproject.org 08 Apr '21

08 Apr '21

commit 62614f0b3f6432d3e9f67869594c4e1d7984c147 Merge: e0b8a79b2e 272cb803df Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 8 14:37:30 2021 +0300 Merge remote-tracking branch 'tor-gitlab/mr/354' changes/bug40354 | 4 ++++ src/lib/fs/path.c | 2 ++ 2 files changed, 6 insertions(+) diff --cc src/lib/fs/path.c index 81eb3aa661,dc1741447e..8194d920ab --- a/src/lib/fs/path.c +++ b/src/lib/fs/path.c @@@ -571,19 -572,7 +572,20 @@@ wrap_closedir(void *arg { closedir(arg); } + #endif /* defined(GLOB_ALTDIRFUNC) */ + +/** Function passed to glob to handle processing errors. epath is the + * path that caused the error and eerrno is the errno set by the + * function that failed. We want to ignore ENOENT and ENOTDIR because, in BSD + * systems, these are not ignored automatically, which makes glob fail when + * globs expand to non-existing paths and GLOB_ERR is set. + */ +static int +glob_errfunc(const char *epath, int eerrno) +{ + (void)epath; + return eerrno == ENOENT || eerrno == ENOTDIR ? 0 : -1; +} #endif /* defined(HAVE_GLOB) */ /** Return a new list containing the paths that match the pattern

1 0

[lego/master] lektor_i18n: merge tempfile fix from https://github.com/numericube/lektor-i18n-plugin/pull/20
by weasel＠torproject.org 08 Apr '21

08 Apr '21

commit 1e20c72f727c838806183f2cbee300c96e686eb8 Author: Peter Palfrader <peter(a)palfrader.org> Date: Thu Apr 8 13:33:07 2021 +0200 lektor_i18n: merge tempfile fix from https://github.com/numericube/lektor-i18n-plugin/pull/20 --- packages/i18n/lektor_i18n.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/i18n/lektor_i18n.py b/packages/i18n/lektor_i18n.py index 400878d..1129727 100644 --- a/packages/i18n/lektor_i18n.py +++ b/packages/i18n/lektor_i18n.py @@ -426,10 +426,18 @@ class I18NPlugin(Plugin): self.process_node(fields, sections, source, source.datamodel.id, builder.env.root_path) + def get_templates_pot_filename(self): + try: + return self.pot_templates_filename + except AttributeError: + self.pot_templates_file = tempfile.NamedTemporaryFile(suffix=".pot",prefix="templates-") + self.pot_templates_filename = self.pot_templates_file.name + return self.pot_templates_filename + def on_before_build_all(self, builder, **extra): if self.enabled: reporter.report_generic("i18n activated, with main language %s"% self.content_language ) - templates_pot_filename = join(tempfile.gettempdir(), 'templates.pot') + templates_pot_filename = self.get_templates_pot_filename() reporter.report_generic("Parsing templates for i18n into %s" \ % relpath(templates_pot_filename, builder.env.root_path)) translations.parse_templates(templates_pot_filename) @@ -443,7 +451,7 @@ class I18NPlugin(Plugin): return contents_pot_filename = join(builder.env.root_path, self.i18npath, 'contents.pot') pots = [contents_pot_filename, - join(tempfile.gettempdir(), 'templates.pot'), + self.get_templates_pot_filename(), join(builder.env.root_path, self.i18npath, 'plugins.pot')] # write out contents.pot from web site contents translations.write_pot(pots[0], self.content_language)

1 0

[tor/master] Fix glob processing on BSD systems. #40318
by asn＠torproject.org 08 Apr '21

08 Apr '21

commit 36768b5756f05774258ca9c5db6379f74dfd6586 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Thu Mar 25 01:23:04 2021 +0000 Fix glob processing on BSD systems. #40318 On Linux systems, glob automatically ignores the errors ENOENT and ENOTDIR because they are expected during glob expansion. But BSD systems do not ignore these, resulting in glob failing when globs expand to invalid paths. This is fixed by adding a custom error handler that ignores only these two errors and removing the GLOB_ERR flag as it makes glob fail even if the error handler ignores the error and is unnecessary as the error handler will make glob fail on all other errors anyway. --- changes/bug40318 | 4 ++++ src/lib/fs/path.c | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/changes/bug40318 b/changes/bug40318 new file mode 100644 index 0000000000..cc02f08ca0 --- /dev/null +++ b/changes/bug40318 @@ -0,0 +1,4 @@ + o Minor bugfixes (configuration tests bsd): + - Fix glob processing errors when globs expand to invalid paths on + BSD systems. Fixes bug 40318; bugfix on 0.4.5.1-alpha. Patch by + Daniel Pinto. diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c index c2fdddb9db..81960bd69a 100644 --- a/src/lib/fs/path.c +++ b/src/lib/fs/path.c @@ -571,6 +571,19 @@ wrap_closedir(void *arg) { closedir(arg); } + +/** Function passed to glob to handle processing errors. epath is the + * path that caused the error and eerrno is the errno set by the + * function that failed. We want to ignore ENOENT and ENOTDIR because, in BSD + * systems, these are not ignored automatically, which makes glob fail when + * globs expand to non-existing paths and GLOB_ERR is set. + */ +static int +glob_errfunc(const char *epath, int eerrno) +{ + (void)epath; + return eerrno == ENOENT || eerrno == ENOTDIR ? 0 : -1; +} #endif /* defined(HAVE_GLOB) */ /** Return a new list containing the paths that match the pattern @@ -591,7 +604,7 @@ tor_glob(const char *pattern) tor_free(pattern_normalized); #elif HAVE_GLOB /* !(defined(_WIN32)) */ glob_t matches; - int flags = GLOB_ERR | GLOB_NOSORT; + int flags = GLOB_NOSORT; #ifdef GLOB_ALTDIRFUNC /* use functions that call sandbox_intern_string */ flags |= GLOB_ALTDIRFUNC; @@ -604,7 +617,10 @@ tor_glob(const char *pattern) matches.gl_stat = &prot_stat; matches.gl_lstat = &prot_lstat; #endif /* defined(GLOB_ALTDIRFUNC) */ - int ret = glob(pattern, flags, NULL, &matches); + // use custom error handler to workaround BSD quirks and do not set GLOB_ERR + // because it would make glob fail on error even if the error handler ignores + // the error + int ret = glob(pattern, flags, glob_errfunc, &matches); if (ret == GLOB_NOMATCH) { return smartlist_new(); } else if (ret != 0) {

1 0

[tor/release-0.4.5] Fix glob processing on BSD systems. #40318
by asn＠torproject.org 08 Apr '21

08 Apr '21

commit 36768b5756f05774258ca9c5db6379f74dfd6586 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Thu Mar 25 01:23:04 2021 +0000 Fix glob processing on BSD systems. #40318 On Linux systems, glob automatically ignores the errors ENOENT and ENOTDIR because they are expected during glob expansion. But BSD systems do not ignore these, resulting in glob failing when globs expand to invalid paths. This is fixed by adding a custom error handler that ignores only these two errors and removing the GLOB_ERR flag as it makes glob fail even if the error handler ignores the error and is unnecessary as the error handler will make glob fail on all other errors anyway. --- changes/bug40318 | 4 ++++ src/lib/fs/path.c | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/changes/bug40318 b/changes/bug40318 new file mode 100644 index 0000000000..cc02f08ca0 --- /dev/null +++ b/changes/bug40318 @@ -0,0 +1,4 @@ + o Minor bugfixes (configuration tests bsd): + - Fix glob processing errors when globs expand to invalid paths on + BSD systems. Fixes bug 40318; bugfix on 0.4.5.1-alpha. Patch by + Daniel Pinto. diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c index c2fdddb9db..81960bd69a 100644 --- a/src/lib/fs/path.c +++ b/src/lib/fs/path.c @@ -571,6 +571,19 @@ wrap_closedir(void *arg) { closedir(arg); } + +/** Function passed to glob to handle processing errors. epath is the + * path that caused the error and eerrno is the errno set by the + * function that failed. We want to ignore ENOENT and ENOTDIR because, in BSD + * systems, these are not ignored automatically, which makes glob fail when + * globs expand to non-existing paths and GLOB_ERR is set. + */ +static int +glob_errfunc(const char *epath, int eerrno) +{ + (void)epath; + return eerrno == ENOENT || eerrno == ENOTDIR ? 0 : -1; +} #endif /* defined(HAVE_GLOB) */ /** Return a new list containing the paths that match the pattern @@ -591,7 +604,7 @@ tor_glob(const char *pattern) tor_free(pattern_normalized); #elif HAVE_GLOB /* !(defined(_WIN32)) */ glob_t matches; - int flags = GLOB_ERR | GLOB_NOSORT; + int flags = GLOB_NOSORT; #ifdef GLOB_ALTDIRFUNC /* use functions that call sandbox_intern_string */ flags |= GLOB_ALTDIRFUNC; @@ -604,7 +617,10 @@ tor_glob(const char *pattern) matches.gl_stat = &prot_stat; matches.gl_lstat = &prot_lstat; #endif /* defined(GLOB_ALTDIRFUNC) */ - int ret = glob(pattern, flags, NULL, &matches); + // use custom error handler to workaround BSD quirks and do not set GLOB_ERR + // because it would make glob fail on error even if the error handler ignores + // the error + int ret = glob(pattern, flags, glob_errfunc, &matches); if (ret == GLOB_NOMATCH) { return smartlist_new(); } else if (ret != 0) {

1 0

[tor/maint-0.4.5] Fix glob processing on BSD systems. #40318
by asn＠torproject.org 08 Apr '21

08 Apr '21

commit 36768b5756f05774258ca9c5db6379f74dfd6586 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Thu Mar 25 01:23:04 2021 +0000 Fix glob processing on BSD systems. #40318 On Linux systems, glob automatically ignores the errors ENOENT and ENOTDIR because they are expected during glob expansion. But BSD systems do not ignore these, resulting in glob failing when globs expand to invalid paths. This is fixed by adding a custom error handler that ignores only these two errors and removing the GLOB_ERR flag as it makes glob fail even if the error handler ignores the error and is unnecessary as the error handler will make glob fail on all other errors anyway. --- changes/bug40318 | 4 ++++ src/lib/fs/path.c | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/changes/bug40318 b/changes/bug40318 new file mode 100644 index 0000000000..cc02f08ca0 --- /dev/null +++ b/changes/bug40318 @@ -0,0 +1,4 @@ + o Minor bugfixes (configuration tests bsd): + - Fix glob processing errors when globs expand to invalid paths on + BSD systems. Fixes bug 40318; bugfix on 0.4.5.1-alpha. Patch by + Daniel Pinto. diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c index c2fdddb9db..81960bd69a 100644 --- a/src/lib/fs/path.c +++ b/src/lib/fs/path.c @@ -571,6 +571,19 @@ wrap_closedir(void *arg) { closedir(arg); } + +/** Function passed to glob to handle processing errors. epath is the + * path that caused the error and eerrno is the errno set by the + * function that failed. We want to ignore ENOENT and ENOTDIR because, in BSD + * systems, these are not ignored automatically, which makes glob fail when + * globs expand to non-existing paths and GLOB_ERR is set. + */ +static int +glob_errfunc(const char *epath, int eerrno) +{ + (void)epath; + return eerrno == ENOENT || eerrno == ENOTDIR ? 0 : -1; +} #endif /* defined(HAVE_GLOB) */ /** Return a new list containing the paths that match the pattern @@ -591,7 +604,7 @@ tor_glob(const char *pattern) tor_free(pattern_normalized); #elif HAVE_GLOB /* !(defined(_WIN32)) */ glob_t matches; - int flags = GLOB_ERR | GLOB_NOSORT; + int flags = GLOB_NOSORT; #ifdef GLOB_ALTDIRFUNC /* use functions that call sandbox_intern_string */ flags |= GLOB_ALTDIRFUNC; @@ -604,7 +617,10 @@ tor_glob(const char *pattern) matches.gl_stat = &prot_stat; matches.gl_lstat = &prot_lstat; #endif /* defined(GLOB_ALTDIRFUNC) */ - int ret = glob(pattern, flags, NULL, &matches); + // use custom error handler to workaround BSD quirks and do not set GLOB_ERR + // because it would make glob fail on error even if the error handler ignores + // the error + int ret = glob(pattern, flags, glob_errfunc, &matches); if (ret == GLOB_NOMATCH) { return smartlist_new(); } else if (ret != 0) {

1 0

[tor/master] Merge branch 'maint-0.4.5'
by asn＠torproject.org 08 Apr '21

08 Apr '21

commit e0b8a79b2e62c69d45cce792f14b127e926082e2 Merge: b07ed22cbb 36768b5756 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 8 14:29:08 2021 +0300 Merge branch 'maint-0.4.5' changes/bug40318 | 4 ++++ src/lib/fs/path.c | 22 +++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by asn＠torproject.org 08 Apr '21

08 Apr '21

commit 41ad333c2f888914787185557b2df5864c0938e2 Merge: c40b729c85 36768b5756 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 8 14:25:31 2021 +0300 Merge branch 'maint-0.4.5' into release-0.4.5 changes/bug40318 | 4 ++++ src/lib/fs/path.c | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/273'
by asn＠torproject.org 08 Apr '21

08 Apr '21

commit b07ed22cbb43fe0aaac3f1b13f4902cea895d724 Merge: 5ebf2b81a1 d2c2204b2a Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Apr 8 14:20:53 2021 +0300 Merge remote-tracking branch 'tor-gitlab/mr/273' changes/bug40141 | 4 ++++ src/lib/fs/path.c | 10 ++++++---- src/test/test_util.c | 7 ------- 3 files changed, 10 insertions(+), 11 deletions(-)

1 0

[tor/master] path: fix directory special case
by asn＠torproject.org 08 Apr '21

08 Apr '21

commit 2e76b024015cb1f0263bfe53746a759b7d255a20 Author: Hello71 <alex_y_xu(a)yahoo.ca> Date: Sat Jan 9 19:16:20 2021 +0000 path: fix directory special case --- changes/glob_dir | 3 +++ src/lib/fs/path.c | 10 ++++++---- src/test/test_util.c | 7 ------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/changes/glob_dir b/changes/glob_dir new file mode 100644 index 0000000000..cb9907f7e4 --- /dev/null +++ b/changes/glob_dir @@ -0,0 +1,3 @@ + o Minor bugfixes (config): + - Fix globbing directories on all platforms. Fixes compilation on musl. + Fixes bug 40141; bugfix on 0.4.5.1-alpha. diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c index c2fdddb9db..39794cb84e 100644 --- a/src/lib/fs/path.c +++ b/src/lib/fs/path.c @@ -611,11 +611,13 @@ tor_glob(const char *pattern) return NULL; } - // #40141: workaround for bug in glibc < 2.19 where patterns ending in path - // separator match files and folders instead of folders only + // #40141, !249: workaround for glibc bug where patterns ending in path + // separator match files and folders instead of folders only. + // this could be in #ifdef __GLIBC__ but: 1. it might affect other libcs too, + // and 2. it doesn't cost much to stat each match again since libc is already + // supposed to do it (otherwise the file may be on slow NFS or something) size_t pattern_len = strlen(pattern); - bool dir_only = has_glob(pattern) && - pattern_len > 0 && pattern[pattern_len-1] == *PATH_SEPARATOR; + bool dir_only = pattern_len > 0 && pattern[pattern_len-1] == *PATH_SEPARATOR; result = smartlist_new(); size_t i; diff --git a/src/test/test_util.c b/src/test/test_util.c index b3a1e2caca..546b3c2907 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4562,15 +4562,8 @@ test_util_glob(void *ptr) TEST("file1"); EXPECT(results_test9); -#if defined(__APPLE__) || defined(__darwin__) || \ - defined(__FreeBSD__) || defined(__NetBSD__) || defined(OpenBSD) TEST("file1"PATH_SEPARATOR); EXPECT_EMPTY(); -#else - const char *results_test10[] = {"file1"}; - TEST("file1"PATH_SEPARATOR); - EXPECT(results_test10); -#endif // test path separator at end - with wildcards and linux path separator const char *results_test11[] = {"dir1", "dir2", "forbidden"};

1 0

[tor/master] Slightly reword the changes file and rename it.
by asn＠torproject.org 08 Apr '21

08 Apr '21

commit d2c2204b2ac564cd71fd0be1ea3efabd6f84fc36 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Jan 22 13:22:14 2021 +0000 Slightly reword the changes file and rename it. --- changes/bug40141 | 4 ++++ changes/glob_dir | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/changes/bug40141 b/changes/bug40141 new file mode 100644 index 0000000000..cf2641cfde --- /dev/null +++ b/changes/bug40141 @@ -0,0 +1,4 @@ + o Minor bugfixes (configuration): + - Fix globbing directories on all platforms when using %include options in + configuration files. This patch also fixes compilation on musl libc based + systems. Fixes bug 40141; bugfix on 0.4.5.1-alpha. diff --git a/changes/glob_dir b/changes/glob_dir deleted file mode 100644 index cb9907f7e4..0000000000 --- a/changes/glob_dir +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (config): - - Fix globbing directories on all platforms. Fixes compilation on musl. - Fixes bug 40141; bugfix on 0.4.5.1-alpha.

1 0