mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-29 10:08:38 +00:00
1e24b22ef4
- Bug 1150366 - Remove duplicate d3.js. r=jsantell (71f991da6) - Bug 1175352 - Refactor LoadInfo arguments to be more self contained (r=bent) (3f7d08164) - Bug 1181533 - Add nsCRTGlue.h and prtime.h includes to nsDownloadManager.cpp to fix --disable-safe-browsing build bustage. r=froydnj (af338edf1) - Bug 905127 - Part 1 - Make some functions from nsNetUtil not inline. r=jduell Bug 905127 - Part 2 - remove unnecessary nsNetUtil.h includes r=jduell Bug 905127 - Make some functions from nsNetUtil not inline. r=jduell (bc47d5b3a) - Bug 1117650 - Part 1: Move all CORS tests into dom/security/test. r=sicking (6f727387c) - Bug 1117650 - Part 2: Move all MixedContent tests into dom/security/test. r=tanvi (73f273829) - Bug 1004703 - ignore 'unsafe-inline' if nonce- or hash-source specifed - tests (r=sstamm) (ebf411159) - Bug 921493 - CSP: test whitelisting of scheme-relative sources (r=dveditz) (f0618b189) - Bug 1139569 - Optimize update function for element editors in markup view;r=mratcliffe (c60d38dca) - Partil of Bug 1139644 - Make markupview use sdk timers instead of individual timers for each window;r=pbrosset (8bc1a4d66) - Bug 1146568 - Avoid unsafe CPOW usage warnings in browser_markupview_tag_edit_08.js; r=bgrins Making use of the devtools test frame-script to set the test node's attributes instead of using a CPOW. (61d7eed64) - Bug 1146568 - Avoid unsafe CPOW usage in markupview tests, in assertAttributes helper; r=bgrins (efc492d5d) - Bug 858038 - Allow moving elements in the markupview by drag/drop; r=pbrosset (51d79c15c) - Bug 1139644 - Flash only relevant attributes in markup view when changed;r=pbrosset (29807fa46) - Bug 1147128 - Make sure attribute shows up in markup view after removing and setting to the previous value;r=mratcliffe (1947f7417) - Bug 1147325 - Clear box model timer on markup view destroy. r=pbrosset Prevents 'this._inspector.toolbox is null' spam in mochitest-dt (1d6808b4a) - Bug 921102 - 1 - Linkify URIs in the inspector; r=tromey, miker This first part adds a parser for node attributes which, given some node information and an attribute name, generates a small AST-like array of objects that tells which parts of the attribute (if any) are links, and what they link to. Using this, the markup-view generates the right HTML structure to display these parts as links. This part 1 doesn't yet allow users to follow these links. (c500e270e) - Bug 1139667 - CSP tests for fetch(). r=ckirschb (df030457f) - Bug 1086999 - CSP: Asterisk (*) wildcard should not allow blob:, data:, or filesystem: when matching source expressions - tests (r=sstamm) (dee0f2239) - Bug 1117650 - Part 3: Move all CSP tests into dom/security/test. r=sstamm (29c95475c) - Bug 1146566 - 1 - Use devtools common frame-script in markupview tests and add helper; r=bgrins (b10e42468) - Bug 1146566 - 2 - Avoid using CPOWs in test browser_markupview_tag_edit_03.js; r=bgrins This change updates the browser_markupview_tag_edit_03.js test by making use of the getDomElementInfo message listener to retrieve information about the tested nodes without having to go through CPOWs. (07f0ee3ff) - Bug 1036324 - Adds option to walker.parents() to not traverse DocShellTreeItems of different types (24123a5d2) - Bug 921102 - 2 - Markup-view tests for attribute links; r=miker (f6da81799) - Bug 901250 - Add scroll into view menu item for the inspector. r=bgrins (bfc7518b1) - Bug 994055 - Part 1: Add a toggle sidebar panel button to the inspector. r=miker This adds a new icon, next to the searchbox (like in the debugger) to expand or collapse the sidebar panel in the inspector. The state is *not* persisted yet when the toolbox is closed. The button is hidden when the toolbox host switches to 'side'. (87730e20a) - Bug 994055 - Part 2: Add tests for the inspector sidebar toggle button. r=miker (2872c3fbd) - Bug 921102 - 3 - Open/copy markup-view attribute links; r=bgrins This part adds contextual menu items that become enabled when the user right clicks on an attribute that has a link. Depending on the nature of the link, a new tab will be opened or a node selected. The user can also choose to copy the link in the clipboard. (9b93485f6) - Bug 921102 - 4 - Tests for the open/copy links on markup-view attributes; r=bgrins (861ba51f6)
414 lines
10 KiB
C++
414 lines
10 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 "TCPSocketParent.h"
|
|
#include "jsapi.h"
|
|
#include "jsfriendapi.h"
|
|
#include "nsJSUtils.h"
|
|
#include "nsIDOMTCPSocket.h"
|
|
#include "mozilla/unused.h"
|
|
#include "mozilla/AppProcessChecker.h"
|
|
#include "mozilla/net/NeckoCommon.h"
|
|
#include "mozilla/net/PNeckoParent.h"
|
|
#include "mozilla/dom/ContentParent.h"
|
|
#include "mozilla/dom/ScriptSettings.h"
|
|
#include "mozilla/dom/TabParent.h"
|
|
#include "mozilla/HoldDropJSObjects.h"
|
|
#include "nsIScriptSecurityManager.h"
|
|
#include "nsNetUtil.h"
|
|
|
|
namespace IPC {
|
|
|
|
//Defined in TCPSocketChild.cpp
|
|
extern bool
|
|
DeserializeArrayBuffer(JS::Handle<JSObject*> aObj,
|
|
const InfallibleTArray<uint8_t>& aBuffer,
|
|
JS::MutableHandle<JS::Value> aVal);
|
|
|
|
} // namespace IPC
|
|
|
|
namespace mozilla {
|
|
namespace dom {
|
|
|
|
static void
|
|
FireInteralError(mozilla::net::PTCPSocketParent* aActor, uint32_t aLineNo)
|
|
{
|
|
mozilla::unused <<
|
|
aActor->SendCallback(NS_LITERAL_STRING("onerror"),
|
|
TCPError(NS_LITERAL_STRING("InvalidStateError")),
|
|
NS_LITERAL_STRING("connecting"));
|
|
}
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_CLASS(TCPSocketParentBase)
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(TCPSocketParentBase)
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mSocket)
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mIntermediary)
|
|
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(TCPSocketParentBase)
|
|
tmp->mIntermediaryObj = nullptr;
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK(mSocket)
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK(mIntermediary)
|
|
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
|
|
|
|
NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(TCPSocketParentBase)
|
|
NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mIntermediaryObj)
|
|
NS_IMPL_CYCLE_COLLECTION_TRACE_END
|
|
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TCPSocketParentBase)
|
|
NS_INTERFACE_MAP_ENTRY(nsITCPSocketParent)
|
|
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
NS_IMPL_CYCLE_COLLECTING_ADDREF(TCPSocketParentBase)
|
|
NS_IMPL_CYCLE_COLLECTING_RELEASE(TCPSocketParentBase)
|
|
|
|
TCPSocketParentBase::TCPSocketParentBase()
|
|
: mIPCOpen(false)
|
|
{
|
|
mObserver = new mozilla::net::OfflineObserver(this);
|
|
mozilla::HoldJSObjects(this);
|
|
}
|
|
|
|
TCPSocketParentBase::~TCPSocketParentBase()
|
|
{
|
|
if (mObserver) {
|
|
mObserver->RemoveObserver();
|
|
}
|
|
mozilla::DropJSObjects(this);
|
|
}
|
|
|
|
uint32_t
|
|
TCPSocketParent::GetAppId()
|
|
{
|
|
uint32_t appId = nsIScriptSecurityManager::UNKNOWN_APP_ID;
|
|
const PContentParent *content = Manager()->Manager();
|
|
const InfallibleTArray<PBrowserParent*>& browsers = content->ManagedPBrowserParent();
|
|
if (browsers.Length() > 0) {
|
|
TabParent *tab = TabParent::GetFrom(browsers[0]);
|
|
appId = tab->OwnAppId();
|
|
}
|
|
return appId;
|
|
};
|
|
|
|
bool
|
|
TCPSocketParent::GetInBrowser()
|
|
{
|
|
bool inBrowser = false;
|
|
const PContentParent *content = Manager()->Manager();
|
|
const InfallibleTArray<PBrowserParent*>& browsers = content->ManagedPBrowserParent();
|
|
if (browsers.Length() > 0) {
|
|
TabParent *tab = TabParent::GetFrom(browsers[0]);
|
|
inBrowser = tab->IsBrowserElement();
|
|
}
|
|
return inBrowser;
|
|
}
|
|
|
|
nsresult
|
|
TCPSocketParent::OfflineNotification(nsISupports *aSubject)
|
|
{
|
|
nsCOMPtr<nsIAppOfflineInfo> info(do_QueryInterface(aSubject));
|
|
if (!info) {
|
|
return NS_OK;
|
|
}
|
|
|
|
uint32_t targetAppId = nsIScriptSecurityManager::UNKNOWN_APP_ID;
|
|
info->GetAppId(&targetAppId);
|
|
|
|
// Obtain App ID
|
|
uint32_t appId = GetAppId();
|
|
if (appId != targetAppId) {
|
|
return NS_OK;
|
|
}
|
|
|
|
// If the app is offline, close the socket
|
|
if (mSocket && NS_IsAppOffline(appId)) {
|
|
mSocket->Close();
|
|
mSocket = nullptr;
|
|
mIntermediaryObj = nullptr;
|
|
mIntermediary = nullptr;
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
|
|
void
|
|
TCPSocketParentBase::ReleaseIPDLReference()
|
|
{
|
|
MOZ_ASSERT(mIPCOpen);
|
|
mIPCOpen = false;
|
|
this->Release();
|
|
}
|
|
|
|
void
|
|
TCPSocketParentBase::AddIPDLReference()
|
|
{
|
|
MOZ_ASSERT(!mIPCOpen);
|
|
mIPCOpen = true;
|
|
this->AddRef();
|
|
}
|
|
|
|
NS_IMETHODIMP_(MozExternalRefCountType) TCPSocketParent::Release(void)
|
|
{
|
|
nsrefcnt refcnt = TCPSocketParentBase::Release();
|
|
if (refcnt == 1 && mIPCOpen) {
|
|
mozilla::unused << PTCPSocketParent::SendRequestDelete();
|
|
return 1;
|
|
}
|
|
return refcnt;
|
|
}
|
|
|
|
bool
|
|
TCPSocketParent::RecvOpen(const nsString& aHost, const uint16_t& aPort, const bool& aUseSSL,
|
|
const nsString& aBinaryType)
|
|
{
|
|
// We don't have browser actors in xpcshell, and hence can't run automated
|
|
// tests without this loophole.
|
|
if (net::UsingNeckoIPCSecurity() &&
|
|
!AssertAppProcessPermission(Manager()->Manager(), "tcp-socket")) {
|
|
FireInteralError(this, __LINE__);
|
|
return true;
|
|
}
|
|
|
|
// Obtain App ID
|
|
uint32_t appId = GetAppId();
|
|
bool inBrowser = GetInBrowser();
|
|
|
|
if (NS_IsAppOffline(appId)) {
|
|
NS_ERROR("Can't open socket because app is offline");
|
|
FireInteralError(this, __LINE__);
|
|
return true;
|
|
}
|
|
|
|
nsresult rv;
|
|
mIntermediary = do_CreateInstance("@mozilla.org/tcp-socket-intermediary;1", &rv);
|
|
if (NS_FAILED(rv)) {
|
|
FireInteralError(this, __LINE__);
|
|
return true;
|
|
}
|
|
|
|
rv = mIntermediary->Open(this, aHost, aPort, aUseSSL, aBinaryType, appId,
|
|
inBrowser, getter_AddRefs(mSocket));
|
|
if (NS_FAILED(rv) || !mSocket) {
|
|
FireInteralError(this, __LINE__);
|
|
return true;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
TCPSocketParent::InitJS(JS::Handle<JS::Value> aIntermediary, JSContext* aCx)
|
|
{
|
|
MOZ_ASSERT(aIntermediary.isObject());
|
|
mIntermediaryObj = &aIntermediary.toObject();
|
|
return NS_OK;
|
|
}
|
|
|
|
bool
|
|
TCPSocketParent::RecvStartTLS()
|
|
{
|
|
NS_ENSURE_TRUE(mSocket, true);
|
|
nsresult rv = mSocket->UpgradeToSecure();
|
|
NS_ENSURE_SUCCESS(rv, true);
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
TCPSocketParent::RecvSuspend()
|
|
{
|
|
NS_ENSURE_TRUE(mSocket, true);
|
|
nsresult rv = mSocket->Suspend();
|
|
NS_ENSURE_SUCCESS(rv, true);
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
TCPSocketParent::RecvResume()
|
|
{
|
|
NS_ENSURE_TRUE(mSocket, true);
|
|
nsresult rv = mSocket->Resume();
|
|
NS_ENSURE_SUCCESS(rv, true);
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
TCPSocketParent::RecvData(const SendableData& aData,
|
|
const uint32_t& aTrackingNumber)
|
|
{
|
|
NS_ENSURE_TRUE(mIntermediary, true);
|
|
|
|
nsresult rv;
|
|
switch (aData.type()) {
|
|
case SendableData::TArrayOfuint8_t: {
|
|
AutoSafeJSContext cx;
|
|
JSAutoRequest ar(cx);
|
|
JS::Rooted<JS::Value> val(cx);
|
|
JS::Rooted<JSObject*> obj(cx, mIntermediaryObj);
|
|
IPC::DeserializeArrayBuffer(obj, aData.get_ArrayOfuint8_t(), &val);
|
|
rv = mIntermediary->OnRecvSendArrayBuffer(val, aTrackingNumber);
|
|
NS_ENSURE_SUCCESS(rv, true);
|
|
break;
|
|
}
|
|
|
|
case SendableData::TnsString:
|
|
rv = mIntermediary->OnRecvSendString(aData.get_nsString(), aTrackingNumber);
|
|
NS_ENSURE_SUCCESS(rv, true);
|
|
break;
|
|
|
|
default:
|
|
MOZ_CRASH("unexpected SendableData type");
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
TCPSocketParent::RecvClose()
|
|
{
|
|
NS_ENSURE_TRUE(mSocket, true);
|
|
nsresult rv = mSocket->Close();
|
|
NS_ENSURE_SUCCESS(rv, true);
|
|
return true;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
TCPSocketParent::SendEvent(const nsAString& aType, JS::Handle<JS::Value> aDataVal,
|
|
const nsAString& aReadyState, JSContext* aCx)
|
|
{
|
|
if (!mIPCOpen) {
|
|
NS_WARNING("Dropping callback due to no IPC connection");
|
|
return NS_OK;
|
|
}
|
|
|
|
CallbackData data;
|
|
if (aDataVal.isString()) {
|
|
JSString* jsstr = aDataVal.toString();
|
|
nsAutoJSString str;
|
|
if (!str.init(aCx, jsstr)) {
|
|
FireInteralError(this, __LINE__);
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
data = SendableData(str);
|
|
|
|
} else if (aDataVal.isUndefined() || aDataVal.isNull()) {
|
|
data = mozilla::void_t();
|
|
|
|
} else if (aDataVal.isObject()) {
|
|
JS::Rooted<JSObject *> obj(aCx, &aDataVal.toObject());
|
|
if (JS_IsArrayBufferObject(obj)) {
|
|
FallibleTArray<uint8_t> fallibleArr;
|
|
uint32_t errLine = 0;
|
|
do {
|
|
JS::AutoCheckCannotGC nogc;
|
|
uint32_t nbytes = JS_GetArrayBufferByteLength(obj);
|
|
uint8_t* buffer = JS_GetArrayBufferData(obj, nogc);
|
|
if (!buffer) {
|
|
errLine = __LINE__;
|
|
break;
|
|
}
|
|
if (!fallibleArr.InsertElementsAt(0, buffer, nbytes, fallible)) {
|
|
errLine = __LINE__;
|
|
break;
|
|
}
|
|
} while (false);
|
|
|
|
if (errLine) {
|
|
FireInteralError(this, errLine);
|
|
return NS_ERROR_OUT_OF_MEMORY;
|
|
}
|
|
|
|
InfallibleTArray<uint8_t> arr;
|
|
arr.SwapElements(fallibleArr);
|
|
data = SendableData(arr);
|
|
|
|
} else {
|
|
nsAutoJSString name;
|
|
|
|
JS::Rooted<JS::Value> val(aCx);
|
|
if (!JS_GetProperty(aCx, obj, "name", &val)) {
|
|
NS_ERROR("No name property on supposed error object");
|
|
} else if (val.isString()) {
|
|
if (!name.init(aCx, val.toString())) {
|
|
NS_WARNING("couldn't initialize string");
|
|
}
|
|
}
|
|
|
|
data = TCPError(name);
|
|
}
|
|
} else {
|
|
NS_ERROR("Unexpected JS value encountered");
|
|
FireInteralError(this, __LINE__);
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
mozilla::unused <<
|
|
PTCPSocketParent::SendCallback(nsString(aType), data,
|
|
nsString(aReadyState));
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
TCPSocketParent::SetSocketAndIntermediary(nsIDOMTCPSocket *socket,
|
|
nsITCPSocketIntermediary *intermediary,
|
|
JSContext* cx)
|
|
{
|
|
mSocket = socket;
|
|
mIntermediary = intermediary;
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
TCPSocketParent::SendUpdateBufferedAmount(uint32_t aBufferedAmount,
|
|
uint32_t aTrackingNumber)
|
|
{
|
|
mozilla::unused << PTCPSocketParent::SendUpdateBufferedAmount(aBufferedAmount,
|
|
aTrackingNumber);
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
TCPSocketParent::GetHost(nsAString& aHost)
|
|
{
|
|
if (!mSocket) {
|
|
NS_ERROR("No internal socket instance mSocket!");
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
return mSocket->GetHost(aHost);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
TCPSocketParent::GetPort(uint16_t* aPort)
|
|
{
|
|
if (!mSocket) {
|
|
NS_ERROR("No internal socket instance mSocket!");
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
return mSocket->GetPort(aPort);
|
|
}
|
|
|
|
void
|
|
TCPSocketParent::ActorDestroy(ActorDestroyReason why)
|
|
{
|
|
if (mSocket) {
|
|
mSocket->Close();
|
|
}
|
|
mSocket = nullptr;
|
|
mIntermediaryObj = nullptr;
|
|
mIntermediary = nullptr;
|
|
}
|
|
|
|
bool
|
|
TCPSocketParent::RecvRequestDelete()
|
|
{
|
|
mozilla::unused << Send__delete__(this);
|
|
return true;
|
|
}
|
|
|
|
} // namespace dom
|
|
} // namespace mozilla
|