Bug 1914286 - Remove NS_RelaxStrictFileOriginPolicy. r=smaug,necko-reviewers,kershaw
Differential Revision: https://phabricator.services.mozilla.com/D219921
This commit is contained in:
@@ -793,18 +793,6 @@ BasePrincipal::IsL10nAllowed(nsIURI* aURI, bool* aRes) {
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
BasePrincipal::AllowsRelaxStrictFileOriginPolicy(nsIURI* aURI, bool* aRes) {
|
||||
*aRes = false;
|
||||
nsCOMPtr<nsIURI> prinURI;
|
||||
nsresult rv = GetURI(getter_AddRefs(prinURI));
|
||||
if (NS_FAILED(rv) || !prinURI) {
|
||||
return NS_OK;
|
||||
}
|
||||
*aRes = NS_RelaxStrictFileOriginPolicy(aURI, prinURI);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
BasePrincipal::GetPrefLightCacheKey(nsIURI* aURI, bool aWithCredentials,
|
||||
const OriginAttributes& aOriginAttributes,
|
||||
|
||||
@@ -182,8 +182,6 @@ class BasePrincipal : public nsJSPrincipals {
|
||||
bool* aOutAllowed) override;
|
||||
NS_IMETHOD GetAsciiHost(nsACString& aAsciiHost) override;
|
||||
NS_IMETHOD GetLocalStorageQuotaKey(nsACString& aRes) override;
|
||||
NS_IMETHOD AllowsRelaxStrictFileOriginPolicy(nsIURI* aURI,
|
||||
bool* aRes) override;
|
||||
NS_IMETHOD CreateReferrerInfo(mozilla::dom::ReferrerPolicy aReferrerPolicy,
|
||||
nsIReferrerInfo** _retval) override;
|
||||
NS_IMETHOD GetIsScriptAllowedByPolicy(
|
||||
|
||||
@@ -305,14 +305,6 @@ bool ContentPrincipal::MayLoadInternal(nsIURI* aURI) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// If strict file origin policy is in effect, local files will always fail
|
||||
// SecurityCompareURIs unless they are identical. Explicitly check file origin
|
||||
// policy, in that case.
|
||||
if (nsScriptSecurityManager::GetStrictFileOriginPolicy() &&
|
||||
NS_URIIsLocalFile(aURI) && NS_RelaxStrictFileOriginPolicy(aURI, mURI)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -419,14 +419,6 @@ interface nsIPrincipal : nsISupports
|
||||
[infallible]
|
||||
boolean isSameOrigin(in nsIURI otherURI);
|
||||
|
||||
/*
|
||||
* Checks if the Principal is allowed to load the Provided file:// URI
|
||||
* using NS_RelaxStrictFileOriginPolicy
|
||||
*
|
||||
* May be called from any thread.
|
||||
*/
|
||||
boolean allowsRelaxStrictFileOriginPolicy(in nsIURI aURI);
|
||||
|
||||
|
||||
/*
|
||||
* Generates a Cache-Key for the Cors-Preflight Cache
|
||||
|
||||
Reference in New Issue
Block a user