Bug 1714645: Use nsSimpleURI instead of NullPrincipalURI. r=ckerschb,…

…nika Differential Revision: https://phabricator.services.mozilla.com/D118489
iaxat · Jul 6, 2021 · 5f20350 · 5f20350
1 parent 1c8bf5c
commit 5f20350
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 13 deletions.
diff --git a/caps/NullPrincipal.cpp b/caps/NullPrincipal.cpp
@@ -13,9 +13,11 @@
 #include "mozilla/ArrayUtils.h"
 
 #include "mozilla/dom/BlobURLProtocolHandler.h"
+#include "mozilla/StaticPrefs_network.h"
 #include "nsDocShell.h"
 #include "NullPrincipal.h"
-#include "NullPrincipalURI.h"
+#include "DefaultURI.h"
+#include "nsSimpleURI.h"
 #include "nsMemory.h"
 #include "nsIClassInfoImpl.h"
 #include "nsNetCID.h"
@@ -24,6 +26,7 @@
 #include "nsScriptSecurityManager.h"
 #include "pratom.h"
 #include "nsIObjectInputStream.h"
+#include "mozilla/GkRustUtils.h"
 
 #include "json/json.h"
 
@@ -73,13 +76,32 @@ already_AddRefed<NullPrincipal> NullPrincipal::CreateWithoutOriginAttributes() {
   return NullPrincipal::Create(OriginAttributes(), nullptr);
 }
 
