Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1916960 - Part 10: Trigger notification for the cached script load. r=bthrall

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D222452
This commit is contained in:
Tooru Fujisawa 2024-09-24 08:05:54 +00:00
parent ea6b136a19
commit c9f670d5a6
4 changed files with 85 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
dom/script/ScriptLoader.cpp
View File

@ -47,6 +47,7 @@
#include "mozilla/dom/SRILogHelper.h"
#include "mozilla/dom/WindowContext.h"
#include "mozilla/Mutex.h" // mozilla::Mutex
#include "mozilla/net/HttpBaseChannel.h"
#include "mozilla/net/UrlClassifierFeatureFactory.h"
#include "mozilla/StaticPrefs_dom.h"
#include "mozilla/StaticPrefs_javascript.h"
@ -79,6 +80,7 @@
#include "nsCRT.h"
#include "nsContentCreatorFunctions.h"
#include "nsProxyRelease.h"
#include "nsQueryObject.h"
#include "nsINetworkPredictor.h"
#include "mozilla/ConsoleReportCollector.h"
#include "mozilla/CycleCollectedJSContext.h"
@ -587,6 +589,17 @@ nsresult ScriptLoader::StartLoad(
return StartClassicLoad(aRequest, aCharsetForPreload);
}
static nsSecurityFlags CORSModeToSecurityFlags(CORSMode aCORSMode) {
nsSecurityFlags securityFlags =
nsContentSecurityManager::ComputeSecurityFlags(
aCORSMode, nsContentSecurityManager::CORSSecurityMapping::
CORS_NONE_MAPS_TO_DISABLED_CORS_CHECKS);
securityFlags |= nsILoadInfo::SEC_ALLOW_CHROME;
return securityFlags;
}
nsresult ScriptLoader::StartClassicLoad(
ScriptLoadRequest* aRequest,
const Maybe<nsAutoString>& aCharsetForPreload) {
@ -606,12 +619,7 @@ nsresult ScriptLoader::StartClassicLoad(
url.get()));
}
nsSecurityFlags securityFlags =
nsContentSecurityManager::ComputeSecurityFlags(
aRequest->CORSMode(), nsContentSecurityManager::CORSSecurityMapping::
CORS_NONE_MAPS_TO_DISABLED_CORS_CHECKS);
securityFlags |= nsILoadInfo::SEC_ALLOW_CHROME;
nsSecurityFlags securityFlags = CORSModeToSecurityFlags(aRequest->CORSMode());
nsresult rv = StartLoadInternal(aRequest, securityFlags, aCharsetForPreload);
@ -630,6 +638,22 @@ static bool IsWebExtensionRequest(ScriptLoadRequest* aRequest) {
return loader->GetKind() == ModuleLoader::WebExtension;
}
static nsresult CreateChannelForScriptLoading(
nsIChannel** aOutChannel, Document* aDocument, nsIURI* aURI,
nsINode* aContext, nsIPrincipal* aTriggeringPrincipal,
nsSecurityFlags aSecurityFlags, nsContentPolicyType aContentPolicyType) {
nsCOMPtr<nsILoadGroup> loadGroup = aDocument->GetDocumentLoadGroup();
nsCOMPtr<nsPIDOMWindowOuter> window = aDocument->GetWindow();
NS_ENSURE_TRUE(window, NS_ERROR_NULL_POINTER);
nsIDocShell* docshell = window->GetDocShell();
nsCOMPtr<nsIInterfaceRequestor> prompter(do_QueryInterface(docshell));
return NS_NewChannelWithTriggeringPrincipal(
aOutChannel, aURI, aContext, aTriggeringPrincipal, aSecurityFlags,
aContentPolicyType,
/* aPerformanceStorage = */ nullptr, loadGroup, prompter);
}
static nsresult CreateChannelForScriptLoading(nsIChannel** aOutChannel,
Document* aDocument,
ScriptLoadRequest* aRequest,
@ -644,17 +668,9 @@ static nsresult CreateChannelForScriptLoading(nsIChannel** aOutChannel,
context = aDocument;
}
nsCOMPtr<nsILoadGroup> loadGroup = aDocument->GetDocumentLoadGroup();
nsCOMPtr<nsPIDOMWindowOuter> window = aDocument->GetWindow();
NS_ENSURE_TRUE(window, NS_ERROR_NULL_POINTER);
nsIDocShell* docshell = window->GetDocShell();
nsCOMPtr<nsIInterfaceRequestor> prompter(do_QueryInterface(docshell));
return NS_NewChannelWithTriggeringPrincipal(
aOutChannel, aRequest->mURI, context, aRequest->TriggeringPrincipal(),
aSecurityFlags, contentPolicyType,
nullptr, // aPerformanceStorage
loadGroup, prompter);
return CreateChannelForScriptLoading(aOutChannel, aDocument, aRequest->mURI,
context, aRequest->TriggeringPrincipal(),
aSecurityFlags, contentPolicyType);
}
static void PrepareLoadInfoForScriptLoading(nsIChannel* aChannel,
@ -1022,6 +1038,37 @@ RequestPriority FetchPriorityToRequestPriority(
}
} // namespace
void ScriptLoader::NotifyObserversForCachedScript(
nsIURI* aURI, nsINode* aContext, nsIPrincipal* aTriggeringPrincipal,
nsSecurityFlags aSecurityFlags, nsContentPolicyType aContentPolicyType) {
nsCOMPtr<nsIObserverService> obsService = services::GetObserverService();
if (!obsService->HasObservers("http-on-resource-cache-response")) {
return;
}
nsCOMPtr<nsIChannel> channel;
nsresult rv = CreateChannelForScriptLoading(
getter_AddRefs(channel), mDocument, aURI, aContext, aTriggeringPrincipal,
aSecurityFlags, aContentPolicyType);
if (NS_FAILED(rv)) {
return;
}
RefPtr<net::HttpBaseChannel> httpBaseChannel = do_QueryObject(channel);
if (httpBaseChannel) {
httpBaseChannel->SetDummyChannelForCachedResource();
}
// TODO: Populate fields.
// TODO: Move the handling into SharedSubResourceCache once the notification
// is merged between CSS and JS (bug 1919218)
obsService->NotifyObservers(channel, "http-on-resource-cache-response",
nullptr);
}
already_AddRefed<ScriptLoadRequest> ScriptLoader::CreateLoadRequest(
ScriptKind aKind, nsIURI* aURI, nsIScriptElement* aElement,
nsIPrincipal* aTriggeringPrincipal, CORSMode aCORSMode,
@ -1049,6 +1096,17 @@ already_AddRefed<ScriptLoadRequest> ScriptLoader::CreateLoadRequest(
return aRequest.forget();
}
nsCOMPtr<nsINode> context;
if (aElement) {
context = do_QueryInterface(aElement);
} else {
context = mDocument;
}
NotifyObserversForCachedScript(aURI, context, aTriggeringPrincipal,
CORSModeToSecurityFlags(aCORSMode),
nsIContentPolicy::TYPE_INTERNAL_SCRIPT);
aRequest->CacheEntryFound(cacheResult.mCompleteValue);
return aRequest.forget();
}

