Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1535697 - Part 4: Refactor the code for computing the origin of the top window for a channel and remember its result on the channel object; r=michal

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D28374

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Ehsan Akhgari 2019-04-29 17:09:39 +00:00
parent dc946ab989
commit 969addfef3
2 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
netwerk/protocol/http/nsHttpChannel.cpp
View File

@ -336,6 +336,7 @@ nsHttpChannel::nsHttpChannel()
mAsyncResumePending(0),
mHasBeenIsolatedChecked(0),
mIsIsolated(0),
mTopWindowOriginComputed(0),
mPushedStream(nullptr),
mLocalBlocklist(false),
mOnTailUnblock(nullptr),
@ -3905,6 +3906,31 @@ bool nsHttpChannel::IsIsolated() {
return mIsIsolated;
}
const nsCString &nsHttpChannel::GetTopWindowOrigin() {
if (mTopWindowOriginComputed) {
return mTopWindowOrigin;
}
nsCOMPtr<nsIURI> topWindowURI;
nsresult rv = GetTopWindowURI(getter_AddRefs(topWindowURI));
bool isDocument = false;
if (NS_FAILED(rv) && NS_SUCCEEDED(GetIsMainDocumentChannel(&isDocument)) &&
isDocument) {
// For top-level documents, use the document channel's origin to compute
// the unique storage space identifier instead of the top Window URI.
rv = NS_GetFinalChannelURI(this, getter_AddRefs(topWindowURI));
NS_ENSURE_SUCCESS(rv, mTopWindowOrigin);
}
rv = nsContentUtils::GetASCIIOrigin(topWindowURI ? topWindowURI : mURI,
mTopWindowOrigin);
NS_ENSURE_SUCCESS(rv, mTopWindowOrigin);
mTopWindowOriginComputed = true;
return mTopWindowOrigin;
}
nsresult nsHttpChannel::OpenCacheEntryInternal(
bool isHttps, nsIApplicationCache *applicationCache,
bool allowApplicationCache) {
@ -4025,24 +4051,13 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(
}
if (IsIsolated()) {
nsCOMPtr<nsIURI> topWindowURI;
rv = GetTopWindowURI(getter_AddRefs(topWindowURI));
bool isDocument = false;
if (NS_FAILED(rv) && NS_SUCCEEDED(GetIsMainDocumentChannel(&isDocument)) &&
isDocument) {
// For top-level documents, use the document channel's origin to compute
// the unique storage space identifier instead of the top Window URI.
rv = NS_GetFinalChannelURI(this, getter_AddRefs(topWindowURI));
NS_ENSURE_SUCCESS(rv, rv);
auto &topWindowOrigin = GetTopWindowOrigin();
if (topWindowOrigin.IsEmpty()) {
return NS_ERROR_FAILURE;
}
nsAutoString topWindowOrigin;
rv = nsContentUtils::GetUTFOrigin(topWindowURI ? topWindowURI : mURI,
topWindowOrigin);
NS_ENSURE_SUCCESS(rv, rv);
extension.Append("-unique:");
extension.Append(NS_ConvertUTF16toUTF8(topWindowOrigin));
extension.Append(topWindowOrigin);
}
mCacheOpenWithPriority = cacheEntryOpenFlags & nsICacheStorage::OPEN_PRIORITY;

9
netwerk/protocol/http/nsHttpChannel.h
View File

@ -548,6 +548,8 @@ class nsHttpChannel final : public HttpBaseChannel,
bool IsIsolated();
const nsCString &GetTopWindowOrigin();
already_AddRefed<nsChannelClassifier> GetOrCreateChannelClassifier();
// Start an internal redirect to a new InterceptedHttpChannel which will
@ -728,6 +730,13 @@ class nsHttpChannel final : public HttpBaseChannel,
// is true.
uint32_t mIsIsolated : 1;
// True only when we have computed the value of the top window origin.
uint32_t mTopWindowOriginComputed : 1;
// The origin of the top window, only valid when mTopWindowOriginComputed is
// true.
nsCString mTopWindowOrigin;
nsTArray<nsContinueRedirectionFunc> mRedirectFuncStack;
// Needed for accurate DNS timing