mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
bc8ce42355
- Bug 1226200: Don't assume a TCPSocket has only one managee (and rename LoneManagedOrNull) r=jdm (aa2d0fcc14) - Bug 1227300, Part 1 - Add an alert notification component. r=MattN,wchen (37758ce9ff) - Bug 1230700. Make Notification::ShowInternal explicitly suppress the exception from GetPermissionInternal. r=smaug (9e288cf5ae) - Bug 1225336 - Add telemetry about web notification display/messages. r=wchen,kitcambridge p=vladan# Please enter the commit message for your changes. Lines starting (b2e481691a) - Bug 1219030 - Collect notification management telemetry. r=wchen,MattN; p=ally (c0ba425b4e) - Bug 1212611 - Use system notification for website notifications in Android. r=mfinkle (84985bcf01) - Bug 1227300, Part 2 - Implement showAlert. r=MattN,wchen (33eedc7e91) - Bug 1214305 - Part 0: Ensure site security service is initialized before trying to use DataStorage via IPC. (8bd73f43b0) - Bug 1137681 - Make user agent docshell overrides affect network requests. r=jduell (e8dabb8338) - Bug 1233245 - Propagate the interception information in the non-e10s case for all HTTP redirects, not just the internal ones; r=jdm (6922fddcf8) - Bug 1226444 - Use helper function to identify preloads. r=sicking (d110669f73) - Bug 1214305 - Part 1: Refactor the logic for querying whether a connection should go through a secure upgrade into NS_ShouldSecureUpgrade; r=mcmanus (2d04c78290) - Bug 1137681 - Per-tab user agent emulation. r=bz (4ff70db690) - Bug 1227300, Part 3 - Implement showAlert for the OS X alerts backend. r=mstange (5eb05d0728) - Bug 1227300, Part 4 - Implement showAlert for the libnotify alerts backend. r=karlt (0942fa2764) - Bug 1227300, Part 5 - Implement showAlert for the B2G alerts backend. r=mhenretty (e39581aea5) - Bug 1227300, Part 6 - Use showAlert to display web notifications. r=wchen (ab79eaa0c8) - domBug 1227300, Part 7 - Update test interfaces. a=testonly (387cb62772) - Bug 1214305 - Part 3: Add a nsIInterceptedChannel.secureUpgradedChannelURI helper; r=jdm (811d25bd58) - Bug 1214305 - Part 4: Use the secure upgraded channel URI in ServiceWorkerManager::PrepareFetchEvent; r=jdm (0c44bf527c) - Bug 1214305 - Part 5: Use the secure upgraded channel URI in FetchEventRunnable::Init; r=jdm (a30f239261) - Bug 1214305 - Part 6: Use a non-IPC redirect for synthesized upgraded responses to ensure the response URL is correctly propagated; r=mcmanus (8ba8a5728c) - Bug 1214305 - Part 7: Decide in the child process whether an intercepted channel should go through a secure upgrade; r=mcmanus (93e27decae) - Bug 1198397 - Add a test for interception of requests upgraded through the CSP upgrade-insecure-requests directive; r=jdm (21eb14eb34) - Bug 1214305 - Part 8: Enable secure upgrade service worker tests on e10s; r=jdm (c14f5fb504) - Bug 1214305 - Part 10: Clean up global DataStorage references in the child process; r=keeler (ef0b52d049) - Bug 1224771 - Close all web notifications when the originating tab is closed. r=wchen (da295b4ba7) - Bug 1214305 - Part 2: Refactor the logic for obtaining the secure upgraded URI into HttpBaseChannel; r=mcmanus (3346078285) - Bug 1237151 (part 1) - Remove ignored qualifiers in dom/media/gmp/. r=cpearce. (18134820a6) - Bug 1237151 (part 2) - Remove ignored qualifiers in WebRTC-relate code. r=jesup. (effe5bd694) - Bug 1118820 part 1 (style system part) - [css-grid] Implement the 'auto-fill' and 'auto-fit' keywords in the repeat() function. r=dholbert (5db1a577db) - Bug 1118820 part 2a - [css-grid] Add a LineNameMap class that lets us lookup line names with a dynamic number of 'repeat(auto-fill/auto-fit)' tracks taken into account. r=dholbert (3ecf4b53f0) - Bug 1118820 part 2b - [css-grid] Move the static functions FindLine/RFindLine/FindNamedLine into the LineNameMap class (idempotent patch). r=dholbert (efb12c594b) - Bug 1118820 part 2c+2d - [css-grid] Modify the LineNameMap::FindLine/RFindLine/FindNamedLine methods to take line names associated with 'repeat(auto-fill/auto-fit)' tracks into account. Instantiate and pass around a LineNameMap object instead of an array of line name arrays. r=dholbert (a3db750297) - Bug 1118820 part 3a - [css-grid] Modify TrackSizingFunctions to take a dynamic number of 'repeat(auto-fill/auto-fit)' tracks taking into account. r=dholbert (9aa6033332) - Bug 1118820 part 3b - [css-grid] Implement the CalculateRepeatFillCount method that calculates the number of 'repeat(auto-fill/auto-fit)' tracks to use for the given sizes. r=dholbert (cf75fab8a8) - Bug 1118820 part 4 - [css-grid] Provide the sizes to use for CalculateRepeatFillCount. r=dholbert (8184c00dba) - Bug 1118820 part 5 - [css-grid] Remove any empty 'repeat(auto-fit)' tracks at the end of its range and adjust affected grid area line numbers accordingly. r=dholbert (c02ba6a6e3) - Bug 1229165 - [css-grid] Reftests for min/max-width/height properties on the grid container. (725097f878) - Bug 1229999 - [css-grid] Reftest. (51b5bc9535) - Bug 1237151 (part 3) - Remove ignored qualifiers in all remaining code. r=froydnj. (69917ebbad) - more bits of Bug 1178892 - Split the profiler into Core & Gecko files (41bb127b9c) - Bug 1199841 - Restructure private browsing to remember status after OnStopRequest r=jdm (16c2c1044d) - Bug 1233845 - Report an interception error and cancel the HTTP channel when encountering a known topcrash situation. r=ehsan (5d08075110) - Bug 664163 - Fix Get(Local|Remote)(Address|Port) in HttpChannelChild. r=jduell (cbf70af4e8) - Bug 1229177 - Show the tracking protection shield for fetch and XHR requests. r=jduell (5833b3e872) - Bug 1220678 Don't crash when DivertToParent() is called on an intercepted channel. r=jdm (5d7ff6ecc8) - Bug 1220681 P1 Make HttpChannelChild::DivertToParent() work with synthetic responses. r=jdm (67715703ef) - Bug 1169819 Add browser chrome test to validate SW force refresh. r=ehsan (c0b6b3e874) - Bug 1220681 P2 Test synthetic responses that trigger downloads. r=ehsan (c701f3ddb1) - Bug 1220681 P3 Delay diversion on parent side until response head has been synthesized. r=jdm (7c697aacee) - Bug 1220681 P4 Automatically suspend the parent channel after synthesizing the response for diverison. r=jdm (27f31bcb35) - Bug 1220681 P5 Don't double suspend parent channel during synthesized divert to parent. r=jdm (62081d4b56) - Bug 1220681 P6 Use clients.claim() in browser_download.js to avoid worker unregister race. r=jdm (c8de291727) - Bug 1240161 - Remove "only-if-cached" from RequestCache; r=bkelly (283486f584) - Bug 1184550 - Add a mochitest for the Request constructor that tests that the body is set to used after being fetched and then fails on the second fetch with the same Request. r=bkelly (db4a967203) - Bug 1205495 - Correctly use the requests's body and redirect mode in reroute.js; r=nsm (a36a96624a) - Bug 1189656 - Fix fetch-request-fallback test paths. r=bkelly (366c884179) - Bug 1219085 - Import the fetch-request-redirect.https.html test from Blink; r=jdm (bf6b484d82) - Bug 1209081 - Part 1: Implement the "navigate" value for RequestMode; r=bkelly (a22f19d94b) - Bug 1209081 - Part 2: Upgrade the saved Requests in the DOM Cache to reflect the "navigate" RequestMode if they represent navigation content policy types; r=bkelly (60d1da23bb) - Bug 1219469 - Part 1: Revert the error reporting added in bug 1233845; r=jdm (dcc022b9d3) - Bug 1219469 - Part 2: Make HttpChannelParentListener be the controller; r=jdm,jduell (9c5f0dfbe0) - Bug 1229369 - Intercept redirected network fetches that have their request mode set to manual; r=jdm (fb21d86ed2)
390 lines
10 KiB
C++
390 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 "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 "nsISocketTransportService.h"
|
|
#include "nsISocketTransport.h"
|
|
#include "nsIScriptSecurityManager.h"
|
|
#include "nsNetUtil.h"
|
|
|
|
namespace IPC {
|
|
|
|
//Defined in TCPSocketChild.cpp
|
|
extern bool
|
|
DeserializeArrayBuffer(JSContext* aCx,
|
|
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("Internal error")),
|
|
static_cast<uint32_t>(TCPReadyState::Connecting));
|
|
}
|
|
|
|
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TCPSocketParentBase)
|
|
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
|
NS_INTERFACE_MAP_END
|
|
|
|
NS_IMPL_CYCLE_COLLECTION(TCPSocketParentBase, mSocket)
|
|
NS_IMPL_CYCLE_COLLECTING_ADDREF(TCPSocketParentBase)
|
|
NS_IMPL_CYCLE_COLLECTING_RELEASE(TCPSocketParentBase)
|
|
|
|
TCPSocketParentBase::TCPSocketParentBase()
|
|
: mIPCOpen(false)
|
|
{
|
|
mObserver = new mozilla::net::OfflineObserver(this);
|
|
}
|
|
|
|
TCPSocketParentBase::~TCPSocketParentBase()
|
|
{
|
|
if (mObserver) {
|
|
mObserver->RemoveObserver();
|
|
}
|
|
}
|
|
|
|
uint32_t
|
|
TCPSocketParent::GetAppId()
|
|
{
|
|
const PContentParent *content = Manager()->Manager();
|
|
if (PBrowserParent* browser = SingleManagedOrNull(content->ManagedPBrowserParent())) {
|
|
TabParent *tab = TabParent::GetFrom(browser);
|
|
return tab->OwnAppId();
|
|
} else {
|
|
return nsIScriptSecurityManager::UNKNOWN_APP_ID;
|
|
}
|
|
};
|
|
|
|
bool
|
|
TCPSocketParent::GetInBrowser()
|
|
{
|
|
const PContentParent *content = Manager()->Manager();
|
|
if (PBrowserParent* browser = SingleManagedOrNull(content->ManagedPBrowserParent())) {
|
|
TabParent *tab = TabParent::GetFrom(browser);
|
|
return tab->IsBrowserElement();
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
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 bool& aUseArrayBuffers)
|
|
{
|
|
// 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;
|
|
}
|
|
|
|
mSocket = new TCPSocket(nullptr, aHost, aPort, aUseSSL, aUseArrayBuffers);
|
|
mSocket->SetAppIdAndBrowser(appId, inBrowser);
|
|
mSocket->SetSocketBridgeParent(this);
|
|
NS_ENSURE_SUCCESS(mSocket->Init(), true);
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
TCPSocketParent::RecvOpenBind(const nsCString& aRemoteHost,
|
|
const uint16_t& aRemotePort,
|
|
const nsCString& aLocalAddr,
|
|
const uint16_t& aLocalPort,
|
|
const bool& aUseSSL,
|
|
const bool& aUseArrayBuffers)
|
|
{
|
|
if (net::UsingNeckoIPCSecurity() &&
|
|
!AssertAppProcessPermission(Manager()->Manager(), "tcp-socket")) {
|
|
FireInteralError(this, __LINE__);
|
|
return true;
|
|
}
|
|
|
|
nsresult rv;
|
|
nsCOMPtr<nsISocketTransportService> sts =
|
|
do_GetService("@mozilla.org/network/socket-transport-service;1", &rv);
|
|
if (NS_FAILED(rv)) {
|
|
FireInteralError(this, __LINE__);
|
|
return true;
|
|
}
|
|
|
|
nsCOMPtr<nsISocketTransport> socketTransport;
|
|
rv = sts->CreateTransport(nullptr, 0,
|
|
aRemoteHost, aRemotePort,
|
|
nullptr, getter_AddRefs(socketTransport));
|
|
if (NS_FAILED(rv)) {
|
|
FireInteralError(this, __LINE__);
|
|
return true;
|
|
}
|
|
|
|
PRNetAddr prAddr;
|
|
if (PR_SUCCESS != PR_InitializeNetAddr(PR_IpAddrAny, aLocalPort, &prAddr)) {
|
|
FireInteralError(this, __LINE__);
|
|
return true;
|
|
}
|
|
if (PR_SUCCESS != PR_StringToNetAddr(aLocalAddr.BeginReading(), &prAddr)) {
|
|
FireInteralError(this, __LINE__);
|
|
return true;
|
|
}
|
|
|
|
mozilla::net::NetAddr addr;
|
|
PRNetAddrToNetAddr(&prAddr, &addr);
|
|
rv = socketTransport->Bind(&addr);
|
|
if (NS_FAILED(rv)) {
|
|
FireInteralError(this, __LINE__);
|
|
return true;
|
|
}
|
|
|
|
// Obtain App ID
|
|
uint32_t appId = nsIScriptSecurityManager::NO_APP_ID;
|
|
bool inBrowser = false;
|
|
const PContentParent *content = Manager()->Manager();
|
|
if (PBrowserParent* browser = SingleManagedOrNull(content->ManagedPBrowserParent())) {
|
|
// appId's are for B2G only currently, where managees.Count() == 1
|
|
// This is not guaranteed currently in Desktop, so skip this there.
|
|
TabParent *tab = TabParent::GetFrom(browser);
|
|
appId = tab->OwnAppId();
|
|
inBrowser = tab->IsBrowserElement();
|
|
}
|
|
|
|
mSocket = new TCPSocket(nullptr, NS_ConvertUTF8toUTF16(aRemoteHost), aRemotePort, aUseSSL, aUseArrayBuffers);
|
|
mSocket->SetAppIdAndBrowser(appId, inBrowser);
|
|
mSocket->SetSocketBridgeParent(this);
|
|
rv = mSocket->InitWithUnconnectedTransport(socketTransport);
|
|
NS_ENSURE_SUCCESS(rv, true);
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
TCPSocketParent::RecvStartTLS()
|
|
{
|
|
NS_ENSURE_TRUE(mSocket, true);
|
|
ErrorResult rv;
|
|
mSocket->UpgradeToSecure(rv);
|
|
NS_ENSURE_FALSE(rv.Failed(), true);
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
TCPSocketParent::RecvSuspend()
|
|
{
|
|
NS_ENSURE_TRUE(mSocket, true);
|
|
mSocket->Suspend();
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
TCPSocketParent::RecvResume()
|
|
{
|
|
NS_ENSURE_TRUE(mSocket, true);
|
|
ErrorResult rv;
|
|
mSocket->Resume(rv);
|
|
NS_ENSURE_FALSE(rv.Failed(), true);
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
TCPSocketParent::RecvData(const SendableData& aData,
|
|
const uint32_t& aTrackingNumber)
|
|
{
|
|
ErrorResult rv;
|
|
switch (aData.type()) {
|
|
case SendableData::TArrayOfuint8_t: {
|
|
AutoSafeJSContext autoCx;
|
|
JS::Rooted<JS::Value> val(autoCx);
|
|
const nsTArray<uint8_t>& buffer = aData.get_ArrayOfuint8_t();
|
|
bool ok = IPC::DeserializeArrayBuffer(autoCx, buffer, &val);
|
|
NS_ENSURE_TRUE(ok, true);
|
|
RootedTypedArray<ArrayBuffer> data(autoCx);
|
|
data.Init(&val.toObject());
|
|
Optional<uint32_t> byteLength(buffer.Length());
|
|
mSocket->SendWithTrackingNumber(autoCx, data, 0, byteLength, aTrackingNumber, rv);
|
|
break;
|
|
}
|
|
|
|
case SendableData::TnsCString: {
|
|
const nsCString& strData = aData.get_nsCString();
|
|
mSocket->SendWithTrackingNumber(strData, aTrackingNumber, rv);
|
|
break;
|
|
}
|
|
|
|
default:
|
|
MOZ_CRASH("unexpected SendableData type");
|
|
}
|
|
NS_ENSURE_FALSE(rv.Failed(), true);
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
TCPSocketParent::RecvClose()
|
|
{
|
|
NS_ENSURE_TRUE(mSocket, true);
|
|
mSocket->Close();
|
|
return true;
|
|
}
|
|
|
|
void
|
|
TCPSocketParent::FireErrorEvent(const nsAString& aName, const nsAString& aType, TCPReadyState aReadyState)
|
|
{
|
|
SendEvent(NS_LITERAL_STRING("error"), TCPError(nsString(aName), nsString(aType)), aReadyState);
|
|
}
|
|
|
|
void
|
|
TCPSocketParent::FireEvent(const nsAString& aType, TCPReadyState aReadyState)
|
|
{
|
|
return SendEvent(aType, mozilla::void_t(), aReadyState);
|
|
}
|
|
|
|
void
|
|
TCPSocketParent::FireArrayBufferDataEvent(nsTArray<uint8_t>& aBuffer, TCPReadyState aReadyState)
|
|
{
|
|
InfallibleTArray<uint8_t> arr;
|
|
arr.SwapElements(aBuffer);
|
|
SendableData data(arr);
|
|
SendEvent(NS_LITERAL_STRING("data"), data, aReadyState);
|
|
}
|
|
|
|
void
|
|
TCPSocketParent::FireStringDataEvent(const nsACString& aData, TCPReadyState aReadyState)
|
|
{
|
|
SendEvent(NS_LITERAL_STRING("data"), SendableData(nsCString(aData)), aReadyState);
|
|
}
|
|
|
|
void
|
|
TCPSocketParent::SendEvent(const nsAString& aType, CallbackData aData, TCPReadyState aReadyState)
|
|
{
|
|
mozilla::Unused << PTCPSocketParent::SendCallback(nsString(aType), aData,
|
|
static_cast<uint32_t>(aReadyState));
|
|
}
|
|
|
|
void
|
|
TCPSocketParent::SetSocket(TCPSocket *socket)
|
|
{
|
|
mSocket = socket;
|
|
}
|
|
|
|
nsresult
|
|
TCPSocketParent::GetHost(nsAString& aHost)
|
|
{
|
|
if (!mSocket) {
|
|
NS_ERROR("No internal socket instance mSocket!");
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
mSocket->GetHost(aHost);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
TCPSocketParent::GetPort(uint16_t* aPort)
|
|
{
|
|
if (!mSocket) {
|
|
NS_ERROR("No internal socket instance mSocket!");
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
*aPort = mSocket->Port();
|
|
return NS_OK;
|
|
}
|
|
|
|
void
|
|
TCPSocketParent::ActorDestroy(ActorDestroyReason why)
|
|
{
|
|
if (mSocket) {
|
|
mSocket->Close();
|
|
}
|
|
mSocket = nullptr;
|
|
}
|
|
|
|
bool
|
|
TCPSocketParent::RecvRequestDelete()
|
|
{
|
|
mozilla::Unused << Send__delete__(this);
|
|
return true;
|
|
}
|
|
|
|
} // namespace dom
|
|
} // namespace mozilla
|