Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1366213: Part 1 - Add a new observer notification 'session-cookie-changed'. r=jdm

Browse Source 
--HG--
extra : rebase_source : 5495a601b463f59f1e39746c2069c6af042a9680
This commit is contained in:
Will Wang 2017-07-07 17:47:53 +08:00
parent f23d657af0
commit 1c9d3566e7
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
netwerk/cookie/nsCookieService.cpp
View File

@ -2245,14 +2245,36 @@ nsCookieService::NotifyThirdParty(nsIURI *aHostURI, bool aIsAccepted, nsIChannel
// cookies.
void
nsCookieService::NotifyChanged(nsISupports *aSubject,
const char16_t *aData)
const char16_t *aData,
bool aOldCookieIsSession)
{
const char* topic = mDBState == mPrivateDBState ?
"private-cookie-changed" : "cookie-changed";
nsCOMPtr<nsIObserverService> os = mozilla::services::GetObserverService();
if (os) {
os->NotifyObservers(aSubject, topic, aData);
if (!os) {
return;
}
// Notify for topic "private-cookie-changed" or "cookie-changed"
os->NotifyObservers(aSubject, topic, aData);
// Notify for topic "session-cookie-changed" to update the copy of session
// cookies in session restore component.
// Ignore private session cookies since they will not be restored.
if (mDBState == mPrivateDBState) {
return;
}
// Filter out notifications for individual non-session cookies.
if (NS_LITERAL_STRING("changed").Equals(aData) ||
NS_LITERAL_STRING("deleted").Equals(aData) ||
NS_LITERAL_STRING("added").Equals(aData)) {
nsCOMPtr<nsICookie> xpcCookie = do_QueryInterface(aSubject);
MOZ_ASSERT(xpcCookie);
auto cookie = static_cast<nsCookie*>(xpcCookie.get());
if (!cookie->IsSession() && !aOldCookieIsSession) {
return;
}
}
os->NotifyObservers(aSubject, "session-cookie-changed", aData);
}
already_AddRefed<nsIArray>
@ -3606,6 +3628,7 @@ nsCookieService::AddInternal(const nsCookieKey &aKey,
foundCookie = FindCookie(aKey, aCookie->Host(),
aCookie->Name(), aCookie->Path(), exactIter);
bool foundSecureExact = foundCookie && exactIter.Cookie()->IsSecure();
bool oldCookieIsSession = false;
if (mLeaveSecureAlone) {
// Step1, call FindSecureCookie(). FindSecureCookie() would
// find the existing cookie with the security flag and has
@ -3647,6 +3670,7 @@ nsCookieService::AddInternal(const nsCookieKey &aKey,
nsCOMPtr<nsIArray> purgedList;
if (foundCookie) {
oldCookie = exactIter.Cookie();
oldCookieIsSession = oldCookie->IsSession();
// Check if the old cookie is stale (i.e. has already expired). If so, we
// need to be careful about the semantics of removing it and adding the new
@ -3780,7 +3804,7 @@ nsCookieService::AddInternal(const nsCookieKey &aKey,
NotifyChanged(purgedList, u"batch-deleted");
}
NotifyChanged(aCookie, foundCookie ? u"changed" : u"added");
NotifyChanged(aCookie, foundCookie ? u"changed" : u"added", oldCookieIsSession);
}
/******************************************************************************

2
netwerk/cookie/nsCookieService.h
View File

@ -318,7 +318,7 @@ class nsCookieService final : public nsICookieService
void TelemetryForEvictingStaleCookie(nsCookie* aEvicted, int64_t oldestCookieTime);
void NotifyRejected(nsIURI *aHostURI);
void NotifyThirdParty(nsIURI *aHostURI, bool aAccepted, nsIChannel *aChannel);
void NotifyChanged(nsISupports *aSubject, const char16_t *aData);
void NotifyChanged(nsISupports *aSubject, const char16_t *aData, bool aOldCookieIsSession = false);
void NotifyPurged(nsICookie2* aCookie);
already_AddRefed<nsIArray> CreatePurgeList(nsICookie2* aCookie);
void UpdateCookieOldestTime(DBState* aDBState, nsCookie* aCookie);