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

Bug 444641 part 3. Propagate the loading principal to the image channel as needed. r=joe,dveditz

Browse Source
This commit is contained in:
Boris Zbarsky 2011-09-20 17:00:42 -04:00
parent 70b13b1eaf
commit b84eb03e7e
2 changed files with 61 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
modules/libpr0n/src/imgLoader.cpp
View File

@ -92,6 +92,8 @@
#include "mozilla/FunctionTimer.h"
#include "mozilla/Preferences.h"
#include "nsContentUtils.h"
using namespace mozilla;
using namespace mozilla::imagelib;
@ -395,13 +397,14 @@ nsProgressNotificationProxy::GetInterface(const nsIID& iid,
return NS_NOINTERFACE;
}
static PRBool NewRequestAndEntry(imgRequest **request, imgCacheEntry **entry)
static PRBool NewRequestAndEntry(bool forcePrincipalCheckForCacheEntry,
imgRequest **request, imgCacheEntry **entry)
{
*request = new imgRequest();
if (!*request)
return PR_FALSE;
*entry = new imgCacheEntry(*request);
*entry = new imgCacheEntry(*request, forcePrincipalCheckForCacheEntry);
if (!*entry) {
delete *request;
return PR_FALSE;
@ -459,13 +462,15 @@ static PRBool ShouldRevalidateEntry(imgCacheEntry *aEntry,
// given loading principal, and false if the request may not be reused due
// to CORS.
static bool
ValidateCORS(imgRequest* request, PRInt32 corsmode, nsIPrincipal* loadingPrincipal)
ValidateCORSAndPrincipal(imgRequest* request, bool forcePrincipalCheck,
PRInt32 corsmode, nsIPrincipal* loadingPrincipal)
{
// If the entry's CORS mode doesn't match, or the CORS mode matches but the
// document principal isn't the same, we can't use this request.
if (request->GetCORSMode() != corsmode) {
return false;
} else if (request->GetCORSMode() != imgIRequest::CORS_NONE) {
} else if (request->GetCORSMode() != imgIRequest::CORS_NONE ||
forcePrincipalCheck) {
nsCOMPtr<nsIPrincipal> otherprincipal = request->GetLoadingPrincipal();
// If we previously had a principal, but we don't now, we can't use this
@ -485,13 +490,23 @@ ValidateCORS(imgRequest* request, PRInt32 corsmode, nsIPrincipal* loadingPrincip
}
static nsresult NewImageChannel(nsIChannel **aResult,
// If aForcePrincipalCheckForCacheEntry is
// true, then we will force a principal check
// even when not using CORS before assuming we
// have a cache hit on a cache entry that we
// create for this channel. This is an out
// param that should be set to true if this
// channel ends up depending on
// aLoadingPrincipal and false otherwise.
bool *aForcePrincipalCheckForCacheEntry,
nsIURI *aURI,
nsIURI *aInitialDocumentURI,
nsIURI *aReferringURI,
nsILoadGroup *aLoadGroup,
const nsCString& aAcceptHeader,
nsLoadFlags aLoadFlags,
nsIChannelPolicy *aPolicy)
nsIChannelPolicy *aPolicy,
nsIPrincipal *aLoadingPrincipal)
{
nsresult rv;
nsCOMPtr<nsIChannel> newChannel;
@ -526,6 +541,8 @@ static nsresult NewImageChannel(nsIChannel **aResult,
if (NS_FAILED(rv))
return rv;
*aForcePrincipalCheckForCacheEntry = false;
// Initialize HTTP-specific attributes
newHttpChannel = do_QueryInterface(*aResult);
if (newHttpChannel) {
@ -550,6 +567,10 @@ static nsresult NewImageChannel(nsIChannel **aResult,
p->AdjustPriority(priority);
}
PRBool setOwner = nsContentUtils::SetUpChannelOwner(aLoadingPrincipal,
*aResult, aURI, PR_FALSE);
*aForcePrincipalCheckForCacheEntry = setOwner;
return NS_OK;
}
@ -558,7 +579,7 @@ static PRUint32 SecondsFromPRTime(PRTime prTime)
return PRUint32(PRInt64(prTime) / PRInt64(PR_USEC_PER_SEC));
}
imgCacheEntry::imgCacheEntry(imgRequest *request)
imgCacheEntry::imgCacheEntry(imgRequest *request, bool forcePrincipalCheck)
: mRequest(request),
mDataSize(0),
mTouchedTime(SecondsFromPRTime(PR_Now())),
@ -567,7 +588,8 @@ imgCacheEntry::imgCacheEntry(imgRequest *request)
// We start off as evicted so we don't try to update the cache. PutIntoCache
// will set this to false.
mEvicted(PR_TRUE),
mHasNoProxies(PR_TRUE)
mHasNoProxies(PR_TRUE),
mForcePrincipalCheck(forcePrincipalCheck)
{}
imgCacheEntry::~imgCacheEntry()
@ -1241,14 +1263,17 @@ PRBool imgLoader::ValidateRequestWithNewChannel(imgRequest *request,
// tell imgCacheValidator::OnStartRequest whether the request came from its
// cache.
nsCOMPtr<nsIChannel> newChannel;
bool forcePrincipalCheck;
rv = NewImageChannel(getter_AddRefs(newChannel),
&forcePrincipalCheck,
aURI,
aInitialDocumentURI,
aReferrerURI,
aLoadGroup,
mAcceptHeader,
aLoadFlags,
aPolicy);
aPolicy,
aLoadingPrincipal);
if (NS_FAILED(rv)) {
return PR_FALSE;
}
@ -1266,7 +1291,8 @@ PRBool imgLoader::ValidateRequestWithNewChannel(imgRequest *request,
if (!progressproxy)
return PR_FALSE;
nsRefPtr<imgCacheValidator> hvc = new imgCacheValidator(progressproxy, request, aCX);
nsRefPtr<imgCacheValidator> hvc =
new imgCacheValidator(progressproxy, request, aCX, forcePrincipalCheck);
nsCOMPtr<nsIStreamListener> listener = hvc.get();
@ -1355,7 +1381,8 @@ PRBool imgLoader::ValidateEntry(imgCacheEntry *aEntry,
if (!request)
return PR_FALSE;
if (!ValidateCORS(request, aCORSMode, aLoadingPrincipal))
if (!ValidateCORSAndPrincipal(request, aEntry->ForcePrincipalCheck(),
aCORSMode, aLoadingPrincipal))
return PR_FALSE;
PRBool validateRequest = PR_FALSE;
@ -1656,18 +1683,22 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI,
if (!request) {
LOG_SCOPE(gImgLog, "imgLoader::LoadImage |cache miss|");
bool forcePrincipalCheck;
rv = NewImageChannel(getter_AddRefs(newChannel),
&forcePrincipalCheck,
aURI,
aInitialDocumentURI,
aReferrerURI,
aLoadGroup,
mAcceptHeader,
requestFlags,
aPolicy);
aPolicy,
aLoadingPrincipal);
if (NS_FAILED(rv))
return NS_ERROR_FAILURE;
if (!NewRequestAndEntry(getter_AddRefs(request), getter_AddRefs(entry)))
if (!NewRequestAndEntry(forcePrincipalCheck, getter_AddRefs(request),
getter_AddRefs(entry)))
return NS_ERROR_OUT_OF_MEMORY;
PR_LOG(gImgLog, PR_LOG_DEBUG,
@ -1868,7 +1899,11 @@ NS_IMETHODIMP imgLoader::LoadImageWithChannel(nsIChannel *channel, imgIDecoderOb
requestFlags, nsnull, _retval);
static_cast<imgRequestProxy*>(*_retval)->NotifyListener();
} else {
if (!NewRequestAndEntry(getter_AddRefs(request), getter_AddRefs(entry)))
// Default to doing a principal check because we don't know who
// started that load and whether their principal ended up being
// inherited on the channel.
if (!NewRequestAndEntry(PR_TRUE, getter_AddRefs(request),
getter_AddRefs(entry)))
return NS_ERROR_OUT_OF_MEMORY;
// We use originalURI here to fulfil the imgIRequest contract on GetURI.
@ -2084,12 +2119,14 @@ NS_IMPL_ISUPPORTS5(imgCacheValidator, nsIStreamListener, nsIRequestObserver,
imgLoader imgCacheValidator::sImgLoader;
imgCacheValidator::imgCacheValidator(nsProgressNotificationProxy* progress,
imgRequest *request, void *aContext)
imgRequest *request, void *aContext,
bool forcePrincipalCheckForCacheEntry)
: mProgressProxy(progress),
mRequest(request),
mContext(aContext)
{
NewRequestAndEntry(getter_AddRefs(mNewRequest), getter_AddRefs(mNewEntry));
NewRequestAndEntry(forcePrincipalCheckForCacheEntry,
getter_AddRefs(mNewRequest), getter_AddRefs(mNewEntry));
}
imgCacheValidator::~imgCacheValidator()

11
modules/libpr0n/src/imgLoader.h
View File

@ -68,7 +68,7 @@ class nsILoadGroup;
class imgCacheEntry
{
public:
imgCacheEntry(imgRequest *request);
imgCacheEntry(imgRequest *request, bool aForcePrincipalCheck);
~imgCacheEntry();
nsrefcnt AddRef()
@ -157,6 +157,11 @@ public:
return mHasNoProxies;
}
bool ForcePrincipalCheck() const
{
return mForcePrincipalCheck;
}
private: // methods
friend class imgLoader;
friend class imgCacheQueue;
@ -183,6 +188,7 @@ private: // data
PRPackedBool mMustValidate : 1;
PRPackedBool mEvicted : 1;
PRPackedBool mHasNoProxies : 1;
PRPackedBool mForcePrincipalCheck : 1;
};
#include <vector>
@ -420,7 +426,8 @@ class imgCacheValidator : public nsIStreamListener,
public nsIAsyncVerifyRedirectCallback
{
public:
imgCacheValidator(nsProgressNotificationProxy* progress, imgRequest *request, void *aContext);
imgCacheValidator(nsProgressNotificationProxy* progress, imgRequest *request,
void *aContext, bool forcePrincipalCheckForCacheEntry);
virtual ~imgCacheValidator();
void AddProxy(imgRequestProxy *aProxy);