Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1419166 - Use nsIPrincipal to decide if a SharedWorker should be shared, r=bkelly

Browse Source
This commit is contained in:
Andrea Marchesini 2017-11-27 17:07:39 +01:00
parent af20a22dd8
commit 2b3039c021
2 changed files with 33 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
dom/workers/RuntimeService.cpp
View File

@ -253,26 +253,6 @@ GetWorkerPref(const nsACString& aPref,
return result;
}
// This fn creates a key for a SharedWorker that contains the name, script
// spec, and the serialized origin attributes:
// "name|scriptSpec^key1=val1&key2=val2&key3=val3"
void
GenerateSharedWorkerKey(const nsACString& aScriptSpec,
const nsAString& aName,
const OriginAttributes& aAttrs,
nsCString& aKey)
{
nsAutoCString suffix;
aAttrs.CreateSuffix(suffix);
aKey.Truncate();
aKey.SetCapacity(aName.Length() + aScriptSpec.Length() + suffix.Length() + 2);
aKey.Append(NS_ConvertUTF16toUTF8(aName));
aKey.Append('|');
aKey.Append(aScriptSpec);
aKey.Append(suffix);
}
void
LoadContextOptions(const char* aPrefName, void* /* aClosure */)
{
@ -1602,16 +1582,23 @@ RuntimeService::RegisterWorker(WorkerPrivate* aWorkerPrivate)
}
if (isSharedWorker) {
const nsString& sharedWorkerName(aWorkerPrivate->WorkerName());
nsAutoCString key;
GenerateSharedWorkerKey(sharedWorkerScriptSpec, sharedWorkerName,
aWorkerPrivate->GetOriginAttributes(), key);
MOZ_ASSERT(!domainInfo->mSharedWorkerInfos.Get(key));
#ifdef DEBUG
for (const UniquePtr<SharedWorkerInfo>& data : domainInfo->mSharedWorkerInfos) {
if (data->mScriptSpec == sharedWorkerScriptSpec &&
data->mName == aWorkerPrivate->WorkerName() &&
// We want to be sure that the window's principal subsumes the
// SharedWorker's principal and vice versa.
data->mWorkerPrivate->GetPrincipal()->Subsumes(aWorkerPrivate->GetPrincipal()) &&
aWorkerPrivate->GetPrincipal()->Subsumes(data->mWorkerPrivate->GetPrincipal())) {
MOZ_CRASH("We should not instantiate a new SharedWorker!");
}
}
#endif
SharedWorkerInfo* sharedWorkerInfo =
UniquePtr<SharedWorkerInfo> sharedWorkerInfo(
new SharedWorkerInfo(aWorkerPrivate, sharedWorkerScriptSpec,
sharedWorkerName);
domainInfo->mSharedWorkerInfos.Put(key, sharedWorkerInfo);
aWorkerPrivate->WorkerName()));
domainInfo->mSharedWorkerInfos.AppendElement(Move(sharedWorkerInfo));
}
}
@ -1671,18 +1658,11 @@ void
RuntimeService::RemoveSharedWorker(WorkerDomainInfo* aDomainInfo,
WorkerPrivate* aWorkerPrivate)
{
for (auto iter = aDomainInfo->mSharedWorkerInfos.Iter();
!iter.Done();
iter.Next()) {
SharedWorkerInfo* data = iter.UserData();
for (uint32_t i = 0; i < aDomainInfo->mSharedWorkerInfos.Length(); ++i) {
const UniquePtr<SharedWorkerInfo>& data =
aDomainInfo->mSharedWorkerInfos[i];
if (data->mWorkerPrivate == aWorkerPrivate) {
#ifdef DEBUG
nsAutoCString key;
GenerateSharedWorkerKey(data->mScriptSpec, data->mName,
aWorkerPrivate->GetOriginAttributes(), key);
MOZ_ASSERT(iter.Key() == key);
#endif
iter.Remove();
aDomainInfo->mSharedWorkerInfos.RemoveElementAt(i);
break;
}
}
@ -2499,21 +2479,25 @@ RuntimeService::CreateSharedWorkerFromLoadInfo(JSContext* aCx,
{
MutexAutoLock lock(mMutex);
WorkerDomainInfo* domainInfo;
SharedWorkerInfo* sharedWorkerInfo;
nsCString scriptSpec;
nsresult rv = aLoadInfo->mResolvedScriptURI->GetSpec(scriptSpec);
NS_ENSURE_SUCCESS(rv, rv);
MOZ_ASSERT(aLoadInfo->mPrincipal);
nsAutoCString key;
GenerateSharedWorkerKey(scriptSpec, aName,
aLoadInfo->mPrincipal->OriginAttributesRef(), key);
if (mDomainMap.Get(aLoadInfo->mDomain, &domainInfo) &&
domainInfo->mSharedWorkerInfos.Get(key, &sharedWorkerInfo)) {
workerPrivate = sharedWorkerInfo->mWorkerPrivate;
WorkerDomainInfo* domainInfo;
if (mDomainMap.Get(aLoadInfo->mDomain, &domainInfo)) {
for (const UniquePtr<SharedWorkerInfo>& data : domainInfo->mSharedWorkerInfos) {
if (data->mScriptSpec == scriptSpec &&
data->mName == aName &&
// We want to be sure that the window's principal subsumes the
// SharedWorker's principal and vice versa.
aLoadInfo->mPrincipal->Subsumes(data->mWorkerPrivate->GetPrincipal()) &&
data->mWorkerPrivate->GetPrincipal()->Subsumes(aLoadInfo->mPrincipal)) {
workerPrivate = data->mWorkerPrivate;
break;
}
}
}
}

2
dom/workers/RuntimeService.h
View File

@ -45,7 +45,7 @@ class RuntimeService final : public nsIObserver
nsTArray<WorkerPrivate*> mActiveWorkers;
nsTArray<WorkerPrivate*> mActiveServiceWorkers;
nsTArray<WorkerPrivate*> mQueuedWorkers;
nsClassHashtable<nsCStringHashKey, SharedWorkerInfo> mSharedWorkerInfos;
nsTArray<UniquePtr<SharedWorkerInfo>> mSharedWorkerInfos;
uint32_t mChildWorkerCount;
WorkerDomainInfo()