Merge branch 'dev-preferences'

SAP · Jan 12, 2024 · a818696 · a818696
2 parents d9f74c7 + 410b341
commit a818696
Show file tree

Hide file tree

Showing 42 changed files with 705 additions and 446 deletions.
diff --git a/dom/base/DOMParser.cpp b/dom/base/DOMParser.cpp
@@ -23,6 +23,7 @@
 #include "nsJSUtils.h"
 #include "nsError.h"
 #include "nsPIDOMWindow.h"
+#include "nsTaintingUtils.h"
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/NullPrincipal.h"

diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
@@ -418,6 +418,7 @@
 #include "nsStringIterator.h"
 #include "nsStyleSheetService.h"
 #include "nsStyleStruct.h"
+#include "nsTaintingUtils.h"
 #include "nsTextNode.h"
 #include "nsUnicharUtils.h"
 #include "nsWrapperCache.h"

diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp
@@ -181,6 +181,7 @@
 #include "nsStyleStruct.h"
 #include "nsStyledElement.h"
 #include "nsTArray.h"
+#include "nsTaintingUtils.h"
 #include "nsTextNode.h"
 #include "nsThreadUtils.h"
 #include "nsViewManager.h"
@@ -3919,9 +3920,7 @@ void Element::SetInnerHTML(const nsAString& aInnerHTML,
                            ErrorResult& aError) {
 
   // TaintFox: innerHTML sink.
-  nsAutoString id;
-  this->GetId(id);
-  ReportTaintSink(aInnerHTML, "innerHTML", id);
+  ReportTaintSink(aInnerHTML, "innerHTML", this);
 
   SetInnerHTMLInternal(aInnerHTML, aError);
 }
@@ -3943,9 +3942,7 @@ void Element::SetOuterHTML(const nsAString& aOuterHTML, ErrorResult& aError) {
   }
 
   // TaintFox: outerHTML sink.
-  nsAutoString id;
-  this->GetId(id);
-  ReportTaintSink(aOuterHTML, "outerHTML", id);
+  ReportTaintSink(aOuterHTML, "outerHTML", this);
 
   if (OwnerDoc()->IsHTMLDocument()) {
     nsAtom* localName;
@@ -3995,7 +3992,7 @@ enum nsAdjacentPosition { eBeforeBegin, eAfterBegin, eBeforeEnd, eAfterEnd };
 void Element::InsertAdjacentHTML(const nsAString& aPosition,
                                  const nsAString& aText, ErrorResult& aError) {
   // TaintFox: insertAdjacentHTML sink
-  ReportTaintSink(aText, "insertAdjacentHTML");
+  ReportTaintSink(aText, "insertAdjacentHTML", this);
 
   nsAdjacentPosition position;
   if (aPosition.LowerCaseEqualsLiteral("beforebegin")) {
@@ -4126,7 +4123,7 @@ void Element::InsertAdjacentText(const nsAString& aWhere,
   RefPtr<nsTextNode> textNode = OwnerDoc()->CreateTextNode(aData);
 
   // TaintFox: insertAdjacentHTML sink
-  ReportTaintSink(aData, "insertAdjacentText");
+  ReportTaintSink(aData, "insertAdjacentText", this);
 
   InsertAdjacent(aWhere, textNode, aError);
 }

diff --git a/dom/base/Location.cpp b/dom/base/Location.cpp
@@ -27,6 +27,7 @@
 #include "nsDocShell.h"
 #include "nsGlobalWindowOuter.h"
 #include "nsPIDOMWindowInlines.h"
+#include "nsTaintingUtils.h"
 #include "mozilla/Likely.h"
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/BasePrincipal.h"

diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
@@ -92,6 +92,7 @@
 #include "MediaManager.h"
 
 #include "nsJSUtils.h"
+#include "nsTaintingUtils.h"
 
 #include "mozilla/dom/Promise.h"
 

diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
@@ -382,6 +382,7 @@
 #include "nsTLiteralString.h"
 #include "nsTPromiseFlatString.h"
 #include "nsTStringRepr.h"
+#include "nsTaintingUtils.h"
 #include "nsTextFragment.h"
 #include "nsTextNode.h"
 #include "nsThreadManager.h"

diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp
@@ -300,6 +300,7 @@
 #include "nsTLiteralString.h"
 #include "nsTObserverArray.h"
 #include "nsTStringRepr.h"
+#include "nsTaintingUtils.h"
 #include "nsThreadUtils.h"
 #include "nsWeakReference.h"
 #include "nsWindowMemoryReporter.h"

diff --git a/dom/base/nsGlobalWindowOuter.cpp b/dom/base/nsGlobalWindowOuter.cpp
@@ -80,6 +80,7 @@
 
 // Helper Classes
 #include "nsJSUtils.h"
+#include "nsTaintingUtils.h"
 #include "jsapi.h"
 #include "jsfriendapi.h"
 #include "js/CallAndConstruct.h"    // JS::Call

diff --git a/dom/base/nsINode.cpp b/dom/base/nsINode.cpp
@@ -97,6 +97,7 @@
 #include "nsRange.h"
 #include "nsString.h"
 #include "nsStyleConsts.h"
+#include "nsTaintingUtils.h"
 #include "nsTextNode.h"
 #include "nsUnicharUtils.h"
 #include "nsWindowSizes.h"