Fixes

square · Feb 10, 2024 · dfa7c34 · dfa7c34
1 parent 2ab1256
commit dfa7c34
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/okhttp/src/main/kotlin/okhttp3/OkHttpClient.kt b/okhttp/src/main/kotlin/okhttp3/OkHttpClient.kt
@@ -1052,11 +1052,13 @@ open class OkHttpClient internal constructor(
      */
     fun certificatePinner(certificatePinner: CertificatePinner) =
       apply {
-        if (certificatePinner != this.certificatePinner) {
+        val cleanCertificatePinner = CertificatePinner(certificatePinner.pins)
+
+        if (cleanCertificatePinner != this.certificatePinner) {
           this.routeDatabase = null
         }
 
-        this.certificatePinner = certificatePinner
+        this.certificatePinner = cleanCertificatePinner
       }
 
     /**

diff --git a/okhttp/src/test/java/okhttp3/OkHttpClientTest.kt b/okhttp/src/test/java/okhttp3/OkHttpClientTest.kt
@@ -362,6 +362,15 @@ class OkHttpClientTest {
         .routeDatabase,
     )
 
+    // identical CertificatePinner
+    assertSame(
+      client.routeDatabase,
+      client.newBuilder()
+        .certificatePinner(CertificatePinner.Builder().build())
+        .build()
+        .routeDatabase,
+    )
+
     // logically different scope of client for route db
     assertNotSame(
       client.routeDatabase,
@@ -422,7 +431,9 @@ class OkHttpClientTest {
     assertNotSame(
       client.routeDatabase,
       client.newBuilder()
-        .certificatePinner(CertificatePinner.Builder().build())
+        .certificatePinner(CertificatePinner.Builder()
+          .add("san.com", "sha1/afwiKY3RxoMmLkuRW1l7QsPZTJPwDS2pdDROQjXw8ig=")
+          .build())
         .build()
         .routeDatabase,
     )