wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1175122 - Add more assertions to the in-tree content policy implementations to ensure that they receive external content policy types; r=baku

Browse Source
This commit is contained in:
Ehsan Akhgari 2015-06-16 09:24:35 -04:00
parent 884a33fd5a
commit e473d353b6
5 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/base/nsNoDataProtocolContentPolicy.cpp
View File

@ -30,6 +30,9 @@ nsNoDataProtocolContentPolicy::ShouldLoad(uint32_t aContentType,
nsIPrincipal *aRequestPrincipal, nsIPrincipal *aRequestPrincipal,
int16_t *aDecision) int16_t *aDecision)
{ {
MOZ_ASSERT(aContentType == nsContentUtils::InternalContentPolicyTypeToExternal(aContentType),
"We should only see external content policy types here.");
*aDecision = nsIContentPolicy::ACCEPT; *aDecision = nsIContentPolicy::ACCEPT;
// Don't block for TYPE_OBJECT since such URIs are sometimes loaded by the // Don't block for TYPE_OBJECT since such URIs are sometimes loaded by the

3
dom/security/nsCSPService.cpp
View File

@ -251,6 +251,9 @@ CSPService::ShouldProcess(uint32_t aContentType,
nsIPrincipal *aRequestPrincipal, nsIPrincipal *aRequestPrincipal,
int16_t *aDecision) int16_t *aDecision)
{ {
MOZ_ASSERT(aContentType == nsContentUtils::InternalContentPolicyTypeToExternal(aContentType),
"We should only see external content policy types here.");
if (!aContentLocation) if (!aContentLocation)
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;

3
dom/security/nsMixedContentBlocker.cpp
View File

@ -787,6 +787,9 @@ nsMixedContentBlocker::ShouldProcess(uint32_t aContentType,
nsIPrincipal* aRequestPrincipal, nsIPrincipal* aRequestPrincipal,
int16_t* aDecision) int16_t* aDecision)
{ {
MOZ_ASSERT(aContentType == nsContentUtils::InternalContentPolicyTypeToExternal(aContentType),
"We should only see external content policy types here.");
if (!aContentLocation) { if (!aContentLocation) {
// aContentLocation may be null when a plugin is loading without an associated URI resource // aContentLocation may be null when a plugin is loading without an associated URI resource
if (aContentType == TYPE_OBJECT) { if (aContentType == TYPE_OBJECT) {

6
embedding/browser/nsWebBrowserContentPolicy.cpp
View File

@ -34,6 +34,9 @@ nsWebBrowserContentPolicy::ShouldLoad(uint32_t aContentType,
{ {
NS_PRECONDITION(aShouldLoad, "Null out param"); NS_PRECONDITION(aShouldLoad, "Null out param");
MOZ_ASSERT(aContentType == nsContentUtils::InternalContentPolicyTypeToExternal(aContentType),
"We should only see external content policy types here.");
*aShouldLoad = nsIContentPolicy::ACCEPT; *aShouldLoad = nsIContentPolicy::ACCEPT;
nsIDocShell* shell = NS_CP_GetDocShellFromContext(aRequestingContext); nsIDocShell* shell = NS_CP_GetDocShellFromContext(aRequestingContext);
@ -84,6 +87,9 @@ nsWebBrowserContentPolicy::ShouldProcess(uint32_t aContentType,
{ {
NS_PRECONDITION(aShouldProcess, "Null out param"); NS_PRECONDITION(aShouldProcess, "Null out param");
MOZ_ASSERT(aContentType == nsContentUtils::InternalContentPolicyTypeToExternal(aContentType),
"We should only see external content policy types here.");
*aShouldProcess = nsIContentPolicy::ACCEPT; *aShouldProcess = nsIContentPolicy::ACCEPT;
// Object tags will always open channels with TYPE_OBJECT, but may end up // Object tags will always open channels with TYPE_OBJECT, but may end up

7
extensions/permissions/nsContentBlocker.cpp
View File

@ -14,6 +14,7 @@
#include "nsContentPolicyUtils.h" #include "nsContentPolicyUtils.h"
#include "nsIObjectLoadingContent.h" #include "nsIObjectLoadingContent.h"
#include "mozilla/ArrayUtils.h" #include "mozilla/ArrayUtils.h"
#include "nsContentUtils.h"
// Possible behavior pref values // Possible behavior pref values
// Those map to the nsIPermissionManager values where possible // Those map to the nsIPermissionManager values where possible
@ -150,6 +151,9 @@ nsContentBlocker::ShouldLoad(uint32_t aContentType,
nsIPrincipal *aRequestPrincipal, nsIPrincipal *aRequestPrincipal,
int16_t *aDecision) int16_t *aDecision)
{ {
MOZ_ASSERT(aContentType == nsContentUtils::InternalContentPolicyTypeToExternal(aContentType),
"We should only see external content policy types here.");
*aDecision = nsIContentPolicy::ACCEPT; *aDecision = nsIContentPolicy::ACCEPT;
nsresult rv; nsresult rv;
@ -201,6 +205,9 @@ nsContentBlocker::ShouldProcess(uint32_t aContentType,
nsIPrincipal *aRequestPrincipal, nsIPrincipal *aRequestPrincipal,
int16_t *aDecision) int16_t *aDecision)
{ {
MOZ_ASSERT(aContentType == nsContentUtils::InternalContentPolicyTypeToExternal(aContentType),
"We should only see external content policy types here.");
// For loads where aRequestingContext is chrome, we should just // For loads where aRequestingContext is chrome, we should just
// accept. Those are most likely toplevel loads in windows, and // accept. Those are most likely toplevel loads in windows, and
// chrome generally knows what it's doing anyway. // chrome generally knows what it's doing anyway.