From b05397d47c88c03540cc4e791a44f90deef61886 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Thu, 21 Dec 2017 10:50:27 -0500 Subject: [PATCH] Bug 1401359 Disable SharedWorker if in windows that cannot access storage. r=baku --- dom/workers/RuntimeService.cpp | 25 ++++++++ dom/workers/test/mochitest.ini | 2 + .../test/sharedWorker_thirdparty_frame.html | 16 +++++ .../test/test_sharedWorker_thirdparty.html | 60 +++++++++++++++++++ 4 files changed, 103 insertions(+) create mode 100644 dom/workers/test/sharedWorker_thirdparty_frame.html create mode 100644 dom/workers/test/test_sharedWorker_thirdparty.html diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp index 930d6f82c969..82daad9d3a79 100644 --- a/dom/workers/RuntimeService.cpp +++ b/dom/workers/RuntimeService.cpp @@ -2457,6 +2457,31 @@ RuntimeService::CreateSharedWorker(const GlobalObject& aGlobal, nsCOMPtr window = do_QueryInterface(aGlobal.GetAsSupports()); MOZ_ASSERT(window); + // If the window is blocked from accessing storage, do not allow it + // to connect to a SharedWorker. This would potentially allow it + // to communicate with other windows that do have storage access. + // Allow private browsing, however, as we handle that isolation + // via the principal. + auto storageAllowed = nsContentUtils::StorageAllowedForWindow(window); + if (storageAllowed != nsContentUtils::StorageAccess::eAllow && + storageAllowed != nsContentUtils::StorageAccess::ePrivateBrowsing) { + return NS_ERROR_DOM_SECURITY_ERR; + } + + // Assert that the principal private browsing state matches the + // StorageAccess value. +#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED + if (storageAllowed == nsContentUtils::StorageAccess::ePrivateBrowsing) { + nsCOMPtr doc = window->GetExtantDoc(); + nsCOMPtr principal = doc ? doc->NodePrincipal() : nullptr; + uint32_t privateBrowsingId = 0; + if (principal) { + MOZ_ALWAYS_SUCCEEDS(principal->GetPrivateBrowsingId(&privateBrowsingId)); + } + MOZ_DIAGNOSTIC_ASSERT(privateBrowsingId != 0); + } +#endif // MOZ_DIAGNOSTIC_ASSERT_ENABLED + JSContext* cx = aGlobal.Context(); WorkerLoadInfo loadInfo; diff --git a/dom/workers/test/mochitest.ini b/dom/workers/test/mochitest.ini index d78a4a4ed984..d4d87acbe2f8 100644 --- a/dom/workers/test/mochitest.ini +++ b/dom/workers/test/mochitest.ini @@ -56,6 +56,7 @@ support-files = rvals_worker.js sharedWorker_console.js sharedWorker_sharedWorker.js + sharedWorker_thirdparty_frame.html simpleThread_worker.js suspend_window.html suspend_worker.js @@ -172,6 +173,7 @@ support-files = [test_resolveWorker-assignment.html] [test_rvals.html] [test_sharedWorker.html] +[test_sharedWorker_thirdparty.html] [test_simpleThread.html] [test_suspend.html] [test_terminate.html] diff --git a/dom/workers/test/sharedWorker_thirdparty_frame.html b/dom/workers/test/sharedWorker_thirdparty_frame.html new file mode 100644 index 000000000000..baa9023c1c79 --- /dev/null +++ b/dom/workers/test/sharedWorker_thirdparty_frame.html @@ -0,0 +1,16 @@ + + diff --git a/dom/workers/test/test_sharedWorker_thirdparty.html b/dom/workers/test/test_sharedWorker_thirdparty.html new file mode 100644 index 000000000000..af94c1a98834 --- /dev/null +++ b/dom/workers/test/test_sharedWorker_thirdparty.html @@ -0,0 +1,60 @@ + + + + + Test for SharedWorker in 3rd Party Iframes + + + + + +

+ + 
+  
+
+ +