November 2017 - tor-commits - lists.torproject.org

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 03 Nov '17

03 Nov '17

commit dd9f8856f59bd9bcfeb720d9193af99cd09ad5ab Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 4 03:45:49 2017 +0000 Update translations for https_everywhere_completed --- zh_CN/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/zh_CN/https-everywhere.dtd b/zh_CN/https-everywhere.dtd index d184c9936..40b3dacd5 100644 --- a/zh_CN/https-everywhere.dtd +++ b/zh_CN/https-everywhere.dtd @@ -11,6 +11,7 @@ <!ENTITY https-everywhere.menu.showCounter "显示计数器"> <!ENTITY https-everywhere.menu.viewAllRules "查看所有规则"> +<!ENTITY https-everywhere.options.generalSettings "常规设置"> <!ENTITY https-everywhere.options.importSettings "导入设置"> <!ENTITY https-everywhere.options.import "导入"> <!ENTITY https-everywhere.options.imported "您的设置已导入。">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 03 Nov '17

03 Nov '17

commit 6f5e948542cc9367846cbafc35b21dff18ef907e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 4 03:45:39 2017 +0000 Update translations for https_everywhere --- zh_CN/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/https-everywhere.dtd b/zh_CN/https-everywhere.dtd index e2edc093d..40b3dacd5 100644 --- a/zh_CN/https-everywhere.dtd +++ b/zh_CN/https-everywhere.dtd @@ -11,7 +11,7 @@ <!ENTITY https-everywhere.menu.showCounter "显示计数器"> <!ENTITY https-everywhere.menu.viewAllRules "查看所有规则"> -<!ENTITY https-everywhere.options.generalSettings "General Settings"> +<!ENTITY https-everywhere.options.generalSettings "常规设置"> <!ENTITY https-everywhere.options.importSettings "导入设置"> <!ENTITY https-everywhere.options.import "导入"> <!ENTITY https-everywhere.options.imported "您的设置已导入。">

1 0

[nyx/master] Inbound connections could be misaligned
by atagar＠torproject.org 03 Nov '17

03 Nov '17

commit 53eb54fad3da89b19cd457b7e0e65317575747da Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 3 19:07:31 2017 -0700 Inbound connections could be misaligned We padded the source and destination with different sizes to account for listing a locale, but that padding was inverted for inbound connections. --- nyx/panel/connection.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 13983b1..a1e5916 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -635,13 +635,16 @@ def _draw_address_column(subwindow, x, y, line, attr): elif not tor_controller().is_geoip_unavailable() and not line.entry.is_private(): dst += ' (%s)' % (line.locale if line.locale else '??') + src = '%-21s' % src + dst = '%-26s' % dst + if line.entry.get_type() in (Category.INBOUND, Category.SOCKS, Category.CONTROL): dst, src = src, dst if line.line_type == LineType.CIRCUIT: return subwindow.addstr(x, y, dst, *attr) else: - return subwindow.addstr(x, y, '%-21s --> %-26s' % (src, dst), *attr) + return subwindow.addstr(x, y, '%s --> %s' % (src, dst), *attr) def _draw_details(subwindow, selected):

1 0

[nyx/master] Don't exitable connections to relays as exits
by atagar＠torproject.org 03 Nov '17

03 Nov '17

commit 82a19385c73c14da932cbb0cd0a5b74a8a7077ef Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 3 18:55:12 2017 -0700 Don't exitable connections to relays as exits If you have an exit policy that allows exiting then relay connections we could conceivably exit to are labeled as 'EXIT'. That's wrong, and would understandably spook folks. --- nyx/panel/connection.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 35fe511..13983b1 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -17,6 +17,8 @@ import nyx.panel import nyx.popups import nyx.tracker +import stem.util.log + from nyx import nyx_interface, tor_controller from nyx.curses import WHITE, NORMAL, BOLD, HIGHLIGHT from nyx.menu import MenuItem, Submenu, RadioMenuItem, RadioGroup @@ -222,7 +224,7 @@ class ConnectionEntry(Entry): for circ in LAST_RETRIEVED_CIRCUITS: if circ.path and len(circ.path) == 1 and circ.path[0][0] == fingerprint and circ.status == 'BUILT': return Category.DIRECTORY # one-hop circuit to retrieve directory information - elif exit_policy and exit_policy.can_exit_to(self._connection.remote_address, self._connection.remote_port): + elif not fingerprint and exit_policy and exit_policy.can_exit_to(self._connection.remote_address, self._connection.remote_port): return Category.EXIT return Category.OUTBOUND

