fixes

Author: mxschmitt

packages/playwright-core/src/server/browser.ts

@@ -101,7 +101,8 @@ export abstract class Browser extends SdkObject {
     validateBrowserContextOptions(options, this.options);
     let clientCertificatesProxy: ClientCertificatesProxy | undefined;
     if (options.clientCertificates?.length) {
-      clientCertificatesProxy = await progress.raceWithCleanup(ClientCertificatesProxy.create(options), proxy => proxy.close());
+      clientCertificatesProxy = await progress.raceWithCleanup(ClientCertificatesProxy.create(options, this.attribution.browserType?.loopback(this.attribution.browser?.options.channel
+      )), proxy => proxy.close());
       options = { ...options };
       options.proxyOverride = clientCertificatesProxy.proxySettings();
       options.internalIgnoreHTTPSErrors = true;

packages/playwright-core/src/server/browserType.ts

@@ -80,7 +80,7 @@ export abstract class BrowserType extends SdkObject {
     // Note: Any initial TLS requests will fail since we rely on the Page/Frames initialize which sets ignoreHTTPSErrors.
     let clientCertificatesProxy: ClientCertificatesProxy | undefined;
     if (options.clientCertificates?.length) {
-      clientCertificatesProxy = await progress.raceWithCleanup(ClientCertificatesProxy.create(options), proxy => proxy.close());
+      clientCertificatesProxy = await progress.raceWithCleanup(ClientCertificatesProxy.create(options, this.loopback(launchOptions.channel)), proxy => proxy.close());
       launchOptions.proxyOverride = clientCertificatesProxy.proxySettings();
       options = { ...options };
       options.internalIgnoreHTTPSErrors = true;
@@ -133,6 +133,7 @@ export abstract class BrowserType extends SdkObject {
     copyTestHooks(options, browserOptions);
     const browser = await progress.race(this.connectToTransport(transport, browserOptions, browserLogsCollector));
     (browser as any)._userDataDirForTest = userDataDir;
+    browser.attribution.browserType = this;
     // We assume no control when using custom arguments, and do not prepare the default context in that case.
     if (persistent && !options.ignoreAllDefaultArgs)
       await browser._defaultContext!._loadDefaultContext(progress);
@@ -350,6 +351,7 @@ export abstract class BrowserType extends SdkObject {
   abstract amendEnvironment(env: Env, userDataDir: string, executable: string, browserArguments: string[], channel?: string): Env;
   abstract doRewriteStartupLog(error: ProtocolError): ProtocolError;
   abstract attemptToGracefullyCloseBrowser(transport: ConnectionTransport): void;
+  abstract loopback(channel: string | undefined): string | undefined;
 }
 
 function copyTestHooks(from: object, to: object) {

packages/playwright-core/src/server/socksClientCertificatesInterceptor.ts

@@ -238,20 +238,23 @@ class SocksProxyConnection {
 
 export class ClientCertificatesProxy {
   _socksProxy: SocksProxy;
+  _loopback: string;
   private _connections: Map<string, SocksProxyConnection> = new Map();
   ignoreHTTPSErrors: boolean | undefined;
   secureContextMap: Map<string, tls.SecureContext> = new Map();
   alpnCache: ALPNCache;
   proxyAgentFromOptions: ReturnType<typeof createProxyAgent>;
 
   private constructor(
-    contextOptions: Pick<types.BrowserContextOptions, 'clientCertificates' | 'ignoreHTTPSErrors' | 'proxy'>
+    contextOptions: Pick<types.BrowserContextOptions, 'clientCertificates' | 'ignoreHTTPSErrors' | 'proxy'>,
+    loopback: string | undefined
   ) {
     verifyClientCertificates(contextOptions.clientCertificates);
     this.alpnCache = new ALPNCache();
     this.ignoreHTTPSErrors = contextOptions.ignoreHTTPSErrors;
     this.proxyAgentFromOptions = createProxyAgent(contextOptions.proxy);
     this._initSecureContexts(contextOptions.clientCertificates);
+    this._loopback = loopback ?? '127.0.0.1';
     this._socksProxy = new SocksProxy();
     this._socksProxy.setPattern('*');
     this._socksProxy.addListener(SocksProxy.Events.SocksRequested, async (payload: SocksSocketRequestedPayload) => {
@@ -294,14 +297,14 @@ export class ClientCertificatesProxy {
     }
   }
 
-  public static async create(contextOptions: Pick<types.BrowserContextOptions, 'clientCertificates' | 'ignoreHTTPSErrors' | 'proxy'>) {
-    const proxy = new ClientCertificatesProxy(contextOptions);
-    await proxy._socksProxy.listen(0, '127.0.0.1');
+  public static async create(contextOptions: Pick<types.BrowserContextOptions, 'clientCertificates' | 'ignoreHTTPSErrors' | 'proxy'>, loopback: string | undefined) {
+    const proxy = new ClientCertificatesProxy(contextOptions, loopback);
+    await proxy._socksProxy.listen(0);
     return proxy;
   }
 
   public proxySettings(): types.ProxySettings {
-    return { server: `socks5://127.0.0.1:${this._socksProxy.port()}` };
+    return { server: `socks5://${this._loopback}:${this._socksProxy.port()}` };
   }
 
   public async close() {

packages/playwright-core/src/server/webkit/webkit.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { spawnSync } from 'child_process';
+import { execSync, spawnSync } from 'child_process';
 
 import { kBrowserCloseMessageId } from './wkConnection';
 import { wrapInASCIIBox } from '../utils/ascii';
@@ -96,6 +96,12 @@ export class WebKit extends BrowserType {
       webkitArguments.push('about:blank');
     return webkitArguments;
   }
+
+  loopback(channel: string): string | undefined {
+    if (channel === 'webkit-wsl' && execSync('wsl -d playwright --cd /home/pwuser wslinfo --networking-mode').includes('nat'))
+      return execSync('wsl -d playwright --cd /home/pwuser ip route show', { encoding: 'utf8' }).trim().split('\n').find(line => line.includes('default'))?.split(' ')[2];
+    return undefined;
+  }
 }
 
 export function translatePathToWSL(path: string): string {

tests/library/browsercontext-cookies-third-party.spec.ts

@@ -323,7 +323,7 @@ test(`add 'Partitioned;' cookie via API`, async ({ page, context, browserName, h
     {
       name: 'top-level-partitioned',
       value: 'value',
-      domain: 'localhost',
+      domain: new URL(httpsServer.EMPTY_PAGE).hostname,
       path: '/',
       expires: -1,
       httpOnly: false,
@@ -335,7 +335,7 @@ test(`add 'Partitioned;' cookie via API`, async ({ page, context, browserName, h
     {
       name: 'top-level-non-partitioned',
       value: 'value',
-      domain: 'localhost',
+      domain: new URL(httpsServer.EMPTY_PAGE).hostname,
       path: '/',
       expires: -1,
       httpOnly: false,
@@ -345,7 +345,7 @@ test(`add 'Partitioned;' cookie via API`, async ({ page, context, browserName, h
     {
       name: 'frame-partitioned',
       value: 'value',
-      domain: 'localhost',
+      domain: new URL(httpsServer.EMPTY_PAGE).hostname,
       path: '/',
       expires: -1,
       httpOnly: false,
@@ -357,7 +357,7 @@ test(`add 'Partitioned;' cookie via API`, async ({ page, context, browserName, h
     {
       name: 'frame-non-partitioned',
       value: 'value',
-      domain: 'localhost',
+      domain: new URL(httpsServer.EMPTY_PAGE).hostname,
       path: '/',
       expires: -1,
       httpOnly: false,