The origin should not contain the ref part of the URL

This commit is contained in:
janekptacijarabaci 2018-03-03 21:23:39 +01:00 committed by Roy Tam
commit 1505b1290e

View file

@ -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;