- tbb-commits - lists.torproject.org

[tor-browser-bundle/hardened-builds-6.5] Bug 19348: Windows %BUILD_TARGET% changed in Tor Browser 6.0
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 4569eee1f94ad008c9a4b3d3924e6fed0b2e1926 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 13 18:15:54 2016 +0200 Bug 19348: Windows %BUILD_TARGET% changed in Tor Browser 6.0 The values in build_targets can now be a list of values rather than a single value and are all included in the generated .htaccess file. They are also all tested in check_update_responses_deployement. Additionally, a trailing '/' in the last RewriteRule in the .htaccess has been added. This missing '/' was the reason why the requests using the new BUILD_TARGET values were returning the en-US complete mar file rather than an error. --- tools/update-responses/config.yml | 5 ++++- tools/update-responses/update_responses | 29 ++++++++++++++++++----------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 5e4d463..179f882 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -5,7 +5,10 @@ download: build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 - win32: WINNT_x86-gcc3 + win32: + - WINNT_x86-gcc3 + - WINNT_x86-gcc3-x86 + - WINNT_x86-gcc3-x64 osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 72a19d7..1a7cb14 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -39,8 +39,10 @@ sub exit_error { exit (exists $_[1] ? $_[1] : 1); } -sub build_target_by_os { - $config->{build_targets}{$_[0]} ? $config->{build_targets}{$_[0]} : $_[0]; +sub build_targets_by_os { + return ($_[0]) unless $config->{build_targets}{$_[0]}; + my $r = $config->{build_targets}{$_[0]}; + return ref $r eq 'ARRAY' ? @$r : ($r); } sub get_nbprocs { @@ -313,16 +315,17 @@ sub write_htaccess { my $files = $config->{versions}{$version}{files}; $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; foreach my $os (sort keys %$files) { - my $bt = build_target_by_os($os); - foreach my $lang (sort keys %{$files->{$os}}) { - foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { - $htaccess .= "RewriteRule ^$bt/$from_version/$lang " - . "$from_version-$version-$os-$lang.xml $flags\n"; + foreach my $bt (build_targets_by_os($os)) { + foreach my $lang (sort keys %{$files->{$os}}) { + foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { + $htaccess .= "RewriteRule ^$bt/$from_version/$lang " + . "$from_version-$version-$os-$lang.xml $flags\n"; + } + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " + . "$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " - . "$version-$os-$lang.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt/ $version-$os-en-US.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt $version-$os-en-US.xml $flags\n"; } write_htdocs($channel, '.htaccess', $htaccess); } @@ -426,10 +429,14 @@ sub check_has_incremental { return undef; } +sub build_targets_list { + map { ref $_ eq 'ARRAY' ? @$_ : $_ } values %{$config->{build_targets}}; +} + sub check_update_responses_channel { my ($config, $base_url, $channel) = @_; my $channel_version = $config->{channels}{$channel}; - foreach my $build_target (values %{$config->{build_targets}}) { + foreach my $build_target (build_targets_list()) { foreach my $lang (qw(en-US de)) { my $url = "$base_url/$channel/$build_target/1.0/$lang"; my $dom = get_remote_xml($url);

1 0

[tor-browser-bundle/hardened-builds] Bug 19348: Windows %BUILD_TARGET% changed in Tor Browser 6.0
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 8944fbfc435fbba739fdbae74402409b0b4f58f7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 13 18:15:54 2016 +0200 Bug 19348: Windows %BUILD_TARGET% changed in Tor Browser 6.0 The values in build_targets can now be a list of values rather than a single value and are all included in the generated .htaccess file. They are also all tested in check_update_responses_deployement. Additionally, a trailing '/' in the last RewriteRule in the .htaccess has been added. This missing '/' was the reason why the requests using the new BUILD_TARGET values were returning the en-US complete mar file rather than an error. --- tools/update-responses/config.yml | 5 ++++- tools/update-responses/update_responses | 29 ++++++++++++++++++----------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 5e4d463..179f882 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -5,7 +5,10 @@ download: build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 - win32: WINNT_x86-gcc3 + win32: + - WINNT_x86-gcc3 + - WINNT_x86-gcc3-x86 + - WINNT_x86-gcc3-x64 osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 72a19d7..1a7cb14 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -39,8 +39,10 @@ sub exit_error { exit (exists $_[1] ? $_[1] : 1); } -sub build_target_by_os { - $config->{build_targets}{$_[0]} ? $config->{build_targets}{$_[0]} : $_[0]; +sub build_targets_by_os { + return ($_[0]) unless $config->{build_targets}{$_[0]}; + my $r = $config->{build_targets}{$_[0]}; + return ref $r eq 'ARRAY' ? @$r : ($r); } sub get_nbprocs { @@ -313,16 +315,17 @@ sub write_htaccess { my $files = $config->{versions}{$version}{files}; $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; foreach my $os (sort keys %$files) { - my $bt = build_target_by_os($os); - foreach my $lang (sort keys %{$files->{$os}}) { - foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { - $htaccess .= "RewriteRule ^$bt/$from_version/$lang " - . "$from_version-$version-$os-$lang.xml $flags\n"; + foreach my $bt (build_targets_by_os($os)) { + foreach my $lang (sort keys %{$files->{$os}}) { + foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { + $htaccess .= "RewriteRule ^$bt/$from_version/$lang " + . "$from_version-$version-$os-$lang.xml $flags\n"; + } + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " + . "$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " - . "$version-$os-$lang.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt/ $version-$os-en-US.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt $version-$os-en-US.xml $flags\n"; } write_htdocs($channel, '.htaccess', $htaccess); } @@ -426,10 +429,14 @@ sub check_has_incremental { return undef; } +sub build_targets_list { + map { ref $_ eq 'ARRAY' ? @$_ : $_ } values %{$config->{build_targets}}; +} + sub check_update_responses_channel { my ($config, $base_url, $channel) = @_; my $channel_version = $config->{channels}{$channel}; - foreach my $build_target (values %{$config->{build_targets}}) { + foreach my $build_target (build_targets_list()) { foreach my $lang (qw(en-US de)) { my $url = "$base_url/$channel/$build_target/1.0/$lang"; my $dom = get_remote_xml($url);

1 0

[tor-browser-bundle/maint-6.0] Bug 19202: Use cdn.tpo in mar files URLs
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit db7120e326563c39da93d529905922bc8998ef15 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 30 17:21:21 2016 +0200 Bug 19202: Use cdn.tpo in mar files URLs --- tools/update-responses/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 615150b..fd6411b 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -15,7 +15,7 @@ versions: 6.0.1: platformVersion: 45.2.0 detailsURL: https://blog.torproject.org/blog/tor-browser-601-released - download_url: https://www.torproject.org/dist/torbrowser/6.0.1 + download_url: https://cdn.torproject.org/aus1/torbrowser/6.0.1 incremental_from: - 5.5.5 - 6.0 @@ -27,7 +27,7 @@ versions: 6.0a5: platformVersion: 45.1.0 detailsURL: https://blog.torproject.org/blog/tor-browser-60a5-released - download_url: https://www.torproject.org/dist/torbrowser/6.0a5 + download_url: https://cdn.torproject.org/aus1/torbrowser/6.0a5 incremental_from: - 6.0a4 migrate_archs:

1 0

[tor-browser-bundle/maint-6.0] Bug 19348: Windows %BUILD_TARGET% changed in Tor Browser 6.0
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 417c30014f40ebb40d7b03f0a71609e0122846e7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 13 18:15:54 2016 +0200 Bug 19348: Windows %BUILD_TARGET% changed in Tor Browser 6.0 The values in build_targets can now be a list of values rather than a single value and are all included in the generated .htaccess file. They are also all tested in check_update_responses_deployement. Additionally, a trailing '/' in the last RewriteRule in the .htaccess has been added. This missing '/' was the reason why the requests using the new BUILD_TARGET values were returning the en-US complete mar file rather than an error. --- tools/update-responses/config.yml | 5 ++++- tools/update-responses/update_responses | 29 ++++++++++++++++++----------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index fd6411b..e7ea1a7 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -5,7 +5,10 @@ download: build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 - win32: WINNT_x86-gcc3 + win32: + - WINNT_x86-gcc3 + - WINNT_x86-gcc3-x86 + - WINNT_x86-gcc3-x64 osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 72a19d7..1a7cb14 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -39,8 +39,10 @@ sub exit_error { exit (exists $_[1] ? $_[1] : 1); } -sub build_target_by_os { - $config->{build_targets}{$_[0]} ? $config->{build_targets}{$_[0]} : $_[0]; +sub build_targets_by_os { + return ($_[0]) unless $config->{build_targets}{$_[0]}; + my $r = $config->{build_targets}{$_[0]}; + return ref $r eq 'ARRAY' ? @$r : ($r); } sub get_nbprocs { @@ -313,16 +315,17 @@ sub write_htaccess { my $files = $config->{versions}{$version}{files}; $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; foreach my $os (sort keys %$files) { - my $bt = build_target_by_os($os); - foreach my $lang (sort keys %{$files->{$os}}) { - foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { - $htaccess .= "RewriteRule ^$bt/$from_version/$lang " - . "$from_version-$version-$os-$lang.xml $flags\n"; + foreach my $bt (build_targets_by_os($os)) { + foreach my $lang (sort keys %{$files->{$os}}) { + foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { + $htaccess .= "RewriteRule ^$bt/$from_version/$lang " + . "$from_version-$version-$os-$lang.xml $flags\n"; + } + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " + . "$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " - . "$version-$os-$lang.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt/ $version-$os-en-US.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt $version-$os-en-US.xml $flags\n"; } write_htdocs($channel, '.htaccess', $htaccess); } @@ -426,10 +429,14 @@ sub check_has_incremental { return undef; } +sub build_targets_list { + map { ref $_ eq 'ARRAY' ? @$_ : $_ } values %{$config->{build_targets}}; +} + sub check_update_responses_channel { my ($config, $base_url, $channel) = @_; my $channel_version = $config->{channels}{$channel}; - foreach my $build_target (values %{$config->{build_targets}}) { + foreach my $build_target (build_targets_list()) { foreach my $lang (qw(en-US de)) { my $url = "$base_url/$channel/$build_target/1.0/$lang"; my $dom = get_remote_xml($url);

1 0

[tor-browser-bundle/master] Bug 19348: Windows %BUILD_TARGET% changed in Tor Browser 6.0
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 7124bb8dfb187108f0f2a4d885ef8f32afea1af7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jun 13 18:15:54 2016 +0200 Bug 19348: Windows %BUILD_TARGET% changed in Tor Browser 6.0 The values in build_targets can now be a list of values rather than a single value and are all included in the generated .htaccess file. They are also all tested in check_update_responses_deployement. Additionally, a trailing '/' in the last RewriteRule in the .htaccess has been added. This missing '/' was the reason why the requests using the new BUILD_TARGET values were returning the en-US complete mar file rather than an error. --- tools/update-responses/config.yml | 5 ++++- tools/update-responses/update_responses | 29 ++++++++++++++++++----------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index adb1067..0425afc 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -5,7 +5,10 @@ download: build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 - win32: WINNT_x86-gcc3 + win32: + - WINNT_x86-gcc3 + - WINNT_x86-gcc3-x86 + - WINNT_x86-gcc3-x64 osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 72a19d7..1a7cb14 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -39,8 +39,10 @@ sub exit_error { exit (exists $_[1] ? $_[1] : 1); } -sub build_target_by_os { - $config->{build_targets}{$_[0]} ? $config->{build_targets}{$_[0]} : $_[0]; +sub build_targets_by_os { + return ($_[0]) unless $config->{build_targets}{$_[0]}; + my $r = $config->{build_targets}{$_[0]}; + return ref $r eq 'ARRAY' ? @$r : ($r); } sub get_nbprocs { @@ -313,16 +315,17 @@ sub write_htaccess { my $files = $config->{versions}{$version}{files}; $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; foreach my $os (sort keys %$files) { - my $bt = build_target_by_os($os); - foreach my $lang (sort keys %{$files->{$os}}) { - foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { - $htaccess .= "RewriteRule ^$bt/$from_version/$lang " - . "$from_version-$version-$os-$lang.xml $flags\n"; + foreach my $bt (build_targets_by_os($os)) { + foreach my $lang (sort keys %{$files->{$os}}) { + foreach my $from_version (sort keys %{$files->{$os}{$lang}{partial}}) { + $htaccess .= "RewriteRule ^$bt/$from_version/$lang " + . "$from_version-$version-$os-$lang.xml $flags\n"; + } + $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " + . "$version-$os-$lang.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt/[^\/]+/$lang " - . "$version-$os-$lang.xml $flags\n"; + $htaccess .= "RewriteRule ^$bt/ $version-$os-en-US.xml $flags\n"; } - $htaccess .= "RewriteRule ^$bt $version-$os-en-US.xml $flags\n"; } write_htdocs($channel, '.htaccess', $htaccess); } @@ -426,10 +429,14 @@ sub check_has_incremental { return undef; } +sub build_targets_list { + map { ref $_ eq 'ARRAY' ? @$_ : $_ } values %{$config->{build_targets}}; +} + sub check_update_responses_channel { my ($config, $base_url, $channel) = @_; my $channel_version = $config->{channels}{$channel}; - foreach my $build_target (values %{$config->{build_targets}}) { + foreach my $build_target (build_targets_list()) { foreach my $lang (qw(en-US de)) { my $url = "$base_url/$channel/$build_target/1.0/$lang"; my $dom = get_remote_xml($url);

1 0

[tor-browser-bundle/master] Merge hardened changelog
by gk＠torproject.org 17 Jun '16

17 Jun '16

commit 20ab1173a22dda041c22e606042949d54a821091 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 17 07:51:53 2016 +0000 Merge hardened changelog --- Bundle-Data/Docs/ChangeLog.txt | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ffd2c2f..83963d1 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,57 @@ +Tor Browser 6.5a1-hardened -- June 8 + * All Platforms + * Update Firefox to 45.2.0esr + * Update Tor to 0.2.8.3-alpha + * Update Torbutton to 1.9.6 + * Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu + * Bug 18905: Hide unusable items from help menu + * Bug 17599: Provide shortcuts for New Identity and New Circuit + * Bug 18980: Remove obsolete toolbar button code + * Bug 18238: Remove unused Torbutton code and strings + * Translation updates + * Code clean-up + * Update Tor Launcher to 0.2.8.5 + * Bug 18947: Tor Browser is not starting on OS X if put into /Applications + * Update HTTPS-Everywhere to 5.1.9 + * Update meek to 0.22 (tag 0.22-18371-3) + * Bug 19121: The update.xml hash should get checked during update + * Bug 12523: Mark JIT pages as non-writable + * Bug 19193: Reduce timing precision for AudioContext, HTMLMediaElement, and MediaStream + * Bug 19164: Remove support for SHA-1 HPKP pins + * Bug 19186: KeyboardEvents are only rounding to 100ms + * Bug 18884: Don't build the loop extension + * Bug 19187: Backport fix for crash related to popup menus + * Bug 19212: Fix crash related to network panel in developer tools + * Bug 18703: Fix circuit isolation issues on Page Info dialog + * bug 19115: Tor Browser should not fall back to Bing as its search engine + * Bug 18915+19065: Use our search plugins in localized builds + * Bug 19176: Zip our language packs deterministically + * Bug 18811: Fix first-party isolation for blobs URLs in Workers + * Bug 18950: Disable or audit Reader View + * Bug 18886: Remove Pocket + * Bug 18619: Tor Browser reports "InvalidStateError" in browser console + * Bug 18945: Disable monitoring the connected state of Tor Browser users + * Bug 18855: Don't show error after add-on directory clean-up + * Bug 18885: Disable the option of logging TLS/SSL key material + * Bug 18770: SVGs should not show up on Page Info dialog when disabled + * Bug 18958: Spoof screen.orientation values + * Bug 19047: Disable Heartbeat prompts + * Bug 18914: Use English-only label in <isindex/> tags + * Bug 18996: Investigate server logging in esr45-based Tor Browser + * Bug 17790: Add unit tests for keyboard fingerprinting defenses + * Bug 18995: Regression test to ensure CacheStorage is disabled + * Bug 18912: Add automated tests for updater cert pinning + * Bug 16728: Add test cases for favicon isolation + * Bug 18976: Remove some FTE bridges + * Linux + * Bug 19189: Backport for working around a linker (gold) bug + * Build System + * All PLatforms + * Bug 18333: Upgrade Go to 1.6.2 + * Bug 18919: Remove unused keys and unused dependencies + * Bug 18291: Remove some uses of libfaketime + * Bug 18845: Make zip and tar helpers generate reproducible archives + Tor Browser 6.5a1 -- June 8 * All Platforms * Update Firefox to 45.2.0esr

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party
by gk＠torproject.org 13 Jun '16

13 Jun '16

commit 74a5f3138fe10081b8384419f96c4043f1f1d23f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 13 07:49:59 2016 +0000 fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party This fixes bug 19401 which is caused by a rebase error we overlooked. --- browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index d68c940..e6ef8e1 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -264,9 +264,9 @@ ChromeActions.prototype = { var docIsPrivate = this.isInPrivateBrowsing(); var netChannel; try { - netChannel = NetUtil.createNewChannel(blobUri, frontWindow.document, null); + netChannel = createNewChannel(blobUri, frontWindow.document, null); } catch (e) { - netChannel = NetUtil.createNewChannel(originalUri, frontWindow.document, null); + netChannel = createNewChannel(originalUri, frontWindow.document, null); } if ('nsIPrivateBrowsingChannel' in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) {

1 0

[tor-browser/tor-browser-45.2.0esr-6.0-1] fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party
by gk＠torproject.org 13 Jun '16

13 Jun '16

commit abff9655e7e5fc87c78fb6dd2a99dab494971cee Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 13 07:49:59 2016 +0000 fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party This fixes bug 19401 which is caused by a rebase error we overlooked. --- browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index d68c940..e6ef8e1 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -264,9 +264,9 @@ ChromeActions.prototype = { var docIsPrivate = this.isInPrivateBrowsing(); var netChannel; try { - netChannel = NetUtil.createNewChannel(blobUri, frontWindow.document, null); + netChannel = createNewChannel(blobUri, frontWindow.document, null); } catch (e) { - netChannel = NetUtil.createNewChannel(originalUri, frontWindow.document, null); + netChannel = createNewChannel(originalUri, frontWindow.document, null); } if ('nsIPrivateBrowsingChannel' in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) {

1 0

[torbutton/master] Bug 19206: Clear out the domain isolator state on `New Identity`.
by gk＠torproject.org 10 Jun '16

10 Jun '16

commit 36d849291ec0b20a58cccc2cd846fcd2540c9bbe Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Jun 7 19:03:31 2016 +0000 Bug 19206: Clear out the domain isolator state on `New Identity`. Additionally clear out the domain isolator state on `New Identity`. In theory this removes the need to explicitly issue a `NEWNYM` as new circuits will be used for all subsequent requests, including those made via the catch-all circuit. --- src/chrome/content/torbutton.js | 7 +++++++ src/components/domain-isolator.js | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index a293c44..e0e541b 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1872,6 +1872,13 @@ function torbutton_do_new_identity() { getService(Ci.nsIPermissionManager); pm.removeAll(); + // Clear the domain isolation state. + torbutton_log(3, "New Identity: Clearing domain isolator"); + + let domainIsolator = Cc["@torproject.org/domain-isolator;1"] + .getService(Ci.nsISupports).wrappedJSObject; + domainIsolator.clearIsolation(); + torbutton_log(3, "New Identity: Sending NEWNYM"); // We only support TBB for newnym. diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index 769c47d..dbdca1b 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -110,6 +110,18 @@ tor.newCircuitForDomain = function(domain) { logger.eclog(3, "New domain isolation for " + domain + ": " + tor.noncesForDomains[domain]); } +// __tor.clearIsolation()_. +// Clear the isolation state cache, forcing new circuits to be used for all +// subsequent requests. +tor.clearIsolation = function () { + // Per-domain nonces are stored in a map, so simply re-initialize the map. + tor.noncesForDomains = {}; + + // Force a rotation on the next catch-all circuit use by setting the creation + // time to the epoch. + tor.unknownDirtySince = 0; +} + // __tor.isolateCircuitsByDomain()__. // For every HTTPChannel, replaces the default SOCKS proxy with one that authenticates // to the SOCKS server (the tor client process) with a username (the first party domain) @@ -190,6 +202,10 @@ DomainIsolator.prototype = { tor.isolationEnabled = false; }, + clearIsolation: function() { + tor.clearIsolation(); + }, + wrappedJSObject: null };

1 0

[torbutton/master] Bug 19206: Include a 128 bit random tag as part of the domain isolator nonce.
by gk＠torproject.org 10 Jun '16

10 Jun '16

commit 0fbd44f0305a01a14bc7439f5ad66b59d9278a2d Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Jun 7 19:01:41 2016 +0000 Bug 19206: Include a 128 bit random tag as part of the domain isolator nonce. When creating a domain isolation nonce, 128 bits of entropy is drawn from a cryptographic source and saved on a per-domain basis. The new circuit behavior is changed to regenerate the nonce, instead of incrementing a counter. This allows the "right thing" to happen when the same tor instance is used across multiple Tor Browser sessions, for example when using a system wide tor, or a magic anonymity box. --- src/components/domain-isolator.js | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/src/components/domain-isolator.js b/src/components/domain-isolator.js index 6cfd21e..769c47d 100644 --- a/src/components/domain-isolator.js +++ b/src/components/domain-isolator.js @@ -16,6 +16,9 @@ const Cc = Components.classes, Ci = Components.interfaces, Cu = Components.utils let logger = Cc["@torproject.org/torbutton-logger;1"] .getService(Components.interfaces.nsISupports).wrappedJSObject; +// Import crypto object (FF 37+). +Cu.importGlobalProperties(["crypto"]); + // ## mozilla namespace. // Useful functionality for interacting with Mozilla services. let mozilla = {}; @@ -69,7 +72,7 @@ tor.socksProxyCredentials = function (originalProxy, domain) { // Check if we already have a nonce. If not, create // one for this domain. if (!tor.noncesForDomains.hasOwnProperty(domain)) { - tor.noncesForDomains[domain] = 0; + tor.noncesForDomains[domain] = tor.nonce(); } let proxy = originalProxy.QueryInterface(Ci.nsIProxyInfo); return mozilla.protocolProxyService @@ -77,21 +80,34 @@ tor.socksProxyCredentials = function (originalProxy, domain) { proxy.host, proxy.port, domain, // username - tor.noncesForDomains[domain].toString(), // password + tor.noncesForDomains[domain], // password proxy.flags, proxy.failoverTimeout, proxy.failoverProxy); }; -tor.newCircuitForDomain = function(domain) { - // Check if we already have a nonce. If not, create - // one for this domain. - if (!tor.noncesForDomains.hasOwnProperty(domain)) { - tor.noncesForDomains[domain] = 0; - } else { - tor.noncesForDomains[domain] += 1; +tor.nonce = function() { + // Generate a new 128 bit random tag. Strictly speaking both using a + // cryptographic entropy source and using 128 bits of entropy for the + // tag are likely overkill, as correct behavior only depends on how + // unlikely it is for there to be a collision. + let tag = new Uint8Array(16); + crypto.getRandomValues(tag); + + // Convert the tag to a hex string. + let tagStr = ""; + for (var i = 0; i < tag.length; i++) { + tagStr += (tag[i] >>> 4).toString(16); + tagStr += (tag[i] & 0x0F).toString(16); } - logger.eclog(3, "New domain isolation count " +tor.noncesForDomains[domain] + " for " + domain); + + return tagStr; +} + +tor.newCircuitForDomain = function(domain) { + // Re-generate the nonce for the domain. + tor.noncesForDomains[domain] = tor.nonce(); + logger.eclog(3, "New domain isolation for " + domain + ": " + tor.noncesForDomains[domain]); } // __tor.isolateCircuitsByDomain()__.

1 0