- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 22468: Add default obfs4 bridges frosty and dragon.
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 092f632376a3d7c3fe32014c7d99317d40ee3374 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 1 13:45:58 2017 -0700 Bug 22468: Add default obfs4 bridges frosty and dragon. --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 9cbb326..d2f4236 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -36,6 +36,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/maint-7.0] Bug 22468: Add default obfs4 bridges frosty and dragon.
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 245852ffb22232effed9ec44bc9e4dde935fd125 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 1 13:45:58 2017 -0700 Bug 22468: Add default obfs4 bridges frosty and dragon. --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index add6448..0a363cd 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -36,6 +36,8 @@ pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/maint-7.0] Bug 22429: Add IPv6 address for Lisbeth:443 obfs4 bridge.
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 94947a1c2333c4dcf0a0bf8af6228aceaf437ad2 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 1 12:55:15 2017 -0700 Bug 22429: Add IPv6 address for Lisbeth:443 obfs4 bridge. --- Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 48d3465..add6448 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -35,6 +35,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/master] Bug 22429: Add IPv6 address for Lisbeth:443 obfs4 bridge.
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 6dbe2e65a8d5822d024669e90d7f920b453adce4 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 1 12:55:15 2017 -0700 Bug 22429: Add IPv6 address for Lisbeth:443 obfs4 bridge. --- Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index fea436d..9cbb326 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -35,6 +35,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); /**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser/tor-browser-52.1.1esr-7.0-1] Bug 16485: Improve about:cache page
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit e1f39122d16e5cd69dd11732d8fb2faf5087fdd2 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 31 08:58:30 2017 +0000 Bug 16485: Improve about:cache page Loading `about:cache` and selecting particular caches via the checkboxes results in a cryptic error ("Unrecognized storage name 'null' in about:cache URL) when updating the page. We avoid that by making sure the storage parameter is in fact empty if it is supposed to be `null`. --- toolkit/components/aboutcache/content/aboutCache.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/toolkit/components/aboutcache/content/aboutCache.js b/toolkit/components/aboutcache/content/aboutCache.js index 07067cc..425e570 100644 --- a/toolkit/components/aboutcache/content/aboutCache.js +++ b/toolkit/components/aboutcache/content/aboutCache.js @@ -40,5 +40,13 @@ function navigate() if ($('priv').checked) context += 'p,'; + // Checking any of the checkboxes and hitting "Update" after `about:cache` got + // loaded should not result in a cryptic error ("Unrecognized storage name + // 'null' in about:cache URL"). Rather, the related list of entries in all + // caches should be made visible. + if (storage == null) { + storage="" + } + window.location.href = 'about:cache?storage=' + storage + '&context=' + context; }

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 16485: Improve about:cache page
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 9607f989206d048c9905d1b19cedf9913750c6c7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 31 08:58:30 2017 +0000 Bug 16485: Improve about:cache page Loading `about:cache` and selecting particular caches via the checkboxes results in a cryptic error ("Unrecognized storage name 'null' in about:cache URL) when updating the page. We avoid that by making sure the storage parameter is in fact empty if it is supposed to be `null`. --- toolkit/components/aboutcache/content/aboutCache.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/toolkit/components/aboutcache/content/aboutCache.js b/toolkit/components/aboutcache/content/aboutCache.js index 07067cc..425e570 100644 --- a/toolkit/components/aboutcache/content/aboutCache.js +++ b/toolkit/components/aboutcache/content/aboutCache.js @@ -40,5 +40,13 @@ function navigate() if ($('priv').checked) context += 'p,'; + // Checking any of the checkboxes and hitting "Update" after `about:cache` got + // loaded should not result in a cryptic error ("Unrecognized storage name + // 'null' in about:cache URL"). Rather, the related list of entries in all + // caches should be made visible. + if (storage == null) { + storage="" + } + window.location.href = 'about:cache?storage=' + storage + '&context=' + context; }

1 0

[torbutton/master] Bug 22457: Allow resources loaded by view-source://
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 137c0527b1d152c5999db53894badc54ab9e34c9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 1 09:26:11 2017 +0000 Bug 22457: Allow resources loaded by view-source:// Instead of whitelisting single resources for view-source requests that might allow platform detection we allow all of those that are needed by requests with a view-source origin. This should be safe now that https://bugzilla.mozilla.org/show_bug.cgi?id=1172165 landed. --- src/components/content-policy.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/content-policy.js b/src/components/content-policy.js index a63919c..b2fdff7 100644 --- a/src/components/content-policy.js +++ b/src/components/content-policy.js @@ -83,8 +83,12 @@ ContentPolicy.prototype = { return Ci.nsIContentPolicy.ACCEPT; } - // Accept if no origin URI or if origin scheme is chrome/resource/about. - if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') || aRequestOrigin.schemeIs('chrome') || aRequestOrigin.schemeIs('about')) + // Accept if no origin URI or if origin scheme is + // chrome/resource/about/view-source. + if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') || + aRequestOrigin.schemeIs('chrome') || + aRequestOrigin.schemeIs('about') || + aRequestOrigin.schemeIs('view-source')) return Ci.nsIContentPolicy.ACCEPT; // Accept if resource directly loaded into a tab.

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 21862: Rip out potentially unsafe rust code
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 88c25c56d96f8fc0801359358d808f0d0e7d4b93 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 24 14:30:03 2017 +0000 Bug 21862: Rip out potentially unsafe rust code Just ripping out the problematic code leads to compile errors complaining about modified third party code. That's fine for now, though we need to think harder about this issue once we start building with Rust being mandatory. --- third_party/rust/url/src/host.rs | 22 +--------------------- third_party/rust/url/src/lib.rs | 11 +---------- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/third_party/rust/url/src/host.rs b/third_party/rust/url/src/host.rs index 47b049a..f2de780 100644 --- a/third_party/rust/url/src/host.rs +++ b/third_party/rust/url/src/host.rs @@ -10,7 +10,7 @@ use std::cmp; use std::fmt::{self, Formatter}; use std::io; -use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs}; +use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6}; use std::vec; use parser::{ParseResult, ParseError}; use percent_encoding::percent_decode; @@ -135,26 +135,6 @@ impl<'a> HostAndPort<&'a str> { } } -impl<S: AsRef<str>> ToSocketAddrs for HostAndPort<S> { - type Iter = SocketAddrs; - - fn to_socket_addrs(&self) -> io::Result<Self::Iter> { - let port = self.port; - match self.host { - Host::Domain(ref domain) => Ok(SocketAddrs { - // FIXME: use std::net::lookup_host when it’s stable. - state: SocketAddrsState::Domain(try!((domain.as_ref(), port).to_socket_addrs())) - }), - Host::Ipv4(address) => Ok(SocketAddrs { - state: SocketAddrsState::One(SocketAddr::V4(SocketAddrV4::new(address, port))) - }), - Host::Ipv6(address) => Ok(SocketAddrs { - state: SocketAddrsState::One(SocketAddr::V6(SocketAddrV6::new(address, port, 0, 0))) - }), - } - } -} - /// Socket addresses for an URL. pub struct SocketAddrs { state: SocketAddrsState diff --git a/third_party/rust/url/src/lib.rs b/third_party/rust/url/src/lib.rs index 9378318..51607e4 100644 --- a/third_party/rust/url/src/lib.rs +++ b/third_party/rust/url/src/lib.rs @@ -130,7 +130,7 @@ use std::fmt::{self, Write}; use std::hash; use std::io; use std::mem; -use std::net::{ToSocketAddrs, IpAddr}; +use std::net::IpAddr; use std::ops::{Range, RangeFrom, RangeTo}; use std::path::{Path, PathBuf}; use std::str; @@ -1191,15 +1191,6 @@ impl Url { } } -/// Return an error if `Url::host` or `Url::port_or_known_default` return `None`. -impl ToSocketAddrs for Url { - type Iter = SocketAddrs; - - fn to_socket_addrs(&self) -> io::Result<Self::Iter> { - try!(self.with_default_port(|_| Err(()))).to_socket_addrs() - } -} - /// Parse a string as an URL, without a base URL or encoding override. impl str::FromStr for Url { type Err = ParseError;

1 0

[tor-browser/tor-browser-52.1.1esr-7.0-1] Bug 21862: Rip out potentially unsafe rust code
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 78aa6185cd8d1d11e09495f6e4dc5cbc19e80cba Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 24 14:30:03 2017 +0000 Bug 21862: Rip out potentially unsafe rust code Just ripping out the problematic code leads to compile errors complaining about modified third party code. That's fine for now, though we need to think harder about this issue once we start building with Rust being mandatory. --- third_party/rust/url/src/host.rs | 22 +--------------------- third_party/rust/url/src/lib.rs | 11 +---------- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/third_party/rust/url/src/host.rs b/third_party/rust/url/src/host.rs index 47b049a..f2de780 100644 --- a/third_party/rust/url/src/host.rs +++ b/third_party/rust/url/src/host.rs @@ -10,7 +10,7 @@ use std::cmp; use std::fmt::{self, Formatter}; use std::io; -use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs}; +use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6}; use std::vec; use parser::{ParseResult, ParseError}; use percent_encoding::percent_decode; @@ -135,26 +135,6 @@ impl<'a> HostAndPort<&'a str> { } } -impl<S: AsRef<str>> ToSocketAddrs for HostAndPort<S> { - type Iter = SocketAddrs; - - fn to_socket_addrs(&self) -> io::Result<Self::Iter> { - let port = self.port; - match self.host { - Host::Domain(ref domain) => Ok(SocketAddrs { - // FIXME: use std::net::lookup_host when it’s stable. - state: SocketAddrsState::Domain(try!((domain.as_ref(), port).to_socket_addrs())) - }), - Host::Ipv4(address) => Ok(SocketAddrs { - state: SocketAddrsState::One(SocketAddr::V4(SocketAddrV4::new(address, port))) - }), - Host::Ipv6(address) => Ok(SocketAddrs { - state: SocketAddrsState::One(SocketAddr::V6(SocketAddrV6::new(address, port, 0, 0))) - }), - } - } -} - /// Socket addresses for an URL. pub struct SocketAddrs { state: SocketAddrsState diff --git a/third_party/rust/url/src/lib.rs b/third_party/rust/url/src/lib.rs index 9378318..51607e4 100644 --- a/third_party/rust/url/src/lib.rs +++ b/third_party/rust/url/src/lib.rs @@ -130,7 +130,7 @@ use std::fmt::{self, Write}; use std::hash; use std::io; use std::mem; -use std::net::{ToSocketAddrs, IpAddr}; +use std::net::IpAddr; use std::ops::{Range, RangeFrom, RangeTo}; use std::path::{Path, PathBuf}; use std::str; @@ -1191,15 +1191,6 @@ impl Url { } } -/// Return an error if `Url::host` or `Url::port_or_known_default` return `None`. -impl ToSocketAddrs for Url { - type Iter = SocketAddrs; - - fn to_socket_addrs(&self) -> io::Result<Self::Iter> { - try!(self.with_default_port(|_| Err(()))).to_socket_addrs() - } -} - /// Parse a string as an URL, without a base URL or encoding override. impl str::FromStr for Url { type Err = ParseError;

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 1329521 - GetLoadContextInfo() should not compare originAttributes and privateBrowsing boolean when docShell is chrome type, r=smaug
by gk＠torproject.org 02 Jun '17

02 Jun '17

commit 3f5f0f7d0b7a3384f5b46d2abef6b1bbf631077e Author: Andrea Marchesini <amarchesini(a)mozilla.com> Date: Fri Jan 13 15:41:28 2017 +0100 Bug 1329521 - GetLoadContextInfo() should not compare originAttributes and privateBrowsing boolean when docShell is chrome type, r=smaug Backported to ESR52: https://bugs.torproject.org/22462 --- netwerk/base/LoadContextInfo.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/netwerk/base/LoadContextInfo.cpp b/netwerk/base/LoadContextInfo.cpp index 61b9394..77eeb79 100644 --- a/netwerk/base/LoadContextInfo.cpp +++ b/netwerk/base/LoadContextInfo.cpp @@ -5,6 +5,7 @@ #include "LoadContextInfo.h" #include "mozilla/dom/ToJSValue.h" +#include "nsDocShell.h" #include "nsIChannel.h" #include "nsILoadContext.h" #include "nsIWebNavigation.h" @@ -141,14 +142,19 @@ GetLoadContextInfo(nsILoadContext *aLoadContext, bool aIsAnonymous) NeckoOriginAttributes(nsILoadContextInfo::NO_APP_ID, false)); } - DebugOnly<bool> pb = aLoadContext->UsePrivateBrowsing(); DocShellOriginAttributes doa; aLoadContext->GetOriginAttributes(doa); - MOZ_ASSERT(pb == (doa.mPrivateBrowsingId > 0)); NeckoOriginAttributes noa; noa.InheritFromDocShellToNecko(doa); +#ifdef DEBUG + nsCOMPtr<nsIDocShellTreeItem> docShell = do_QueryInterface(aLoadContext); + if (!docShell || docShell->ItemType() != nsIDocShellTreeItem::typeChrome) { + MOZ_ASSERT(aLoadContext->UsePrivateBrowsing() == (doa.mPrivateBrowsingId > 0)); + } +#endif + return new LoadContextInfo(aIsAnonymous, noa); }

1 0