Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fixed cookie synchronization #2818

Merged
merged 6 commits into from Dec 16, 2022
Merged

fix: fixed cookie synchronization #2818

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
699a56d
test: added test cookie with the max-age
Aleksey28 Dec 8, 2022
119c172
fix: fixed cookie sync
Aleksey28 Dec 8, 2022
3134daf
test: fixed test
Aleksey28 Dec 8, 2022
c438d97
fix: added isNil check
Aleksey28 Dec 8, 2022
c669d59
test: fixed tests
Aleksey28 Dec 8, 2022
559c0dd
fix: changed the way getting current date
Aleksey28 Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/client/sandbox/cookie/index.ts
View file
Open in desktop
Expand Up @@ -139,10 +139,11 @@ class CookieSandboxProxyStrategy implements CookieSandboxStrategy {
const maxAge = Number(parsedCookie.maxAge);
const expires = Number(parsedCookie.expires);

if (!isNaN(maxAge) && maxAge * 1000 < currentDate.getTime() - parsedCookie.lastAccessed.getTime() ||
if (!isNaN(maxAge) && maxAge * 1000 <= currentDate.getTime() - parsedCookie.lastAccessed.getTime() ||
!isNaN(expires) && expires < currentDate.getTime()) {
nativeMethods.documentCookieSetter.call(this.document, generateDeleteSyncCookieStr(parsedCookie));
CookieSandbox._updateClientCookieStr(parsedCookie.key, null);
serverSyncCookies.push(parsedCookie);
}
}
}
Expand Down Expand Up @@ -213,7 +214,7 @@ class CookieSandboxProxyStrategy implements CookieSandboxStrategy {
parsedCookie.isClientSync = true;
parsedCookie.isWindowSync = true;
parsedCookie.sid = settings.get().sessionId;
parsedCookie.lastAccessed = new nativeMethods.date(); //eslint-disable-line new-cap
parsedCookie.lastAccessed = cookieUtils.getUTCDate();

prepareSyncCookieProperties(parsedCookie);

Expand Down
2 changes: 1 addition & 1 deletion src/utils/cookie.ts
View file
Open in desktop
Expand Up @@ -67,7 +67,7 @@ function formatSyncCookieKey (cookie: CookieRecord): string {
const path = encodeURIComponent(cookie.path);
const expires = cookie.expires !== 'Infinity' ? cookie.expires.getTime().toString(TIME_RADIX) : '';
const lastAccessed = cookie.lastAccessed.getTime().toString(TIME_RADIX);
const maxAge = cookie.maxAge && cookie.maxAge !== 'Infinity' ? cookie.maxAge.toString(TIME_RADIX) : '';
const maxAge = !isNaN(Number(cookie.maxAge)) && String(cookie.maxAge) !== 'Infinity' ? cookie.maxAge.toString(TIME_RADIX) : '';
Aleksey28 marked this conversation as resolved.
Show resolved Hide resolved

return `${syncType}|${cookie.sid}|${key}|${domain}|${path}|${expires}|${lastAccessed}|${maxAge}`;
}
Expand Down
30 changes: 29 additions & 1 deletion test/client/fixtures/sandbox/cookie-test.js
View file
Open in desktop
Expand Up @@ -204,7 +204,6 @@ if (!isGreaterThanSafari15_1) { //eslint-disable-line camelcase

strictEqual(settings.get().cookie, 'temp=temp; test=123');

console.log(nativeMethods.documentCookieGetter.call(document));
strictEqual(nativeMethods.documentCookieGetter.call(document).replace(/\|[^|]+\|=/, '|lastAccessed|='),
'c|sessionId|temp|example.com|%2F||lastAccessed|=temp');
});
Expand Down Expand Up @@ -270,6 +269,35 @@ if (!isGreaterThanSafari15_1) { //eslint-disable-line camelcase
'c|sessionId|invalid|example.com|%2Fpath||lastAccessed|=path');
});

test('cookie with the max-age', function () {
strictEqual(document.cookie, '');

document.cookie = 'temp=temp; max-age=9';

strictEqual(settings.get().cookie, 'temp=temp');
strictEqual(nativeMethods.documentCookieGetter.call(document).replace(/(\|[^|]+\|)(\d*=)/, '|lastAccessed|$2'),
'c|sessionId|temp|example.com|%2F||lastAccessed|9=temp');

document.cookie = 'temp=temp; max-age=0';

strictEqual(settings.get().cookie, '');

strictEqual(nativeMethods.documentCookieGetter.call(document).replace(/(\|[^|]+\|)(\d*=)/, '|lastAccessed|$2'),
'c|sessionId|temp|example.com|%2F||lastAccessed|0=temp');

document.cookie = 'temp=temp; max-age=Infinity';

strictEqual(settings.get().cookie, 'temp=temp');
strictEqual(nativeMethods.documentCookieGetter.call(document).replace(/(\|[^|]+\|)(=)/, '|lastAccessed|$2'),
'c|sessionId|temp|example.com|%2F||lastAccessed|=temp');

document.cookie = 'temp=temp; max-age=-Infinity';

strictEqual(settings.get().cookie, '');
strictEqual(nativeMethods.documentCookieGetter.call(document).replace(/(\|[^|]+\|)(-Infinity=)/, '|lastAccessed|$2'),
'c|sessionId|temp|example.com|%2F||lastAccessed|-Infinity=temp');
});

test('cookie with the invalid secure', function () {
var storedForcedLocation = destLocation.getLocation();

Expand Down