mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
393bc6639f
- Bug 1209162 - Create OriginAttributes subtypes. IGNORE IDL r=sicking. (c2cbe04ef3) - Bug 1220570 - Potential cookie lost while downgrading from Aurora 44 to 43. r=jduell (1a0111c842) - Bug 1217456: Add a security flag for controlling redirects. Use this flag in fetch() implementation. r=bkelly,jduell (79d449e479) - Bug 1112040 - Add a mochitest. r=bholley (566a05f720) - Bug 1171215 - Compute third-partyness in the loadinfo instead of nsIHttpChannelInternal so that other protocols correctly respect the third-party cookie pref. r=sicking/ckerschb (06f7a10a83) - better backport of Bug 485941 - Stack overflow using overly-deep XML tree (DoS). r=bzbarsky (ac43feeffa) - Bug 1182546 - Use channel->Open2() in parser/htmlparser/nsExpatDriver.cpp (r=bz) (42768f373a) - Bug 1163435 part 1 - [css-grid][css-flexbox] Propagate an explicit CB width/height to the reflow state to resolve percentage lengths for grid items properly. Resolve percent against the size in the same axis for abs.pos. children too. r=dholbert (a55463fb05) - Bug 1163435 part 2 - tests. (bb683c5fc6) - Bug 1223282 - Make NS_AUTOMARGIN be a different value than NS_UNCONSTRAINEDSIZE to avoid having clamped huge margin values be interpreted as auto margins. r=roc (4cdfe0f277) - Bug 1224230 - Explicitly store the lineContainer's writing mode in InlineIntrinsicISizeData. r=dbaron (6474515223) - Bug 1221043. Revert to including trailing whitespace for accessibility APIs. r=marcoz,mats (406018c163) - Bug 1227113 - Fix some indentation issues in ServiceWorkerManager, r=janv (2b343bde09) - Bug 1223116 P1 Expose nsIServiceWorkerManager.shouldReportToWindow(). r=catalinb (02899e429d) - Bug 1226441 - Part 1: Add wpt test verifying fetch event waits for activate to complete; r=catalinb (e8eb3e6e7a) - Bug 1209865 - Add gecko profiler marker when mark() of User Timing API is called. r=baku (f48d76e395) - Bug 1169068 - Performance.translateTime(), r=bz (38cd1c31b2) - Bug 1226441 - Part 2: Delay functional event dispatch until service worker is activated; r=catalinb (778cd3dd24) - Bug 1178233 - [non-e10s] The update process doesn't work within about:serviceworkers in non-e10s mode. Test. r=baku (4f8b6f53f8) - Bug 1188545 - Disable unstable test: test_aboutserviceworkers.html. a=testonly (4bbe106693) - Bug 1219255 - We should be able to attach to a service worker;r=amarchesini (0d6b71b4ec) - Bug 1222464 - Part 2: Implement FetchEvent.clientId; r=jdm (9c8abd62dd) - Bug 1218150 - Mark the members of Clients as NewObject; r=bzbarsky (b6b00a586c) - Bug 1222464 - Part 3: Implement Clients.get(); r=jdm (f5ca60d801) - Bug 1222464 - Part 1: Save a client ID for top-level navigations on the docshell and assign it as the document ID when we start loading the document; r=jdm (7dcb5ce2b6) - Bug 1218141 - Add some SameObject and NewObject annotations to ServiceWorkerGlobalScope; r=bzbarsky (5019f58c7a) - Bug 1218190 - Add a pref to enable Clients.openWindow, r=catalinb (dbb6d007dd) - Bug 1218142 - Remove ServiceWorkerGlobalScope.onbeforeevicted/onevicted; r=bzbarsky (029de6f8ec) - Bug 1218146 - Move WindowClient.frameType to Client.frameType; r=bzbarsky (00f0211276) - Bug 1218147 - Make WindowClient.focus() NewObject; r=bzbarsky (3c6aea4b67) - Bug 1189659 - Part 1 - Continue service worker job queue when life cycle events expire. r=bkelly (aa09cd9c60) - Bug 1227932 - Fix Service Workers SoftUpdate and registration.update code paths. r=ehsan (24567b23c0) - Bug 1189659 - Part 2 - Remove set of scopes being updated from ServiceWorkerManager. r=bkelly (ce581b095c) - Bug 1189659 - Part 3 - Use separate synchronization queues for service worker register jobs and install jobs. r=bkelly (9c408a22ed) - Bug 1189659 - Part 4 - Fix race in test_install_event.html. r=bkelly (3186ffb808) - Bug 1189659 - Part 5 - Fix race in skip-waiting.https.html and add some logging for SkipWaitingFlag in ServiceWorkerManager. r=ehsan (4e5ddda6f3) - Bug 1229056 - Implement ClientQueryOptions.includeUncontrolled; r=jdm (dbe56aa60d) - namespace (3b0863d42d) - Bug 1201127 - Return the same ServiceWorkerRegistration object from service worker APIs dealing with the same underlying registration object; r=jdm (c542688ae0) - Bug 1171583 - Remove mutable warning from |nsSimpleURI::SetUserPass|. r=bz (73934deaad) - Bug 1206199 - Extend channelwrapper to mediate OnStartRequest, OnStopRequest, OnDataAvailable (r=sicking) (758a7ec65c) - Bug 1186783 (part 4) - Replace nsBaseHashtable::EnumerateRead() calls in netwerk/ with iterators. r=valentin. (681bdba278) - Bug 1186783 (part 3) - Replace nsBaseHashtable::EnumerateRead() calls in netwerk/ with iterators. r=valentin. (76b8b7191e) - Bug 1186783 (part 2) - Replace nsBaseHashtable::EnumerateRead() calls in netwerk/ with iterators. r=valentin. (5c0743ac49) - Bug 1186783 (part 1) - Replace nsBaseHashtable::EnumerateRead() calls in netwerk/ with iterators. r=valentin. (952cc720cc) - Bug 1186783 (part 5) - Replace nsBaseHashtable::EnumerateRead() calls in netwerk/ with iterators. r=valentin. (25b9735c52) - Bug 1186783 (part 1) - Replace nsBaseHashtable::EnumerateRead() calls in netwerk/. r=michal. (ae52425809) - Bug 1186783 (follow-up) - Bustage fix for Gonk. (d4a1b769bd) - add back some hotfix stuff, even if unused (fe32076c5b) - Bug 1068087: Switch about:plugins to run remotely. r=mconley (bc4316dd03) - Bug 1214058: Part 1 - Add a simplified JSON-based add-on update protocol. r=Mossop (a3198884d5) - Bug 1214058: Part 2 - Run add-on update tests against comparable JSON and RDF manifests. r=Mossop (aa6a796e6f) - Bug 1152977 - Enable by default DEAA for desktop platforms that use OpenGL compositor. r=jmuizelaar (bfa9efd5c8)
416 lines
11 KiB
C++
416 lines
11 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 "AppProcessChecker.h"
|
|
#include "nsIPermissionManager.h"
|
|
#ifdef MOZ_CHILD_PERMISSIONS
|
|
#include "ContentParent.h"
|
|
#include "mozIApplication.h"
|
|
#include "mozilla/hal_sandbox/PHalParent.h"
|
|
#include "nsIAppsService.h"
|
|
#include "nsIPrincipal.h"
|
|
#include "nsPrintfCString.h"
|
|
#include "nsIURI.h"
|
|
#include "nsNetUtil.h"
|
|
#include "nsServiceManagerUtils.h"
|
|
#include "TabParent.h"
|
|
|
|
#include <algorithm>
|
|
|
|
using namespace mozilla::dom;
|
|
using namespace mozilla::hal_sandbox;
|
|
using namespace mozilla::services;
|
|
#else
|
|
namespace mozilla {
|
|
namespace dom {
|
|
class PContentParent;
|
|
} // namespace dom
|
|
} // namespace mozilla
|
|
|
|
class nsIPrincipal;
|
|
#endif
|
|
|
|
namespace mozilla {
|
|
|
|
#if DEUBG
|
|
#define LOG(args...) printf_stderr(args)
|
|
#else
|
|
#define LOG(...)
|
|
#endif
|
|
|
|
#ifdef MOZ_CHILD_PERMISSIONS
|
|
|
|
static bool
|
|
CheckAppTypeHelper(mozIApplication* aApp,
|
|
AssertAppProcessType aType,
|
|
const char* aCapability,
|
|
bool aIsBrowserElement)
|
|
{
|
|
bool aValid = false;
|
|
|
|
// isBrowser frames inherit their app descriptor to identify their
|
|
// data storage, but they don't inherit the capability associated
|
|
// with that descriptor.
|
|
if (aApp && (aType == ASSERT_APP_HAS_PERMISSION || !aIsBrowserElement)) {
|
|
switch (aType) {
|
|
case ASSERT_APP_HAS_PERMISSION:
|
|
case ASSERT_APP_PROCESS_PERMISSION:
|
|
if (!NS_SUCCEEDED(aApp->HasPermission(aCapability, &aValid))) {
|
|
aValid = false;
|
|
}
|
|
break;
|
|
case ASSERT_APP_PROCESS_MANIFEST_URL: {
|
|
nsAutoString manifestURL;
|
|
if (NS_SUCCEEDED(aApp->GetManifestURL(manifestURL)) &&
|
|
manifestURL.EqualsASCII(aCapability)) {
|
|
aValid = true;
|
|
}
|
|
break;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
return aValid;
|
|
}
|
|
|
|
bool
|
|
AssertAppProcess(PBrowserParent* aActor,
|
|
AssertAppProcessType aType,
|
|
const char* aCapability)
|
|
{
|
|
if (!aActor) {
|
|
NS_WARNING("Testing process capability for null actor");
|
|
return false;
|
|
}
|
|
|
|
TabParent* tab = TabParent::GetFrom(aActor);
|
|
nsCOMPtr<mozIApplication> app = tab->GetOwnOrContainingApp();
|
|
|
|
return CheckAppTypeHelper(app, aType, aCapability, tab->IsBrowserElement());
|
|
}
|
|
|
|
static bool
|
|
CheckAppStatusHelper(mozIApplication* aApp,
|
|
unsigned short aStatus)
|
|
{
|
|
bool valid = false;
|
|
|
|
if (aApp) {
|
|
unsigned short appStatus = 0;
|
|
if (NS_SUCCEEDED(aApp->GetAppStatus(&appStatus))) {
|
|
valid = appStatus == aStatus;
|
|
}
|
|
}
|
|
|
|
return valid;
|
|
}
|
|
|
|
bool
|
|
AssertAppStatus(PBrowserParent* aActor,
|
|
unsigned short aStatus)
|
|
{
|
|
if (!aActor) {
|
|
NS_WARNING("Testing process capability for null actor");
|
|
return false;
|
|
}
|
|
|
|
TabParent* tab = TabParent::GetFrom(aActor);
|
|
nsCOMPtr<mozIApplication> app = tab->GetOwnOrContainingApp();
|
|
|
|
return CheckAppStatusHelper(app, aStatus);
|
|
}
|
|
|
|
// A general purpose helper function to check permission against the origin
|
|
// rather than mozIApplication.
|
|
static bool
|
|
CheckOriginPermission(const nsACString& aOrigin, const char* aPermission)
|
|
{
|
|
LOG("CheckOriginPermission: %s, %s\n", nsCString(aOrigin).get(), aPermission);
|
|
|
|
nsIScriptSecurityManager *securityManager =
|
|
nsContentUtils::GetSecurityManager();
|
|
|
|
nsCOMPtr<nsIPrincipal> principal;
|
|
securityManager->CreateCodebasePrincipalFromOrigin(aOrigin,
|
|
getter_AddRefs(principal));
|
|
|
|
nsCOMPtr<nsIPermissionManager> permMgr = services::GetPermissionManager();
|
|
NS_ENSURE_TRUE(permMgr, false);
|
|
|
|
uint32_t perm;
|
|
nsresult rv = permMgr->TestExactPermissionFromPrincipal(principal, aPermission, &perm);
|
|
NS_ENSURE_SUCCESS(rv, false);
|
|
|
|
LOG("Permission %s for %s: %d\n", aPermission, nsCString(aOrigin).get(), perm);
|
|
return nsIPermissionManager::ALLOW_ACTION == perm;
|
|
}
|
|
|
|
bool
|
|
AssertAppProcess(TabContext& aContext,
|
|
AssertAppProcessType aType,
|
|
const char* aCapability)
|
|
{
|
|
const mozilla::DocShellOriginAttributes& attr = aContext.OriginAttributesRef();
|
|
nsCString suffix;
|
|
attr.CreateSuffix(suffix);
|
|
|
|
if (!aContext.SignedPkgOriginNoSuffix().IsEmpty()) {
|
|
LOG("TabContext owning signed package origin: %s, originAttr; %s\n",
|
|
nsCString(aContext.SignedPkgOriginNoSuffix()).get(),
|
|
suffix.get());
|
|
}
|
|
|
|
// Do a origin-based permission check if the TabContext owns a signed package.
|
|
if (!aContext.SignedPkgOriginNoSuffix().IsEmpty() &&
|
|
(ASSERT_APP_HAS_PERMISSION == aType || ASSERT_APP_PROCESS_PERMISSION == aType)) {
|
|
nsCString origin = aContext.SignedPkgOriginNoSuffix() + suffix;
|
|
return CheckOriginPermission(origin, aCapability);
|
|
}
|
|
|
|
nsCOMPtr<mozIApplication> app = aContext.GetOwnOrContainingApp();
|
|
return CheckAppTypeHelper(app, aType, aCapability, aContext.IsBrowserElement());
|
|
}
|
|
|
|
bool
|
|
AssertAppStatus(TabContext& aContext,
|
|
unsigned short aStatus)
|
|
{
|
|
|
|
nsCOMPtr<mozIApplication> app = aContext.GetOwnOrContainingApp();
|
|
return CheckAppStatusHelper(app, aStatus);
|
|
}
|
|
|
|
bool
|
|
AssertAppProcess(PContentParent* aActor,
|
|
AssertAppProcessType aType,
|
|
const char* aCapability)
|
|
{
|
|
nsTArray<TabContext> contextArray =
|
|
static_cast<ContentParent*>(aActor)->GetManagedTabContext();
|
|
for (uint32_t i = 0; i < contextArray.Length(); ++i) {
|
|
if (AssertAppProcess(contextArray[i], aType, aCapability)) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
NS_ERROR(
|
|
nsPrintfCString(
|
|
"Security problem: Content process does not have `%s'. It will be killed.\n",
|
|
aCapability).get());
|
|
|
|
static_cast<ContentParent*>(aActor)->KillHard("AssertAppProcess");
|
|
|
|
return false;
|
|
}
|
|
|
|
bool
|
|
AssertAppStatus(PContentParent* aActor,
|
|
unsigned short aStatus)
|
|
{
|
|
nsTArray<TabContext> contextArray =
|
|
static_cast<ContentParent*>(aActor)->GetManagedTabContext();
|
|
for (uint32_t i = 0; i < contextArray.Length(); ++i) {
|
|
if (AssertAppStatus(contextArray[i], aStatus)) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
NS_ERROR(
|
|
nsPrintfCString(
|
|
"Security problem: Content process does not have `%d' status. It will be killed.",
|
|
aStatus).get());
|
|
|
|
static_cast<ContentParent*>(aActor)->KillHard("AssertAppStatus");
|
|
|
|
return false;
|
|
}
|
|
|
|
bool
|
|
AssertAppProcess(PHalParent* aActor,
|
|
AssertAppProcessType aType,
|
|
const char* aCapability)
|
|
{
|
|
return AssertAppProcess(aActor->Manager(), aType, aCapability);
|
|
}
|
|
|
|
bool
|
|
AssertAppPrincipal(PContentParent* aActor,
|
|
nsIPrincipal* aPrincipal)
|
|
{
|
|
if (!aPrincipal) {
|
|
NS_WARNING("Principal is invalid, killing app process");
|
|
static_cast<ContentParent*>(aActor)->KillHard("AssertAppPrincipal");
|
|
return false;
|
|
}
|
|
|
|
uint32_t principalAppId = aPrincipal->GetAppId();
|
|
bool inBrowserElement = aPrincipal->GetIsInBrowserElement();
|
|
|
|
// Check if the permission's appId matches a child we manage.
|
|
nsTArray<TabContext> contextArray =
|
|
static_cast<ContentParent*>(aActor)->GetManagedTabContext();
|
|
for (uint32_t i = 0; i < contextArray.Length(); ++i) {
|
|
if (contextArray[i].OwnOrContainingAppId() == principalAppId) {
|
|
// If the child only runs inBrowserElement content and the principal claims
|
|
// it's not in a browser element, it's lying.
|
|
if (!contextArray[i].IsBrowserElement() || inBrowserElement) {
|
|
return true;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
|
|
NS_WARNING("Principal is invalid, killing app process");
|
|
static_cast<ContentParent*>(aActor)->KillHard("AssertAppPrincipal");
|
|
return false;
|
|
}
|
|
|
|
already_AddRefed<nsIPrincipal>
|
|
GetAppPrincipal(uint32_t aAppId)
|
|
{
|
|
nsCOMPtr<nsIAppsService> appsService = do_GetService(APPS_SERVICE_CONTRACTID);
|
|
|
|
nsCOMPtr<mozIApplication> app;
|
|
nsresult rv = appsService->GetAppByLocalId(aAppId, getter_AddRefs(app));
|
|
NS_ENSURE_SUCCESS(rv, nullptr);
|
|
|
|
nsCOMPtr<nsIPrincipal> principal;
|
|
app->GetPrincipal(getter_AddRefs(principal));
|
|
|
|
return principal.forget();
|
|
}
|
|
|
|
uint32_t
|
|
CheckPermission(PContentParent* aActor,
|
|
nsIPrincipal* aPrincipal,
|
|
const char* aPermission)
|
|
{
|
|
if (!AssertAppPrincipal(aActor, aPrincipal)) {
|
|
return nsIPermissionManager::DENY_ACTION;
|
|
}
|
|
|
|
nsCOMPtr<nsIPermissionManager> pm =
|
|
services::GetPermissionManager();
|
|
NS_ENSURE_TRUE(pm, nsIPermissionManager::DENY_ACTION);
|
|
|
|
// Make sure that `aPermission' is an app permission before checking the origin.
|
|
nsCOMPtr<nsIPrincipal> appPrincipal = GetAppPrincipal(aPrincipal->GetAppId());
|
|
uint32_t appPerm = nsIPermissionManager::UNKNOWN_ACTION;
|
|
nsresult rv = pm->TestExactPermissionFromPrincipal(appPrincipal, aPermission, &appPerm);
|
|
NS_ENSURE_SUCCESS(rv, nsIPermissionManager::UNKNOWN_ACTION);
|
|
// Setting to "deny" in the settings UI should deny everywhere.
|
|
if (appPerm == nsIPermissionManager::UNKNOWN_ACTION ||
|
|
appPerm == nsIPermissionManager::DENY_ACTION) {
|
|
return appPerm;
|
|
}
|
|
|
|
uint32_t permission = nsIPermissionManager::UNKNOWN_ACTION;
|
|
rv = pm->TestExactPermissionFromPrincipal(aPrincipal, aPermission, &permission);
|
|
NS_ENSURE_SUCCESS(rv, nsIPermissionManager::UNKNOWN_ACTION);
|
|
if (permission == nsIPermissionManager::UNKNOWN_ACTION ||
|
|
permission == nsIPermissionManager::DENY_ACTION) {
|
|
return permission;
|
|
}
|
|
|
|
// For browser content (and if the app hasn't explicitly denied this),
|
|
// consider the requesting origin, not the app.
|
|
if (appPerm == nsIPermissionManager::PROMPT_ACTION &&
|
|
aPrincipal->GetIsInBrowserElement()) {
|
|
return permission;
|
|
}
|
|
|
|
// Setting to "prompt" in the settings UI should prompt everywhere in
|
|
// non-browser content.
|
|
if (appPerm == nsIPermissionManager::PROMPT_ACTION ||
|
|
permission == nsIPermissionManager::PROMPT_ACTION) {
|
|
return nsIPermissionManager::PROMPT_ACTION;
|
|
}
|
|
|
|
if (appPerm == nsIPermissionManager::ALLOW_ACTION ||
|
|
permission == nsIPermissionManager::ALLOW_ACTION) {
|
|
return nsIPermissionManager::ALLOW_ACTION;
|
|
}
|
|
|
|
NS_RUNTIMEABORT("Invalid permission value");
|
|
return nsIPermissionManager::DENY_ACTION;
|
|
}
|
|
|
|
#else
|
|
|
|
bool
|
|
AssertAppProcess(mozilla::dom::PBrowserParent* aActor,
|
|
AssertAppProcessType aType,
|
|
const char* aCapability)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
AssertAppStatus(mozilla::dom::PBrowserParent* aActor,
|
|
unsigned short aStatus)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
AssertAppProcess(const mozilla::dom::TabContext& aContext,
|
|
AssertAppProcessType aType,
|
|
const char* aCapability)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
AssertAppStatus(const mozilla::dom::TabContext& aContext,
|
|
unsigned short aStatus)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
|
|
bool
|
|
AssertAppProcess(mozilla::dom::PContentParent* aActor,
|
|
AssertAppProcessType aType,
|
|
const char* aCapability)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
AssertAppStatus(mozilla::dom::PContentParent* aActor,
|
|
unsigned short aStatus)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
AssertAppProcess(mozilla::hal_sandbox::PHalParent* aActor,
|
|
AssertAppProcessType aType,
|
|
const char* aCapability)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
AssertAppPrincipal(mozilla::dom::PContentParent* aActor,
|
|
nsIPrincipal* aPrincipal)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
uint32_t
|
|
CheckPermission(mozilla::dom::PContentParent* aActor,
|
|
nsIPrincipal* aPrincipal,
|
|
const char* aPermission)
|
|
{
|
|
return nsIPermissionManager::ALLOW_ACTION;
|
|
}
|
|
|
|
#endif
|
|
|
|
} // namespace mozilla
|