Bug 1292450 - Check mPrivateBrowsingId is correct in LoadInfo and LoadContext. r=smaug, ehsan (9895a88a) · Commits · The Tor Project / Applications / Mullvad Browser

docshell/base/LoadContext.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ LoadContext::LoadContext(nsIPrincipal* aPrincipal,
		: mTopFrameElement(nullptr)
		, mNestedFrameId(0)
		, mIsContent(true)
		, mUsePrivateBrowsing(false)
		, mUseRemoteTabs(false)
		#ifdef DEBUG
		, mIsNotNull(true)
		@@ -53,7 +52,7 @@ LoadContext::LoadContext(nsIPrincipal* aPrincipal,
		{
		PrincipalOriginAttributes poa = BasePrincipal::Cast(aPrincipal)->OriginAttributesRef();
		mOriginAttributes.InheritFromDocToChildDocShell(poa);
		mOriginAttributes.SyncAttributesWithPrivateBrowsing(mUsePrivateBrowsing);
		mUsePrivateBrowsing = (poa.mPrivateBrowsingId != 0);
		if (!aOptionalBase) {
		return;
		}

netwerk/base/LoadInfo.cpp

+24 −0

Original line number	Diff line number	Diff line
		@@ -188,6 +188,21 @@ LoadInfo::LoadInfo(nsIPrincipal* aLoadingPrincipal,
		}

		InheritOriginAttributes(mLoadingPrincipal, mOriginAttributes);

		// For chrome docshell, the mPrivateBrowsingId remains 0 even its
		// UsePrivateBrowsing() is true, so we only update the mPrivateBrowsingId in
		// origin attributes if the type of the docshell is content.
		if (aLoadingContext) {
		nsCOMPtr<nsIDocShell> docShell = aLoadingContext->OwnerDoc()->GetDocShell();
		if (docShell) {
		if (docShell->ItemType() == nsIDocShellTreeItem::typeContent) {
		mOriginAttributes.SyncAttributesWithPrivateBrowsing(GetUsePrivateBrowsing());
		} else if (docShell->ItemType() == nsIDocShellTreeItem::typeChrome) {
		MOZ_ASSERT(mOriginAttributes.mPrivateBrowsingId == 0,
		"chrome docshell shouldn't have mPrivateBrowsingId set.");
		}
		}
		}
		}

		/* Constructor takes an outer window, but no loadingNode or loadingPrincipal.
		@@ -240,6 +255,15 @@ LoadInfo::LoadInfo(nsPIDOMWindowOuter* aOuterWindow,
		MOZ_ASSERT(docShell);
		const DocShellOriginAttributes attrs =
		nsDocShell::Cast(docShell)->GetOriginAttributes();

		if (docShell->ItemType() == nsIDocShellTreeItem::typeContent) {
		MOZ_ASSERT(GetUsePrivateBrowsing() == (attrs.mPrivateBrowsingId != 0),
		"docshell and mSecurityFlags have different value for PrivateBrowsing().");
		} else if (docShell->ItemType() == nsIDocShellTreeItem::typeChrome) {
		MOZ_ASSERT(attrs.mPrivateBrowsingId == 0,
		"chrome docshell shouldn't have mPrivateBrowsingId set.");
		}

		mOriginAttributes.InheritFromDocShellToNecko(attrs);
		}

netwerk/base/nsILoadInfo.idl

+7 −0

Original line number	Diff line number	Diff line
		@@ -304,6 +304,8 @@ interface nsILoadInfo : nsISupports

		/**
		* If usePrivateBrowsing is true, private browsing will be used.
		* This value equals to originAttributes.privateBrowsingId in content
		* side.
		*/
		[infallible] readonly attribute boolean usePrivateBrowsing;

		@@ -417,6 +419,11 @@ interface nsILoadInfo : nsISupports
		/**
		* Customized NeckoOriginAttributes within LoadInfo to allow overwriting of the
		* default originAttributes from the loadingPrincipal.
		*
		* In chrome side, originAttributes.privateBrowsingId will always be 0 even if
		* the usePrivateBrowsing is true, because chrome docshell won't set
		* privateBrowsingId on origin attributes (See bug 1278664). This is to make
		* sure nsILoadInfo and nsILoadContext have the same origin attributes.
		*/
		[implicit_jscontext, binaryname(ScriptableOriginAttributes)]
		attribute jsval originAttributes;

netwerk/base/nsNetUtil.cpp

+11 −4

Original line number	Diff line number	Diff line
		@@ -2466,12 +2466,14 @@ NS_CompareLoadInfoAndLoadContext(nsIChannel *aChannel)
		return NS_ERROR_UNEXPECTED;
		}

		LOG(("NS_CompareLoadInfoAndLoadContext - loadInfo: %d, %d, %d, %d; "
		"loadContext: %d %d, %d, %d. [channel=%p]",
		LOG(("NS_CompareLoadInfoAndLoadContext - loadInfo: %d, %d, %d, %d, %d; "
		"loadContext: %d %d, %d, %d, %d. [channel=%p]",
		originAttrsLoadInfo.mAppId, originAttrsLoadInfo.mInIsolatedMozBrowser,
		originAttrsLoadInfo.mUserContextId, loadInfoUsePB,
		originAttrsLoadInfo.mUserContextId, originAttrsLoadInfo.mPrivateBrowsingId,
		loadInfoUsePB,
		loadContextAppId, loadContextIsInBE,
		originAttrsLoadContext.mUserContextId, loadContextUsePB,
		originAttrsLoadContext.mUserContextId, originAttrsLoadContext.mPrivateBrowsingId,
		loadContextUsePB,
		aChannel));

		MOZ_ASSERT(originAttrsLoadInfo.mAppId == loadContextAppId,
		@@ -2488,6 +2490,11 @@ NS_CompareLoadInfoAndLoadContext(nsIChannel *aChannel)
		"The value of mUserContextId in the loadContext and in the "
		"loadInfo are not the same!");

		MOZ_ASSERT(originAttrsLoadInfo.mPrivateBrowsingId ==
		originAttrsLoadContext.mPrivateBrowsingId,
		"The value of mPrivateBrowsingId in the loadContext and in the "
		"loadInfo are not the same!");

		MOZ_ASSERT(loadInfoUsePB == loadContextUsePB,
		"The value of usePrivateBrowsing in the loadContext and in the loadInfo "
		"are not the same!");

netwerk/protocol/http/HttpBaseChannel.cpp

+13 −0

Original line number	Diff line number	Diff line
		@@ -2633,6 +2633,19 @@ HttpBaseChannel::ShouldIntercept(nsIURI* aURI)
		return shouldIntercept;
		}

		void HttpBaseChannel::CheckPrivateBrowsing()
		{
		nsCOMPtr<nsILoadContext> loadContext;
		NS_QueryNotificationCallbacks(this, loadContext);
		// For addons it's possible that mLoadInfo is null.
		if (mLoadInfo && loadContext) {
		DocShellOriginAttributes docShellAttrs;
		loadContext->GetOriginAttributes(docShellAttrs);
		MOZ_ASSERT(mLoadInfo->GetOriginAttributes().mPrivateBrowsingId == docShellAttrs.mPrivateBrowsingId,
		"PrivateBrowsingId values are not the same between LoadInfo and LoadContext.");
		}
		}

		//-----------------------------------------------------------------------------
		// nsHttpChannel::nsITraceableChannel
		//-----------------------------------------------------------------------------