fix: add pfxBase64 to jsonCert instead of params (#1746)

stevenfuhr · web-flow · commit 995cf902fb09 · 2025-02-07T12:33:20.000-08:00
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/Utils.java b/playwright/src/main/java/com/microsoft/playwright/impl/Utils.java
@@ -434,7 +434,7 @@ static void addToProtocol(JsonObject params, List<ClientCertificate> clientCerti
         }
         String pfxBase64 = base64Buffer(cert.pfx, cert.pfxPath);
         if (pfxBase64 != null) {
-          params.addProperty("pfx", pfxBase64);
+          jsonCert.addProperty("pfx", pfxBase64);
         }
       } catch (IOException e) {
         throw new PlaywrightException("Failed to read from file", e);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestClientCertificates.java b/playwright/src/test/java/com/microsoft/playwright/TestClientCertificates.java
@@ -1,7 +1,6 @@
 package com.microsoft.playwright;
 
 import com.microsoft.playwright.options.ClientCertificate;
-import com.microsoft.playwright.options.Proxy;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -120,6 +119,25 @@ public void passWithTrustedClientCertificates() {
     request.dispose();
   }
 
+  @Test
+  public void passWithTrustedClientCertificatesPfx() {
+    APIRequest.NewContextOptions requestOptions = new APIRequest.NewContextOptions()
+      .setIgnoreHTTPSErrors(true) // TODO: remove once we can pass a custom CA.
+      .setClientCertificates(asList(
+        new ClientCertificate(customServer.origin)
+          .setPfxPath(asset("client-certificates/client/trusted/client_keystore.p12"))
+          .setPassphrase("passphrase")));
+
+    APIRequestContext request = playwright.request().newContext(requestOptions);
+    APIResponse response = request.get(customServer.url);
+
+    assertEquals(customServer.url, response.url());
+    assertEquals(200, response.status());
+    assertTrue(response.text().contains("Hello CN=Alice, your certificate was issued by O=Client Certificate Demo,CN=localhost!"), response.text());
+
+    request.dispose();
+  }
+
   static boolean isWebKitMacOS() {
     return isWebKit() && isMac;
   }
diff --git a/playwright/src/test/resources/client-certificates/client/trusted/client_keystore.p12 b/playwright/src/test/resources/client-certificates/client/trusted/client_keystore.p12

Original file line number	Diff line number	Diff line change
`@@ -434,7 +434,7 @@ static void addToProtocol(JsonObject params, List<ClientCertificate> clientCerti`
`434`	`434`	`}`
`435`	`435`	`String pfxBase64 = base64Buffer(cert.pfx, cert.pfxPath);`
`436`	`436`	`if (pfxBase64 != null) {`
`437`		`- params.addProperty("pfx", pfxBase64);`
	`437`	`+ jsonCert.addProperty("pfx", pfxBase64);`
`438`	`438`	`}`
`439`	`439`	`} catch (IOException e) {`
`440`	`440`	`throw new PlaywrightException("Failed to read from file", e);`