diff --git a/dom/security/test/sri/iframe_require-sri-for_main.html b/dom/security/test/sri/iframe_require-sri-for_main.html index 8a51ba69f512..467c699c7a58 100644 --- a/dom/security/test/sri/iframe_require-sri-for_main.html +++ b/dom/security/test/sri/iframe_require-sri-for_main.html @@ -34,7 +34,14 @@

black text

diff --git a/dom/security/test/sri/iframe_require-sri-for_no_csp.html b/dom/security/test/sri/iframe_require-sri-for_no_csp.html new file mode 100644 index 000000000000..435b32ea3b98 --- /dev/null +++ b/dom/security/test/sri/iframe_require-sri-for_no_csp.html @@ -0,0 +1,5 @@ + diff --git a/dom/security/test/sri/mochitest.ini b/dom/security/test/sri/mochitest.ini index e10a7771b47b..2e3ad7c61b8e 100644 --- a/dom/security/test/sri/mochitest.ini +++ b/dom/security/test/sri/mochitest.ini @@ -3,11 +3,16 @@ support-files = file_bug_1271796.css iframe_require-sri-for_main.html iframe_require-sri-for_main.html^headers^ + iframe_require-sri-for_no_csp.html iframe_script_crossdomain.html iframe_script_sameorigin.html iframe_sri_disabled.html iframe_style_crossdomain.html iframe_style_sameorigin.html + rsf_csp_worker.js + rsf_csp_worker.js^headers^ + rsf_imported.js + rsf_worker.js script_crossdomain1.js script_crossdomain1.js^headers^ script_crossdomain2.js diff --git a/dom/security/test/sri/rsf_csp_worker.js b/dom/security/test/sri/rsf_csp_worker.js new file mode 100644 index 000000000000..553fdf92b983 --- /dev/null +++ b/dom/security/test/sri/rsf_csp_worker.js @@ -0,0 +1,9 @@ +postMessage("good_worker_could_load"); +try { + importScripts('rsf_imported.js'); +} catch(e) { + postMessage("good_worker_after_importscripts"); +} +finally { + postMessage("finish"); +} diff --git a/dom/security/test/sri/rsf_csp_worker.js^headers^ b/dom/security/test/sri/rsf_csp_worker.js^headers^ new file mode 100644 index 000000000000..0a6ccba79063 --- /dev/null +++ b/dom/security/test/sri/rsf_csp_worker.js^headers^ @@ -0,0 +1 @@ +content-security-policy: require-sri-for script style diff --git a/dom/security/test/sri/rsf_imported.js b/dom/security/test/sri/rsf_imported.js new file mode 100644 index 000000000000..33f54b7a0adf --- /dev/null +++ b/dom/security/test/sri/rsf_imported.js @@ -0,0 +1 @@ +postMessage('bad_worker_could_load_via_importScripts'); diff --git a/dom/security/test/sri/rsf_spawn_CSPd_worker.js b/dom/security/test/sri/rsf_spawn_CSPd_worker.js new file mode 100644 index 000000000000..652c77100acc --- /dev/null +++ b/dom/security/test/sri/rsf_spawn_CSPd_worker.js @@ -0,0 +1,3 @@ +w = new Worker("rsf_csp_worker.js"); +// use the handler function in test_require-sri-for_csp_directive.html +w.onmessage = parent.handler; diff --git a/dom/security/test/sri/rsf_worker.js b/dom/security/test/sri/rsf_worker.js new file mode 100644 index 000000000000..553d3deee742 --- /dev/null +++ b/dom/security/test/sri/rsf_worker.js @@ -0,0 +1,2 @@ +parent.postMessage('bad_worker_could_load', '*'); +importScripts('rsf_imported.js'); diff --git a/dom/security/test/sri/test_require-sri-for_csp_directive.html b/dom/security/test/sri/test_require-sri-for_csp_directive.html index 0e2b91712bd7..ef1b3603f5f3 100644 --- a/dom/security/test/sri/test_require-sri-for_csp_directive.html +++ b/dom/security/test/sri/test_require-sri-for_csp_directive.html @@ -10,10 +10,12 @@ -Mozilla Bug 1265318 - +Mozilla Bug 1265318
+
+ diff --git a/dom/workers/ScriptLoader.cpp b/dom/workers/ScriptLoader.cpp index 83ecb3720cf8..ac4f709b258d 100644 --- a/dom/workers/ScriptLoader.cpp +++ b/dom/workers/ScriptLoader.cpp @@ -59,6 +59,7 @@ #include "mozilla/dom/PromiseNativeHandler.h" #include "mozilla/dom/Response.h" #include "mozilla/dom/ScriptSettings.h" +#include "mozilla/dom/SRILogHelper.h" #include "mozilla/UniquePtr.h" #include "Principal.h" #include "WorkerHolder.h" @@ -1110,6 +1111,25 @@ private: aLoadInfo.mURL.Assign(NS_ConvertUTF8toUTF16(filename)); } + nsCOMPtr chanLoadInfo = channel->GetLoadInfo(); + if (chanLoadInfo && chanLoadInfo->GetEnforceSRI()) { + // importScripts() and the Worker constructor do not support integrity metadata + // (or any fetch options). Until then, we can just block. + // If we ever have those data in the future, we'll have to the check to + // by using the SRICheck module + MOZ_LOG(SRILogHelper::GetSriLog(), mozilla::LogLevel::Debug, + ("Scriptloader::Load, SRI required but not supported in workers")); + nsCOMPtr wcsp; + chanLoadInfo->LoadingPrincipal()->GetCsp(getter_AddRefs(wcsp)); + MOZ_ASSERT(wcsp, "We sould have a CSP for the worker here"); + if (wcsp) { + wcsp->LogViolationDetails( + nsIContentSecurityPolicy::VIOLATION_TYPE_REQUIRE_SRI_FOR_SCRIPT, + aLoadInfo.mURL, EmptyString(), 0, EmptyString(), EmptyString()); + } + return NS_ERROR_SRI_CORRUPT; + } + // Update the principal of the worker and its base URI if we just loaded the // worker's primary script. if (IsMainWorkerScript()) { @@ -1215,7 +1235,8 @@ private: rv = csp->GetReferrerPolicy(&rp, &hasReferrerPolicy); NS_ENSURE_SUCCESS(rv, rv); - if (hasReferrerPolicy) { + + if (hasReferrerPolicy) { //FIXME bug 1307366: move RP out of CSP code mWorkerPrivate->SetReferrerPolicy(static_cast(rp)); } }