mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 13:23:07 +00:00
9eb17f6255
- Bug 1156847 - Part 3: When loading a service worker from the network, remember the security info of the channel on the WorkerPrivate; r=nsm (d2f579b83) - Bug 1156847 - Part 4: When storing a service worker script to the cache, store its security info in the cache as well; r=khuey (8440bb596) - Bug 1156847 - Part 5: When loading a service worker from the cache, set its security info on the WorkerPrivate; r=nsm (656aa49a1) - Bug 1156847 - Part 6: When calling FetchEvent.respondWith(), fall back to the security info of the service worker if the Response object that we are responding with doesn't have its own security info; r=nsm (bab71f147) - Bug 1156847 - Part 7: Add unit tests for responding to a FetchEvent with a synthesized Response both in the case where the service worker is loaded from the network and from the cache; r=nsm (8e56133c8) - Bug 1156847 followup: annotate workers helper-class "ScriptLoaderRunnable" OnStartRequest/OnStopRequest as override. rs=ehsan (88def1fa6) - Bug 1153929 - Add assertions and null checks to fix windows crash in nsHttpTransaction r=mcmanus (2547bda07) - Bug 1153929 - Add diagnostic asserts to check vtable is still present for mPipeOut r=mcmanus (b141045b9) - Bug 1130101 - Part 1: Store the value of the Service-Worker-Allowed header in the CompareManager object; r=nsm (7cecb4099) - Bug 1130101 - Part 2: Honor the Service-Worker-Allowed header when prefix matching the service worker scope; r=nsm (ed55a1670) - Bug 1130101 - Part 3: Add unit tests for the handling of the Service-Worker-Allowed header; r=nsm (fdb91f97b) - Bug 1130684 - Implement Service Worker clients.claim. r=nsm,ehsan (fdbf75e48) - Bug 1159407 - JavaScript error at aboutServiceWorkers.js when updating the service worker via about:serviceworkers page. r=baku (49d511930) - Bug 1162088 - patch 1 - ServiceWorkerManager should use OriginAttributes from the principal as scopeKey, r=nsm, r=bholley (162db819e) - Bug 1162088 - patch 2 - ServiceWorkerManager should use OriginAttributes from the principal as scopeKey, r=nsm (non-jsm part only) (983045b41) - Bug 1171486 - Avoid recursively obtaining the service worker manager service; r=nsm (7d9253661) - Bug 1131352 - Part 1: Fix codegen issue. r=smaug (488aa914f) - Bug 1157108 - onpush EventHandler support. r=ehsan (9905bbebf) - Bug 1132673 - Removing the scope line from ServiceWorkerGlobalScope and changing the signature and body of getScope. r=nsm,baku (ccfb8111b) - Bug 1140239 - Remove the commented out global properties of ServiceWorkerGlobalScope; r=baku (4730659f4) - Bug 1158728 - ServiceWorkerClient: use innerWindow id for referencing clients. r=nsm (22c3aecc9) - Bug 1130684 - Test fetch events are intercepted after a client is claimed. r=nsm (c5de59e99) - Bug 1161684 - Allow JAR channels to be intercepted by service workers. Tests. r=jdm (9f9227bf9) - Bug 1157619 P2 Test that service worker is not intercepted on force refresh. r=ehsan (5d3a804c1) - Bug 1170550 - Don't crash when registering a service worker which has a strict mode error; r=baku (12783152a) - Bug 1131352 - Part 2: Add ServiceWorkerGlobalScope skipWaiting(). r=nsm, r=baku (f5a3f06b5) - Bug 1131352 - Part 3: ServiceWorkerManager::SetSkipWaitingFlag() updated CLOSED TREE (88657b944)
322 lines
9.0 KiB
C++
322 lines
9.0 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "mozilla/dom/Promise.h"
|
|
#include "mozilla/dom/PromiseWorkerProxy.h"
|
|
|
|
#include "ServiceWorkerClient.h"
|
|
#include "ServiceWorkerClients.h"
|
|
#include "ServiceWorkerManager.h"
|
|
#include "ServiceWorkerWindowClient.h"
|
|
|
|
#include "WorkerPrivate.h"
|
|
#include "WorkerRunnable.h"
|
|
#include "WorkerScope.h"
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::dom;
|
|
using namespace mozilla::dom::workers;
|
|
|
|
NS_IMPL_CYCLE_COLLECTING_ADDREF(ServiceWorkerClients)
|
|
NS_IMPL_CYCLE_COLLECTING_RELEASE(ServiceWorkerClients)
|
|
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(ServiceWorkerClients, mWorkerScope)
|
|
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(ServiceWorkerClients)
|
|
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
|
|
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
ServiceWorkerClients::ServiceWorkerClients(ServiceWorkerGlobalScope* aWorkerScope)
|
|
: mWorkerScope(aWorkerScope)
|
|
{
|
|
MOZ_ASSERT(mWorkerScope);
|
|
}
|
|
|
|
JSObject*
|
|
ServiceWorkerClients::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
|
|
{
|
|
return ClientsBinding::Wrap(aCx, this, aGivenProto);
|
|
}
|
|
|
|
namespace {
|
|
|
|
class ResolvePromiseWorkerRunnable final : public WorkerRunnable
|
|
{
|
|
nsRefPtr<PromiseWorkerProxy> mPromiseProxy;
|
|
nsTArray<ServiceWorkerClientInfo> mValue;
|
|
|
|
public:
|
|
ResolvePromiseWorkerRunnable(WorkerPrivate* aWorkerPrivate,
|
|
PromiseWorkerProxy* aPromiseProxy,
|
|
nsTArray<ServiceWorkerClientInfo>& aValue)
|
|
: WorkerRunnable(aWorkerPrivate, WorkerThreadModifyBusyCount),
|
|
mPromiseProxy(aPromiseProxy)
|
|
{
|
|
AssertIsOnMainThread();
|
|
mValue.SwapElements(aValue);
|
|
}
|
|
|
|
bool
|
|
WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate)
|
|
{
|
|
MOZ_ASSERT(aWorkerPrivate);
|
|
aWorkerPrivate->AssertIsOnWorkerThread();
|
|
|
|
Promise* promise = mPromiseProxy->GetWorkerPromise();
|
|
MOZ_ASSERT(promise);
|
|
|
|
nsTArray<nsRefPtr<ServiceWorkerClient>> ret;
|
|
for (size_t i = 0; i < mValue.Length(); i++) {
|
|
ret.AppendElement(nsRefPtr<ServiceWorkerClient>(
|
|
new ServiceWorkerWindowClient(promise->GetParentObject(),
|
|
mValue.ElementAt(i))));
|
|
}
|
|
promise->MaybeResolve(ret);
|
|
|
|
// release the reference on the worker thread.
|
|
mPromiseProxy->CleanUp(aCx);
|
|
|
|
return true;
|
|
}
|
|
};
|
|
|
|
class MatchAllRunnable final : public nsRunnable
|
|
{
|
|
WorkerPrivate* mWorkerPrivate;
|
|
nsRefPtr<PromiseWorkerProxy> mPromiseProxy;
|
|
nsCString mScope;
|
|
public:
|
|
MatchAllRunnable(WorkerPrivate* aWorkerPrivate,
|
|
PromiseWorkerProxy* aPromiseProxy,
|
|
const nsCString& aScope)
|
|
: mWorkerPrivate(aWorkerPrivate),
|
|
mPromiseProxy(aPromiseProxy),
|
|
mScope(aScope)
|
|
{
|
|
MOZ_ASSERT(aWorkerPrivate);
|
|
aWorkerPrivate->AssertIsOnWorkerThread();
|
|
}
|
|
|
|
NS_IMETHOD
|
|
Run() override
|
|
{
|
|
AssertIsOnMainThread();
|
|
|
|
MutexAutoLock lock(mPromiseProxy->GetCleanUpLock());
|
|
if (mPromiseProxy->IsClean()) {
|
|
// Don't resolve the promise if it was already released.
|
|
return NS_OK;
|
|
}
|
|
|
|
nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
|
|
nsTArray<ServiceWorkerClientInfo> result;
|
|
|
|
swm->GetAllClients(mWorkerPrivate->GetPrincipal(), mScope, result);
|
|
nsRefPtr<ResolvePromiseWorkerRunnable> r =
|
|
new ResolvePromiseWorkerRunnable(mWorkerPrivate, mPromiseProxy, result);
|
|
|
|
AutoSafeJSContext cx;
|
|
if (r->Dispatch(cx)) {
|
|
return NS_OK;
|
|
}
|
|
|
|
// Dispatch to worker thread failed because the worker is shutting down.
|
|
// Use a control runnable to release the runnable on the worker thread.
|
|
nsRefPtr<PromiseWorkerProxyControlRunnable> releaseRunnable =
|
|
new PromiseWorkerProxyControlRunnable(mWorkerPrivate, mPromiseProxy);
|
|
|
|
if (!releaseRunnable->Dispatch(cx)) {
|
|
NS_RUNTIMEABORT("Failed to dispatch MatchAll promise control runnable.");
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
};
|
|
|
|
class ResolveClaimRunnable final : public WorkerRunnable
|
|
{
|
|
nsRefPtr<PromiseWorkerProxy> mPromiseProxy;
|
|
nsresult mResult;
|
|
|
|
public:
|
|
ResolveClaimRunnable(WorkerPrivate* aWorkerPrivate,
|
|
PromiseWorkerProxy* aPromiseProxy,
|
|
nsresult aResult)
|
|
: WorkerRunnable(aWorkerPrivate, WorkerThreadModifyBusyCount)
|
|
, mPromiseProxy(aPromiseProxy)
|
|
, mResult(aResult)
|
|
{
|
|
AssertIsOnMainThread();
|
|
}
|
|
|
|
bool
|
|
WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) override
|
|
{
|
|
MOZ_ASSERT(aWorkerPrivate);
|
|
aWorkerPrivate->AssertIsOnWorkerThread();
|
|
|
|
Promise* promise = mPromiseProxy->GetWorkerPromise();
|
|
MOZ_ASSERT(promise);
|
|
|
|
if (NS_SUCCEEDED(mResult)) {
|
|
promise->MaybeResolve(JS::UndefinedHandleValue);
|
|
} else {
|
|
promise->MaybeReject(NS_ERROR_DOM_INVALID_STATE_ERR);
|
|
}
|
|
|
|
// Release the reference on the worker thread.
|
|
mPromiseProxy->CleanUp(aCx);
|
|
|
|
return true;
|
|
}
|
|
};
|
|
|
|
class ClaimRunnable final : public nsRunnable
|
|
{
|
|
nsRefPtr<PromiseWorkerProxy> mPromiseProxy;
|
|
nsCString mScope;
|
|
// We grab the ID so we don't have to hold a lock the entire time the claim
|
|
// operation is happening on the main thread.
|
|
uint64_t mServiceWorkerID;
|
|
|
|
public:
|
|
ClaimRunnable(PromiseWorkerProxy* aPromiseProxy, const nsCString& aScope)
|
|
: mPromiseProxy(aPromiseProxy)
|
|
, mScope(aScope)
|
|
, mServiceWorkerID(aPromiseProxy->GetWorkerPrivate()->ServiceWorkerID())
|
|
{
|
|
MOZ_ASSERT(aPromiseProxy);
|
|
}
|
|
|
|
NS_IMETHOD
|
|
Run() override
|
|
{
|
|
MutexAutoLock lock(mPromiseProxy->GetCleanUpLock());
|
|
if (mPromiseProxy->IsClean()) {
|
|
// Don't resolve the promise if it was already released.
|
|
return NS_OK;
|
|
}
|
|
|
|
WorkerPrivate* workerPrivate = mPromiseProxy->GetWorkerPrivate();
|
|
MOZ_ASSERT(workerPrivate);
|
|
|
|
nsRefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
|
|
MOZ_ASSERT(swm);
|
|
|
|
nsresult rv = swm->ClaimClients(workerPrivate->GetPrincipal(),
|
|
mScope, mServiceWorkerID);
|
|
|
|
nsRefPtr<ResolveClaimRunnable> r =
|
|
new ResolveClaimRunnable(workerPrivate, mPromiseProxy, rv);
|
|
|
|
AutoJSAPI jsapi;
|
|
jsapi.Init();
|
|
JSContext* cx = jsapi.cx();
|
|
if (r->Dispatch(cx)) {
|
|
return NS_OK;
|
|
}
|
|
|
|
// Dispatch to worker thread failed because the worker is shutting down.
|
|
// Use a control runnable to release the runnable on the worker thread.
|
|
nsRefPtr<PromiseWorkerProxyControlRunnable> releaseRunnable =
|
|
new PromiseWorkerProxyControlRunnable(workerPrivate, mPromiseProxy);
|
|
|
|
if (!releaseRunnable->Dispatch(cx)) {
|
|
NS_RUNTIMEABORT("Failed to dispatch Claim control runnable.");
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
};
|
|
|
|
} // namespace
|
|
|
|
already_AddRefed<Promise>
|
|
ServiceWorkerClients::MatchAll(const ClientQueryOptions& aOptions,
|
|
ErrorResult& aRv)
|
|
{
|
|
WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
|
|
MOZ_ASSERT(workerPrivate);
|
|
workerPrivate->AssertIsOnWorkerThread();
|
|
|
|
nsString scope;
|
|
mWorkerScope->GetScope(scope);
|
|
|
|
if (aOptions.mIncludeUncontrolled || aOptions.mType != ClientType::Window) {
|
|
aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
|
|
return nullptr;
|
|
}
|
|
|
|
nsRefPtr<Promise> promise = Promise::Create(mWorkerScope, aRv);
|
|
if (NS_WARN_IF(aRv.Failed())) {
|
|
return nullptr;
|
|
}
|
|
|
|
nsRefPtr<PromiseWorkerProxy> promiseProxy =
|
|
PromiseWorkerProxy::Create(workerPrivate, promise);
|
|
if (!promiseProxy->GetWorkerPromise()) {
|
|
// Don't dispatch if adding the worker feature failed.
|
|
return promise.forget();
|
|
}
|
|
|
|
nsRefPtr<MatchAllRunnable> r =
|
|
new MatchAllRunnable(workerPrivate,
|
|
promiseProxy,
|
|
NS_ConvertUTF16toUTF8(scope));
|
|
nsresult rv = NS_DispatchToMainThread(r);
|
|
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
promise->MaybeReject(NS_ERROR_NOT_AVAILABLE);
|
|
}
|
|
|
|
return promise.forget();
|
|
}
|
|
|
|
already_AddRefed<Promise>
|
|
ServiceWorkerClients::OpenWindow(const nsAString& aUrl)
|
|
{
|
|
ErrorResult result;
|
|
nsRefPtr<Promise> promise = Promise::Create(mWorkerScope, result);
|
|
if (NS_WARN_IF(result.Failed())) {
|
|
return nullptr;
|
|
}
|
|
|
|
promise->MaybeResolve(JS::UndefinedHandleValue);
|
|
return promise.forget();
|
|
}
|
|
|
|
already_AddRefed<Promise>
|
|
ServiceWorkerClients::Claim(ErrorResult& aRv)
|
|
{
|
|
WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
|
|
MOZ_ASSERT(workerPrivate);
|
|
|
|
nsRefPtr<Promise> promise = Promise::Create(mWorkerScope, aRv);
|
|
if (NS_WARN_IF(aRv.Failed())) {
|
|
return nullptr;
|
|
}
|
|
|
|
nsRefPtr<PromiseWorkerProxy> promiseProxy =
|
|
PromiseWorkerProxy::Create(workerPrivate, promise);
|
|
if (!promiseProxy->GetWorkerPromise()) {
|
|
// Don't dispatch if adding the worker feature failed.
|
|
return promise.forget();
|
|
}
|
|
|
|
nsString scope;
|
|
mWorkerScope->GetScope(scope);
|
|
|
|
nsRefPtr<ClaimRunnable> runnable =
|
|
new ClaimRunnable(promiseProxy, NS_ConvertUTF16toUTF8(scope));
|
|
|
|
aRv = NS_DispatchToMainThread(runnable);
|
|
if (NS_WARN_IF(aRv.Failed())) {
|
|
promise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
|
|
}
|
|
|
|
return promise.forget();
|
|
}
|