corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1945540: Part 3 - Get integrity from import map. r=tschuster,jonco,dom-core,mccr8

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D236559
This commit is contained in:
Fatih Kilic
2025-03-06 14:16:30 +00:00
parent d25bab3055
commit 37486aeb74
12 changed files with 92 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
js/loader/ModuleLoaderBase.cpp
View File

@@ -953,10 +953,37 @@ void ModuleLoaderBase::StartFetchingModuleDependencies(
}
}
bool ModuleLoaderBase::GetImportMapSRI(
nsIURI* aURI, nsIURI* aSourceURI, nsIConsoleReportCollector* aReporter,
mozilla::dom::SRIMetadata* aMetadataOut) {
MOZ_ASSERT(aMetadataOut->IsEmpty());
MOZ_ASSERT(aURI);
if (!HasImportMapRegistered()) {
return false;
}
mozilla::Maybe<nsString> entry =
ImportMap::LookupIntegrity(mImportMap.get(), aURI);
if (entry.isNothing()) {
return false;
}
mozilla::dom::SRICheck::IntegrityMetadata(
*entry, aSourceURI->GetSpecOrDefault(), aReporter, aMetadataOut);
return true;
}
void ModuleLoaderBase::StartFetchingModuleAndDependencies(
ModuleLoadRequest* aParent, const ModuleMapKey& aRequestedModule) {
RefPtr<ModuleLoadRequest> childRequest = CreateStaticImport(
aRequestedModule.mUri, aRequestedModule.mModuleType, aParent);
// Check import map for integrity information
mozilla::dom::SRIMetadata sriMetadata;
GetImportMapSRI(aRequestedModule.mUri, aParent->mURI,
mLoader->GetConsoleReportCollector(), &sriMetadata);
RefPtr<ModuleLoadRequest> childRequest =
CreateStaticImport(aRequestedModule.mUri, aRequestedModule.mModuleType,
aParent, sriMetadata);
aParent->mImports.AppendElement(childRequest);