mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
968d2b4e71
- Bug 1153314 - Assign load group to IdP load channel, r=jib (2c78dcc17) - Bug 1048048 - add preload content policy types for scripts (r=baku) (8dc3c1db1) - Bug 1210941 P1 Create the LOAD_BYPASS_SERVICE_WORKER flag. r=jduell (59fcdd603) - Bug 1173378 - crash in mozilla::net::HttpBaseChannel::OverrideSecurityInfo(nsISupports*), r=ehsan (de9772c35) - Bug 1179399 - Add a flag to HttpBaseChannel indicating whether interception is occurring. r=mayhemer (58a874dc5) - Bug 1168084 - Persist view source tab options. r=mconley (c48d492b2) - Bug 1187399 - Add a js::DefaultHasher specialization for mozilla::UniquePtr<T> that proxies the UniquePtr's raw pointer to PointerHasher. r=terrence (bfeed9936) - Bug 1193459: Fix JS_DEPENDENT_TEMPLATE_HINT for clang-cl. r=jimb (9565eceaf) - pointer style (329deb0ec) - space and pointer style (844d8998a) - Bug 1172503 - Delete unwarranted optimization to fix "Assertion failure: !!desc.object() == objHasOwn, at js/src/vm/NativeObject.cpp:1990". r=evilpie. (a97fe0bd4) - pointer style (4c5f6eb6d)
155 lines
4.5 KiB
C++
155 lines
4.5 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "mozilla/dom/ChannelInfo.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsIChannel.h"
|
|
#include "nsIHttpChannel.h"
|
|
#include "nsSerializationHelper.h"
|
|
#include "mozilla/net/HttpBaseChannel.h"
|
|
#include "mozilla/ipc/ChannelInfo.h"
|
|
#include "nsIJARChannel.h"
|
|
#include "nsJARChannel.h"
|
|
#include "nsNetUtil.h"
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::dom;
|
|
|
|
void
|
|
ChannelInfo::InitFromChannel(nsIChannel* aChannel)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(!mInited, "Cannot initialize the object twice");
|
|
|
|
nsCOMPtr<nsISupports> securityInfo;
|
|
aChannel->GetSecurityInfo(getter_AddRefs(securityInfo));
|
|
if (securityInfo) {
|
|
SetSecurityInfo(securityInfo);
|
|
}
|
|
|
|
nsLoadFlags loadFlags = 0;
|
|
aChannel->GetLoadFlags(&loadFlags);
|
|
mRedirected = (loadFlags & nsIChannel::LOAD_REPLACE);
|
|
if (mRedirected) {
|
|
// Save the spec and not the nsIURI object itself, since those objects are
|
|
// not thread-safe, and releasing them somewhere other than the main thread
|
|
// is not possible.
|
|
nsCOMPtr<nsIURI> redirectedURI;
|
|
aChannel->GetURI(getter_AddRefs(redirectedURI));
|
|
if (redirectedURI) {
|
|
redirectedURI->GetSpec(mRedirectedURISpec);
|
|
}
|
|
}
|
|
|
|
mInited = true;
|
|
}
|
|
|
|
void
|
|
ChannelInfo::InitFromIPCChannelInfo(const ipc::IPCChannelInfo& aChannelInfo)
|
|
{
|
|
MOZ_ASSERT(!mInited, "Cannot initialize the object twice");
|
|
|
|
mSecurityInfo = aChannelInfo.securityInfo();
|
|
mRedirectedURISpec = aChannelInfo.redirectedURI();
|
|
mRedirected = aChannelInfo.redirected();
|
|
|
|
mInited = true;
|
|
}
|
|
|
|
void
|
|
ChannelInfo::SetSecurityInfo(nsISupports* aSecurityInfo)
|
|
{
|
|
MOZ_ASSERT(mSecurityInfo.IsEmpty(), "security info should only be set once");
|
|
nsCOMPtr<nsISerializable> serializable = do_QueryInterface(aSecurityInfo);
|
|
if (!serializable) {
|
|
NS_WARNING("A non-serializable object was passed to InternalResponse::SetSecurityInfo");
|
|
return;
|
|
}
|
|
NS_SerializeToString(serializable, mSecurityInfo);
|
|
}
|
|
|
|
nsresult
|
|
ChannelInfo::ResurrectInfoOnChannel(nsIChannel* aChannel)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(mInited);
|
|
|
|
// These pointers may be null at this point. They must be checked before
|
|
// being dereferenced.
|
|
nsCOMPtr<nsIHttpChannel> httpChannel =
|
|
do_QueryInterface(aChannel);
|
|
nsCOMPtr<nsIJARChannel> jarChannel =
|
|
do_QueryInterface(aChannel);
|
|
|
|
if (!mSecurityInfo.IsEmpty()) {
|
|
nsCOMPtr<nsISupports> infoObj;
|
|
nsresult rv = NS_DeserializeObject(mSecurityInfo, getter_AddRefs(infoObj));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
if (httpChannel) {
|
|
net::HttpBaseChannel* httpBaseChannel =
|
|
static_cast<net::HttpBaseChannel*>(httpChannel.get());
|
|
rv = httpBaseChannel->OverrideSecurityInfo(infoObj);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
} else {
|
|
if (NS_WARN_IF(!jarChannel)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
static_cast<nsJARChannel*>(jarChannel.get())->
|
|
OverrideSecurityInfo(infoObj);
|
|
}
|
|
}
|
|
|
|
if (mRedirected) {
|
|
nsLoadFlags flags = 0;
|
|
aChannel->GetLoadFlags(&flags);
|
|
flags |= nsIChannel::LOAD_REPLACE;
|
|
aChannel->SetLoadFlags(flags);
|
|
|
|
nsCOMPtr<nsIURI> redirectedURI;
|
|
nsresult rv = NS_NewURI(getter_AddRefs(redirectedURI),
|
|
mRedirectedURISpec);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
if (httpChannel) {
|
|
net::HttpBaseChannel* httpBaseChannel =
|
|
static_cast<net::HttpBaseChannel*>(httpChannel.get());
|
|
rv = httpBaseChannel->OverrideURI(redirectedURI);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
} else {
|
|
if (NS_WARN_IF(!jarChannel)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
static_cast<nsJARChannel*>(jarChannel.get())->OverrideURI(redirectedURI);
|
|
}
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
ipc::IPCChannelInfo
|
|
ChannelInfo::AsIPCChannelInfo() const
|
|
{
|
|
// This may be called when mInited is false, for example if we try to store
|
|
// a synthesized Response object into the Cache. Uninitialized and empty
|
|
// ChannelInfo objects are indistinguishable at the IPC level, so this is
|
|
// fine.
|
|
|
|
IPCChannelInfo ipcInfo;
|
|
|
|
ipcInfo.securityInfo() = mSecurityInfo;
|
|
ipcInfo.redirectedURI() = mRedirectedURISpec;
|
|
ipcInfo.redirected() = mRedirected;
|
|
|
|
return ipcInfo;
|
|
}
|