1 0

[nyx/master] Lessen connection panel padding when there isn't geoip data
by atagar＠torproject.org 03 Nov '17

03 Nov '17

commit 16e9c1f22a2087fd9e84466b5c30568ddc6696f8 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 3 19:10:05 2017 -0700 Lessen connection panel padding when there isn't geoip data When we don't list geoip information there's no need to reserve space for it. --- nyx/panel/connection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index a1e5916..ed0ec11 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -636,7 +636,7 @@ def _draw_address_column(subwindow, x, y, line, attr): dst += ' (%s)' % (line.locale if line.locale else '??') src = '%-21s' % src - dst = '%-26s' % dst + dst = '%-21s' % dst if tor_controller().is_geoip_unavailable() else '%-26s' % dst if line.entry.get_type() in (Category.INBOUND, Category.SOCKS, Category.CONTROL): dst, src = src, dst

1 0

[nyx/master] Use inference as the primary resolver when DisableDebuggerAttachment is set
by atagar＠torproject.org 03 Nov '17

03 Nov '17

commit b801d16d1a1593faffd725f343d93eba8b55725e Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 3 18:48:01 2017 -0700 Use inference as the primary resolver when DisableDebuggerAttachment is set On reflection it will be less confusing if inference is used as the primary resolver in all scenarios. --- nyx/tracker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nyx/tracker.py b/nyx/tracker.py index 64e7310..8ef928a 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -511,7 +511,7 @@ class ConnectionTracker(Daemon): # in town. if tor_controller().get_conf('DisableDebuggerAttachment', None) == '0': - self._resolvers = connection.system_resolvers() + [CustomResolver.INFERENCE] + self._resolvers = [CustomResolver.INFERENCE] + connection.system_resolvers() else: self._resolvers = [CustomResolver.INFERENCE]

1 0

[tor-browser-build/master] Applying patch for bug 24052
by gk＠torproject.org 03 Nov '17

03 Nov '17

