зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1264192 - Adjust cookie eviction heuristics when exceeding the maximum cookies allowed per host. r=ehsan
If no expired cookies exist, in order of preference, evict the oldest: * session cookie with a non-matching path * session cookie with a matching path * non-session cookie with a non-matching path * non-session cookie with a matching path This replaces the previous heuristic of evicting the oldest cookie, irregardless of any other attributes, if no expired cookies were present. This ensures that cookies that are already considered transient by web applications will be removed first, followed by cookies that are unrelated to the response that is adding new cookies. --HG-- extra : amend_source : f79ba9dd393a3f37760e643b10b7137e37a6397a
This commit is contained in:
Josh Matthews
Родитель
303eae9cec
Коммит
64a98fc3b7
|
|
@ -9,8 +9,6 @@
|
|||
#include "nsUTF8ConverterService.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
static const int64_t kCookieStaleThreshold = 60 * PR_USEC_PER_SEC; // 1 minute in microseconds
|
||||
|
||||
/******************************************************************************
|
||||
* nsCookie:
|
||||
* string helper impl
|
||||
|
|
@ -130,7 +128,7 @@ nsCookie::IsStale() const
|
|||
{
|
||||
int64_t currentTimeInUsec = PR_Now();
|
||||
|
||||
return currentTimeInUsec - LastAccessed() > kCookieStaleThreshold;
|
||||
return currentTimeInUsec - LastAccessed() > mCookieStaleThreshold * PR_USEC_PER_SEC;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
|
||||
#include "mozilla/MemoryReporting.h"
|
||||
#include "mozilla/BasePrincipal.h"
|
||||
#include "mozilla/Preferences.h"
|
||||
|
||||
using mozilla::OriginAttributes;
|
||||
|
||||
|
|
@ -56,6 +57,8 @@ class nsCookie : public nsICookie2
|
|||
, mExpiry(aExpiry)
|
||||
, mLastAccessed(aLastAccessed)
|
||||
, mCreationTime(aCreationTime)
|
||||
// Defaults to 60s
|
||||
, mCookieStaleThreshold(mozilla::Preferences::GetInt("network.cookie.staleThreshold", 60))
|
||||
, mIsSession(aIsSession)
|
||||
, mIsSecure(aIsSecure)
|
||||
, mIsHttpOnly(aIsHttpOnly)
|
||||
|
|
@ -127,6 +130,7 @@ class nsCookie : public nsICookie2
|
|||
int64_t mExpiry;
|
||||
int64_t mLastAccessed;
|
||||
int64_t mCreationTime;
|
||||
int64_t mCookieStaleThreshold;
|
||||
bool mIsSession;
|
||||
bool mIsSecure;
|
||||
bool mIsHttpOnly;
|
||||
|
|
|
|||
|
|
@ -3493,7 +3493,7 @@ nsCookieService::AddInternal(const nsCookieKey &aKey,
|
|||
nsCookieEntry *entry = mDBState->hostTable.GetEntry(aKey);
|
||||
if (entry && entry->GetCookies().Length() >= mMaxCookiesPerHost) {
|
||||
nsListIter iter;
|
||||
FindStaleCookie(entry, currentTime, iter);
|
||||
FindStaleCookie(entry, currentTime, aHostURI, iter);
|
||||
oldCookie = iter.Cookie();
|
||||
|
||||
// remove the oldest cookie from the domain
|
||||
|
|
@ -4361,12 +4361,35 @@ nsCookieService::CookieExists(nsICookie2 *aCookie,
|
|||
void
|
||||
nsCookieService::FindStaleCookie(nsCookieEntry *aEntry,
|
||||
int64_t aCurrentTime,
|
||||
nsIURI* aSource,
|
||||
nsListIter &aIter)
|
||||
{
|
||||
aIter.entry = nullptr;
|
||||
bool requireHostMatch = true;
|
||||
nsAutoCString baseDomain, sourceHost, sourcePath;
|
||||
if (aSource) {
|
||||
GetBaseDomain(aSource, baseDomain, requireHostMatch);
|
||||
aSource->GetAsciiHost(sourceHost);
|
||||
aSource->GetPath(sourcePath);
|
||||
}
|
||||
|
||||
int64_t oldestTime = 0;
|
||||
const nsCookieEntry::ArrayType &cookies = aEntry->GetCookies();
|
||||
|
||||
int64_t oldestNonMatchingSessionCookieTime = 0;
|
||||
nsListIter oldestNonMatchingSessionCookie;
|
||||
oldestNonMatchingSessionCookie.entry = nullptr;
|
||||
|
||||
int64_t oldestSessionCookieTime = 0;
|
||||
nsListIter oldestSessionCookie;
|
||||
oldestSessionCookie.entry = nullptr;
|
||||
|
||||
int64_t oldestNonMatchingNonSessionCookieTime = 0;
|
||||
nsListIter oldestNonMatchingNonSessionCookie;
|
||||
oldestNonMatchingNonSessionCookie.entry = nullptr;
|
||||
|
||||
int64_t oldestCookieTime = 0;
|
||||
nsListIter oldestCookie;
|
||||
oldestCookie.entry = nullptr;
|
||||
|
||||
for (nsCookieEntry::IndexType i = 0; i < cookies.Length(); ++i) {
|
||||
nsCookie *cookie = cookies[i];
|
||||
|
||||
|
|
@ -4377,12 +4400,69 @@ nsCookieService::FindStaleCookie(nsCookieEntry *aEntry,
|
|||
return;
|
||||
}
|
||||
|
||||
// Check if we've found the oldest cookie so far.
|
||||
if (!aIter.entry || oldestTime > cookie->LastAccessed()) {
|
||||
oldestTime = cookie->LastAccessed();
|
||||
aIter.entry = aEntry;
|
||||
aIter.index = i;
|
||||
// Update our various records of oldest cookies fitting several restrictions:
|
||||
// * session cookies
|
||||
// * non-session cookies
|
||||
// * cookies with paths and domains that don't match the cookie triggering this purge
|
||||
|
||||
uint32_t cookiePathLen = cookie->Path().Length();
|
||||
if (cookiePathLen > 0 && cookie->Path().Last() == '/')
|
||||
--cookiePathLen;
|
||||
|
||||
// This cookie is a candidate for eviction if we have no information about
|
||||
// the source request, or if it is not a path or domain match against the
|
||||
// source request.
|
||||
bool isPrimaryEvictionCandidate = true;
|
||||
if (aSource) {
|
||||
bool pathMatches = StringBeginsWith(sourcePath, Substring(cookie->Path(), 0, cookiePathLen));
|
||||
bool domainMatches = cookie->RawHost() == sourceHost ||
|
||||
(cookie->IsDomain() && StringEndsWith(sourceHost, cookie->Host()));
|
||||
isPrimaryEvictionCandidate = !pathMatches || !domainMatches;
|
||||
}
|
||||
|
||||
int64_t lastAccessed = cookie->LastAccessed();
|
||||
if (cookie->IsSession()) {
|
||||
if (!oldestSessionCookie.entry || oldestSessionCookieTime > lastAccessed) {
|
||||
oldestSessionCookieTime = lastAccessed;
|
||||
oldestSessionCookie.entry = aEntry;
|
||||
oldestSessionCookie.index = i;
|
||||
}
|
||||
|
||||
if (isPrimaryEvictionCandidate &&
|
||||
(!oldestNonMatchingSessionCookie.entry ||
|
||||
oldestNonMatchingSessionCookieTime > lastAccessed)) {
|
||||
oldestNonMatchingSessionCookieTime = lastAccessed;
|
||||
oldestNonMatchingSessionCookie.entry = aEntry;
|
||||
oldestNonMatchingSessionCookie.index = i;
|
||||
}
|
||||
} else if (isPrimaryEvictionCandidate &&
|
||||
(!oldestNonMatchingNonSessionCookie.entry ||
|
||||
oldestNonMatchingNonSessionCookieTime > lastAccessed)) {
|
||||
oldestNonMatchingNonSessionCookieTime = lastAccessed;
|
||||
oldestNonMatchingNonSessionCookie.entry = aEntry;
|
||||
oldestNonMatchingNonSessionCookie.index = i;
|
||||
}
|
||||
|
||||
// Check if we've found the oldest cookie so far.
|
||||
if (!oldestCookie.entry || oldestCookieTime > lastAccessed) {
|
||||
oldestCookieTime = lastAccessed;
|
||||
oldestCookie.entry = aEntry;
|
||||
oldestCookie.index = i;
|
||||
}
|
||||
}
|
||||
|
||||
// Prefer to evict the oldest session cookies with a non-matching path/domain,
|
||||
// followed by the oldest session cookie with a matching path/domain,
|
||||
// followed by the oldest non-session cookie with a non-matching path/domain,
|
||||
// resorting to the oldest non-session cookie with a matching path/domain.
|
||||
if (oldestNonMatchingSessionCookie.entry) {
|
||||
aIter = oldestNonMatchingSessionCookie;
|
||||
} else if (oldestSessionCookie.entry) {
|
||||
aIter = oldestSessionCookie;
|
||||
} else if (oldestNonMatchingNonSessionCookie.entry) {
|
||||
aIter = oldestNonMatchingNonSessionCookie;
|
||||
} else {
|
||||
aIter = oldestCookie;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -312,7 +312,7 @@ class nsCookieService final : public nsICookieService
|
|||
void RemoveAllFromMemory();
|
||||
already_AddRefed<nsIArray> PurgeCookies(int64_t aCurrentTimeInUsec);
|
||||
bool FindCookie(const nsCookieKey& aKey, const nsAFlatCString &aHost, const nsAFlatCString &aName, const nsAFlatCString &aPath, nsListIter &aIter);
|
||||
static void FindStaleCookie(nsCookieEntry *aEntry, int64_t aCurrentTime, nsListIter &aIter);
|
||||
void FindStaleCookie(nsCookieEntry *aEntry, int64_t aCurrentTime, nsIURI* aSource, nsListIter &aIter);
|
||||
void NotifyRejected(nsIURI *aHostURI);
|
||||
void NotifyThirdParty(nsIURI *aHostURI, bool aAccepted, nsIChannel *aChannel);
|
||||
void NotifyChanged(nsISupports *aSubject, const char16_t *aData);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,252 @@
|
|||
var {utils: Cu, interfaces: Ci, classes: Cc} = Components;
|
||||
|
||||
Cu.import("resource://gre/modules/Services.jsm");
|
||||
|
||||
const BASE_HOSTNAMES = ["example.org", "example.co.uk"];
|
||||
const SUBDOMAINS = ["", "pub.", "www.", "other."];
|
||||
|
||||
const cs = Cc["@mozilla.org/cookieService;1"].getService(Ci.nsICookieService);
|
||||
const cm = cs.QueryInterface(Ci.nsICookieManager2);
|
||||
|
||||
function run_test() {
|
||||
Services.prefs.setIntPref("network.cookie.staleThreshold", 0);
|
||||
for (var host of BASE_HOSTNAMES) {
|
||||
do_print('testing with host ' + host);
|
||||
var base = SUBDOMAINS[0] + host;
|
||||
var sub = SUBDOMAINS[1] + host;
|
||||
var other = SUBDOMAINS[2] + host;
|
||||
var another = SUBDOMAINS[3] + host;
|
||||
test_basic_eviction(base, sub, other, another);
|
||||
cm.removeAll();
|
||||
test_domain_or_path_matches_not_both(base, sub, other, another);
|
||||
cm.removeAll();
|
||||
}
|
||||
test_localdomain();
|
||||
}
|
||||
|
||||
// Verify that subdomains of localhost are treated as separate hosts and aren't considered
|
||||
// candidates for eviction.
|
||||
function test_localdomain() {
|
||||
Services.prefs.setIntPref("network.cookie.maxPerHost", 2);
|
||||
|
||||
const BASE_URI = Services.io.newURI("http://localhost", null, null);
|
||||
const BASE_BAR = Services.io.newURI("http://localhost/bar", null, null);
|
||||
const OTHER_URI = Services.io.newURI("http://other.localhost", null, null);
|
||||
const OTHER_BAR = Services.io.newURI("http://other.localhost/bar", null, null);
|
||||
|
||||
setCookie("session_no_path", null, null, null, BASE_URI);
|
||||
setCookie("session_bar_path", null, "/bar", null, BASE_BAR);
|
||||
|
||||
setCookie("session_no_path", null, null, null, OTHER_URI);
|
||||
setCookie("session_bar_path", null, "/bar", null, OTHER_BAR);
|
||||
|
||||
verifyCookies(['session_no_path',
|
||||
'session_bar_path'], BASE_URI);
|
||||
verifyCookies(['session_no_path',
|
||||
'session_bar_path'], OTHER_URI);
|
||||
|
||||
setCookie("session_another_no_path", null, null, null, BASE_URI);
|
||||
verifyCookies(['session_no_path',
|
||||
'session_another_no_path'], BASE_URI);
|
||||
|
||||
setCookie("session_another_no_path", null, null, null, OTHER_URI);
|
||||
verifyCookies(['session_no_path',
|
||||
'session_another_no_path'], OTHER_URI);
|
||||
}
|
||||
|
||||
// Ensure that cookies are still considered candidates for eviction if either the domain
|
||||
// or path matches, but not both.
|
||||
function test_domain_or_path_matches_not_both(base_host,
|
||||
subdomain_host,
|
||||
other_subdomain_host,
|
||||
another_subdomain_host) {
|
||||
Services.prefs.setIntPref("network.cookie.maxPerHost", 2);
|
||||
|
||||
const BASE_URI = Services.io.newURI("http://" + base_host, null, null);
|
||||
const PUB_FOO_PATH = Services.io.newURI("http://" + subdomain_host + "/foo", null, null);
|
||||
const WWW_BAR_PATH = Services.io.newURI("http://" + other_subdomain_host + "/bar", null, null);
|
||||
const OTHER_BAR_PATH = Services.io.newURI("http://" + another_subdomain_host + "/bar", null, null);
|
||||
const PUB_BAR_PATH = Services.io.newURI("http://" + subdomain_host + "/bar", null, null);
|
||||
const WWW_FOO_PATH = Services.io.newURI("http://" + other_subdomain_host + "/foo", null, null);
|
||||
|
||||
setCookie("session_pub_with_foo_path", subdomain_host, "/foo", null, PUB_FOO_PATH);
|
||||
setCookie("session_www_with_bar_path", other_subdomain_host, "/bar", null, WWW_BAR_PATH);
|
||||
verifyCookies(['session_pub_with_foo_path',
|
||||
'session_www_with_bar_path'], BASE_URI);
|
||||
|
||||
setCookie("session_pub_with_bar_path", subdomain_host, "/bar", null, PUB_BAR_PATH);
|
||||
verifyCookies(['session_www_with_bar_path',
|
||||
'session_pub_with_bar_path'], BASE_URI);
|
||||
|
||||
setCookie("session_other_with_bar_path", another_subdomain_host, "/bar", null, OTHER_BAR_PATH);
|
||||
verifyCookies(['session_pub_with_bar_path',
|
||||
'session_other_with_bar_path'], BASE_URI);
|
||||
}
|
||||
|
||||
function test_basic_eviction(base_host, subdomain_host, other_subdomain_host) {
|
||||
Services.prefs.setIntPref("network.cookie.maxPerHost", 5);
|
||||
|
||||
const BASE_URI = Services.io.newURI("http://" + base_host, null, null);
|
||||
const SUBDOMAIN_URI = Services.io.newURI("http://" + subdomain_host, null, null);
|
||||
const OTHER_SUBDOMAIN_URI = Services.io.newURI("http://" + other_subdomain_host, null, null);
|
||||
const FOO_PATH = Services.io.newURI("http://" + base_host + "/foo", null, null);
|
||||
const BAR_PATH = Services.io.newURI("http://" + base_host + "/bar", null, null);
|
||||
const ALL_SUBDOMAINS = '.' + base_host;
|
||||
const OTHER_SUBDOMAIN = other_subdomain_host;
|
||||
|
||||
// Initialize the set of cookies with a mix of non-session cookies with no path,
|
||||
// and session cookies with explicit paths. Any subsequent cookies added will cause
|
||||
// existing cookies to be evicted.
|
||||
setCookie("non_session_non_path_non_domain", null, null, 10000, BASE_URI);
|
||||
setCookie("non_session_non_path_subdomain", ALL_SUBDOMAINS, null, 10000, SUBDOMAIN_URI);
|
||||
setCookie("session_non_path_pub_domain", OTHER_SUBDOMAIN, null, null, OTHER_SUBDOMAIN_URI);
|
||||
setCookie("session_foo_path", null, "/foo", null, FOO_PATH);
|
||||
setCookie("session_bar_path", null, "/bar", null, BAR_PATH);
|
||||
verifyCookies(['non_session_non_path_non_domain',
|
||||
'non_session_non_path_subdomain',
|
||||
'session_non_path_pub_domain',
|
||||
'session_foo_path',
|
||||
'session_bar_path'], BASE_URI);
|
||||
|
||||
// Ensure that cookies set for the / path appear more recent.
|
||||
cs.getCookieString(OTHER_SUBDOMAIN_URI, null)
|
||||
verifyCookies(['non_session_non_path_non_domain',
|
||||
'session_foo_path',
|
||||
'session_bar_path',
|
||||
'non_session_non_path_subdomain',
|
||||
'session_non_path_pub_domain'], BASE_URI);
|
||||
|
||||
// Evict oldest session cookie that does not match example.org/foo (session_bar_path)
|
||||
setCookie("session_foo_path_2", null, "/foo", null, FOO_PATH);
|
||||
verifyCookies(['non_session_non_path_non_domain',
|
||||
'session_foo_path',
|
||||
'non_session_non_path_subdomain',
|
||||
'session_non_path_pub_domain',
|
||||
'session_foo_path_2'], BASE_URI);
|
||||
|
||||
// Evict oldest session cookie that does not match example.org/bar (session_foo_path)
|
||||
setCookie("session_bar_path_2", null, "/bar", null, BAR_PATH);
|
||||
verifyCookies(['non_session_non_path_non_domain',
|
||||
'non_session_non_path_subdomain',
|
||||
'session_non_path_pub_domain',
|
||||
'session_foo_path_2',
|
||||
'session_bar_path_2'], BASE_URI);
|
||||
|
||||
// Evict oldest session cookie that does not match example.org/ (session_non_path_pub_domain)
|
||||
setCookie("non_session_non_path_non_domain_2", null, null, 10000, BASE_URI);
|
||||
verifyCookies(['non_session_non_path_non_domain',
|
||||
'non_session_non_path_subdomain',
|
||||
'session_foo_path_2',
|
||||
'session_bar_path_2',
|
||||
'non_session_non_path_non_domain_2'], BASE_URI);
|
||||
|
||||
// Evict oldest session cookie that does not match example.org/ (session_foo_path_2)
|
||||
setCookie("session_non_path_non_domain_3", null, null, null, BASE_URI);
|
||||
verifyCookies(['non_session_non_path_non_domain',
|
||||
'non_session_non_path_subdomain',
|
||||
'session_bar_path_2',
|
||||
'non_session_non_path_non_domain_2',
|
||||
'session_non_path_non_domain_3'], BASE_URI);
|
||||
|
||||
// Evict oldest session cookie; all such cookies match example.org/bar (session_bar_path_2)
|
||||
setCookie("non_session_non_path_non_domain_3", null, null, 10000, BAR_PATH);
|
||||
verifyCookies(['non_session_non_path_non_domain',
|
||||
'non_session_non_path_subdomain',
|
||||
'non_session_non_path_non_domain_2',
|
||||
'session_non_path_non_domain_3',
|
||||
'non_session_non_path_non_domain_3'], BASE_URI);
|
||||
|
||||
// Evict oldest session cookie, even though it matches pub.example.org (session_non_path_non_domain_3)
|
||||
setCookie("non_session_non_path_pub_domain", null, null, 10000, OTHER_SUBDOMAIN_URI);
|
||||
verifyCookies(['non_session_non_path_non_domain',
|
||||
'non_session_non_path_subdomain',
|
||||
'non_session_non_path_non_domain_2',
|
||||
'non_session_non_path_non_domain_3',
|
||||
'non_session_non_path_pub_domain'], BASE_URI);
|
||||
|
||||
// All session cookies have been evicted.
|
||||
// Evict oldest non-session non-domain-matching cookie (non_session_non_path_pub_domain)
|
||||
setCookie("non_session_bar_path_non_domain", null, '/bar', 10000, BAR_PATH);
|
||||
verifyCookies(['non_session_non_path_non_domain',
|
||||
'non_session_non_path_subdomain',
|
||||
'non_session_non_path_non_domain_2',
|
||||
'non_session_non_path_non_domain_3',
|
||||
'non_session_bar_path_non_domain'], BASE_URI);
|
||||
|
||||
// Evict oldest non-session non-path-matching cookie (non_session_bar_path_non_domain)
|
||||
setCookie("non_session_non_path_non_domain_4", null, null, 10000, BASE_URI);
|
||||
verifyCookies(['non_session_non_path_non_domain',
|
||||
'non_session_non_path_subdomain',
|
||||
'non_session_non_path_non_domain_2',
|
||||
'non_session_non_path_non_domain_3',
|
||||
'non_session_non_path_non_domain_4'], BASE_URI);
|
||||
|
||||
// At this point all remaining cookies are non-session cookies, have a path of /,
|
||||
// and either don't have a domain or have one that matches subdomains.
|
||||
// They will therefore be evicted from oldest to newest if all new cookies added share
|
||||
// similar characteristics.
|
||||
}
|
||||
|
||||
// Verify that the given cookie names exist, and are ordered from least to most recently accessed
|
||||
function verifyCookies(names, uri) {
|
||||
do_check_eq(cm.countCookiesFromHost(uri.host), names.length);
|
||||
let cookies = cm.getCookiesFromHost(uri.host, {});
|
||||
let actual_cookies = [];
|
||||
while (cookies.hasMoreElements()) {
|
||||
let cookie = cookies.getNext().QueryInterface(Ci.nsICookie2);
|
||||
actual_cookies.push(cookie);
|
||||
}
|
||||
if (names.length != actual_cookies.length) {
|
||||
let left = names.filter(function(n) {
|
||||
return actual_cookies.findIndex(function(c) {
|
||||
return c.name == n;
|
||||
}) == -1;
|
||||
});
|
||||
let right = actual_cookies.filter(function(c) {
|
||||
return names.findIndex(function(n) {
|
||||
return c.name == n;
|
||||
}) == -1;
|
||||
}).map(function(c) { return c.name });
|
||||
if (left.length) {
|
||||
do_print("unexpected cookies: " + left);
|
||||
}
|
||||
if (right.length) {
|
||||
do_print("expected cookies: " + right);
|
||||
}
|
||||
}
|
||||
do_check_eq(names.length, actual_cookies.length);
|
||||
actual_cookies.sort(function(a, b) {
|
||||
if (a.lastAccessed < b.lastAccessed)
|
||||
return -1;
|
||||
if (a.lastAccessed > b.lastAccessed)
|
||||
return 1;
|
||||
return 0;
|
||||
});
|
||||
for (var i = 0; i < names.length; i++) {
|
||||
do_check_eq(names[i], actual_cookies[i].name);
|
||||
do_check_eq(names[i].startsWith('session'), actual_cookies[i].isSession);
|
||||
}
|
||||
}
|
||||
|
||||
var lastValue = 0
|
||||
function setCookie(name, domain, path, maxAge, url) {
|
||||
let value = name + "=" + ++lastValue;
|
||||
var s = 'setting cookie ' + value;
|
||||
if (domain) {
|
||||
value += "; Domain=" + domain;
|
||||
s += ' (d=' + domain + ')';
|
||||
}
|
||||
if (path) {
|
||||
value += "; Path=" + path;
|
||||
s += ' (p=' + path + ')';
|
||||
}
|
||||
if (maxAge) {
|
||||
value += "; Max-Age=" + maxAge;
|
||||
s += ' (non-session)';
|
||||
} else {
|
||||
s += ' (session)';
|
||||
}
|
||||
s += ' for ' + url.spec;
|
||||
do_print(s);
|
||||
cs.setCookieStringFromHttp(url, null, null, value, null, null);
|
||||
}
|
||||
|
|
@ -8,3 +8,4 @@ skip-if = toolkit == 'gonk'
|
|||
[test_bug1267910.js]
|
||||
[test_parser_0001.js]
|
||||
[test_parser_0019.js]
|
||||
[test_eviction.js]
|
||||
Загрузка…
Ссылка в новой задаче