Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 20:22:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1459588 - Remove unused allowDocumentToBeAgnosticToCSP r=ckerschb

Browse Source 
This cleanup basically reverts the remaining bits of 93dcf59ff87

MozReview-Commit-ID: 9zimpjAkZyj

--HG--
extra : rebase_source : 7c2d573a0cd067f529f096472c1d543d8d598635
This commit is contained in:
Rob Wu 2018-05-07 15:12:51 +02:00
parent 295e7d99bc
commit 7e5117562b
6 changed files with 1 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/base/nsDocument.cpp
View File

@ -2883,13 +2883,6 @@ nsIDocument::InitCSP(nsIChannel* aChannel)
return NS_OK;
}
// In case this channel was instrument to discard the CSP, then
// there is nothing for us to do here.
nsCOMPtr<nsILoadInfo> loadInfo = aChannel->GetLoadInfo();
if (loadInfo && loadInfo->GetAllowDocumentToBeAgnosticToCSP()) {
return NS_OK;
}
nsAutoCString tCspHeaderValue, tCspROHeaderValue;
nsCOMPtr<nsIHttpChannel> httpChannel;
@ -2916,6 +2909,7 @@ nsIDocument::InitCSP(nsIChannel* aChannel)
// Check if this is a signed content to apply default CSP.
bool applySignedContentCSP = false;
nsCOMPtr<nsILoadInfo> loadInfo = aChannel->GetLoadInfo();
if (loadInfo && loadInfo->GetVerifySignedContent()) {
applySignedContentCSP = true;
}

2
ipc/glue/BackgroundUtils.cpp
View File