commit e0e6bfd780cdbb529aecc57699a8f410f667c62f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 30 09:44:58 2017 +0000 Applying patch for bug 24052 --- projects/firefox/24052.patch | 57 ++++++++++++++++++++++++++++++++++++++++++++ projects/firefox/build | 4 ++++ projects/firefox/config | 2 ++ 3 files changed, 63 insertions(+) diff --git a/projects/firefox/24052.patch b/projects/firefox/24052.patch new file mode 100644 index 0000000..a418a97 --- /dev/null +++ b/projects/firefox/24052.patch @@ -0,0 +1,57 @@ +From c5d1bb91512f9dd20e0f54c6f3e6979588cf9f56 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Fri, 27 Oct 2017 20:40:57 +0000 +Subject: [PATCH] Bug 24052: Streamline handling of file:// resources + +We should make sure restrictions regarding loading of file:// resources +are adhered to more strictly, at least on *nix platforms. + +This is a workaround for +https://bugzilla.mozilla.org/show_bug.cgi?id=1412081. + +diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp +index 0da79c18ae41..0cc67da7b18f 100644 +--- a/netwerk/base/nsIOService.cpp ++++ b/netwerk/base/nsIOService.cpp +@@ -789,12 +789,20 @@ nsIOService::NewChannelFromURIWithProxyFlagsInternal(nsIURI* aURI, + // if calling newChannel2() fails we try to fall back to + // creating a new channel by calling NewChannel(). + if (NS_FAILED(rv)) { ++#ifdef XP_UNIX ++ if (rv == NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) { ++ return rv; ++ } else { ++#endif + rv = handler->NewChannel(aURI, getter_AddRefs(channel)); + NS_ENSURE_SUCCESS(rv, rv); + // The protocol handler does not implement NewChannel2, so + // maybe we need to wrap the channel (see comment in MaybeWrap + // function). + channel = nsSecCheckWrapChannel::MaybeWrap(channel, aLoadInfo); ++#ifdef XP_UNIX ++ } ++#endif + } + } + +diff --git a/netwerk/protocol/file/nsFileProtocolHandler.cpp b/netwerk/protocol/file/nsFileProtocolHandler.cpp +index e55cb9d47460..c24c928b6f02 100644 +--- a/netwerk/protocol/file/nsFileProtocolHandler.cpp ++++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp +@@ -188,6 +188,13 @@ nsFileProtocolHandler::NewChannel2(nsIURI* uri, + nsILoadInfo* aLoadInfo, + nsIChannel** result) + { ++#ifdef XP_UNIX ++ if (aLoadInfo && aLoadInfo->TriggeringPrincipal()) { ++ if (aLoadInfo->TriggeringPrincipal()->GetIsCodebasePrincipal()) { ++ return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST; ++ } ++ } ++#endif + nsFileChannel *chan = new nsFileChannel(uri); + if (!chan) + return NS_ERROR_OUT_OF_MEMORY; +-- +2.14.2 + diff --git a/projects/firefox/build b/projects/firefox/build index 8ff265d..97b148d 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -86,6 +86,10 @@ fi export CC='gcc -m32' [% END -%] +[% IF c("var/linux") || c("var/osx") %] + patch -p1 < $rootdir/24052.patch +[% END -%] + rm -f configure rm -f js/src/configure make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts" diff --git a/projects/firefox/config b/projects/firefox/config index 85a4f00..c0c620f 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -81,6 +81,8 @@ input_files: enable: '[% c("var/linux") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' + - filename: 24052.patch + enable: '[% c("var/linux") || c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll sha256sum: 8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 enable: '[% c("var/windows") %]'

1 0

[tor-browser-build/master] Fold in missing stable release notes
by gk＠torproject.org 03 Nov '17

03 Nov '17

commit 897d6d1a74fda13743828846fe9b1616d3455011 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 30 10:00:38 2017 +0000 Fold in missing stable release notes --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 7697b5c..e1c70f2 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,6 +4,13 @@ Tor Browser 7.5a7 -- November 6 2017 * Linux * Bug 24052: Streamline handling of file:// resources +Tor Browser 7.0.8 -- October 25 2017 + * All Platforms + * Update Torbutton to 1.9.7.9 + * Bug 23949: Fix donation banner display + * Update locales with translated banner + * Translations update + Tor Browser 7.5a6 -- October 19 2017 * All Platforms * Update Firefox to 52.4.1esr @@ -22,6 +29,33 @@ Tor Browser 7.5a6 -- October 19 2017 * Bug 23807: Tab crashes when playing video on High Sierra * Bug 23025: Add some hardening flags to macOS build +Tor Browser 7.0.7 -- October 19 2017 + * All Platforms + * Update Firefox to 52.4.1esr + * Update Torbutton to 1.9.7.8 + * Bug 23887: Update banner locales and Mozilla text + * Bug 23526: Add 2017 Donation banner text + * Bug 23483: Donation banner on about:tor for 2017 (testing mode) + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Translations update + * Update HTTPS-Everywhere to 2017.10.4 + * Update NoScript to 5.1.2 + * Bug 23723: Loading entities from NoScript .dtd files is blocked + * Bug 23724: NoScript update breaks Security Slider and its icon disappears + * Bug 23745: Tab crashes when using Tor Browser to access Google Drive + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Bug 23694: Update the detailsURL in update responses + * OS X + * Bug 23807: Tab crashes when playing video on High Sierra + * Linux + * Bug 22692: Enable content sandboxing on Linux + Tor Browser 7.5a5 -- September 28 2017 * All Platforms * Update Firefox to 52.4.0esr

