mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
4270b0ce16
- Bug 1265133 - Adds s-expr comments support for wasmTextToBinary. r=sunfish (85ff83eb37)
- Bug 1263203: Ensure we don't have Phi values in wasm; r=luke (165667b0b2)
- Bug 676828 - Initialize AudioSession on xpcshell. r=jmathies (684b071278)
- Bug 676828 - Use RAII for AudioSession instead. r=bholley (d17dc48e35)
- Bug 1256992: Initialize Windows sandbox BrokerServices before any child processes are created. r=aklotz, r=bholley (145949d5ea)
- Bug 1255934 - Start collecting telemetry data on the usage of remote JAR protocol in the wild; r=mcmanus (d2f43908e0)
- Bug 1237198 - Block SWFs on the content blocking list hosted on the Shavar service. r=francois (cb2d850412)
- Bug 1242644 - HTML swapFrameLoaders. r=bz (1d899b3e19)
- Bug 1259877 - Remove the unused JSObject::callMethod. r=jorendorff (624bb62f38)
- Bug 1259877 - Remove jsarray.cpp's now-unused SortComparatorFunction. r=mrrrgn (66c84d0d64)
- Bug 1259877 - Update function-calling JSAPI methods to use js::Call. r=sfink (a9fe2995ae)
- Bug 1259877 - Update Reflect.parse callback code to work with InvokeArgs and js::Call. r=arai (d4acd08f45)
- Bug 1259877 - Rename FastInvokeGuard to FastCallGuard and make it not depend on CallArgs::set{Callee,This}, and remove js::Invoke. r=shu (adb4f46944)
- Bug 1259877 - Adjust Promise code to use Call instead of Invoke. r=till (161a451182)
- Bug 1259877 - Update ScriptedDirectProxyHandler code to use js::Call and FixedInvokeArgs. r=evilpie (bd20c77152)
- Bug 1259877 - Update various builtins to use js::Call, not js::Invoke. r=efaust (1a49365f0a)
- Bug 1246091 - patch 1/7 - Add some NS_WARN_IF in Console.cpp, r=ejpbruel (1d5db4511c)
- Bug 1246091 - patch 2/7 - Propagate initialization error in Console.cpp, r=ejpbruel (ea081b0835)
- Bug 1246091 - patch 3/7 - Console API should store ConsoleCallData internally, r=ejpbruel (c9a5e71c0b)
- Bug 1246091 - patch 4/7 - Expose ConsoleCallData to WorkerDebuggerGlobalScope, r=ejpbruel (0209ec651e)
- Bug 1246091 - patch 5/7 - Remove data when memory pressure notification is received, r=ejpbruel (8d07cc4755)
- Bug 1246091 - patch 6/7 - Tests, r=ejpbruel (7e8e20083e)
- Bug 1246091 - patch 7/7 - Correct use of JSCompartment in Console.cpp, r=bz (fcac2da17e)
- Followup for bug 1246091 to fix the naming for PopulateConsoleNotificationInTheTargetScope, r=me (dd942dde21)
- Followup for bug 1246091 to fix the rooting hazard, get us closer to reopening the CLOSED TREE, and reduce philor's blood pressure. (6ef49eaf20)
- Bug 1247953 - Increase the number of stored ConsoleEvent objects, r=bgrinstead (139304e4c6)
- Bug 1211665 - Save originAttributes in the console event messages. r=baku (068697a29f)
- Bug 1263392 - Console should reset the state of ConsoleCallData if the worker runnables are not correctly dispatched, r=smaug (04c3a73423)
- Bug 1246153 part 1. Restrict initialization of dictionaries from JSON to dictionaries that can actually be represented in JSON. r=bholley (2b9c4b98d9)
- Bug 1260414 - WorkerDebuggerGlobalScope.setConsoleEventHandler should be able to receive a null param, r=bz (0b91b09796)
- Bug 1259338 P1 Ensure that AllowWindowInteractionHandler is released on worker thread. r=khuey (28e058999a)
- Bug 1258034 - Fix ServiceWorkerPrivate.cpp build error on b2g r=khuey (1ba0edcc64)
- Bug 1260439 - workerdebuggersandbox_moved needs to update the wrappercache;r=bz (be656ef346)
- Bug 1253777 P1 Ensure buffered copying when reading body in service worker respondWith(). r=jdm (fe61b4f1b3)
- Bug 1253777 P2 Test passing a file-backed blob to FetchEvent.respondWith(). r=jdm (930bf780b0)
- Bug 1226384 - Reject the promise returned from ServiceWorkerRegistration.update() if the registration is being uninstalled; r=bkelly (209e034384)
- Bug 1230030 Don't replace active worker unnecessarly after saving registration in e10s mode. r=ehsan (5582d7ea04)
- Bug 1229795 - P1. Remove scriptSpec from registration data. r=baku, bkelly (f83b7862ec)
- Bug 1229795 - P2. Remove waitingCacheName from registartion data. r=baku (f9279c4ded)
- Bug 1229795 - P3. Migrate service worker registrar data between version 2 and version 3. r=baku (27a53f3d96)
- bit of Bug 1237831 (4b21cec952)
- Bug 1256411 Simplify and cleanup ServiceWorkerInfo. r=ehsan (947166b5e2)
- Bug 1240013 - Crash in nsNavBookmarks::OnVisit by setting long locatiÂĤon.hash. r=Yoric (e9f722434d)
- Bug 1250363 - Speed up history removals through a simulated per-statement trigger. r=yoric (f57235e806)
- Bug 1259294: Part 2 - Use MOZ_ALWAYS_SUCCEEDS. r=froydnj (7624e0a821)
- Bug 548685 - Avoid null pointer deref in nsURIHashKey r=mcmanus (913c7bf0b9)
- Bug 1246153 part 2. Create a way to ask for a clean new global that works on both mainthread and workers. r=bholley (35532ec302)
- Bug 1246153 part 3. Use the new clean global setup for doing from-JSON creation of dictionaries. r=bholley (0cf844641c)
- Bug 1242482 - Propagate Service worker unregistration to the parent process. r=bkelly (b7f44defbe)
- Bug 1247436 Ensure service worker registration is persisted if its resurrected from a pending uninstall. r=baku (d74fc996f1)
- Bug 1242482 P2 Don't SendUnregister() if registration is already removed. r=baku (a0768d2a1c)
- Bug 1242482 P3 Don't send unregister messages when triggered from a PropagateUnregister(). r=baku (b12a3b7ad5)
- Bug 1242482 P4 Don't call SendUnregister() a second time when SW registration is finally removed. r=baku (b0249dd442)
- Bug 1253738 P1 Require an explicit principal when looking up a service worker registration. r=baku (cdb980236a)
- Bug 1253738 P2 Consistently use "scope key" terminology in ServiceWorkerManager. r=baku (e8ae328a83)
- Bug 1253738 P3 Use origin the ServiceWorkerManager scope key. r=baku (e555aba315)
- Bug 1252290 - load xpcom services registered with the category manager as being able to handle push notifications before delivering them. r=kitcambridge (3ade504ad7)
- Bug 1246341 - Report push event errors and rejections to the Push service. r=baku (436943501c)
- Bug 1251113 - Change PushService state to PUSH_SERVICE_UNINIT in the state change process queue. r=dragana (1bacbbb72b)
- Bug 1263311: Part 1 - Change the nsICancelableRunnable interface. r=froydnj (599db8f7d0)
- Bug 1263311: Part 2 - Remove a non-existent CancelableRunnable. r=froydnj (a077efc319)
- Bug 1165052 - Part 8: Use ArraySpeciesCreate in Array.prototype.concat. r=efaust (c421e8e87c)
- Bug 1120715 - Part 3: Connect the Necko level cache mode parameter with the Request cache mode variable; r=bkelly (9a813c0e04)
327 lines
10 KiB
C++
327 lines
10 KiB
C++
/* 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 "BackgroundUtils.h"
|
|
|
|
#include "MainThreadUtils.h"
|
|
#include "mozilla/Assertions.h"
|
|
#include "mozilla/BasePrincipal.h"
|
|
#include "mozilla/ipc/PBackgroundSharedTypes.h"
|
|
#include "mozilla/net/NeckoChannelParams.h"
|
|
#include "nsPrincipal.h"
|
|
#include "nsIScriptSecurityManager.h"
|
|
#include "nsIURI.h"
|
|
#include "nsNetUtil.h"
|
|
#include "mozilla/LoadInfo.h"
|
|
#include "nsNullPrincipal.h"
|
|
#include "nsServiceManagerUtils.h"
|
|
#include "nsString.h"
|
|
#include "nsTArray.h"
|
|
|
|
namespace mozilla {
|
|
namespace net {
|
|
class OptionalLoadInfoArgs;
|
|
}
|
|
|
|
using mozilla::BasePrincipal;
|
|
using namespace mozilla::net;
|
|
|
|
namespace ipc {
|
|
|
|
already_AddRefed<nsIPrincipal>
|
|
PrincipalInfoToPrincipal(const PrincipalInfo& aPrincipalInfo,
|
|
nsresult* aOptionalResult)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(aPrincipalInfo.type() != PrincipalInfo::T__None);
|
|
|
|
nsresult stackResult;
|
|
nsresult& rv = aOptionalResult ? *aOptionalResult : stackResult;
|
|
|
|
nsCOMPtr<nsIScriptSecurityManager> secMan =
|
|
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return nullptr;
|
|
}
|
|
|
|
nsCOMPtr<nsIPrincipal> principal;
|
|
|
|
switch (aPrincipalInfo.type()) {
|
|
case PrincipalInfo::TSystemPrincipalInfo: {
|
|
rv = secMan->GetSystemPrincipal(getter_AddRefs(principal));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return nullptr;
|
|
}
|
|
|
|
return principal.forget();
|
|
}
|
|
|
|
case PrincipalInfo::TNullPrincipalInfo: {
|
|
principal = do_CreateInstance(NS_NULLPRINCIPAL_CONTRACTID, &rv);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return nullptr;
|
|
}
|
|
|
|
return principal.forget();
|
|
}
|
|
|
|
case PrincipalInfo::TContentPrincipalInfo: {
|
|
const ContentPrincipalInfo& info =
|
|
aPrincipalInfo.get_ContentPrincipalInfo();
|
|
|
|
nsCOMPtr<nsIURI> uri;
|
|
rv = NS_NewURI(getter_AddRefs(uri), info.spec());
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return nullptr;
|
|
}
|
|
|
|
if (info.attrs().mAppId == nsIScriptSecurityManager::UNKNOWN_APP_ID) {
|
|
rv = secMan->GetSimpleCodebasePrincipal(uri, getter_AddRefs(principal));
|
|
} else {
|
|
principal = BasePrincipal::CreateCodebasePrincipal(uri, info.attrs());
|
|
rv = principal ? NS_OK : NS_ERROR_FAILURE;
|
|
}
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return nullptr;
|
|
}
|
|
|
|
return principal.forget();
|
|
}
|
|
|
|
case PrincipalInfo::TExpandedPrincipalInfo: {
|
|
const ExpandedPrincipalInfo& info = aPrincipalInfo.get_ExpandedPrincipalInfo();
|
|
|
|
nsTArray< nsCOMPtr<nsIPrincipal> > whitelist;
|
|
nsCOMPtr<nsIPrincipal> wlPrincipal;
|
|
|
|
for (uint32_t i = 0; i < info.whitelist().Length(); i++) {
|
|
wlPrincipal = PrincipalInfoToPrincipal(info.whitelist()[i], &rv);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return nullptr;
|
|
}
|
|
// append that principal to the whitelist
|
|
whitelist.AppendElement(wlPrincipal);
|
|
}
|
|
|
|
RefPtr<nsExpandedPrincipal> expandedPrincipal = new nsExpandedPrincipal(whitelist);
|
|
if (!expandedPrincipal) {
|
|
NS_WARNING("could not instantiate expanded principal");
|
|
return nullptr;
|
|
}
|
|
|
|
principal = expandedPrincipal;
|
|
return principal.forget();
|
|
}
|
|
|
|
default:
|
|
MOZ_CRASH("Unknown PrincipalInfo type!");
|
|
}
|
|
|
|
MOZ_CRASH("Should never get here!");
|
|
}
|
|
|
|
nsresult
|
|
PrincipalToPrincipalInfo(nsIPrincipal* aPrincipal,
|
|
PrincipalInfo* aPrincipalInfo)
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
MOZ_ASSERT(aPrincipal);
|
|
MOZ_ASSERT(aPrincipalInfo);
|
|
|
|
bool isNullPointer;
|
|
nsresult rv = aPrincipal->GetIsNullPrincipal(&isNullPointer);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
|
|
if (isNullPointer) {
|
|
*aPrincipalInfo = NullPrincipalInfo();
|
|
return NS_OK;
|
|
}
|
|
|
|
nsCOMPtr<nsIScriptSecurityManager> secMan =
|
|
do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
|
|
bool isSystemPrincipal;
|
|
rv = secMan->IsSystemPrincipal(aPrincipal, &isSystemPrincipal);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
|
|
if (isSystemPrincipal) {
|
|
*aPrincipalInfo = SystemPrincipalInfo();
|
|
return NS_OK;
|
|
}
|
|
|
|
// might be an expanded principal
|
|
nsCOMPtr<nsIExpandedPrincipal> expanded =
|
|
do_QueryInterface(aPrincipal);
|
|
|
|
if (expanded) {
|
|
nsTArray<PrincipalInfo> whitelistInfo;
|
|
PrincipalInfo info;
|
|
|
|
nsTArray< nsCOMPtr<nsIPrincipal> >* whitelist;
|
|
MOZ_ALWAYS_SUCCEEDS(expanded->GetWhiteList(&whitelist));
|
|
|
|
for (uint32_t i = 0; i < whitelist->Length(); i++) {
|
|
rv = PrincipalToPrincipalInfo((*whitelist)[i], &info);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
// append that spec to the whitelist
|
|
whitelistInfo.AppendElement(info);
|
|
}
|
|
|
|
*aPrincipalInfo = ExpandedPrincipalInfo(Move(whitelistInfo));
|
|
return NS_OK;
|
|
}
|
|
|
|
// must be a content principal
|
|
|
|
nsCOMPtr<nsIURI> uri;
|
|
rv = aPrincipal->GetURI(getter_AddRefs(uri));
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
|
|
if (NS_WARN_IF(!uri)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
nsCString spec;
|
|
rv = uri->GetSpec(spec);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
return rv;
|
|
}
|
|
|
|
*aPrincipalInfo = ContentPrincipalInfo(BasePrincipal::Cast(aPrincipal)->OriginAttributesRef(),
|
|
spec);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
LoadInfoToLoadInfoArgs(nsILoadInfo *aLoadInfo,
|
|
OptionalLoadInfoArgs* aOptionalLoadInfoArgs)
|
|
{
|
|
if (!aLoadInfo) {
|
|
// if there is no loadInfo, then there is nothing to serialize
|
|
*aOptionalLoadInfoArgs = void_t();
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult rv = NS_OK;
|
|
PrincipalInfo requestingPrincipalInfo;
|
|
rv = PrincipalToPrincipalInfo(aLoadInfo->LoadingPrincipal(),
|
|
&requestingPrincipalInfo);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
PrincipalInfo triggeringPrincipalInfo;
|
|
rv = PrincipalToPrincipalInfo(aLoadInfo->TriggeringPrincipal(),
|
|
&triggeringPrincipalInfo);
|
|
|
|
nsTArray<PrincipalInfo> redirectChainIncludingInternalRedirects;
|
|
for (const nsCOMPtr<nsIPrincipal>& principal : aLoadInfo->RedirectChainIncludingInternalRedirects()) {
|
|
rv = PrincipalToPrincipalInfo(principal, redirectChainIncludingInternalRedirects.AppendElement());
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
}
|
|
|
|
nsTArray<PrincipalInfo> redirectChain;
|
|
for (const nsCOMPtr<nsIPrincipal>& principal : aLoadInfo->RedirectChain()) {
|
|
rv = PrincipalToPrincipalInfo(principal, redirectChain.AppendElement());
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
}
|
|
|
|
*aOptionalLoadInfoArgs =
|
|
LoadInfoArgs(
|
|
requestingPrincipalInfo,
|
|
triggeringPrincipalInfo,
|
|
aLoadInfo->GetSecurityFlags(),
|
|
aLoadInfo->InternalContentPolicyType(),
|
|
static_cast<uint32_t>(aLoadInfo->GetTainting()),
|
|
aLoadInfo->GetUpgradeInsecureRequests(),
|
|
aLoadInfo->GetVerifySignedContent(),
|
|
aLoadInfo->GetInnerWindowID(),
|
|
aLoadInfo->GetOuterWindowID(),
|
|
aLoadInfo->GetParentOuterWindowID(),
|
|
aLoadInfo->GetEnforceSecurity(),
|
|
aLoadInfo->GetInitialSecurityCheckDone(),
|
|
aLoadInfo->GetIsInThirdPartyContext(),
|
|
aLoadInfo->GetOriginAttributes(),
|
|
redirectChainIncludingInternalRedirects,
|
|
redirectChain,
|
|
aLoadInfo->CorsUnsafeHeaders(),
|
|
aLoadInfo->GetForcePreflight(),
|
|
aLoadInfo->GetIsPreflight());
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
LoadInfoArgsToLoadInfo(const OptionalLoadInfoArgs& aOptionalLoadInfoArgs,
|
|
nsILoadInfo** outLoadInfo)
|
|
{
|
|
if (aOptionalLoadInfoArgs.type() == OptionalLoadInfoArgs::Tvoid_t) {
|
|
*outLoadInfo = nullptr;
|
|
return NS_OK;
|
|
}
|
|
|
|
const LoadInfoArgs& loadInfoArgs =
|
|
aOptionalLoadInfoArgs.get_LoadInfoArgs();
|
|
|
|
nsresult rv = NS_OK;
|
|
nsCOMPtr<nsIPrincipal> requestingPrincipal =
|
|
PrincipalInfoToPrincipal(loadInfoArgs.requestingPrincipalInfo(), &rv);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
nsCOMPtr<nsIPrincipal> triggeringPrincipal =
|
|
PrincipalInfoToPrincipal(loadInfoArgs.triggeringPrincipalInfo(), &rv);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
nsTArray<nsCOMPtr<nsIPrincipal>> redirectChainIncludingInternalRedirects;
|
|
for (const PrincipalInfo& principalInfo : loadInfoArgs.redirectChainIncludingInternalRedirects()) {
|
|
nsCOMPtr<nsIPrincipal> redirectedPrincipal =
|
|
PrincipalInfoToPrincipal(principalInfo, &rv);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
redirectChainIncludingInternalRedirects.AppendElement(redirectedPrincipal.forget());
|
|
}
|
|
|
|
nsTArray<nsCOMPtr<nsIPrincipal>> redirectChain;
|
|
for (const PrincipalInfo& principalInfo : loadInfoArgs.redirectChain()) {
|
|
nsCOMPtr<nsIPrincipal> redirectedPrincipal =
|
|
PrincipalInfoToPrincipal(principalInfo, &rv);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
redirectChain.AppendElement(redirectedPrincipal.forget());
|
|
}
|
|
|
|
nsCOMPtr<nsILoadInfo> loadInfo =
|
|
new mozilla::LoadInfo(requestingPrincipal,
|
|
triggeringPrincipal,
|
|
loadInfoArgs.securityFlags(),
|
|
loadInfoArgs.contentPolicyType(),
|
|
static_cast<LoadTainting>(loadInfoArgs.tainting()),
|
|
loadInfoArgs.upgradeInsecureRequests(),
|
|
loadInfoArgs.verifySignedContent(),
|
|
loadInfoArgs.innerWindowID(),
|
|
loadInfoArgs.outerWindowID(),
|
|
loadInfoArgs.parentOuterWindowID(),
|
|
loadInfoArgs.enforceSecurity(),
|
|
loadInfoArgs.initialSecurityCheckDone(),
|
|
loadInfoArgs.isInThirdPartyContext(),
|
|
loadInfoArgs.originAttributes(),
|
|
redirectChainIncludingInternalRedirects,
|
|
redirectChain,
|
|
loadInfoArgs.corsUnsafeHeaders(),
|
|
loadInfoArgs.forcePreflight(),
|
|
loadInfoArgs.isPreflight());
|
|
|
|
loadInfo.forget(outLoadInfo);
|
|
return NS_OK;
|
|
}
|
|
|
|
} // namespace ipc
|
|
} // namespace mozilla
|