From c1ba23a015a2e85b2290a1cdfb0d697381b3cd2a Mon Sep 17 00:00:00 2001
From: janekptacijarabaci <janekptacijarabaci@seznam.cz>
Date: Sat, 3 Mar 2018 21:23:39 +0100
Subject: The origin should not contain the ref part of the URL

---
 caps/nsPrincipal.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'caps')

diff --git a/caps/nsPrincipal.cpp b/caps/nsPrincipal.cpp
index 4cb472369..f89061043 100644
--- a/caps/nsPrincipal.cpp
+++ b/caps/nsPrincipal.cpp
@@ -184,8 +184,23 @@ nsPrincipal::GetOriginForURI(nsIURI* aURI, nsACString& aOrigin)
     // origin string
     nsCOMPtr<nsIStandardURL> standardURL = do_QueryInterface(origin);
     NS_ENSURE_TRUE(standardURL, NS_ERROR_FAILURE);
+
     rv = origin->GetAsciiSpec(aOrigin);
     NS_ENSURE_SUCCESS(rv, rv);
+
+    // The origin, when taken from the spec, should not contain the ref part of
+    // the URL.
+
+    int32_t pos = aOrigin.FindChar('?');
+    int32_t hashPos = aOrigin.FindChar('#');
+
+    if (hashPos != kNotFound && (pos == kNotFound || hashPos < pos)) {
+      pos = hashPos;
+    }
+
+    if (pos != kNotFound) {
+      aOrigin.Truncate(pos);
+    }
   }
 
   return NS_OK;
-- 
cgit v1.2.3