1 0

[tor-browser-build/master] Apply follow-up patch for bug 24052
by gk＠torproject.org 03 Nov '17

03 Nov '17

commit 409a6951d0c081905fc44f12e5b2359032178f18 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 2 11:10:00 2017 +0000 Apply follow-up patch for bug 24052 --- projects/firefox/24052_2.patch | 29 +++++++++++++++++++++++++++++ projects/firefox/build | 1 + projects/firefox/config | 2 ++ 3 files changed, 32 insertions(+) diff --git a/projects/firefox/24052_2.patch b/projects/firefox/24052_2.patch new file mode 100644 index 0000000..0060428 --- /dev/null +++ b/projects/firefox/24052_2.patch @@ -0,0 +1,29 @@ +From e2c1240ad25f4edcc7d3828b29f6aeb953a24a2e Mon Sep 17 00:00:00 2001 +From: Arthur Edelstein <arthuredelstein(a)gmail.com> +Date: Wed, 1 Nov 2017 02:33:18 -0700 +Subject: [PATCH] Bug 24052: Handle redirects by blocking them early + +This is the second part of the workaround for +https://bugzilla.mozilla.org/show_bug.cgi?id=1412081. + +diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp +index 0e570e8cb57d..b38be48bf0c9 100644 +--- a/netwerk/protocol/http/nsHttpChannel.cpp ++++ b/netwerk/protocol/http/nsHttpChannel.cpp +@@ -5419,6 +5419,13 @@ nsHttpChannel::AsyncProcessRedirection(uint32_t redirectType) + return NS_ERROR_CORRUPTED_CONTENT; + } + ++ bool isRedirectToFile = false; ++ rv = mRedirectURI->SchemeIs("file", &isRedirectToFile); ++ if (!NS_FAILED(rv) && isRedirectToFile) { ++ LOG(("Attempted to redirect from a remote page to a file:// URI.")); ++ return NS_ERROR_FAILURE; ++ } ++ + if (mApplicationCache) { + // if we are redirected to a different origin check if there is a fallback + // cache entry to fall back to. we don't care about file strict +-- +2.14.2 + diff --git a/projects/firefox/build b/projects/firefox/build index 97b148d..3806fdf 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -88,6 +88,7 @@ fi [% IF c("var/linux") || c("var/osx") %] patch -p1 < $rootdir/24052.patch + patch -p1 < $rootdir/24052_2.patch [% END -%] rm -f configure diff --git a/projects/firefox/config b/projects/firefox/config index c0c620f..2e30001 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -83,6 +83,8 @@ input_files: enable: '[% c("var/osx") %]' - filename: 24052.patch enable: '[% c("var/linux") || c("var/osx") %]' + - filename: 24052_2.patch + enable: '[% c("var/linux") || c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll sha256sum: 8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 enable: '[% c("var/windows") %]'

1 0

[tor-browser-build/master] Version bump and Changelog update
by gk＠torproject.org 03 Nov '17

03 Nov '17

commit b0390291a524873a5e10ee2973999596c30d40c2 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 2 11:12:52 2017 +0000 Version bump and Changelog update --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ rbm.conf | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e18d650..7697b5c 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser 7.5a7 -- November 6 2017 + * OS X + * Bug 24052: Streamline handling of file:// resources + * Linux + * Bug 24052: Streamline handling of file:// resources + Tor Browser 7.5a6 -- October 19 2017 * All Platforms * Update Firefox to 52.4.1esr diff --git a/rbm.conf b/rbm.conf index 80a7091..ab2a080 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5a6' + torbrowser_version: '7.5a7' torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5a5 + - 7.5a6 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0