Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-12 23:12:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1407695 - Do not return expiry key for session cookies; r=ato

Browse Source 
MozReview-Commit-ID: H1CctBpOOdM

--HG--
extra : rebase_source : 148e2189e46713161f696d6b09c0b854d513f979
This commit is contained in:
Øyvind Strømmen 2017-10-16 22:42:48 +02:00
parent 9711670a1a
commit 4c2fdeab8b
2 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
testing/marionette/cookie.js
View File

@ -206,15 +206,20 @@ cookie.iter = function* (host, currentPath = "/") {
do {
if ((cookie.host == "." + hostname || cookie.host == hostname) &&
isForCurrentPath(cookie.path)) {
yield {
let data = {
"name": cookie.name,
"value": cookie.value,
"path": cookie.path,
"domain": cookie.host,
"secure": cookie.isSecure,
"httpOnly": cookie.isHttpOnly,
"expiry": cookie.expiry,
};
if (!cookie.isSession) {
data.expiry = cookie.expiry;
}
yield data;
}
hostname = hostname.replace(/^.*?\./, "");
} while (hostname.indexOf(".") != -1);

34
testing/marionette/test_cookie.js
View File

@ -24,7 +24,7 @@ cookie.manager = {
cookie.manager.cookies.push(newCookie);
},
remove: function (host, name, path, blocked, originAttributes) {;
remove: function (host, name, path, blocked, originAttributes) {
for (let i = 0; i < this.cookies.length; ++i) {
let candidate = this.cookies[i];
if (candidate.host === host &&
@ -248,11 +248,39 @@ add_test(function test_remove() {
add_test(function test_iter() {
cookie.manager.cookies = [];
cookie.add({name: "0", value: "", domain: "foo.example.com"});
cookie.add({name: "1", value: "", domain: "bar.example.com"});
cookie.add({
session: false,
name: "0",
value: "",
domain: "foo.example.com",
});
cookie.add({
session: false,
name: "1",
value: "",
domain: "bar.example.com",
});
let fooCookies = [...cookie.iter("foo.example.com")];
equal(1, fooCookies.length);
equal(".foo.example.com", fooCookies[0].domain);
equal(true, fooCookies[0].hasOwnProperty("expiry"));
// here we're explicitly setting session to true as a workaround until
// bug 1408962 has been fixed. when that bug has been fixed the cookie
// will be created as session cookie simply by leaving out the 'expiry'
// property.
cookie.add({
session: true,
name: "aSessionCookie",
value: "",
domain: "session.com",
});
let sessionCookies = [...cookie.iter("session.com")];
equal(1, sessionCookies.length);
equal("aSessionCookie", sessionCookies[0].name);
equal(false, sessionCookies[0].hasOwnProperty("expiry"));
run_next_test();
});