nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1899138 - Set the IsInThirdPartyContext for the loadInfo of the channel that loads worker scripts. r=asuth

Browse source 
To set the IsInThirdPartyContext bit to the channel's loadInfo, we
duduce whether the channel is foreign by looking into the partitionKey
of the worker. If the partitionKey of the OAs of the worker's principal
is not empty, the worker should be foreign, so as to the channel.

Differential Revision: https://phabricator.services.mozilla.com/D211757
This commit is contained in:
Tim Huang 2024-05-29 08:57:47 +00:00
parent 7015137c0c
commit d6dbe99f94
2 changed files with 22 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

10
dom/serviceworkers/ServiceWorkerScriptCache.cpp
View file

@ -693,6 +693,16 @@ nsresult CompareNetwork::Initialize(nsIPrincipal* aPrincipal,
return rv; return rv;
} }
// Set the IsInThirdPartyContext for the channel's loadInfo according to the
// partitionKey of the principal. The worker is foreign if it's using
// partitioned principal, i.e. the partitionKey is not empty. In this case,
// we need to set the bit to the channel's loadInfo.
if (!aPrincipal->OriginAttributesRef().mPartitionKey.IsEmpty()) {
nsCOMPtr<nsILoadInfo> loadInfo = mChannel->LoadInfo();
rv = loadInfo->SetIsInThirdPartyContext(true);
MOZ_ASSERT(NS_SUCCEEDED(rv));
}
nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(mChannel); nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(mChannel);
if (httpChannel) { if (httpChannel) {
// Spec says no redirects allowed for top-level SW scripts. // Spec says no redirects allowed for top-level SW scripts.

12
dom/workers/ScriptLoader.cpp
View file

@ -1025,6 +1025,18 @@ nsresult WorkerScriptLoader::LoadScript(
if (NS_WARN_IF(NS_FAILED(rv))) { if (NS_WARN_IF(NS_FAILED(rv))) {
return rv; return rv;
} }
// Set the IsInThirdPartyContext for the channel's loadInfo according to the
// partitionKey of the principal. The worker is foreign if it's using
// partitioned principal, i.e. the partitionKey is not empty. In this case,
// we need to set the bit to the channel's loadInfo.
if (!principal->OriginAttributesRef().mPartitionKey.IsEmpty()) {
nsCOMPtr<nsILoadInfo> loadInfo = channel->LoadInfo();
rv = loadInfo->SetIsInThirdPartyContext(true);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
}
} }
// Associate any originating stack with the channel. // Associate any originating stack with the channel.