mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
b808ffac2d
- Bug 1196391, part 3 - Make argument count assertions fatal in js::ExpandErrorArgumentsVA(). r=Waldo (8233c0afac) - minor cleanup (1da0b2c3e9) - Bug 1191765: Make Debugger.Object.prototype.getScript properly recognize functions without scripts. r=fitzgen (3e2753577f) - Bug 1165807 - display WeakSet and WeakMap contents in console; r=bz,fitzgen (d8f70d8e6a) - Bug 1226024 - Expose the root of the dominator tree to JavaScript; r=bz,sfink x # Please enter the commit message for your changes. Lines starting (1949832288) - Bug 1220702 - Part 1: Replace callback() and newNode() with variadic templates. What could go wrong? r=Waldo. (80e1b40871) - Bug 1220702 - Part 2: Fix the .method property of certain FunctionDeclaration nodes. r=Waldo. (47f244a6e0) - Bug 1220702 - Part 3: Distinguish ES6 generators from legacy generators in Reflect.parse() output. r=Waldo. (362bb8ea4b) - bit of Bug 1180017 - Fix up the badly-horked backout and re-land. (f4f92ff88c) - Bug 1155303 - Add telemetry for async DeferredFinalize max pause. r=smaug (3ddc7b8856) - Bug 1174796 - Make sure ReleaseNow releases everything. r=smaug (5065aa1f52) - Bug 1191918 - Remove printf debugging r=me (48e95e425e) - update some tests (26ae4a8050) - Bug 1218643 - correct a DOM test. r=smaug " (75c6302bbb) - space (26dfeca131) - Bug 1166805 part 1 - refactor common tests for whether an animated list mirrors the base version of the list into methods. r=dholbert (e538b90e00) - Bug 1166805 part 2 - Call SetCapacity before calling DOMSVGXXXList::MaybeInsertNullInAnimValListAt, to prevent fallible InsertElementAt calls from failing r=dholbert (918397681f) - Bug 1092125 - Part 1 - Add non-scaling-stroke support to nsSVGPathGeometryElement::GetGeometryBounds (except line). r=jwatt (19ee6f9517) - Bug 1092125 - part 2 - add non-scaling-stroke support to SVGLineElement::GetGeometryBounds. r=jwatt (2c84b88ff1) - Bug 1140080 - ensure we only create stop frames for gradients. r=dholbert (636db91975) - Bug 1182496 - Don't create frames for SVG <text> descendants with failing conditional processing attributes. r=dholbert (4e976c1587) - Bug 1149542 - Part 3: Crashtest. r=dholbert (cde5ca0f57) - Bug 1209525 - Protect GetGeometryBounds from a singular non-scaling-stroke transform. r=longsonr (2cd1f2e0a4) - Bug 325427 - Add crashtest. (98ab5e6907) - Bug 803562 - force -moz-appearance: none on foreignObject elements. r=dbaron (0ba37f76ad) - Bug 950324 - Add crashtest. (6e2f7bc4c2) - Bug 1178159 - Ignore stroke-linecap:"square" on circle and ellipse. r=longsonr (42f4a9a71c) - Bug 1187770 - work around draw targets that don't display zero-length lines. r=longsonr (a612616ecb) - Bug 1222812 - add a null check in case there is no old style. r=dholbert (6a883edea2) - Bug 958160 - Compute bounds in transformed space instead of user space in GetCoveredRegion. r=longsonr (d020a10c56) - Bug 1224061: Followup to fix b2g bustage r=me CLOSED TREE (1dc2693955) - Bug 1173573 - Fix possible crash initializing sessionstorage. r=honzab (c6c77ccf7d) - Bug 536509 - Update localStorage to use common StorageAllowedForWindow logic, r=ehsan (825ee71ff3) - Bug 606655 - delete cookies UI option AskMeEveryTime and its related comments and tests. r=mak (828dfe54a5) - Bug 1194052 - Append to redirectchain before asyncopen() is called (r=sicking,mayhemer) (bb051ceb94) - Bug 1145503 - TP exceptions added while in Private Browsing mode persist beyond the Private Browsing session. r=ehsan Import url-classifier and private browsing modules. (4492b2de09) - Bug 1138979 - Pref to turn TP on when in Private Browsing mode. r=mmc , r=ehsan (5078eaa914) - Bug 1168635 - Extend nsITLSServerSocket to customize cipher suites. r=keeler (185a551640) - Bug 1165423 - WebRTC Fix DTLS handshake by expanding UDP buffer. r=rjesup (1f207e03ee) - Bug 1219939 - make nsTemporaryFileInputStream nsISeekableStream, r=jduell (f2a5ddfbf2) - Bug 1125816 - Parse FTP directory listings of Windows CE and WEC7 FTP Server r=jduell (4137b29d21) - Bug 1171016 - Initialize the linelen variable at its declaration in ParseFTPList.cpp. r=mcmanus (2a3960897d) - Bug 1197313 - remove PR_snprintf calls in netwerk/; r=froydnj (005da76d31) - Bug 1219910 - make gSocketThread a relaxed atomic variable; r=mcmanus (620d299605) - Bug 1222867 - part 1 - return already_AddRefed from WebSocketEventService::CreateFrameIfNeeded; r=mcmanus (0eee829a08) - Bug 1222867 - part 2 - be smarter about transferring ownership of WebSocketFrame; r=mcmanus (4a9fd71798) - Bug 1211001 - constant ASSERTION: nsITimer->SetDelay() called when the one-shot timer is not set up, r=mcmanus (451c903cbe) - Bug 1130822 - properly decode arbitrarily aligned data for non-tier1 platforms. r=mcmanus (bcb99913dc) - Bug 1204731 - telemetry for peer h2 goaway r=hurley (d6748682b4) - Bug 1205810 - telemetry for local h2 goaway code r=hurley (e142625588) - bug 1194818 - h2 header priority handling r=hurley (51766fff44) - bug 1194820 - h2 push promise padding handling r=hurley (560ee1f480) - bug 1208114 - fix h2 connect tunnels r=hurley (d17f920c31) - Bug 1213060 (part 1) - Properly handle discarding padding in Http2Session::OnWriteSegment. r=mcmanus (2cce4ac006) - Bug 1213060 (part 2) - Re-add state assertion in Http2Session::OnWriteSegment. r=mcmanus (6b1c030780) - fix build (39845819f6) - Bug 1214076 - allow TokenServerClient errors to be JSON.stringify'd. r=rnewman (ab6085fa97) - Bug 1220007 P1 Allow ConsoleReportCollectors to flush to another collector. r=bz (a97b2c5a57) - Bug 1220007 P2 Make InterceptedChannel's collect logs locally and only flush to nsIChannel on main thread r=bz (85b77c5a44) - Bug 867407 - Fix cloning of file URIs with search query strings (r=sworkman) (da6fd51c15) - Bug 1220728 Clear pending exceptions if string conversion fails in SWintercept error handling. r=bz (b188c34862) - Bug 1147913 - Change NS_SOCKETTRANSPORTSERVICE_CONTRACTID to NS_STREAMTRANSPORTSERVICE_CONTRACTID in RespondWithHandler::ResolvedCallback. r=ehsan (5b443e88ab) - fix namespace (562ed51caa) - Bug 1206060 - Show pinning status at about:cache. r=michal (75ed53663f) - Bug 1032254 - Generic way to pin reasource in the HTTP cache, r=michal (eeb860f8e3) - Bug 1211504. Remove unused member from RefLayer. (fab6bae915)
281 lines
9.2 KiB
C++
281 lines
9.2 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=2 sw=2 et: */
|
|
/* 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 "nsCookiePermission.h"
|
|
|
|
#include "mozIThirdPartyUtil.h"
|
|
#include "nsICookie2.h"
|
|
#include "nsIServiceManager.h"
|
|
#include "nsICookiePromptService.h"
|
|
#include "nsICookieManager2.h"
|
|
#include "nsNetUtil.h"
|
|
#include "nsIInterfaceRequestorUtils.h"
|
|
#include "nsIProtocolHandler.h"
|
|
#include "nsIURI.h"
|
|
#include "nsIPrefService.h"
|
|
#include "nsIPrefBranch.h"
|
|
#include "nsIChannel.h"
|
|
#include "nsIHttpChannelInternal.h"
|
|
#include "nsIDOMWindow.h"
|
|
#include "nsIPrincipal.h"
|
|
#include "nsString.h"
|
|
#include "nsCRT.h"
|
|
#include "nsILoadContext.h"
|
|
#include "nsIScriptObjectPrincipal.h"
|
|
#include "nsNetCID.h"
|
|
#include "prtime.h"
|
|
|
|
/****************************************************************
|
|
************************ nsCookiePermission ********************
|
|
****************************************************************/
|
|
|
|
// values for mCookiesLifetimePolicy
|
|
// 0 == accept normally
|
|
// 1 == ask before accepting, no more supported, treated like ACCEPT_NORMALLY (Bug 606655).
|
|
// 2 == downgrade to session
|
|
// 3 == limit lifetime to N days
|
|
static const uint32_t ACCEPT_NORMALLY = 0;
|
|
static const uint32_t ASK_BEFORE_ACCEPT = 1;
|
|
static const uint32_t ACCEPT_SESSION = 2;
|
|
static const uint32_t ACCEPT_FOR_N_DAYS = 3;
|
|
|
|
static const bool kDefaultPolicy = true;
|
|
static const char kCookiesLifetimePolicy[] = "network.cookie.lifetimePolicy";
|
|
static const char kCookiesLifetimeDays[] = "network.cookie.lifetime.days";
|
|
static const char kCookiesAlwaysAcceptSession[] = "network.cookie.alwaysAcceptSessionCookies";
|
|
|
|
static const char kCookiesPrefsMigrated[] = "network.cookie.prefsMigrated";
|
|
// obsolete pref names for migration
|
|
static const char kCookiesLifetimeEnabled[] = "network.cookie.lifetime.enabled";
|
|
static const char kCookiesLifetimeBehavior[] = "network.cookie.lifetime.behavior";
|
|
|
|
static const char kPermissionType[] = "cookie";
|
|
|
|
NS_IMPL_ISUPPORTS(nsCookiePermission,
|
|
nsICookiePermission,
|
|
nsIObserver)
|
|
|
|
bool
|
|
nsCookiePermission::Init()
|
|
{
|
|
// Initialize nsIPermissionManager and fetch relevant prefs. This is only
|
|
// required for some methods on nsICookiePermission, so it should be done
|
|
// lazily.
|
|
nsresult rv;
|
|
mPermMgr = do_GetService(NS_PERMISSIONMANAGER_CONTRACTID, &rv);
|
|
if (NS_FAILED(rv)) return false;
|
|
mThirdPartyUtil = do_GetService(THIRDPARTYUTIL_CONTRACTID, &rv);
|
|
if (NS_FAILED(rv)) return false;
|
|
|
|
// failure to access the pref service is non-fatal...
|
|
nsCOMPtr<nsIPrefBranch> prefBranch =
|
|
do_GetService(NS_PREFSERVICE_CONTRACTID);
|
|
if (prefBranch) {
|
|
prefBranch->AddObserver(kCookiesLifetimePolicy, this, false);
|
|
prefBranch->AddObserver(kCookiesLifetimeDays, this, false);
|
|
prefBranch->AddObserver(kCookiesAlwaysAcceptSession, this, false);
|
|
PrefChanged(prefBranch, nullptr);
|
|
|
|
// migration code for original cookie prefs
|
|
bool migrated;
|
|
rv = prefBranch->GetBoolPref(kCookiesPrefsMigrated, &migrated);
|
|
if (NS_FAILED(rv) || !migrated) {
|
|
bool lifetimeEnabled = false;
|
|
prefBranch->GetBoolPref(kCookiesLifetimeEnabled, &lifetimeEnabled);
|
|
|
|
// if they're limiting lifetime, use the appropriate limited lifetime pref
|
|
if (lifetimeEnabled) {
|
|
int32_t lifetimeBehavior;
|
|
prefBranch->GetIntPref(kCookiesLifetimeBehavior, &lifetimeBehavior);
|
|
if (lifetimeBehavior)
|
|
prefBranch->SetIntPref(kCookiesLifetimePolicy, ACCEPT_FOR_N_DAYS);
|
|
else
|
|
prefBranch->SetIntPref(kCookiesLifetimePolicy, ACCEPT_SESSION);
|
|
}
|
|
prefBranch->SetBoolPref(kCookiesPrefsMigrated, true);
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void
|
|
nsCookiePermission::PrefChanged(nsIPrefBranch *aPrefBranch,
|
|
const char *aPref)
|
|
{
|
|
int32_t val;
|
|
|
|
#define PREF_CHANGED(_P) (!aPref || !strcmp(aPref, _P))
|
|
|
|
if (PREF_CHANGED(kCookiesLifetimePolicy) &&
|
|
NS_SUCCEEDED(aPrefBranch->GetIntPref(kCookiesLifetimePolicy, &val))) {
|
|
if (val != static_cast<int32_t>(ACCEPT_SESSION) &&
|
|
val != static_cast<int32_t>(ACCEPT_FOR_N_DAYS)) {
|
|
val = ACCEPT_NORMALLY;
|
|
}
|
|
mCookiesLifetimePolicy = val;
|
|
}
|
|
|
|
if (PREF_CHANGED(kCookiesLifetimeDays) &&
|
|
NS_SUCCEEDED(aPrefBranch->GetIntPref(kCookiesLifetimeDays, &val)))
|
|
// save cookie lifetime in seconds instead of days
|
|
mCookiesLifetimeSec = val * 24 * 60 * 60;
|
|
|
|
bool bval;
|
|
if (PREF_CHANGED(kCookiesAlwaysAcceptSession) &&
|
|
NS_SUCCEEDED(aPrefBranch->GetBoolPref(kCookiesAlwaysAcceptSession, &bval)))
|
|
mCookiesAlwaysAcceptSession = bval;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsCookiePermission::SetAccess(nsIURI *aURI,
|
|
nsCookieAccess aAccess)
|
|
{
|
|
// Lazily initialize ourselves
|
|
if (!EnsureInitialized())
|
|
return NS_ERROR_UNEXPECTED;
|
|
|
|
//
|
|
// NOTE: nsCookieAccess values conveniently match up with
|
|
// the permission codes used by nsIPermissionManager.
|
|
// this is nice because it avoids conversion code.
|
|
//
|
|
return mPermMgr->Add(aURI, kPermissionType, aAccess,
|
|
nsIPermissionManager::EXPIRE_NEVER, 0);
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsCookiePermission::CanAccess(nsIURI *aURI,
|
|
nsIChannel *aChannel,
|
|
nsCookieAccess *aResult)
|
|
{
|
|
// Check this protocol doesn't allow cookies
|
|
bool hasFlags;
|
|
nsresult rv =
|
|
NS_URIChainHasFlags(aURI, nsIProtocolHandler::URI_FORBIDS_COOKIE_ACCESS,
|
|
&hasFlags);
|
|
if (NS_FAILED(rv) || hasFlags) {
|
|
*aResult = ACCESS_DENY;
|
|
return NS_OK;
|
|
}
|
|
|
|
// Lazily initialize ourselves
|
|
if (!EnsureInitialized())
|
|
return NS_ERROR_UNEXPECTED;
|
|
|
|
// finally, check with permission manager...
|
|
rv = mPermMgr->TestPermission(aURI, kPermissionType, (uint32_t *) aResult);
|
|
if (NS_SUCCEEDED(rv)) {
|
|
if (*aResult == nsICookiePermission::ACCESS_SESSION) {
|
|
*aResult = nsICookiePermission::ACCESS_ALLOW;
|
|
}
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsCookiePermission::CanSetCookie(nsIURI *aURI,
|
|
nsIChannel *aChannel,
|
|
nsICookie2 *aCookie,
|
|
bool *aIsSession,
|
|
int64_t *aExpiry,
|
|
bool *aResult)
|
|
{
|
|
NS_ASSERTION(aURI, "null uri");
|
|
|
|
*aResult = kDefaultPolicy;
|
|
|
|
// Lazily initialize ourselves
|
|
if (!EnsureInitialized())
|
|
return NS_ERROR_UNEXPECTED;
|
|
|
|
uint32_t perm;
|
|
mPermMgr->TestPermission(aURI, kPermissionType, &perm);
|
|
bool isThirdParty = false;
|
|
switch (perm) {
|
|
case nsICookiePermission::ACCESS_SESSION:
|
|
*aIsSession = true;
|
|
|
|
case nsICookiePermission::ACCESS_ALLOW:
|
|
*aResult = true;
|
|
break;
|
|
|
|
case nsICookiePermission::ACCESS_DENY:
|
|
*aResult = false;
|
|
break;
|
|
|
|
case nsICookiePermission::ACCESS_ALLOW_FIRST_PARTY_ONLY:
|
|
mThirdPartyUtil->IsThirdPartyChannel(aChannel, aURI, &isThirdParty);
|
|
// If it's third party, we can't set the cookie
|
|
if (isThirdParty)
|
|
*aResult = false;
|
|
break;
|
|
|
|
case nsICookiePermission::ACCESS_LIMIT_THIRD_PARTY:
|
|
mThirdPartyUtil->IsThirdPartyChannel(aChannel, aURI, &isThirdParty);
|
|
// If it's third party, check whether cookies are already set
|
|
if (isThirdParty) {
|
|
nsresult rv;
|
|
nsCOMPtr<nsICookieManager2> cookieManager = do_GetService(NS_COOKIEMANAGER_CONTRACTID, &rv);
|
|
if (NS_FAILED(rv)) {
|
|
*aResult = false;
|
|
break;
|
|
}
|
|
uint32_t priorCookieCount = 0;
|
|
nsAutoCString hostFromURI;
|
|
aURI->GetHost(hostFromURI);
|
|
cookieManager->CountCookiesFromHost(hostFromURI, &priorCookieCount);
|
|
*aResult = priorCookieCount != 0;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
// The permission manager has nothing to say about this cookie
|
|
// so we apply the default prefs to it.
|
|
NS_ASSERTION(perm == nsIPermissionManager::UNKNOWN_ACTION, "unknown permission");
|
|
|
|
// Now we need to figure out what type of accept policy we're dealing with.
|
|
// If we accept cookies normally, just bail and return.
|
|
if (mCookiesLifetimePolicy == ACCEPT_NORMALLY) {
|
|
*aResult = true;
|
|
return NS_OK;
|
|
}
|
|
|
|
// Declare this here since it'll be used in all of the remaining cases.
|
|
int64_t currentTime = PR_Now() / PR_USEC_PER_SEC;
|
|
int64_t delta = *aExpiry - currentTime;
|
|
|
|
// We are accepting the cookie, but if it's not a session cookie,
|
|
// we may have to limit its lifetime.
|
|
if (!*aIsSession && delta > 0) {
|
|
if (mCookiesLifetimePolicy == ACCEPT_SESSION) {
|
|
// limit lifetime to session
|
|
*aIsSession = true;
|
|
} else if (delta > mCookiesLifetimeSec) {
|
|
// limit lifetime to specified time
|
|
*aExpiry = currentTime + mCookiesLifetimeSec;
|
|
}
|
|
}
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
NS_IMETHODIMP
|
|
nsCookiePermission::Observe(nsISupports *aSubject,
|
|
const char *aTopic,
|
|
const char16_t *aData)
|
|
{
|
|
nsCOMPtr<nsIPrefBranch> prefBranch = do_QueryInterface(aSubject);
|
|
NS_ASSERTION(!nsCRT::strcmp(NS_PREFBRANCH_PREFCHANGE_TOPIC_ID, aTopic),
|
|
"unexpected topic - we only deal with pref changes!");
|
|
|
|
if (prefBranch)
|
|
PrefChanged(prefBranch, NS_LossyConvertUTF16toASCII(aData).get());
|
|
return NS_OK;
|
|
}
|