+already_AddRefed<nsIURI> NullPrincipal::CreateURI() {
+  nsCOMPtr<nsIURIMutator> mutator;
+  if (StaticPrefs::network_url_useDefaultURI()) {
+    mutator = new mozilla::net::DefaultURI::Mutator();
+  } else {
+    mutator = new mozilla::net::nsSimpleURI::Mutator();
+  }
+
+  nsAutoCStringN<NSID_LENGTH> uuid;
+  GkRustUtils::GenerateUUID(uuid);
+
+  nsCOMPtr<nsIURI> uri;
+  MOZ_ALWAYS_SUCCEEDS(NS_MutateURI(mutator)
+                          .SetSpec(NS_NULLPRINCIPAL_SCHEME ":"_ns + uuid)
+                          .Finalize(uri));
+  return uri.forget();
+}
+
 already_AddRefed<NullPrincipal> NullPrincipal::CreateInternal(
     const OriginAttributes& aOriginAttributes, bool aIsFirstParty,
     nsIURI* aURI) {
   nsCOMPtr<nsIURI> uri = aURI;
   if (!uri) {
-    uri = new NullPrincipalURI();
+    uri = NullPrincipal::CreateURI();
   }
+
   MOZ_RELEASE_ASSERT(uri->SchemeIs(NS_NULLPRINCIPAL_SCHEME));
 
   nsAutoCString originNoSuffix;

diff --git a/caps/NullPrincipal.h b/caps/NullPrincipal.h
@@ -66,6 +66,8 @@ class NullPrincipal final : public BasePrincipal {
 
   static already_AddRefed<NullPrincipal> CreateWithoutOriginAttributes();
 
+  static already_AddRefed<nsIURI> CreateURI();
+
   virtual nsresult GetScriptLocation(nsACString& aStr) override;
 
   nsresult GetSiteIdentifier(SiteIdentifier& aSite) override {

diff --git a/dom/base/DOMParser.cpp b/dom/base/DOMParser.cpp
@@ -22,7 +22,6 @@
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/LoadInfo.h"
 #include "mozilla/NullPrincipal.h"
-#include "NullPrincipalURI.h"
 #include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/ScriptSettings.h"
@@ -252,8 +251,8 @@ already_AddRefed<DOMParser> DOMParser::Constructor(const GlobalObject& aOwner,
   nsCOMPtr<nsIURI> documentURI;
   nsIURI* baseURI = nullptr;
   if (docPrincipal->IsSystemPrincipal()) {
-    documentURI = new NullPrincipalURI();
-    docPrincipal = NullPrincipal::Create(OriginAttributes(), documentURI);
+    docPrincipal = NullPrincipal::Create(OriginAttributes());
+    documentURI = docPrincipal->GetURI();
   } else {
     // Grab document and base URIs off the window our constructor was
     // called on. Error out if anything untoward happens.
@@ -282,10 +281,10 @@ already_AddRefed<DOMParser> DOMParser::Constructor(const GlobalObject& aOwner,
 
 // static
 already_AddRefed<DOMParser> DOMParser::CreateWithoutGlobal(ErrorResult& aRv) {
-  nsCOMPtr<nsIURI> documentURI = new NullPrincipalURI();
   nsCOMPtr<nsIPrincipal> docPrincipal =
-      NullPrincipal::Create(OriginAttributes(), documentURI);
+      NullPrincipal::Create(OriginAttributes());
 
+  nsCOMPtr<nsIURI> documentURI = docPrincipal->GetURI();
   if (!documentURI) {
     aRv.Throw(NS_ERROR_UNEXPECTED);
     return nullptr;

diff --git a/layout/style/URLExtraData.cpp b/layout/style/URLExtraData.cpp
@@ -8,7 +8,6 @@
 
 #include "mozilla/URLExtraData.h"
 
-#include "mozilla/NullPrincipalURI.h"
 #include "nsProxyRelease.h"
 #include "ReferrerInfo.h"
 
@@ -19,7 +18,7 @@ StaticRefPtr<URLExtraData> URLExtraData::sDummyChrome;
 
 /* static */
 void URLExtraData::Init() {
-  RefPtr<nsIURI> baseURI = new NullPrincipalURI();
+  RefPtr<nsIURI> baseURI = NullPrincipal::CreateURI();
   nsCOMPtr<nsIReferrerInfo> referrerInfo = new dom::ReferrerInfo(nullptr);
   sDummy = new URLExtraData(do_AddRef(baseURI), do_AddRef(referrerInfo),
                             NullPrincipal::CreateWithoutOriginAttributes());

diff --git a/layout/style/test/gtest/StyloParsingBench.cpp b/layout/style/test/gtest/StyloParsingBench.cpp
@@ -12,7 +12,7 @@
 #include "mozilla/dom/DOMString.h"
 #include "mozilla/Encoding.h"
 #include "mozilla/Utf8.h"
-#include "mozilla/NullPrincipalURI.h"
+#include "mozilla/NullPrincipal.h"
 #include "mozilla/css/SheetParsingMode.h"
 #include "ReferrerInfo.h"
 #include "nsCSSValue.h"
@@ -36,7 +36,7 @@ static void ServoParsingBench(const StyleUseCounters* aCounters) {
   cssStr.Append(css);
   ASSERT_EQ(Encoding::UTF8ValidUpTo(css), css.Length());
 
-  RefPtr<NullPrincipalURI> uri = new NullPrincipalURI();
+  RefPtr<nsIURI> uri = NullPrincipal::CreateURI();
   nsCOMPtr<nsIReferrerInfo> referrerInfo = new ReferrerInfo(nullptr);
   RefPtr<URLExtraData> data =
       new URLExtraData(uri.forget(), referrerInfo.forget(),
@@ -56,7 +56,7 @@ static constexpr uint16_t STYLE_RULE = 1;
 static void ServoSetPropertyByIdBench(const nsACString& css) {
   RefPtr<RawServoDeclarationBlock> block =
       Servo_DeclarationBlock_CreateEmpty().Consume();
-  RefPtr<NullPrincipalURI> uri = new NullPrincipalURI();
+  RefPtr<nsIURI> uri = NullPrincipal::CreateURI();
   nsCOMPtr<nsIReferrerInfo> referrerInfo = new ReferrerInfo(nullptr);
   RefPtr<URLExtraData> data =
       new URLExtraData(uri.forget(), referrerInfo.forget(),
@@ -75,7 +75,7 @@ static void ServoGetPropertyValueById() {
   RefPtr<RawServoDeclarationBlock> block =
       Servo_DeclarationBlock_CreateEmpty().Consume();
 
-  RefPtr<NullPrincipalURI> uri = new NullPrincipalURI();
+  RefPtr<nsIURI> uri = NullPrincipal::CreateURI();
   nsCOMPtr<nsIReferrerInfo> referrerInfo = new ReferrerInfo(nullptr);
   RefPtr<URLExtraData> data =
       new URLExtraData(uri.forget(), referrerInfo.forget(),