mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
c6ee756140
- Bug 1190574 - make test.chain.replace and cohorts throw on unknown test name + fix broken tests. r=drno, r=jib (9288da531a) - Bug 1190574 - added missing calls to release stored ICE candidates. r=jib (590e1f2769) - Bug 1241948 - Update web-platform-tests expected data to revision 967dfa72eaa149af854c6c38cb64e28b4961a480, a=testonly (67bfe4dc02) - Bug 1209744 - Implement canTrickleIceCandidates attribute, r=bwc,khuey (56f7db7415) - Bug 1181768 - Make already-defined pc.getConfiguration() work. r=mt (d621edf192) - Bug 1254839 - include file and line number in RTCPeerConnection warnings. r=bz (1f914d83b0) - Bug 1243607: make webrtc bitrate prefs take precedence over automatic bitrate selection r=pkerr (655a6ebf1a) - Bug 1242199: Add lower-limit WebRTC bandwidth pref for testing r=pkerr (40895a6821) - Bug 1244913 - change SelectBandwidth to SelectBitrates. r=jesup (4952cb9143) - Bug 1244913 - resolution-based bitrates for each simulcast layer, scaleResolutionDownBy, and working maxBitrate in unicast. r=bwc,jesup (cf40bb9c9f) - Bug 1166832 - Add test to verify video (using capture stream) after renegotiation. r=bwc (adb0cd89cb) - Bug 1250990 - Make RTCRtpEncodingParameters.scaleResolutionDownBy work with H.264 unicast. r=jesup (83eca85bb4) - Bug 1237224: Check sending framesize is set before calculating max fps when max-mbps is negotiated r=pkerr (6910dbb65f) - Bug 1198345 - Split moar Hello Telemetry values from general WebRTC. r=jesup (cc9b0c8059) - Bug 1217677: increase UDP socket receive buffer for <= Win7. r=jesup, mcmanus (bd096afc64) - Bug 1244638 - Part 3: Rename method from NotifyTimingUpdate to PostSpecifiedTimingUpdated. r=birtles (71fe98e0b2) - Bug 1122236 - CSP: Implement block-all-mixed-content (r=tanvi,kate,mrbkap) (3fddc3166d) - Bug 1229222 - add chromeutils for the creation of origin attributes with the correct default values. r=sicking (bf1e5673c0) - Bug 1240651 - Annotate addonId into crash report (r=bholley) (4be5ef9e5e) - Bug 1254906 - Change the annotation on JSPrincipals::dump's definition to match that of its declaration. r=bz (2e46a62057) - Bug 1211590 - Inherits OriginAttributes from loading principal for GetChannelURIPrincipal. r=sicking (838147dbce) - Bug 1251311. JS::DescribeScriptedCaller can't throw JS exceptions. Adjust some callers accordingly. r=khuey (2f3f111d74) - Bug 1210703 - followup: fix test file used in caps and fix assertions to have actual/expected value in the right order, rs=bustage on a CLOSED TREE (548ddafc98) - Bug 1208756 - Tests. r=billm (6b803253f2) - Bug 1238160 - Test frame principal when toggling isolation. r=bz (a1954c14dd) - Bug 1237141 - Make this test pass in e10s. r=felipe (32b8c1479f) - var-let (1bb1fe779e) - Bug 1207494 - Part 10: Remove use of expression closure from dom/json/. r=jst (668bf3efa8) - Bug 1207494 - Part 9: Remove use of expression closure from dom/indexedDB/. r=khuey (8bf68b9afe) - Bug 1043562 - Hide the Contacts API from the contexts that lack sufficient privileges, such as Firefox desktop and Android; r=smaug (dd78b59dda) - Bug 1152114 - Ignore webapps with localId 0 (r=fabrice) (dbd208872b)
261 lines
8.0 KiB
C++
261 lines
8.0 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/* 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 "xpcprivate.h"
|
|
#include "nsString.h"
|
|
#include "nsIObjectOutputStream.h"
|
|
#include "nsIObjectInputStream.h"
|
|
#include "nsJSPrincipals.h"
|
|
#include "plstr.h"
|
|
#include "nsXPIDLString.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsIServiceManager.h"
|
|
#include "nsMemory.h"
|
|
#include "nsStringBuffer.h"
|
|
|
|
#include "mozilla/dom/StructuredCloneTags.h"
|
|
// for mozilla::dom::workers::kJSPrincipalsDebugToken
|
|
#include "mozilla/dom/workers/Workers.h"
|
|
#include "mozilla/ipc/BackgroundUtils.h"
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::ipc;
|
|
|
|
NS_IMETHODIMP_(MozExternalRefCountType)
|
|
nsJSPrincipals::AddRef()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
NS_PRECONDITION(int32_t(refcount) >= 0, "illegal refcnt");
|
|
nsrefcnt count = ++refcount;
|
|
NS_LOG_ADDREF(this, count, "nsJSPrincipals", sizeof(*this));
|
|
return count;
|
|
}
|
|
|
|
NS_IMETHODIMP_(MozExternalRefCountType)
|
|
nsJSPrincipals::Release()
|
|
{
|
|
MOZ_ASSERT(NS_IsMainThread());
|
|
NS_PRECONDITION(0 != refcount, "dup release");
|
|
nsrefcnt count = --refcount;
|
|
NS_LOG_RELEASE(this, count, "nsJSPrincipals");
|
|
if (count == 0) {
|
|
delete this;
|
|
}
|
|
|
|
return count;
|
|
}
|
|
|
|
/* static */ bool
|
|
nsJSPrincipals::Subsume(JSPrincipals *jsprin, JSPrincipals *other)
|
|
{
|
|
bool result;
|
|
nsresult rv = nsJSPrincipals::get(jsprin)->Subsumes(nsJSPrincipals::get(other), &result);
|
|
return NS_SUCCEEDED(rv) && result;
|
|
}
|
|
|
|
/* static */ void
|
|
nsJSPrincipals::Destroy(JSPrincipals *jsprin)
|
|
{
|
|
// The JS runtime can call this method during the last GC when
|
|
// nsScriptSecurityManager is destroyed. So we must not assume here that
|
|
// the security manager still exists.
|
|
|
|
nsJSPrincipals *nsjsprin = nsJSPrincipals::get(jsprin);
|
|
|
|
// We need to destroy the nsIPrincipal. We'll do this by adding
|
|
// to the refcount and calling release
|
|
|
|
#ifdef NS_BUILD_REFCNT_LOGGING
|
|
// The refcount logging considers AddRef-to-1 to indicate creation,
|
|
// so trick it into thinking it's otherwise, but balance the
|
|
// Release() we do below.
|
|
nsjsprin->refcount++;
|
|
nsjsprin->AddRef();
|
|
nsjsprin->refcount--;
|
|
#else
|
|
nsjsprin->refcount++;
|
|
#endif
|
|
nsjsprin->Release();
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
|
|
// Defined here so one can do principals->dump() in the debugger
|
|
JS_PUBLIC_API(void)
|
|
JSPrincipals::dump()
|
|
{
|
|
if (debugToken == nsJSPrincipals::DEBUG_TOKEN) {
|
|
nsAutoCString str;
|
|
static_cast<nsJSPrincipals *>(this)->GetScriptLocation(str);
|
|
fprintf(stderr, "nsIPrincipal (%p) = %s\n", static_cast<void*>(this), str.get());
|
|
} else if (debugToken == dom::workers::kJSPrincipalsDebugToken) {
|
|
fprintf(stderr, "Web Worker principal singleton (%p)\n", this);
|
|
} else {
|
|
fprintf(stderr,
|
|
"!!! JSPrincipals (%p) is not nsJSPrincipals instance - bad token: "
|
|
"actual=0x%x expected=0x%x\n",
|
|
this, unsigned(debugToken), unsigned(nsJSPrincipals::DEBUG_TOKEN));
|
|
}
|
|
}
|
|
|
|
#endif
|
|
|
|
/* static */ bool
|
|
nsJSPrincipals::ReadPrincipals(JSContext* aCx, JSStructuredCloneReader* aReader,
|
|
JSPrincipals** aOutPrincipals)
|
|
{
|
|
uint32_t tag;
|
|
uint32_t unused;
|
|
if (!JS_ReadUint32Pair(aReader, &tag, &unused)) {
|
|
return false;
|
|
}
|
|
|
|
if (!(tag == SCTAG_DOM_NULL_PRINCIPAL ||
|
|
tag == SCTAG_DOM_SYSTEM_PRINCIPAL ||
|
|
tag == SCTAG_DOM_CONTENT_PRINCIPAL ||
|
|
tag == SCTAG_DOM_EXPANDED_PRINCIPAL)) {
|
|
xpc::Throw(aCx, NS_ERROR_DOM_DATA_CLONE_ERR);
|
|
return false;
|
|
}
|
|
|
|
return ReadKnownPrincipalType(aCx, aReader, tag, aOutPrincipals);
|
|
}
|
|
|
|
static bool
|
|
ReadPrincipalInfo(JSStructuredCloneReader* aReader,
|
|
uint32_t aTag,
|
|
PrincipalInfo& aInfo)
|
|
{
|
|
if (aTag == SCTAG_DOM_SYSTEM_PRINCIPAL) {
|
|
aInfo = SystemPrincipalInfo();
|
|
} else if (aTag == SCTAG_DOM_NULL_PRINCIPAL) {
|
|
aInfo = NullPrincipalInfo();
|
|
} else if (aTag == SCTAG_DOM_EXPANDED_PRINCIPAL) {
|
|
uint32_t length, unused;
|
|
if (!JS_ReadUint32Pair(aReader, &length, &unused)) {
|
|
return false;
|
|
}
|
|
|
|
ExpandedPrincipalInfo expanded;
|
|
|
|
for (uint32_t i = 0; i < length; i++) {
|
|
uint32_t tag;
|
|
if (!JS_ReadUint32Pair(aReader, &tag, &unused)) {
|
|
return false;
|
|
}
|
|
|
|
PrincipalInfo sub;
|
|
if (!ReadPrincipalInfo(aReader, tag, sub)) {
|
|
return false;
|
|
}
|
|
expanded.whitelist().AppendElement(sub);
|
|
}
|
|
|
|
aInfo = expanded;
|
|
} else if (aTag == SCTAG_DOM_CONTENT_PRINCIPAL) {
|
|
uint32_t suffixLength, specLength;
|
|
if (!JS_ReadUint32Pair(aReader, &suffixLength, &specLength)) {
|
|
return false;
|
|
}
|
|
|
|
nsAutoCString suffix;
|
|
suffix.SetLength(suffixLength);
|
|
if (!JS_ReadBytes(aReader, suffix.BeginWriting(), suffixLength)) {
|
|
return false;
|
|
}
|
|
|
|
nsAutoCString spec;
|
|
spec.SetLength(specLength);
|
|
if (!JS_ReadBytes(aReader, spec.BeginWriting(), specLength)) {
|
|
return false;
|
|
}
|
|
|
|
OriginAttributes attrs;
|
|
attrs.PopulateFromSuffix(suffix);
|
|
aInfo = ContentPrincipalInfo(attrs, spec);
|
|
} else {
|
|
MOZ_CRASH("unexpected principal structured clone tag");
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
/* static */ bool
|
|
nsJSPrincipals::ReadKnownPrincipalType(JSContext* aCx,
|
|
JSStructuredCloneReader* aReader,
|
|
uint32_t aTag,
|
|
JSPrincipals** aOutPrincipals)
|
|
{
|
|
MOZ_ASSERT(aTag == SCTAG_DOM_NULL_PRINCIPAL ||
|
|
aTag == SCTAG_DOM_SYSTEM_PRINCIPAL ||
|
|
aTag == SCTAG_DOM_CONTENT_PRINCIPAL ||
|
|
aTag == SCTAG_DOM_EXPANDED_PRINCIPAL);
|
|
if (NS_WARN_IF(!NS_IsMainThread())) {
|
|
xpc::Throw(aCx, NS_ERROR_UNCATCHABLE_EXCEPTION);
|
|
return false;
|
|
}
|
|
|
|
PrincipalInfo info;
|
|
if (!ReadPrincipalInfo(aReader, aTag, info)) {
|
|
return false;
|
|
}
|
|
|
|
nsresult rv;
|
|
nsCOMPtr<nsIPrincipal> prin = PrincipalInfoToPrincipal(info, &rv);
|
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
|
xpc::Throw(aCx, NS_ERROR_DOM_DATA_CLONE_ERR);
|
|
return false;
|
|
}
|
|
|
|
*aOutPrincipals = get(prin.forget().take());
|
|
return true;
|
|
}
|
|
|
|
static bool
|
|
WritePrincipalInfo(JSStructuredCloneWriter* aWriter, const PrincipalInfo& aInfo)
|
|
{
|
|
if (aInfo.type() == PrincipalInfo::TNullPrincipalInfo) {
|
|
return JS_WriteUint32Pair(aWriter, SCTAG_DOM_NULL_PRINCIPAL, 0);
|
|
}
|
|
if (aInfo.type() == PrincipalInfo::TSystemPrincipalInfo) {
|
|
return JS_WriteUint32Pair(aWriter, SCTAG_DOM_SYSTEM_PRINCIPAL, 0);
|
|
}
|
|
if (aInfo.type() == PrincipalInfo::TExpandedPrincipalInfo) {
|
|
const ExpandedPrincipalInfo& expanded = aInfo;
|
|
if (!JS_WriteUint32Pair(aWriter, SCTAG_DOM_EXPANDED_PRINCIPAL, 0) ||
|
|
!JS_WriteUint32Pair(aWriter, expanded.whitelist().Length(), 0)) {
|
|
return false;
|
|
}
|
|
|
|
for (uint32_t i = 0; i < expanded.whitelist().Length(); i++) {
|
|
if (!WritePrincipalInfo(aWriter, expanded.whitelist()[i])) {
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
MOZ_ASSERT(aInfo.type() == PrincipalInfo::TContentPrincipalInfo);
|
|
const ContentPrincipalInfo& cInfo = aInfo;
|
|
nsAutoCString suffix;
|
|
cInfo.attrs().CreateSuffix(suffix);
|
|
return JS_WriteUint32Pair(aWriter, SCTAG_DOM_CONTENT_PRINCIPAL, 0) &&
|
|
JS_WriteUint32Pair(aWriter, suffix.Length(), cInfo.spec().Length()) &&
|
|
JS_WriteBytes(aWriter, suffix.get(), suffix.Length()) &&
|
|
JS_WriteBytes(aWriter, cInfo.spec().get(), cInfo.spec().Length());
|
|
}
|
|
|
|
bool
|
|
nsJSPrincipals::write(JSContext* aCx, JSStructuredCloneWriter* aWriter)
|
|
{
|
|
PrincipalInfo info;
|
|
if (NS_WARN_IF(NS_FAILED(PrincipalToPrincipalInfo(this, &info)))) {
|
|
xpc::Throw(aCx, NS_ERROR_DOM_DATA_CLONE_ERR);
|
|
return false;
|
|
}
|
|
|
|
return WritePrincipalInfo(aWriter, info);
|
|
}
|