mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-27 23:02:20 +00:00
635e7a7358
This patch is meant to be a proposed short run fix to prevent ApplyAddonContentScriptCSP from leaking the ExpandedPrincipal and nsCSPContext instance because they keep a reference to each other. This patch prevent that leak by creating a clone of the ExpandedPrincipal and then use that cloned instance in the call to nsCSPContext::SetRequestContextWithPrincipal. Once Bug 1548468 will move the CSP off the ExpandedPrincipal class, cloning the expanded principal to prevent that leak should not be necessary anymore. Differential Revision: https://phabricator.services.mozilla.com/D132144
97 lines
3.4 KiB
C++
97 lines
3.4 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef ExpandedPrincipal_h
|
|
#define ExpandedPrincipal_h
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "nsJSPrincipals.h"
|
|
#include "nsTArray.h"
|
|
#include "nsNetUtil.h"
|
|
#include "mozilla/BasePrincipal.h"
|
|
|
|
class nsIContentSecurityPolicy;
|
|
|
|
namespace Json {
|
|
class Value;
|
|
}
|
|
|
|
class ExpandedPrincipal : public nsIExpandedPrincipal,
|
|
public mozilla::BasePrincipal {
|
|
public:
|
|
static already_AddRefed<ExpandedPrincipal> Create(
|
|
const nsTArray<nsCOMPtr<nsIPrincipal>>& aAllowList,
|
|
const mozilla::OriginAttributes& aAttrs);
|
|
|
|
static PrincipalKind Kind() { return eExpandedPrincipal; }
|
|
|
|
NS_DECL_NSIEXPANDEDPRINCIPAL
|
|
|
|
NS_IMETHOD_(MozExternalRefCountType) AddRef() override {
|
|
return nsJSPrincipals::AddRef();
|
|
};
|
|
NS_IMETHOD_(MozExternalRefCountType) Release() override {
|
|
return nsJSPrincipals::Release();
|
|
};
|
|
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) override;
|
|
uint32_t GetHashValue() override;
|
|
NS_IMETHOD GetURI(nsIURI** aURI) override;
|
|
NS_IMETHOD GetDomain(nsIURI** aDomain) override;
|
|
NS_IMETHOD SetDomain(nsIURI* aDomain) override;
|
|
NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override;
|
|
NS_IMETHOD GetAddonId(nsAString& aAddonId) override;
|
|
NS_IMETHOD IsThirdPartyURI(nsIURI* uri, bool* aRes) override;
|
|
virtual bool AddonHasPermission(const nsAtom* aPerm) override;
|
|
virtual nsresult GetScriptLocation(nsACString& aStr) override;
|
|
|
|
bool AddonAllowsLoad(nsIURI* aURI, bool aExplicit = false);
|
|
|
|
void SetCsp(nsIContentSecurityPolicy* aCSP);
|
|
|
|
// Returns the principal to inherit when this principal requests the given
|
|
// URL. See BasePrincipal::PrincipalToInherit.
|
|
nsIPrincipal* PrincipalToInherit(nsIURI* aRequestedURI = nullptr);
|
|
|
|
nsresult GetSiteIdentifier(mozilla::SiteIdentifier& aSite) override;
|
|
|
|
virtual nsresult PopulateJSONObject(Json::Value& aObject) override;
|
|
// Serializable keys are the valid enum fields the serialization supports
|
|
enum SerializableKeys : uint8_t { eSpecs = 0, eSuffix, eMax = eSuffix };
|
|
typedef mozilla::BasePrincipal::KeyValT<SerializableKeys> KeyVal;
|
|
|
|
static already_AddRefed<BasePrincipal> FromProperties(
|
|
nsTArray<ExpandedPrincipal::KeyVal>& aFields);
|
|
|
|
class Deserializer : public BasePrincipal::Deserializer {
|
|
public:
|
|
NS_IMETHOD Read(nsIObjectInputStream* aStream) override;
|
|
};
|
|
|
|
protected:
|
|
explicit ExpandedPrincipal(nsTArray<nsCOMPtr<nsIPrincipal>>&& aPrincipals,
|
|
const nsACString& aOriginNoSuffix,
|
|
const mozilla::OriginAttributes& aAttrs);
|
|
|
|
virtual ~ExpandedPrincipal();
|
|
|
|
bool SubsumesInternal(nsIPrincipal* aOther,
|
|
DocumentDomainConsideration aConsideration) override;
|
|
|
|
bool MayLoadInternal(nsIURI* aURI) override;
|
|
|
|
private:
|
|
const nsTArray<nsCOMPtr<nsIPrincipal>> mPrincipals;
|
|
nsCOMPtr<nsIContentSecurityPolicy> mCSP;
|
|
};
|
|
|
|
#define NS_EXPANDEDPRINCIPAL_CID \
|
|
{ \
|
|
0xe8ee88b0, 0x5571, 0x4086, { \
|
|
0xa4, 0x5b, 0x39, 0xa7, 0x16, 0x90, 0x6b, 0xdb \
|
|
} \
|
|
}
|
|
|
|
#endif // ExpandedPrincipal_h
|