Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Revert "fix(webkit): make cookie SameSite=Lax by default"

Browse source 
This reverts commit eababcf511.
This commit is contained in:
Yury Semikhatsky 2024-05-24 17:25:48 -07:00
parent eababcf511
commit b1a2d99fd4
5 changed files with 25 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/playwright-core/src/server/webkit/wkBrowser.ts
View file

@ -256,11 +256,7 @@ export class WKBrowserContext extends BrowserContext {
async doGetCookies(urls: string[]): Promise<channels.NetworkCookie[]> { async doGetCookies(urls: string[]): Promise<channels.NetworkCookie[]> {
const { cookies } = await this._browser._browserSession.send('Playwright.getAllCookies', { browserContextId: this._browserContextId }); const { cookies } = await this._browser._browserSession.send('Playwright.getAllCookies', { browserContextId: this._browserContextId });
return network.filterCookies(cookies.map((c: channels.NetworkCookie) => { return network.filterCookies(cookies.map((c: channels.NetworkCookie) => {
const copy: any = { ...c }; const copy: any = { ... c };
// "Prevent cross-site tracking." is on by default in Safary, which essentially
// disables SameSite=None and such cookies become Lax.
if (copy.sameSite === 'None')
copy.sameSite = 'Lax';
copy.expires = c.expires === -1 ? -1 : c.expires / 1000; copy.expires = c.expires === -1 ? -1 : c.expires / 1000;
delete copy.session; delete copy.session;
return copy as channels.NetworkCookie; return copy as channels.NetworkCookie;
@ -271,10 +267,7 @@ export class WKBrowserContext extends BrowserContext {
const cc = network.rewriteCookies(cookies).map(c => ({ const cc = network.rewriteCookies(cookies).map(c => ({
...c, ...c,
session: c.expires === -1 || c.expires === undefined, session: c.expires === -1 || c.expires === undefined,
expires: c.expires && c.expires !== -1 ? c.expires * 1000 : c.expires, expires: c.expires && c.expires !== -1 ? c.expires * 1000 : c.expires
// With "Prevent cross-site tracking." on by default in Safary, SameSite=None cookies
// behave as Lax.
sameSite: (!c.sameSite || c.sameSite === 'None') ? 'Lax' : c.sameSite,
})) as Protocol.Playwright.SetCookieParam[]; })) as Protocol.Playwright.SetCookieParam[];
await this._browser._browserSession.send('Playwright.setCookies', { cookies: cc, browserContextId: this._browserContextId }); await this._browser._browserSession.send('Playwright.setCookies', { cookies: cc, browserContextId: this._browserContextId });
} }

4
tests/config/browserTest.ts
View file

@ -67,11 +67,11 @@ const test = baseTest.extend<BrowserTestTestFixtures, BrowserTestWorkerFixtures>
await run(false); await run(false);
}, { scope: 'worker' }], }, { scope: 'worker' }],
defaultSameSiteCookieValue: [async ({ browserName, browserMajorVersion, channel, platform }, run) => { defaultSameSiteCookieValue: [async ({ browserName, browserMajorVersion, channel }, run) => {
if (browserName === 'chromium') if (browserName === 'chromium')
await run('Lax'); await run('Lax');
else if (browserName === 'webkit') else if (browserName === 'webkit')
await run('Lax'); await run('None');
else if (browserName === 'firefox' && channel === 'firefox-beta') else if (browserName === 'firefox' && channel === 'firefox-beta')
await run(browserMajorVersion >= 103 && browserMajorVersion < 110 ? 'Lax' : 'None'); await run(browserMajorVersion >= 103 && browserMajorVersion < 110 ? 'Lax' : 'None');
else if (browserName === 'firefox' && channel !== 'firefox-beta') else if (browserName === 'firefox' && channel !== 'firefox-beta')

4
tests/library/browsercontext-add-cookies.spec.ts
View file

@ -224,7 +224,7 @@ it('should have |expires| set to |-1| for session cookies', async ({ context, se
expect(cookies[0].expires).toBe(-1); expect(cookies[0].expires).toBe(-1);
}); });
it('should set cookie with reasonable defaults', async ({ context, server, browserName, defaultSameSiteCookieValue }) => { it('should set cookie with reasonable defaults', async ({ context, server, browserName }) => {
await context.addCookies([{ await context.addCookies([{
url: server.EMPTY_PAGE, url: server.EMPTY_PAGE,
name: 'defaults', name: 'defaults',
@ -239,7 +239,7 @@ it('should set cookie with reasonable defaults', async ({ context, server, brows
expires: -1, expires: -1,
httpOnly: false, httpOnly: false,
secure: false, secure: false,
sameSite: defaultSameSiteCookieValue, sameSite: browserName === 'chromium' ? 'Lax' : 'None',
}]); }]);
}); });

37
tests/library/browsercontext-cookies.spec.ts
View file

@ -147,7 +147,7 @@ it('should get cookies from multiple urls', async ({ context, browserName, isWin
url: 'https://foo.com', url: 'https://foo.com',
name: 'doggo', name: 'doggo',
value: 'woofs', value: 'woofs',
sameSite: 'Lax', sameSite: 'None',
}, { }, {
url: 'https://bar.com', url: 'https://bar.com',
name: 'catto', name: 'catto',
@ -168,7 +168,7 @@ it('should get cookies from multiple urls', async ({ context, browserName, isWin
expires: -1, expires: -1,
httpOnly: false, httpOnly: false,
secure: true, secure: true,
sameSite: 'Lax', sameSite: (browserName === 'webkit' && isWindows) ? 'None' : 'Lax',
}, { }, {
name: 'doggo', name: 'doggo',
value: 'woofs', value: 'woofs',
@ -177,7 +177,7 @@ it('should get cookies from multiple urls', async ({ context, browserName, isWin
expires: -1, expires: -1,
httpOnly: false, httpOnly: false,
secure: true, secure: true,
sameSite: 'Lax', sameSite: 'None',
}])); }]));
}); });
@ -279,7 +279,7 @@ it('should add cookies with an expiration', async ({ context }) => {
url: 'https://foo.com', url: 'https://foo.com',
name: 'doggo', name: 'doggo',
value: 'woofs', value: 'woofs',
sameSite: 'Lax', sameSite: 'None',
expires, expires,
}]); }]);
const cookies = await context.cookies(['https://foo.com']); const cookies = await context.cookies(['https://foo.com']);
@ -292,7 +292,7 @@ it('should add cookies with an expiration', async ({ context }) => {
expires, expires,
httpOnly: false, httpOnly: false,
secure: true, secure: true,
sameSite: 'Lax', sameSite: 'None',
}]); }]);
{ {
// Rollover to 5-digit year // Rollover to 5-digit year
@ -300,14 +300,14 @@ it('should add cookies with an expiration', async ({ context }) => {
url: 'https://foo.com', url: 'https://foo.com',
name: 'doggo', name: 'doggo',
value: 'woofs', value: 'woofs',
sameSite: 'Lax', sameSite: 'None',
expires: 253402300799, // Fri, 31 Dec 9999 23:59:59 +0000 (UTC) expires: 253402300799, // Fri, 31 Dec 9999 23:59:59 +0000 (UTC)
}]); }]);
await expect(context.addCookies([{ await expect(context.addCookies([{
url: 'https://foo.com', url: 'https://foo.com',
name: 'doggo', name: 'doggo',
value: 'woofs', value: 'woofs',
sameSite: 'Lax', sameSite: 'None',
expires: 253402300800, // Sat, 1 Jan 1000 00:00:00 +0000 (UTC) expires: 253402300800, // Sat, 1 Jan 1000 00:00:00 +0000 (UTC)
}])).rejects.toThrow(/Cookie should have a valid expires/); }])).rejects.toThrow(/Cookie should have a valid expires/);
} }
@ -316,7 +316,7 @@ it('should add cookies with an expiration', async ({ context }) => {
url: 'https://foo.com', url: 'https://foo.com',
name: 'doggo', name: 'doggo',
value: 'woofs', value: 'woofs',
sameSite: 'Lax', sameSite: 'None',
expires: -42, expires: -42,
}])).rejects.toThrow(/Cookie should have a valid expires/); }])).rejects.toThrow(/Cookie should have a valid expires/);
}); });
@ -350,26 +350,26 @@ it('should be able to send third party cookies via an iframe', async ({ browser,
} }
}); });
it('should support requestStorageAccess', async ({ browser, httpsServer, channel, browserName, isLinux, isMac }) => { it('should support requestStorageAccess', async ({ page, server, channel, browserName, isMac, isLinux, isWindows }) => {
const page = await browser.newPage({ ignoreHTTPSErrors: true });
it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/17285' }); it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/17285' });
it.skip(browserName === 'chromium', 'requestStorageAccess API is not available in Chromium'); it.skip(browserName === 'chromium', 'requestStorageAccess API is not available in Chromium');
it.skip(channel === 'firefox-beta', 'hasStorageAccess returns true, but no cookie is sent'); it.skip(channel === 'firefox-beta', 'hasStorageAccess returns true, but no cookie is sent');
httpsServer.setRoute('/set-cookie.html', (req, res) => {
res.setHeader('Set-Cookie', 'name=value; Path=/; SameSite=None; Secure'); server.setRoute('/set-cookie.html', (req, res) => {
res.setHeader('Set-Cookie', 'name=value; Path=/');
res.end(); res.end();
}); });
// Navigate once to the domain as top level. // Navigate once to the domain as top level.
await page.goto(httpsServer.CROSS_PROCESS_PREFIX + '/set-cookie.html'); await page.goto(server.CROSS_PROCESS_PREFIX + '/set-cookie.html');
await page.goto(httpsServer.EMPTY_PAGE); await page.goto(server.EMPTY_PAGE);
await page.setContent(`<iframe src="${httpsServer.CROSS_PROCESS_PREFIX + '/empty.html'}"></iframe>`); await page.setContent(`<iframe src="${server.CROSS_PROCESS_PREFIX + '/empty.html'}"></iframe>`);
const frame = page.frames()[1]; const frame = page.frames()[1];
if (browserName === 'firefox') { if (browserName === 'firefox') {
expect(await frame.evaluate(() => document.hasStorageAccess())).toBeTruthy(); expect(await frame.evaluate(() => document.hasStorageAccess())).toBeTruthy();
{ {
const [serverRequest] = await Promise.all([ const [serverRequest] = await Promise.all([
httpsServer.waitForRequest('/title.html'), server.waitForRequest('/title.html'),
frame.evaluate(() => fetch('/title.html')) frame.evaluate(() => fetch('/title.html'))
]); ]);
expect(serverRequest.headers.cookie).toBe('name=value'); expect(serverRequest.headers.cookie).toBe('name=value');
@ -381,7 +381,7 @@ it('should support requestStorageAccess', async ({ browser, httpsServer, channel
expect(await frame.evaluate(() => document.hasStorageAccess())).toBeFalsy(); expect(await frame.evaluate(() => document.hasStorageAccess())).toBeFalsy();
{ {
const [serverRequest] = await Promise.all([ const [serverRequest] = await Promise.all([
httpsServer.waitForRequest('/title.html'), server.waitForRequest('/title.html'),
frame.evaluate(() => fetch('/title.html')) frame.evaluate(() => fetch('/title.html'))
]); ]);
if (!isMac && browserName === 'webkit') if (!isMac && browserName === 'webkit')
@ -393,13 +393,12 @@ it('should support requestStorageAccess', async ({ browser, httpsServer, channel
expect(await frame.evaluate(() => document.hasStorageAccess())).toBeTruthy(); expect(await frame.evaluate(() => document.hasStorageAccess())).toBeTruthy();
{ {
const [serverRequest] = await Promise.all([ const [serverRequest] = await Promise.all([
httpsServer.waitForRequest('/title.html'), server.waitForRequest('/title.html'),
frame.evaluate(() => fetch('/title.html')) frame.evaluate(() => fetch('/title.html'))
]); ]);
expect(serverRequest.headers.cookie).toBe('name=value'); expect(serverRequest.headers.cookie).toBe('name=value');
} }
} }
await page.close();
}); });
it('should parse cookie with large Max-Age correctly', async ({ server, page, defaultSameSiteCookieValue, browserName, platform }) => { it('should parse cookie with large Max-Age correctly', async ({ server, page, defaultSameSiteCookieValue, browserName, platform }) => {

2
tests/library/browsercontext-fetch.spec.ts
View file

@ -1211,7 +1211,7 @@ it('should support set-cookie with SameSite and without Secure attribute over HT
}); });
await page.request.get(server.EMPTY_PAGE); await page.request.get(server.EMPTY_PAGE);
const [cookie] = await page.context().cookies(); const [cookie] = await page.context().cookies();
if (['chromium', 'webkit'].includes(browserName) && value === 'None') if (browserName === 'chromium' && value === 'None')
expect(cookie).toBeFalsy(); expect(cookie).toBeFalsy();
else if (browserName === 'webkit' && isWindows) else if (browserName === 'webkit' && isWindows)
expect(cookie.sameSite).toBe('None'); expect(cookie.sameSite).toBe('None');