Use Npgsql 9.0.0-preview.1-ci.20241025T100626 (#3330)

npgsql · Oct 27, 2024 · 222c13a · 222c13a
1 parent 90e2c70
commit 222c13a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <EFCoreVersion>[9.0.0-rc.2.24474.1]</EFCoreVersion>
     <MicrosoftExtensionsVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsVersion>
-    <NpgsqlVersion>8.0.5</NpgsqlVersion>
+    <NpgsqlVersion>9.0.0-preview.1-ci.20241025T100626</NpgsqlVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/EFCore.PG/Storage/Internal/NpgsqlDataSourceManager.cs b/src/EFCore.PG/Storage/Internal/NpgsqlDataSourceManager.cs
@@ -136,14 +136,19 @@ enumDefinition.StoreTypeSchema is null
         }
 
         // Legacy authentication-related callbacks at the EF level; apply these when building a data source as well.
-        if (npgsqlOptionsExtension.ProvideClientCertificatesCallback is not null)
+        if (npgsqlOptionsExtension.ProvideClientCertificatesCallback is not null
+            || npgsqlOptionsExtension.RemoteCertificateValidationCallback is not null)
         {
-            dataSourceBuilder.UseClientCertificatesCallback(x => npgsqlOptionsExtension.ProvideClientCertificatesCallback(x));
-        }
-
-        if (npgsqlOptionsExtension.RemoteCertificateValidationCallback is not null)
-        {
-            dataSourceBuilder.UseUserCertificateValidationCallback(npgsqlOptionsExtension.RemoteCertificateValidationCallback);
+            dataSourceBuilder.UseSslClientAuthenticationOptionsCallback(o =>
+            {
+                if (npgsqlOptionsExtension.ProvideClientCertificatesCallback is not null)
+                {
+                    o.ClientCertificates ??= new();
+                    npgsqlOptionsExtension.ProvideClientCertificatesCallback(o.ClientCertificates);
+                }
+
+                o.RemoteCertificateValidationCallback = npgsqlOptionsExtension.RemoteCertificateValidationCallback;
+            });
         }
 
         // Finally, if the user has provided a data source builder configuration action, invoke it.

diff --git a/src/EFCore.PG/Storage/Internal/NpgsqlRelationalConnection.cs b/src/EFCore.PG/Storage/Internal/NpgsqlRelationalConnection.cs
@@ -99,14 +99,18 @@ protected override DbConnection CreateDbConnection()
 
         var conn = new NpgsqlConnection(ConnectionString);
 
-        if (_provideClientCertificatesCallback is not null)
+        if (_provideClientCertificatesCallback is not null || _remoteCertificateValidationCallback is not null)
         {
-            conn.ProvideClientCertificatesCallback = _provideClientCertificatesCallback;
-        }
-
-        if (_remoteCertificateValidationCallback is not null)
-        {
-            conn.UserCertificateValidationCallback = _remoteCertificateValidationCallback;
+            conn.SslClientAuthenticationOptionsCallback = o =>
+            {
+                if (_provideClientCertificatesCallback is not null)
+                {
+                    o.ClientCertificates ??= new();
+                    _provideClientCertificatesCallback(o.ClientCertificates);
+                }
+
+                o.RemoteCertificateValidationCallback = _remoteCertificateValidationCallback;
+            };
         }
 
         if (_providePasswordCallback is not null)