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

review feedback

Browse source
This commit is contained in:
Max Schmitt 2024-08-15 09:04:58 +02:00
parent 75eb4c118e
commit ef1159e3a3
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
packages/playwright-core/src/server/socksClientCertificatesInterceptor.ts
View file

@ -82,6 +82,7 @@ class SocksProxyConnection {
internalTLS: tls.TLSSocket | undefined; internalTLS: tls.TLSSocket | undefined;
private _targetCloseEventListener: () => void; private _targetCloseEventListener: () => void;
private _dummyServer: tls.Server | undefined; private _dummyServer: tls.Server | undefined;
private _closed = false;
constructor(socksProxy: ClientCertificatesProxy, uid: string, host: string, port: number) { constructor(socksProxy: ClientCertificatesProxy, uid: string, host: string, port: number) {
this.socksProxy = socksProxy; this.socksProxy = socksProxy;
@ -100,6 +101,10 @@ class SocksProxyConnection {
this.target = await createSocket(rewriteToLocalhostIfNeeded(this.host), this.port); this.target = await createSocket(rewriteToLocalhostIfNeeded(this.host), this.port);
this.target.once('close', this._targetCloseEventListener); this.target.once('close', this._targetCloseEventListener);
this.target.once('error', error => this.socksProxy._socksProxy.sendSocketError({ uid: this.uid, error: error.message })); this.target.once('error', error => this.socksProxy._socksProxy.sendSocketError({ uid: this.uid, error: error.message }));
if (this._closed) {
this.target.destroy();
return;
}
this.socksProxy._socksProxy.socketConnected({ this.socksProxy._socksProxy.socketConnected({
uid: this.uid, uid: this.uid,
host: this.target.localAddress!, host: this.target.localAddress!,
@ -112,6 +117,7 @@ class SocksProxyConnection {
this.target.destroy(); this.target.destroy();
this.internalTLS?.destroy(); this.internalTLS?.destroy();
this._dummyServer?.close(); this._dummyServer?.close();
this._closed = true;
} }
public onData(data: Buffer) { public onData(data: Buffer) {
@ -141,6 +147,8 @@ class SocksProxyConnection {
}); });
this.socksProxy.alpnCache.get(rewriteToLocalhostIfNeeded(this.host), this.port, alpnProtocolChosenByServer => { this.socksProxy.alpnCache.get(rewriteToLocalhostIfNeeded(this.host), this.port, alpnProtocolChosenByServer => {
debugLogger.log('client-certificates', `Proxy->Target ${this.host}:${this.port} chooses ALPN ${alpnProtocolChosenByServer}`); debugLogger.log('client-certificates', `Proxy->Target ${this.host}:${this.port} chooses ALPN ${alpnProtocolChosenByServer}`);
if (this._closed)
return;
this._dummyServer = tls.createServer({ this._dummyServer = tls.createServer({
...dummyServerTlsOptions, ...dummyServerTlsOptions,
ALPNProtocols: alpnProtocolChosenByServer === 'h2' ? ['h2', 'http/1.1'] : ['http/1.1'], ALPNProtocols: alpnProtocolChosenByServer === 'h2' ? ['h2', 'http/1.1'] : ['http/1.1'],
@ -202,7 +210,9 @@ class SocksProxyConnection {
return; return;
} }
const tlsOptions: tls.ConnectionOptions = { if (this._closed)
return;
targetTLS = tls.connect({
socket: this.target, socket: this.target,
host: this.host, host: this.host,
port: this.port, port: this.port,
@ -210,9 +220,7 @@ class SocksProxyConnection {
ALPNProtocols: [internalTLS.alpnProtocol || 'http/1.1'], ALPNProtocols: [internalTLS.alpnProtocol || 'http/1.1'],
servername: !net.isIP(this.host) ? this.host : undefined, servername: !net.isIP(this.host) ? this.host : undefined,
secureContext, secureContext,
}; });
targetTLS = tls.connect(tlsOptions);
targetTLS.once('secureConnect', () => { targetTLS.once('secureConnect', () => {
internalTLS.pipe(targetTLS); internalTLS.pipe(targetTLS);