Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1579357 - Check the arguments in BasePrincipal XPCOM methods, r=jkt

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D45001

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Andrea Marchesini 2019-09-09 16:45:29 +00:00
parent 9cede8d015
commit 41fd92503f
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
caps/BasePrincipal.cpp
View File

@ -292,7 +292,7 @@ bool BasePrincipal::Subsumes(nsIPrincipal* aOther,
NS_IMETHODIMP
BasePrincipal::Equals(nsIPrincipal* aOther, bool* aResult) {
NS_ENSURE_TRUE(aOther, NS_ERROR_INVALID_ARG);
NS_ENSURE_ARG_POINTER(aOther);
*aResult = FastEquals(aOther);
@ -301,7 +301,7 @@ BasePrincipal::Equals(nsIPrincipal* aOther, bool* aResult) {
NS_IMETHODIMP
BasePrincipal::EqualsConsideringDomain(nsIPrincipal* aOther, bool* aResult) {
NS_ENSURE_TRUE(aOther, NS_ERROR_INVALID_ARG);
NS_ENSURE_ARG_POINTER(aOther);
*aResult = FastEqualsConsideringDomain(aOther);
@ -310,7 +310,7 @@ BasePrincipal::EqualsConsideringDomain(nsIPrincipal* aOther, bool* aResult) {
NS_IMETHODIMP
BasePrincipal::Subsumes(nsIPrincipal* aOther, bool* aResult) {
NS_ENSURE_TRUE(aOther, NS_ERROR_INVALID_ARG);
NS_ENSURE_ARG_POINTER(aOther);
*aResult = FastSubsumes(aOther);
@ -319,7 +319,7 @@ BasePrincipal::Subsumes(nsIPrincipal* aOther, bool* aResult) {
NS_IMETHODIMP
BasePrincipal::SubsumesConsideringDomain(nsIPrincipal* aOther, bool* aResult) {
NS_ENSURE_TRUE(aOther, NS_ERROR_INVALID_ARG);
NS_ENSURE_ARG_POINTER(aOther);
*aResult = FastSubsumesConsideringDomain(aOther);
@ -329,7 +329,7 @@ BasePrincipal::SubsumesConsideringDomain(nsIPrincipal* aOther, bool* aResult) {
NS_IMETHODIMP
BasePrincipal::SubsumesConsideringDomainIgnoringFPD(nsIPrincipal* aOther,
bool* aResult) {
NS_ENSURE_TRUE(aOther, NS_ERROR_INVALID_ARG);
NS_ENSURE_ARG_POINTER(aOther);
*aResult = FastSubsumesConsideringDomainIgnoringFPD(aOther);
@ -339,6 +339,8 @@ BasePrincipal::SubsumesConsideringDomainIgnoringFPD(nsIPrincipal* aOther,
NS_IMETHODIMP
BasePrincipal::CheckMayLoad(nsIURI* aURI, bool aReport,
bool aAllowIfInheritsPrincipal) {
NS_ENSURE_ARG_POINTER(aURI);
// Check the internal method first, which allows us to quickly approve loads
// for the System Principal.
if (MayLoadInternal(aURI)) {

12
caps/BasePrincipal.h
View File

@ -205,6 +205,8 @@ class BasePrincipal : public nsJSPrincipals {
* of whether they subsume the document principal.
*/
bool OverridesCSP(nsIPrincipal* aDocumentPrincipal) {
MOZ_ASSERT(aDocumentPrincipal);
// Expanded principals override CSP if and only if they subsume the document
// principal.
if (mKind == eExpandedPrincipal) {
@ -264,6 +266,8 @@ class BasePrincipal : public nsJSPrincipals {
};
inline bool BasePrincipal::FastEquals(nsIPrincipal* aOther) {
MOZ_ASSERT(aOther);
auto other = Cast(aOther);
if (Kind() != other->Kind()) {
// Principals of different kinds can't be equal.
@ -287,6 +291,8 @@ inline bool BasePrincipal::FastEquals(nsIPrincipal* aOther) {
}
inline bool BasePrincipal::FastEqualsConsideringDomain(nsIPrincipal* aOther) {
MOZ_ASSERT(aOther);
// If neither of the principals have document.domain set, we use the fast path
// in Equals(). Otherwise, we fall back to the slow path below.
auto other = Cast(aOther);
@ -299,6 +305,8 @@ inline bool BasePrincipal::FastEqualsConsideringDomain(nsIPrincipal* aOther) {
}
inline bool BasePrincipal::FastSubsumes(nsIPrincipal* aOther) {
MOZ_ASSERT(aOther);
// If two principals are equal, then they both subsume each other.
if (FastEquals(aOther)) {
return true;
@ -309,6 +317,8 @@ inline bool BasePrincipal::FastSubsumes(nsIPrincipal* aOther) {
}
inline bool BasePrincipal::FastSubsumesConsideringDomain(nsIPrincipal* aOther) {
MOZ_ASSERT(aOther);
// If neither of the principals have document.domain set, we hand off to
// FastSubsumes() which has fast paths for some special cases. Otherwise, we
// fall back to the slow path below.
@ -321,6 +331,8 @@ inline bool BasePrincipal::FastSubsumesConsideringDomain(nsIPrincipal* aOther) {
inline bool BasePrincipal::FastSubsumesIgnoringFPD(
nsIPrincipal* aOther, DocumentDomainConsideration aConsideration) {
MOZ_ASSERT(aOther);
if (Kind() == eContentPrincipal &&
!dom::ChromeUtils::IsOriginAttributesEqualIgnoringFPD(
mOriginAttributes, Cast(aOther)->mOriginAttributes)) {