@ -407,7 +407,6 @@ LoadInfoToLoadInfoArgs(nsILoadInfo *aLoadInfo,
aLoadInfo->GetBrowserWouldUpgradeInsecureRequests(),
aLoadInfo->GetVerifySignedContent(),
aLoadInfo->GetEnforceSRI(),
aLoadInfo->GetAllowDocumentToBeAgnosticToCSP(),
aLoadInfo->GetForceAllowDataURI(),
aLoadInfo->GetAllowInsecureRedirectToDataURI(),
aLoadInfo->GetSkipContentPolicyCheckForWebRequest(),
@ -556,7 +555,6 @@ LoadInfoArgsToLoadInfo(const OptionalLoadInfoArgs& aOptionalLoadInfoArgs,
loadInfoArgs.browserWouldUpgradeInsecureRequests(),
loadInfoArgs.verifySignedContent(),
loadInfoArgs.enforceSRI(),
loadInfoArgs.allowDocumentToBeAgnosticToCSP(),
loadInfoArgs.forceAllowDataURI(),
loadInfoArgs.allowInsecureRedirectToDataURI(),
loadInfoArgs.skipContentPolicyCheckForWebRequest(),

24
netwerk/base/LoadInfo.cpp
View File

@ -69,7 +69,6 @@ LoadInfo::LoadInfo(nsIPrincipal* aLoadingPrincipal,
, mBrowserWouldUpgradeInsecureRequests(false)
, mVerifySignedContent(false)
, mEnforceSRI(false)
, mAllowDocumentToBeAgnosticToCSP(false)
, mForceAllowDataURI(false)
, mAllowInsecureRedirectToDataURI(false)
, mSkipContentPolicyCheckForWebRequest(false)
@ -296,7 +295,6 @@ LoadInfo::LoadInfo(nsPIDOMWindowOuter* aOuterWindow,
, mBrowserWouldUpgradeInsecureRequests(false)
, mVerifySignedContent(false)
, mEnforceSRI(false)
, mAllowDocumentToBeAgnosticToCSP(false)
, mForceAllowDataURI(false)
, mAllowInsecureRedirectToDataURI(false)
, mSkipContentPolicyCheckForWebRequest(false)
@ -375,7 +373,6 @@ LoadInfo::LoadInfo(const LoadInfo& rhs)
, mBrowserWouldUpgradeInsecureRequests(rhs.mBrowserWouldUpgradeInsecureRequests)
, mVerifySignedContent(rhs.mVerifySignedContent)
, mEnforceSRI(rhs.mEnforceSRI)
, mAllowDocumentToBeAgnosticToCSP(rhs.mAllowDocumentToBeAgnosticToCSP)
, mForceAllowDataURI(rhs.mForceAllowDataURI)
, mAllowInsecureRedirectToDataURI(rhs.mAllowInsecureRedirectToDataURI)
, mSkipContentPolicyCheckForWebRequest(rhs.mSkipContentPolicyCheckForWebRequest)
@ -421,7 +418,6 @@ LoadInfo::LoadInfo(nsIPrincipal* aLoadingPrincipal,
bool aBrowserWouldUpgradeInsecureRequests,
bool aVerifySignedContent,
bool aEnforceSRI,
bool aAllowDocumentToBeAgnosticToCSP,
bool aForceAllowDataURI,
bool aAllowInsecureRedirectToDataURI,
bool aSkipContentPolicyCheckForWebRequest,
@ -461,7 +457,6 @@ LoadInfo::LoadInfo(nsIPrincipal* aLoadingPrincipal,
, mBrowserWouldUpgradeInsecureRequests(aBrowserWouldUpgradeInsecureRequests)
, mVerifySignedContent(aVerifySignedContent)
, mEnforceSRI(aEnforceSRI)
, mAllowDocumentToBeAgnosticToCSP(aAllowDocumentToBeAgnosticToCSP)
, mForceAllowDataURI(aForceAllowDataURI)
, mAllowInsecureRedirectToDataURI(aAllowInsecureRedirectToDataURI)
, mSkipContentPolicyCheckForWebRequest(aSkipContentPolicyCheckForWebRequest)
@ -1007,25 +1002,6 @@ LoadInfo::ResetPrincipalToInheritToNullPrincipal()
return NS_OK;
}
NS_IMETHODIMP
LoadInfo::SetAllowDocumentToBeAgnosticToCSP(bool aAllowDocumentToBeAgnosticToCSP)
{
if (mInternalContentPolicyType != nsIContentPolicy::TYPE_DOCUMENT) {
MOZ_ASSERT(false, "not available for loads other than TYPE_DOCUMENT");
return NS_ERROR_UNEXPECTED;
}
mAllowDocumentToBeAgnosticToCSP = aAllowDocumentToBeAgnosticToCSP;
return NS_OK;
}
NS_IMETHODIMP
LoadInfo::GetAllowDocumentToBeAgnosticToCSP(bool* aAllowDocumentToBeAgnosticToCSP)
{
*aAllowDocumentToBeAgnosticToCSP = mAllowDocumentToBeAgnosticToCSP;
return NS_OK;
}
NS_IMETHODIMP
LoadInfo::SetScriptableOriginAttributes(JSContext* aCx,
JS::Handle<JS::Value> aOriginAttributes)

2
netwerk/base/LoadInfo.h
View File

@ -118,7 +118,6 @@ private:
bool aBrowserWouldUpgradeInsecureRequests,
bool aVerifySignedContent,
bool aEnforceSRI,
bool aAllowDocumentToBeAgnosticToCSP,
bool aForceAllowDataURI,
bool aAllowInsecureRedirectToDataURI,
bool aSkipContentPolicyCheckForWebRequest,
@ -187,7 +186,6 @@ private:
bool mBrowserWouldUpgradeInsecureRequests;
bool mVerifySignedContent;
bool mEnforceSRI;
bool mAllowDocumentToBeAgnosticToCSP;
bool mForceAllowDataURI;
bool mAllowInsecureRedirectToDataURI;
bool mSkipContentPolicyCheckForWebRequest;

12
netwerk/base/nsILoadInfo.idl
View File

@ -627,18 +627,6 @@ interface nsILoadInfo : nsISupports
*/
void resetPrincipalToInheritToNullPrincipal();
/**
* Allows certain top-level channels to be agnostic to CSP. If set,
* this attribute needs to be set before the CSP is initialized
* within nsDocument. If set after, this attribute has no effect.
* Please note, that this logic is only available for loads of TYPE_DOCUMENT,
* and is discarded for other loads.
*
* WARNING: Please only use that function if you know exactly what
* you are doing!!!
*/
[infallible] attribute boolean allowDocumentToBeAgnosticToCSP;
/**
* Customized OriginAttributes within LoadInfo to allow overwriting of the
* default originAttributes from the loadingPrincipal.

1
netwerk/ipc/NeckoChannelParams.ipdlh
View File

@ -51,7 +51,6 @@ struct LoadInfoArgs
bool browserWouldUpgradeInsecureRequests;
bool verifySignedContent;
bool enforceSRI;
bool allowDocumentToBeAgnosticToCSP;
bool forceAllowDataURI;
bool allowInsecureRedirectToDataURI;
bool skipContentPolicyCheckForWebRequest;