5
dom/script/ScriptLoader.h
View File

@ -472,6 +472,11 @@ class ScriptLoader final : public JS::loader::ScriptLoaderInterface {
const SRIMetadata& aIntegrity, ReferrerPolicy aReferrerPolicy,
JS::loader::ParserMetadata aParserMetadata, RequestType requestType);
void NotifyObserversForCachedScript(nsIURI* aURI, nsINode* aContext,
nsIPrincipal* aTriggeringPrincipal,
nsSecurityFlags aSecurityFlags,
nsContentPolicyType aContentPolicyType);
/**
* Unblocks the creator parser of the parser-blocking scripts.
*/

3
dom/script/moz.build
View File

@ -44,6 +44,9 @@ UNIFIED_SOURCES += [
LOCAL_INCLUDES += [
"/dom/base",
"/js/loader",
# For nsHttpChannel.h
"/netwerk/base",
"/netwerk/protocol/http",
]
include("/ipc/chromium/chromium-config.mozbuild")

2
xpcom/ds/nsObserverService.cpp
View File

@ -185,8 +185,10 @@ nsresult nsObserverService::FilterHttpOnTopics(const char* aTopic) {
if (mozilla::net::IsNeckoChild() && !strncmp(aTopic, "http-on-", 8) &&
strcmp(aTopic, "http-on-before-stop-request") &&
strcmp(aTopic, "http-on-failed-opening-request") &&
// TODO: Merge cache response notifications (bug 1919218)
strcmp(aTopic, "http-on-image-cache-response") &&
strcmp(aTopic, "http-on-stylesheet-cache-response") &&
strcmp(aTopic, "http-on-resource-cache-response") &&
strcmp(aTopic, "http-on-opening-request") &&
strcmp(aTopic, "http-on-stop-request")) {
nsCOMPtr<nsIConsoleService> console(