diff --git a/dom/locales/en-US/chrome/dom/dom.properties b/dom/locales/en-US/chrome/dom/dom.properties index a63f674dfee..c949231ef45 100644 --- a/dom/locales/en-US/chrome/dom/dom.properties +++ b/dom/locales/en-US/chrome/dom/dom.properties @@ -173,8 +173,6 @@ WebrtcDeprecatedPrefixWarning=WebRTC interfaces with the "moz" prefix (mozRTCPee NavigatorGetUserMediaWarning=navigator.mozGetUserMedia has been replaced by navigator.mediaDevices.getUserMedia # LOCALIZATION NOTE: Do not translate "ServiceWorker". %S is a URL. InterceptionFailedWithURL=Failed to load '%S'. A ServiceWorker intercepted the request and encountered an unexpected error. -# LOCALIZATION NOTE: Do not translate "ServiceWorker", "FetchEvent.respondWith()", "opaque", or "Response". %S is a URL. -OpaqueInterceptionDisabledWithURL=Failed to load '%S'. A ServiceWorker passed an opaque Response to FetchEvent.respondWith() while opaque interception is disabled. # LOCALIZATION NOTE: Do not translate "ServiceWorker", "FetchEvent.respondWith()", "FetchEvent", "no-cors", "opaque", "Response", or "RequestMode". %1$S is a URL. %2$S is a RequestMode value. BadOpaqueInterceptionRequestModeWithURL=Failed to load '%1$S'. A ServiceWorker passed an opaque Response to FetchEvent.respondWith() while handling a '%2$S' FetchEvent. Opaque Response objects are only valid when the RequestMode is 'no-cors'. # LOCALIZATION NOTE: Do not translate "ServiceWorker", "Error", "Response", "FetchEvent.respondWith()", or "fetch()". %S is a URL. diff --git a/dom/tests/mochitest/fetch/sw_reroute.js b/dom/tests/mochitest/fetch/sw_reroute.js index c22fd62fd9d..631ec2b6d1f 100644 --- a/dom/tests/mochitest/fetch/sw_reroute.js +++ b/dom/tests/mochitest/fetch/sw_reroute.js @@ -12,7 +12,6 @@ function testScript(script) { SpecialPowers.pushPrefEnv({ "set": [["dom.requestcache.enabled", true], ["dom.serviceWorkers.enabled", true], - ["dom.serviceWorkers.interception.opaque.enabled", true], ["dom.serviceWorkers.testing.enabled", true], ["dom.serviceWorkers.exemptFromPerDomainMax", true]] }, function() { diff --git a/dom/workers/ServiceWorkerEvents.cpp b/dom/workers/ServiceWorkerEvents.cpp index 83afc14f575..44fd75a8d59 100644 --- a/dom/workers/ServiceWorkerEvents.cpp +++ b/dom/workers/ServiceWorkerEvents.cpp @@ -554,15 +554,6 @@ RespondWithHandler::ResolvedCallback(JSContext* aCx, JS::Handle aValu MOZ_ASSERT(worker); worker->AssertIsOnWorkerThread(); - // Allow opaque response interception to be disabled until we can ensure the - // security implications are not a complete disaster. - if (response->Type() == ResponseType::Opaque && - !worker->OpaqueInterceptionEnabled()) { - autoCancel.SetCancelMessage( - NS_LITERAL_CSTRING("OpaqueInterceptionDisabledWithURL"), mRequestURL); - return; - } - // Section "HTTP Fetch", step 2.2: // If one of the following conditions is true, return a network error: // * response's type is "error". diff --git a/dom/workers/WorkerPrefs.h b/dom/workers/WorkerPrefs.h index 5c595c637f1..3d2e662ac8f 100644 --- a/dom/workers/WorkerPrefs.h +++ b/dom/workers/WorkerPrefs.h @@ -31,7 +31,6 @@ WORKER_SIMPLE_PREF("dom.webnotifications.enabled", DOMWorkerNotificationEnabled, WORKER_SIMPLE_PREF("dom.webnotifications.serviceworker.enabled", DOMServiceWorkerNotificationEnabled, DOM_SERVICEWORKERNOTIFICATION) WORKER_SIMPLE_PREF("dom.serviceWorkers.enabled", ServiceWorkersEnabled, SERVICEWORKERS_ENABLED) WORKER_SIMPLE_PREF("dom.serviceWorkers.testing.enabled", ServiceWorkersTestingEnabled, SERVICEWORKERS_TESTING_ENABLED) -WORKER_SIMPLE_PREF("dom.serviceWorkers.interception.opaque.enabled", OpaqueInterceptionEnabled, INTERCEPTION_OPAQUE_ENABLED) WORKER_SIMPLE_PREF("dom.serviceWorkers.openWindow.enabled", OpenWindowEnabled, OPEN_WINDOW_ENABLED) WORKER_SIMPLE_PREF("dom.push.enabled", PushEnabled, PUSH_ENABLED) WORKER_SIMPLE_PREF("dom.requestcache.enabled", RequestCacheEnabled, REQUESTCACHE_ENABLED) diff --git a/dom/workers/test/serviceworkers/test_eventsource_intercept.html b/dom/workers/test/serviceworkers/test_eventsource_intercept.html index 0d7ff6d98fd..55df62bb7ba 100644 --- a/dom/workers/test/serviceworkers/test_eventsource_intercept.html +++ b/dom/workers/test/serviceworkers/test_eventsource_intercept.html @@ -95,7 +95,6 @@ ["dom.serviceWorkers.exemptFromPerDomainMax", true], ["dom.serviceWorkers.enabled", true], ["dom.serviceWorkers.testing.enabled", true], - ["dom.serviceWorkers.interception.opaque.enabled", true], ["dom.caches.enabled", true], ]}, runTest); diff --git a/dom/workers/test/serviceworkers/test_fetch_event.html b/dom/workers/test/serviceworkers/test_fetch_event.html index 6605f681aa4..764be87b131 100644 --- a/dom/workers/test/serviceworkers/test_fetch_event.html +++ b/dom/workers/test/serviceworkers/test_fetch_event.html @@ -73,7 +73,6 @@ SimpleTest.waitForExplicitFinish(); SpecialPowers.pushPrefEnv({"set": [ ["dom.serviceWorkers.exemptFromPerDomainMax", true], - ["dom.serviceWorkers.interception.opaque.enabled", true], ["dom.serviceWorkers.enabled", true], ["dom.serviceWorkers.testing.enabled", true], ]}, runTest); diff --git a/dom/workers/test/serviceworkers/test_not_intercept_plugin.html b/dom/workers/test/serviceworkers/test_not_intercept_plugin.html index 0dff3ee06a5..a90e068d343 100644 --- a/dom/workers/test/serviceworkers/test_not_intercept_plugin.html +++ b/dom/workers/test/serviceworkers/test_not_intercept_plugin.html @@ -68,7 +68,6 @@ SpecialPowers.pushPrefEnv({"set": [ ["dom.requestcontext.enabled", true], ["dom.serviceWorkers.exemptFromPerDomainMax", true], - ["dom.serviceWorkers.interception.opaque.enabled", true], ["dom.serviceWorkers.enabled", true], ["dom.serviceWorkers.testing.enabled", true], ]}, runTest); diff --git a/dom/workers/test/serviceworkers/test_opaque_intercept.html b/dom/workers/test/serviceworkers/test_opaque_intercept.html index fe0598f4547..5cb12e518c7 100644 --- a/dom/workers/test/serviceworkers/test_opaque_intercept.html +++ b/dom/workers/test/serviceworkers/test_opaque_intercept.html @@ -77,7 +77,6 @@ ["dom.serviceWorkers.exemptFromPerDomainMax", true], ["dom.serviceWorkers.enabled", true], ["dom.serviceWorkers.testing.enabled", true], - ["dom.serviceWorkers.interception.opaque.enabled", true], ["dom.caches.enabled", true], ]}, runTest); diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 52aa48d4280..7b720b50376 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -143,9 +143,6 @@ pref("dom.workers.maxPerDomain", 50); pref("dom.serviceWorkers.enabled", false); -// Allow service workers to intercept opaque (cross origin) responses -pref("dom.serviceWorkers.interception.opaque.enabled", true); - // The amount of time (milliseconds) service workers keep running after each event. pref("dom.serviceWorkers.idle_timeout", 30000); diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/ServiceWorkerGlobalScope/__dir__.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/ServiceWorkerGlobalScope/__dir__.ini index 7ff1044269c..ae99e9ff719 100644 --- a/testing/web-platform/mozilla/meta/service-workers/service-worker/ServiceWorkerGlobalScope/__dir__.ini +++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/ServiceWorkerGlobalScope/__dir__.ini @@ -1,2 +1 @@ -prefs: [dom.serviceWorkers.enabled: true, - dom.serviceWorkers.interception.opaque.enabled: true] +prefs: [dom.serviceWorkers.enabled:true] diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/__dir__.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/__dir__.ini index 7ff1044269c..ae99e9ff719 100644 --- a/testing/web-platform/mozilla/meta/service-workers/service-worker/__dir__.ini +++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/__dir__.ini @@ -1,2 +1 @@ -prefs: [dom.serviceWorkers.enabled: true, - dom.serviceWorkers.interception.opaque.enabled: true] +prefs: [dom.serviceWorkers.enabled:true]