Backed out 2 changesets (bug 1642667) for mda failures on test_peerConnection_basicAudioNATRelay.html . CLOSED TREE
authorNarcis Beleuzu <nbeleuzu@mozilla.com>
Wed, 10 Jun 2020 16:34:45 +0300
changeset 598936 9f3871bb562a7ad2dd56132fb627d57d12044de6
parent 598935 04543b8ded5089fd04678057478ed96b28021ec1
child 598937 fca2a64739b13da32d93ee5d48f6bd2e2f23fadc
push id13310
push userffxbld-merge
push dateMon, 29 Jun 2020 14:50:06 +0000
treeherdermozilla-beta@15a59a0afa5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1642667
milestone79.0a1
backs outc1672891baf59b423d76ea2feee4df6ccd8bb46e
4745600e205afdc49a08e5fb5bc93119e561c76a
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 1642667) for mda failures on test_peerConnection_basicAudioNATRelay.html . CLOSED TREE Backed out changeset c1672891baf5 (bug 1642667) Backed out changeset 4745600e205a (bug 1642667)
browser/components/originattributes/test/browser/browser_clientAuth.js
dom/media/tests/mochitest/test_peerConnection_basicAudioNATRelay.html
modules/libpref/init/StaticPrefList.yaml
netwerk/protocol/http/nsHttpChannel.cpp
netwerk/test/unit/test_http2-proxy.js
toolkit/components/antitracking/test/browser/browser.ini
toolkit/components/antitracking/test/browser/browser_networkIsolation.js
toolkit/components/antitracking/test/browser/browser_staticPartition_network.js
--- a/browser/components/originattributes/test/browser/browser_clientAuth.js
+++ b/browser/components/originattributes/test/browser/browser_clientAuth.js
@@ -10,20 +10,17 @@ function onCertDialogLoaded(subject) {
 Services.obs.addObserver(onCertDialogLoaded, "cert-dialog-loaded");
 
 registerCleanupFunction(() => {
   Services.obs.removeObserver(onCertDialogLoaded, "cert-dialog-loaded");
 });
 
 async function setup() {
   await SpecialPowers.pushPrefEnv({
-    set: [
-      ["security.default_personal_cert", "Ask Every Time"],
-      ["privacy.partition.network_state", false],
-    ],
+    set: [["security.default_personal_cert", "Ask Every Time"]],
   });
 }
 
 function getResult() {
   // The first tab always returns true.
   if (!secondTabStarted) {
     certCached = true;
     secondTabStarted = true;
--- a/dom/media/tests/mochitest/test_peerConnection_basicAudioNATRelay.html
+++ b/dom/media/tests/mochitest/test_peerConnection_basicAudioNATRelay.html
@@ -18,18 +18,17 @@ if (!("mediaDevices" in navigator)) {
   SpecialPowers.pushPrefEnv({set: [['media.devices.insecure.enabled', true]]},
                             () => location.reload());
 } else {
   runNetworkTest(async (options = {}) => {
     await pushPrefs(
         ['media.peerconnection.ice.obfuscate_host_addresses', false],
         ['media.peerconnection.nat_simulator.filtering_type', 'PORT_DEPENDENT'],
         ['media.peerconnection.nat_simulator.mapping_type', 'PORT_DEPENDENT'],
-        ['media.getusermedia.insecure.enabled', true],
-        ['privacy.partition.network_state', false])
+        ['media.getusermedia.insecure.enabled', true]);
     options.expectedLocalCandidateType = "srflx";
     options.expectedRemoteCandidateType = "relay";
     // If both have TURN, it is a toss-up which one will end up using a
     // relay.
     options.turn_disabled_local = true;
     const test = new PeerConnectionTest(options);
     // Make sure we don't end up choosing the wrong thing due to delays in
     // trickle. Once we are willing to accept trickle after ICE success, we
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -8575,23 +8575,16 @@
   value: true
   mirror: always
 
 - name: privacy.partition.network_state
   type: RelaxedAtomicBool
   value: @IS_NIGHTLY_BUILD@
   mirror: always
 
-# By default, the network state isolation is not active when there is a proxy
-# setting. This pref forces the network isolation even in these scenarios.
-- name: privacy.partition.network_state.connection_with_proxy
-  type: bool
-  value: false
-  mirror: always
-
 #---------------------------------------------------------------------------
 # Prefs starting with "prompts."
 #---------------------------------------------------------------------------
 
 # Prompt modal type prefs
 # See nsIPromptService::MODAL_TYPE fields for possible values.
 
 # Insecure form submit warning.
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -2422,31 +2422,23 @@ void nsHttpChannel::ProcessAltService() 
   if (NS_FAILED(mURI->GetAsciiHost(originHost))) {
     return;
   }
 
   nsCOMPtr<nsIInterfaceRequestor> callbacks;
   nsCOMPtr<nsProxyInfo> proxyInfo;
   NS_NewNotificationCallbacksAggregation(mCallbacks, mLoadGroup,
                                          getter_AddRefs(callbacks));
-
   if (mProxyInfo) {
     proxyInfo = do_QueryInterface(mProxyInfo);
   }
 
   OriginAttributes originAttributes;
-  // Regular principal in case we have a proxy.
-  if (proxyInfo &&
-      !StaticPrefs::privacy_partition_network_state_connection_with_proxy()) {
-    StoragePrincipalHelper::GetOriginAttributes(
-        this, originAttributes, StoragePrincipalHelper::eRegularPrincipal);
-  } else {
-    StoragePrincipalHelper::GetOriginAttributesForNetworkState(
-        this, originAttributes);
-  }
+  StoragePrincipalHelper::GetOriginAttributes(
+      this, originAttributes, StoragePrincipalHelper::eRegularPrincipal);
 
   AltSvcMapping::ProcessHeader(
       altSvc, scheme, originHost, originPort, mUsername, GetTopWindowOrigin(),
       mPrivateBrowsing, IsIsolated(), callbacks, proxyInfo,
       mCaps & NS_HTTP_DISALLOW_SPDY, originAttributes);
 }
 
 nsresult nsHttpChannel::ProcessResponse() {
@@ -6764,25 +6756,18 @@ nsresult nsHttpChannel::BeginConnect() {
 
   mRequestHead.SetHTTPS(isHttps);
   mRequestHead.SetOrigin(scheme, host, port);
 
   SetOriginHeader();
   SetDoNotTrack();
 
   OriginAttributes originAttributes;
-  // Regular principal in case we have a proxy.
-  if (proxyInfo &&
-      !StaticPrefs::privacy_partition_network_state_connection_with_proxy()) {
-    StoragePrincipalHelper::GetOriginAttributes(
-        this, originAttributes, StoragePrincipalHelper::eRegularPrincipal);
-  } else {
-    StoragePrincipalHelper::GetOriginAttributesForNetworkState(
-        this, originAttributes);
-  }
+  StoragePrincipalHelper::GetOriginAttributes(
+      this, originAttributes, StoragePrincipalHelper::eRegularPrincipal);
 
   RefPtr<nsHttpConnectionInfo> connInfo = new nsHttpConnectionInfo(
       host, port, EmptyCString(), mUsername, GetTopWindowOrigin(), proxyInfo,
       originAttributes, isHttps);
   mAllowAltSvc = (mAllowAltSvc && !gHttpHandler->IsSpdyBlacklisted(connInfo));
 
   RefPtr<AltSvcMapping> mapping;
   if (!mConnectionInfo && mAllowAltSvc &&  // per channel
--- a/netwerk/test/unit/test_http2-proxy.js
+++ b/netwerk/test/unit/test_http2-proxy.js
@@ -330,20 +330,16 @@ add_task(async function setup() {
   Services.prefs.setStringPref(
     "services.settings.server",
     `data:text/html,test`
   );
 
   Services.prefs.setBoolPref("network.http.spdy.enabled", true);
   Services.prefs.setBoolPref("network.http.spdy.enabled.http2", true);
 
-  // Even with network state isolation active, we don't end up using the
-  // partitioned principal.
-  Services.prefs.setBoolPref("privacy.partition.network_state", true);
-
   // make all native resolve calls "secretly" resolve localhost instead
   Services.prefs.setBoolPref("network.dns.native-is-localhost", true);
 
   filter = new ProxyFilter("https", "localhost", proxy_port, 0);
   pps.registerFilter(filter, 10);
 
   initial_session_count = await proxy_session_counter();
   info(`Initial proxy session count = ${initial_session_count}`);
--- a/toolkit/components/antitracking/test/browser/browser.ini
+++ b/toolkit/components/antitracking/test/browser/browser.ini
@@ -148,9 +148,8 @@ support-files =
   !/browser/components/originattributes/test/browser/file_thirdPartyChild.script.js
   !/browser/components/originattributes/test/browser/file_thirdPartyChild.sharedworker.js
   !/browser/components/originattributes/test/browser/file_thirdPartyChild.video.ogv
   !/browser/components/originattributes/test/browser/file_thirdPartyChild.worker.fetch.html
   !/browser/components/originattributes/test/browser/file_thirdPartyChild.worker.js
   !/browser/components/originattributes/test/browser/file_thirdPartyChild.worker.request.html
   !/browser/components/originattributes/test/browser/file_thirdPartyChild.worker.xhr.html
   !/browser/components/originattributes/test/browser/file_thirdPartyChild.xhr.html
-[browser_staticPartition_network.js]
--- a/toolkit/components/antitracking/test/browser/browser_networkIsolation.js
+++ b/toolkit/components/antitracking/test/browser/browser_networkIsolation.js
@@ -40,17 +40,16 @@ add_task(async function() {
       [
         "network.cookie.cookieBehavior",
         Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER,
       ],
       ["network.http.altsvc.proxy_checks", false],
       ["privacy.trackingprotection.enabled", false],
       ["privacy.trackingprotection.pbmode.enabled", false],
       ["privacy.trackingprotection.annotate_channels", true],
-      ["privacy.partition.network_state", false],
     ],
   });
 
   await UrlClassifierTestUtils.addTestTrackers();
 
   info("Creating a new tab");
   let tab = BrowserTestUtils.addTab(gBrowser, TEST_TOP_PAGE);
   gBrowser.selectedTab = tab;
deleted file mode 100644
--- a/toolkit/components/antitracking/test/browser/browser_staticPartition_network.js
+++ /dev/null
@@ -1,108 +0,0 @@
-function altSvcCacheKeyIsolated(parsed) {
-  return parsed.length > 5 && parsed[5] == "I";
-}
-
-function altSvcPartitionKey(key) {
-  let parts = key.split(":");
-  return parts[parts.length - 1];
-}
-
-const gHttpHandler = Cc["@mozilla.org/network/protocol;1?name=http"].getService(
-  Ci.nsIHttpProtocolHandler
-);
-
-add_task(async function() {
-  info("Starting tlsSessionTickets test");
-
-  await SpecialPowers.flushPrefEnv();
-  await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.cache.disk.enable", false],
-      ["browser.cache.memory.enable", false],
-      ["network.cookie.cookieBehavior", Ci.nsICookieService.BEHAVIOR_ACCEPT],
-      ["network.http.altsvc.proxy_checks", false],
-      ["privacy.trackingprotection.enabled", false],
-      ["privacy.trackingprotection.pbmode.enabled", false],
-      ["privacy.trackingprotection.annotate_channels", false],
-      ["privacy.partition.network_state", true],
-      ["privacy.partition.network_state.connection_with_proxy", true],
-    ],
-  });
-
-  info("Creating a new tab");
-  let tab = BrowserTestUtils.addTab(gBrowser, TEST_TOP_PAGE);
-  gBrowser.selectedTab = tab;
-
-  let browser = gBrowser.getBrowserForTab(tab);
-  await BrowserTestUtils.browserLoaded(browser);
-
-  const thirdPartyURL =
-    "https://tlsresumptiontest.example.org/browser/toolkit/components/antitracking/test/browser/empty-altsvc.js";
-  const partitionKey1 = "^partitionKey=%28http%2Cexample.net%29";
-  const partitionKey2 = "^partitionKey=%28http%2Cmochi.test%29";
-
-  function checkAltSvcCache(keys) {
-    let arr = gHttpHandler.altSvcCacheKeys;
-    is(
-      arr.length,
-      keys.length,
-      "Found the expected number of items in the cache"
-    );
-    for (let i = 0; i < arr.length; ++i) {
-      is(
-        altSvcPartitionKey(arr[i]),
-        keys[i],
-        "Expected top window origin found in the Alt-Svc cache key"
-      );
-    }
-  }
-
-  checkAltSvcCache([]);
-
-  info("Loading something in the tab");
-  await SpecialPowers.spawn(browser, [{ thirdPartyURL }], async function(obj) {
-    dump("AAA: " + content.window.location.href + "\n");
-    let src = content.document.createElement("script");
-    let p = new content.Promise(resolve => {
-      src.onload = resolve;
-    });
-    content.document.body.appendChild(src);
-    src.src = obj.thirdPartyURL;
-    await p;
-  });
-
-  checkAltSvcCache([partitionKey1]);
-
-  info("Creating a second tab");
-  let tab2 = BrowserTestUtils.addTab(gBrowser, TEST_TOP_PAGE_6);
-  gBrowser.selectedTab = tab2;
-
-  let browser2 = gBrowser.getBrowserForTab(tab2);
-  await BrowserTestUtils.browserLoaded(browser2);
-
-  info("Loading something in the second tab");
-  await SpecialPowers.spawn(browser2, [{ thirdPartyURL }], async function(obj) {
-    let src = content.document.createElement("script");
-    let p = new content.Promise(resolve => {
-      src.onload = resolve;
-    });
-    content.document.body.appendChild(src);
-    src.src = obj.thirdPartyURL;
-    await p;
-  });
-
-  checkAltSvcCache([partitionKey2, partitionKey1]);
-
-  info("Removing the tabs");
-  BrowserTestUtils.removeTab(tab);
-  BrowserTestUtils.removeTab(tab2);
-});
-
-add_task(async function() {
-  info("Cleaning up.");
-  await new Promise(resolve => {
-    Services.clearData.deleteData(Ci.nsIClearDataService.CLEAR_ALL, value =>
-      resolve()
-    );
-  });
-});