February 2018 - tor-commits - lists.torproject.org

[doctor/master] Move curling to a helper
by atagar＠torproject.org 12 Feb '18

12 Feb '18

commit 22080b3f4b08f05c2c6e2fa841c259620ed66d72 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 11 18:23:35 2018 -0800 Move curling to a helper No reason to bundle retries and such in the main function. --- package_versions.py | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/package_versions.py b/package_versions.py index 9d56659..6c6e3f6 100755 --- a/package_versions.py +++ b/package_versions.py @@ -83,6 +83,17 @@ PACKAGES = [ log = util.get_logger('package_versions') +def fetch_url(url): + for i in range(3): + try: + return urllib2.urlopen(url, timeout = 5).read() + except Exception as exc: + if i < 2: + time.sleep(2 ** i) + else: + raise IOError(str(exc)) + + def gentoo_version(request): # Unlike other platforms gentoo lists all package versions, so we # need to figure out what's the latest. @@ -113,19 +124,9 @@ def email_content(): lines.append(DIV) for package in packages: - request, request_exc = None, None - - for i in range(3): - try: - request = urllib2.urlopen(package.url, timeout = 5).read() - break - except Exception as exc: - request_exc = exc # note exception and retry + try: + request = fetch_url(package.url) - if i != 2: - time.sleep(2 ** i) - - if request: if package.platform == 'gentoo': current_version = gentoo_version(request) else: @@ -140,9 +141,14 @@ def email_content(): else: msg = 'current version is %s but wiki has %s' % (current_version, package.version) has_issue = True - else: - msg = 'unable to retrieve current version: %s' % request_exc - has_issue = True + except IOError as exc: + msg = 'unable to retrieve current version: %s' % exc + + # Gentoo's site fails pretty routinely. No need to generate notices for + # it. + + if package.platform == 'gentoo': + has_issue = True lines.append(COLUMN % (project, package.platform, package.version, msg))

1 0

[doctor/master] Track txtorcon's archlinux version
by atagar＠torproject.org 12 Feb '18

12 Feb '18

commit 33df762f055c718d3604061bc30986b2731ae76c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 11 19:22:32 2018 -0800 Track txtorcon's archlinux version --- package_versions.py | 1 + 1 file changed, 1 insertion(+) diff --git a/package_versions.py b/package_versions.py index aa10bad..03282fb 100755 --- a/package_versions.py +++ b/package_versions.py @@ -61,6 +61,7 @@ PACKAGES = [ ('txtorcon', [ Package('debian', 'https://packages.debian.org/sid/python-txtorcon', DEBIAN_VERSION), Package('gentoo', 'https://packages.gentoo.org/packages/dev-python/txtorcon', None), + Package('archlinux', 'https://aur.archlinux.org/packages/python-txtorcon/', AUR_VERSION), Package('slackware', 'https://slackbuilds.org/repository/14.2/python/txtorcon/', 'txtorcon-([0-9\.]+).tar.gz'), Package('freebsd', 'https://www.freshports.org/security/py-txtorcon/', FREEBSD_VERSION), ]),

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 12 Feb '18

12 Feb '18

commit e4afc4d140c18a19b5c82361b219134c16d77889 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 12 02:19:45 2018 +0000 Update translations for tails-openpgp-applet_completed --- de/openpgp-applet.pot | 2 +- es/openpgp-applet.pot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/de/openpgp-applet.pot b/de/openpgp-applet.pot index 0908afd25..1db83ef29 100644 --- a/de/openpgp-applet.pot +++ b/de/openpgp-applet.pot @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2017-09-22 17:51+0000\n" +"PO-Revision-Date: 2018-02-12 01:57+0000\n" "Last-Translator: spriver <spriver(a)autistici.org>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" diff --git a/es/openpgp-applet.pot b/es/openpgp-applet.pot index ff72d81ab..d48ce11b8 100644 --- a/es/openpgp-applet.pot +++ b/es/openpgp-applet.pot @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2018-01-31 23:29+0000\n" +"PO-Revision-Date: 2018-02-12 02:02+0000\n" "Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 12 Feb '18

12 Feb '18

commit a9e604acf36bcae475b6cf0c6c9de37a2c1a19f3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 12 02:19:38 2018 +0000 Update translations for tails-openpgp-applet --- de/openpgp-applet.pot | 2 +- es/openpgp-applet.pot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/de/openpgp-applet.pot b/de/openpgp-applet.pot index 0908afd25..1db83ef29 100644 --- a/de/openpgp-applet.pot +++ b/de/openpgp-applet.pot @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2017-09-22 17:51+0000\n" +"PO-Revision-Date: 2018-02-12 01:57+0000\n" "Last-Translator: spriver <spriver(a)autistici.org>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" diff --git a/es/openpgp-applet.pot b/es/openpgp-applet.pot index ff72d81ab..d48ce11b8 100644 --- a/es/openpgp-applet.pot +++ b/es/openpgp-applet.pot @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2018-01-31 23:29+0000\n" +"PO-Revision-Date: 2018-02-12 02:02+0000\n" "Last-Translator: Emma Peel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0

[tor/maint-0.2.9] Permit kill(pid, 0) in the seccomp2 sandbox.
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 7461cd30676da62324271ddd7b7d347eeff40266 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 16 12:44:47 2017 -0500 Permit kill(pid, 0) in the seccomp2 sandbox. We don't want to allow general signals to be sent, but there's no problem sending a kill(0) to probe whether a process is there. Fixes bug 24198; bugfix on 0.2.5.1-alpha when the seccomp2 sandbox was introduced. --- changes/bug24198 | 4 ++++ src/common/sandbox.c | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/changes/bug24198 b/changes/bug24198 new file mode 100644 index 000000000..679070687 --- /dev/null +++ b/changes/bug24198 @@ -0,0 +1,4 @@ + o Minor bugfixes (controller, linux seccomp2 sandbox): + - Avoid a crash when attempting to use the seccomp2 sandbox + together with the OwningControllerProcess feature. + Fixes bug 24198; bugfix on 0.2.5.1-alpha. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 7f4511db2..0b862a549 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1050,6 +1050,19 @@ sb_stat64(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } #endif +static int +sb_kill(scmp_filter_ctx ctx, sandbox_cfg_t *filter) +{ + (void) filter; +#ifdef __NR_kill + /* Allow killing anything with signal 0 -- it isn't really a kill. */ + return seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(kill), + SCMP_CMP(1, SCMP_CMP_EQ, 0)); +#else + return 0; +#endif +} + /** * Array of function pointers responsible for filtering different syscalls at * a parameter level. @@ -1088,7 +1101,8 @@ static sandbox_filter_func_t filter_func[] = { sb_socket, sb_setsockopt, sb_getsockopt, - sb_socketpair + sb_socketpair, + sb_kill }; const char *

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit b2c4d4e7fae3dda864282953c05ab3b9b0f1b22d Merge: 8939eaf47 84c13336c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 18:11:04 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug24198 | 4 ++++ src/common/sandbox.c | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Permit kill(pid, 0) in the seccomp2 sandbox.
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 7461cd30676da62324271ddd7b7d347eeff40266 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 16 12:44:47 2017 -0500 Permit kill(pid, 0) in the seccomp2 sandbox. We don't want to allow general signals to be sent, but there's no problem sending a kill(0) to probe whether a process is there. Fixes bug 24198; bugfix on 0.2.5.1-alpha when the seccomp2 sandbox was introduced. --- changes/bug24198 | 4 ++++ src/common/sandbox.c | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/changes/bug24198 b/changes/bug24198 new file mode 100644 index 000000000..679070687 --- /dev/null +++ b/changes/bug24198 @@ -0,0 +1,4 @@ + o Minor bugfixes (controller, linux seccomp2 sandbox): + - Avoid a crash when attempting to use the seccomp2 sandbox + together with the OwningControllerProcess feature. + Fixes bug 24198; bugfix on 0.2.5.1-alpha. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 7f4511db2..0b862a549 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1050,6 +1050,19 @@ sb_stat64(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } #endif +static int +sb_kill(scmp_filter_ctx ctx, sandbox_cfg_t *filter) +{ + (void) filter; +#ifdef __NR_kill + /* Allow killing anything with signal 0 -- it isn't really a kill. */ + return seccomp_rule_add_1(ctx, SCMP_ACT_ALLOW, SCMP_SYS(kill), + SCMP_CMP(1, SCMP_CMP_EQ, 0)); +#else + return 0; +#endif +} + /** * Array of function pointers responsible for filtering different syscalls at * a parameter level. @@ -1088,7 +1101,8 @@ static sandbox_filter_func_t filter_func[] = { sb_socket, sb_setsockopt, sb_getsockopt, - sb_socketpair + sb_socketpair, + sb_kill }; const char *

1 0

[tor/maint-0.2.9] Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 84c13336c410ac218c70d6ce2ce6216f9b24e796 Merge: 848ba26c1 7461cd306 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 18:10:59 2018 -0500 Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9 changes/bug24198 | 4 ++++ src/common/sandbox.c | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 84c13336c410ac218c70d6ce2ce6216f9b24e796 Merge: 848ba26c1 7461cd306 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 18:10:59 2018 -0500 Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9 changes/bug24198 | 4 ++++ src/common/sandbox.c | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 84c13336c410ac218c70d6ce2ce6216f9b24e796 Merge: 848ba26c1 7461cd306 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 18:10:59 2018 -0500 Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9 changes/bug24198 | 4 ++++ src/common/sandbox.c | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-)

1 0