yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: do not pass access-key header into the redirects (#24478)

Browse Source
This commit is contained in:
Pavel Feldman 2023-07-27 19:03:14 -07:00 committed by GitHub
parent 9c70a75d48
commit b5d49d0849
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/playwright-core/src/server/transport.ts
View File

@ -59,18 +59,22 @@ export class WebSocketTransport implements ConnectionTransport {
readonly headers: HeadersArray = []; readonly headers: HeadersArray = [];
static async connect(progress: (Progress|undefined), url: string, headers?: { [key: string]: string; }, followRedirects?: boolean, debugLogHeader?: string): Promise<WebSocketTransport> { static async connect(progress: (Progress|undefined), url: string, headers?: { [key: string]: string; }, followRedirects?: boolean, debugLogHeader?: string): Promise<WebSocketTransport> {
return await WebSocketTransport._connect(progress, url, headers || {}, { follow: !!followRedirects, hadRedirects: false }, debugLogHeader);
}
static async _connect(progress: (Progress|undefined), url: string, headers: { [key: string]: string; }, redirect: { follow: boolean, hadRedirects: boolean }, debugLogHeader?: string): Promise<WebSocketTransport> {
const logUrl = stripQueryParams(url); const logUrl = stripQueryParams(url);
progress?.log(`<ws connecting> ${logUrl}`); progress?.log(`<ws connecting> ${logUrl}`);
const transport = new WebSocketTransport(progress, url, logUrl, headers, followRedirects, debugLogHeader); const transport = new WebSocketTransport(progress, url, logUrl, headers, redirect.follow && redirect.hadRedirects, debugLogHeader);
let success = false; let success = false;
progress?.cleanupWhenAborted(async () => { progress?.cleanupWhenAborted(async () => {
if (!success) if (!success)
await transport.closeAndWait().catch(e => null); await transport.closeAndWait().catch(e => null);
}); });
await new Promise<WebSocketTransport>((fulfill, reject) => { const result = await new Promise<{ transport?: WebSocketTransport, redirect?: IncomingMessage }>((fulfill, reject) => {
transport._ws.on('open', async () => { transport._ws.on('open', async () => {
progress?.log(`<ws connected> ${logUrl}`); progress?.log(`<ws connected> ${logUrl}`);
fulfill(transport); fulfill({ transport });
}); });
transport._ws.on('error', event => { transport._ws.on('error', event => {
progress?.log(`<ws connect error> ${logUrl} ${event.message}`); progress?.log(`<ws connect error> ${logUrl} ${event.message}`);
@ -78,6 +82,11 @@ export class WebSocketTransport implements ConnectionTransport {
transport._ws.close(); transport._ws.close();
}); });
transport._ws.on('unexpected-response', (request: ClientRequest, response: IncomingMessage) => { transport._ws.on('unexpected-response', (request: ClientRequest, response: IncomingMessage) => {
if (redirect.follow && !redirect.hadRedirects && (response.statusCode === 301 || response.statusCode === 302 || response.statusCode === 307 || response.statusCode === 308)) {
fulfill({ redirect: response });
transport._ws.close();
return;
}
for (let i = 0; i < response.rawHeaders.length; i += 2) { for (let i = 0; i < response.rawHeaders.length; i += 2) {
if (debugLogHeader && response.rawHeaders[i] === debugLogHeader) if (debugLogHeader && response.rawHeaders[i] === debugLogHeader)
progress?.log(response.rawHeaders[i + 1]); progress?.log(response.rawHeaders[i + 1]);
@ -93,6 +102,13 @@ export class WebSocketTransport implements ConnectionTransport {
}); });
}); });
}); });
if (result.redirect) {
// Strip access key headers from the redirected request.
const newHeaders = Object.fromEntries(Object.entries(headers || {}).filter(([name]) => !name.includes('access-key')));
return WebSocketTransport._connect(progress, result.redirect.headers.location!, newHeaders, { follow: true, hadRedirects: true }, debugLogHeader);
}
success = true; success = true;
return transport; return transport;
} }