Bug 1608862 : refactor GetURI usage in BlobURLProtocolHandler.cpp r=c…

…kerschb *** Add get Prepath Differential Revision: https://phabricator.services.mozilla.com/D59731 --HG-- extra : moz-landing-system : lando
dothq · Feb 12, 2020 · 0c4f11b · 0c4f11b
1 parent f5bedf7
commit 0c4f11b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/caps/BasePrincipal.cpp b/caps/BasePrincipal.cpp
@@ -527,6 +527,16 @@ BasePrincipal::GetExposablePrePath(nsACString& aPrepath) {
   }
   return fixedURI->GetDisplayPrePath(aPrepath);
 }
+NS_IMETHODIMP
+BasePrincipal::GetPrepath(nsACString& aPath) {
+  aPath.Truncate();
+  nsCOMPtr<nsIURI> prinURI;
+  nsresult rv = GetURI(getter_AddRefs(prinURI));
+  if (NS_FAILED(rv) || !prinURI) {
+    return NS_OK;
+  }
+  return prinURI->GetPrePath(aPath);
+}
 
 NS_IMETHODIMP
 BasePrincipal::GetIsSystemPrincipal(bool* aResult) {

diff --git a/caps/BasePrincipal.h b/caps/BasePrincipal.h
@@ -129,6 +129,7 @@ class BasePrincipal : public nsJSPrincipals {
   NS_IMETHOD GetAsciiSpec(nsACString& aSpec) override;
   NS_IMETHOD GetExposablePrePath(nsACString& aResult) override;
   NS_IMETHOD GetHostPort(nsACString& aRes) override;
+  NS_IMETHOD GetPrepath(nsACString& aResult) override;
   NS_IMETHOD GetOriginSuffix(nsACString& aOriginSuffix) final;
   NS_IMETHOD GetIsOnion(bool* aIsOnion) override;
   NS_IMETHOD GetIsInIsolatedMozBrowserElement(

diff --git a/caps/nsIPrincipal.idl b/caps/nsIPrincipal.idl
@@ -224,6 +224,13 @@ interface nsIPrincipal : nsISerializable
     [noscript] readonly attribute ACString hostPort;
 
 
+    /**
+        * Returns the prepath of the principals uri
+        * follows the format scheme:
+        * "scheme://username:password@hostname:portnumber/"
+    */
+        [noscript] readonly attribute ACString prepath;
+
     /**
       * Returns the ASCII Spec from the Principals URI.
       * Might return the empty string, e.g. for the case of

diff --git a/dom/file/uri/BlobURLProtocolHandler.cpp b/dom/file/uri/BlobURLProtocolHandler.cpp
@@ -303,11 +303,8 @@ class BlobURLsReporter final : public nsIMemoryReporter {
     nsCOMPtr<nsIStackFrame> frame = dom::GetCurrentJSStack(maxFrames);
 
     nsAutoCString origin;
-    nsCOMPtr<nsIURI> principalURI;
-    if (NS_SUCCEEDED(aInfo->mPrincipal->GetURI(getter_AddRefs(principalURI))) &&
-        principalURI) {
-      principalURI->GetPrePath(origin);
-    }
+
+    aInfo->mPrincipal->GetPrepath(origin);
 
     // If we got a frame, we better have a current JSContext.  This is cheating
     // a bit; ideally we'd have our caller pass in a JSContext, or have
@@ -354,11 +351,9 @@ class BlobURLsReporter final : public nsIMemoryReporter {
 
   static void BuildPath(nsAutoCString& path, nsCStringHashKey::KeyType aKey,
                         DataInfo* aInfo, bool anonymize) {
-    nsCOMPtr<nsIURI> principalURI;
     nsAutoCString url, owner;
-    if (NS_SUCCEEDED(aInfo->mPrincipal->GetURI(getter_AddRefs(principalURI))) &&
-        principalURI != nullptr && NS_SUCCEEDED(principalURI->GetSpec(owner)) &&
-        !owner.IsEmpty()) {
+    aInfo->mPrincipal->GetAsciiSpec(owner);
+    if (!owner.IsEmpty()) {
       owner.ReplaceChar('/', '\\');
       path += "owner(";
       if (anonymize) {