forked from mirrors/gecko-dev
7cdbab4b1e
The logic for choosing the principal here was originally written before loadInfo had a separate principalToInherit field, and we needed to specify it via the triggeringPrincipal instead. At that point, we had to choose a component principal with permission to load the URI at the start of the request. However, now that we have a separate field for the principal to inherit, it's only needed after access checks have passed and we know that we have a URI which inherits a principal. In that case, the current logic causes us to always inherit the first principal in the whitelist (which is the page principal) for URIs (such as data: URIs) that always inherit, where we really want to inherit the last (which is the extension principal). MozReview-Commit-ID: EPoUNuOCwrH --HG-- extra : rebase_source : 535083e3dd4598ac4e8ea187d27d61ac2ac48476
63 lines
2.3 KiB
C++
63 lines
2.3 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 ExpandedPrincipal : public nsIExpandedPrincipal
|
|
, public mozilla::BasePrincipal
|
|
{
|
|
public:
|
|
static already_AddRefed<ExpandedPrincipal>
|
|
Create(nsTArray<nsCOMPtr<nsIPrincipal>>& aWhiteList,
|
|
const mozilla::OriginAttributes& aAttrs);
|
|
|
|
static PrincipalKind Kind() { return eExpandedPrincipal; }
|
|
|
|
NS_DECL_NSIEXPANDEDPRINCIPAL
|
|
NS_DECL_NSISERIALIZABLE
|
|
|
|
NS_IMETHOD_(MozExternalRefCountType) AddRef() override { return nsJSPrincipals::AddRef(); };
|
|
NS_IMETHOD_(MozExternalRefCountType) Release() override { return nsJSPrincipals::Release(); };
|
|
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) override;
|
|
NS_IMETHOD GetHashValue(uint32_t* aHashValue) 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;
|
|
virtual bool AddonHasPermission(const nsAtom* aPerm) override;
|
|
virtual nsresult GetScriptLocation(nsACString &aStr) override;
|
|
|
|
// Returns the principal to inherit when this principal requests the given
|
|
// URL. See BasePrincipal::PrincipalToInherit.
|
|
nsIPrincipal* PrincipalToInherit(nsIURI* aRequestedURI = nullptr);
|
|
|
|
protected:
|
|
explicit ExpandedPrincipal(nsTArray<nsCOMPtr<nsIPrincipal>> &aWhiteList);
|
|
|
|
virtual ~ExpandedPrincipal();
|
|
|
|
bool SubsumesInternal(nsIPrincipal* aOther,
|
|
DocumentDomainConsideration aConsideration) override;
|
|
|
|
bool MayLoadInternal(nsIURI* aURI) override;
|
|
|
|
private:
|
|
nsTArray< nsCOMPtr<nsIPrincipal> > mPrincipals;
|
|
};
|
|
|
|
#define NS_EXPANDEDPRINCIPAL_CONTRACTID "@mozilla.org/expandedprincipal;1"
|
|
#define NS_EXPANDEDPRINCIPAL_CID \
|
|
{ 0xe8ee88b0, 0x5571, 0x4086, \
|
|
{ 0xa4, 0x5b, 0x39, 0xa7, 0x16, 0x90, 0x6b, 0xdb } }
|
|
|
|
#endif // ExpandedPrincipal_h
|