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

Bug 1947732 - Provide nsIPrincipal to GetTrustedTypesCompliantString. r=smaug

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D246424
This commit is contained in:
Tom Schuster
2025-04-30 11:09:07 +00:00
parent b1d9d0b790
commit edaa914b45
43 changed files with 177 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dom/base/Document.cpp
View File

@@ -5206,6 +5206,7 @@ void Document::EnsureInitializeInternalCommandDataHashtable() {
Document::InternalCommandData Document::ConvertToInternalCommand(
const nsAString& aHTMLCommandName,
const TrustedHTMLOrString* aValue /* = nullptr */,
nsIPrincipal* aSubjectPrincipal /* = nullptr */,
ErrorResult* aRv /* = nullptr */,
nsAString* aAdjustedValue /* = nullptr */) {
MOZ_ASSERT(!aAdjustedValue || aAdjustedValue->IsEmpty());
@@ -5244,8 +5245,8 @@ Document::InternalCommandData Document::ConvertToInternalCommand(
if (commandData.mCommand == Command::InsertHTML) {
constexpr nsLiteralString sink = u"Document execCommand"_ns;
compliantString = TrustedTypeUtils::GetTrustedTypesCompliantString(
*aValue, sink, kTrustedTypesOnlySinkGroup, *this, compliantStringHolder,
*aRv);
*aValue, sink, kTrustedTypesOnlySinkGroup, *this, aSubjectPrincipal,
compliantStringHolder, *aRv);
if (aRv->Failed()) {
return InternalCommandData();
}
@@ -5586,8 +5587,8 @@ bool Document::ExecCommand(const nsAString& aHTMLCommandName, bool aShowUI,
// this might add some ugly JS dependencies?
nsAutoString adjustedValue;
InternalCommandData commandData =
ConvertToInternalCommand(aHTMLCommandName, &aValue, &aRv, &adjustedValue);
InternalCommandData commandData = ConvertToInternalCommand(
aHTMLCommandName, &aValue, &aSubjectPrincipal, &aRv, &adjustedValue);
switch (commandData.mCommand) {
case Command::DoNothing:
return false;
@@ -20202,13 +20203,13 @@ static already_AddRefed<Document> CreateHTMLDocument(GlobalObject& aGlobal,
/* static */
already_AddRefed<Document> Document::ParseHTMLUnsafe(
GlobalObject& aGlobal, const TrustedHTMLOrString& aHTML,
ErrorResult& aError) {
nsIPrincipal* aSubjectPrincipal, ErrorResult& aError) {
nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(aGlobal.GetAsSupports());
constexpr nsLiteralString sink = u"Document parseHTMLUnsafe"_ns;
Maybe<nsAutoString> compliantStringHolder;
const nsAString* compliantString =
TrustedTypeUtils::GetTrustedTypesCompliantString(
aHTML, sink, kTrustedTypesOnlySinkGroup, *global,
aHTML, sink, kTrustedTypesOnlySinkGroup, *global, aSubjectPrincipal,
compliantStringHolder, aError);
if (aError.Failed()) {
return nullptr;