Address comments

NuGet · Mar 8, 2024 · 6265781 · 6265781
1 parent 84d67b4
commit 6265781
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpHandlerResourceV3Provider.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpHandlerResourceV3Provider.cs
@@ -19,6 +19,11 @@ public class HttpHandlerResourceV3Provider : ResourceProvider
     {
         private readonly IProxyCache _proxyCache;
 
+#if NETSTANDARD2_0
+        internal static Func<HttpRequestMessage, X509Certificate2, X509Chain, SslPolicyErrors, bool> DangerousAcceptAnyServerCertificateValidator =
+            (message, certificate, chain, policyErrors) => true;
+#endif
+
         public HttpHandlerResourceV3Provider()
             : this(ProxyCache.Instance)
         {
@@ -61,7 +66,7 @@ private HttpHandlerResourceV3 CreateResource(PackageSource packageSource)
 #if NETSTANDARD2_0
             if (packageSource.DisableTLSCertificateValidation)
             {
-                clientHandler.ServerCertificateCustomValidationCallback = (HttpRequestMessage message, X509Certificate2 cert, X509Chain chain, SslPolicyErrors errors) => true;
+                clientHandler.ServerCertificateCustomValidationCallback = DangerousAcceptAnyServerCertificateValidator;
             }
 #else
             if (packageSource.DisableTLSCertificateValidation)

diff --git a/...uGet.Core.FuncTests/Dotnet.Integration.Test/DotnetRestoreTLSCertificateValidationTests.cs b/...uGet.Core.FuncTests/Dotnet.Integration.Test/DotnetRestoreTLSCertificateValidationTests.cs
@@ -34,7 +34,7 @@ await SimpleTestPackageUtility.CreateFolderFeedV3Async(
             var projectA = XPlatTestUtils.CreateProject("ProjectA", pathContext, packageA100, "net472");
             var workingDirectory = Path.Combine(pathContext.SolutionRoot, projectA.ProjectName);
             SelfSignedCertificateMockServer tcpListenerServer = new SelfSignedCertificateMockServer(pathContext.PackageSource);
-            var serverTask = tcpListenerServer.StartServer();
+            var serverTask = tcpListenerServer.StartServerAsync();
             var configFile = @$"<?xml version=""1.0"" encoding=""utf-8""?>
 <configuration>
     <packageSources>
@@ -62,7 +62,7 @@ await SimpleTestPackageUtility.CreateFolderFeedV3Async(
             var projectB = XPlatTestUtils.CreateProject("ProjectB", pathContext, packageB100, "net472");
             var workingDirectory = Path.Combine(pathContext.SolutionRoot, projectB.ProjectName);
             SelfSignedCertificateMockServer tcpListenerServer = new SelfSignedCertificateMockServer(pathContext.PackageSource);
-            var serverTask = tcpListenerServer.StartServer();
+            var serverTask = tcpListenerServer.StartServerAsync();
             var configFile = @$"<?xml version=""1.0"" encoding=""utf-8""?>
 <configuration>
     <packageSources>
@@ -92,8 +92,8 @@ await SimpleTestPackageUtility.CreateFolderFeedV3Async(
             var workingDirectory = Path.Combine(pathContext.SolutionRoot, projectB.ProjectName);
             SelfSignedCertificateMockServer tcpListenerServer1 = new SelfSignedCertificateMockServer(pathContext.PackageSource);
             SelfSignedCertificateMockServer tcpListenerServer2 = new SelfSignedCertificateMockServer(pathContext.PackageSource);
-            var serverTask = tcpListenerServer1.StartServer();
-            var serverTask2 = tcpListenerServer2.StartServer();
+            var serverTask = tcpListenerServer1.StartServerAsync();
+            var serverTask2 = tcpListenerServer2.StartServerAsync();
             var configFile = @$"<?xml version=""1.0"" encoding=""utf-8""?>
 <configuration>
     <packageSources>
@@ -125,8 +125,8 @@ await SimpleTestPackageUtility.CreateFolderFeedV3Async(
             var workingDirectory = Path.Combine(pathContext.SolutionRoot, projectB.ProjectName);
             SelfSignedCertificateMockServer tcpListenerServer1 = new SelfSignedCertificateMockServer(pathContext.PackageSource);
             SelfSignedCertificateMockServer tcpListenerServer2 = new SelfSignedCertificateMockServer(pathContext.PackageSource);
-            var serverTask = tcpListenerServer1.StartServer();
-            var serverTask2 = tcpListenerServer2.StartServer();
+            var serverTask = tcpListenerServer1.StartServerAsync();
+            var serverTask2 = tcpListenerServer2.StartServerAsync();
             var configFile = @$"<?xml version=""1.0"" encoding=""utf-8""?>
 <configuration>
     <packageSources>

diff --git a/test/TestUtilities/Test.Utility/SelfSignedCertificateMockServer.cs b/test/TestUtilities/Test.Utility/SelfSignedCertificateMockServer.cs
@@ -32,9 +32,8 @@ public SelfSignedCertificateMockServer(string packageDirectory)
             _certificate = GenerateSelfSignedCertificate();
         }
 
-        public async Task StartServer()
+        public async Task StartServerAsync()
         {
-
             var portReserver = new PortReserver();
             var portNumber = await portReserver.ExecuteAsync((p, t) => Task.FromResult(p), CancellationToken.None);
             _tcpListener = new TcpListener(IPAddress.Loopback, portNumber);
@@ -59,7 +58,7 @@ private async Task HandleClient(TcpClient client)
             using (client)
             using (var sslStream = new SslStream(client.GetStream(), false))
             {
-                await sslStream.AuthenticateAsServerAsync(_certificate, clientCertificateRequired: false, enabledSslProtocols: SslProtocols.Tls12, checkCertificateRevocation: true);
+                await sslStream.AuthenticateAsServerAsync(_certificate, clientCertificateRequired: false, checkCertificateRevocation: true);
                 using (var reader = new StreamReader(sslStream, Encoding.ASCII, false, 128))
                 using (var writer = new StreamWriter(sslStream, Encoding.ASCII, 128, false))
                 {

diff --git a/test/TestUtilities/Test.Utility/TestServer/TcpListenerServer.cs b/test/TestUtilities/Test.Utility/TestServer/TcpListenerServer.cs
@@ -11,7 +11,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Net.Security;
-using System.Security.Authentication;
 
 namespace NuGet.Test.Server
 {
@@ -95,7 +94,7 @@ private async Task StartInvalidTlsCertificateServer(TcpListener tcpListener, Can
                 using (var client = await Task.Run(tcpListener.AcceptTcpClientAsync, token))
                 using (var sslStream = new SslStream(client.GetStream(), false))
                 {
-                    sslStream.AuthenticateAsServer(_tlsCertificate, clientCertificateRequired: false, SslProtocols.Tls12, checkCertificateRevocation: true);
+                    sslStream.AuthenticateAsServer(_tlsCertificate, clientCertificateRequired: false, checkCertificateRevocation: true);
                     using (var reader = new StreamReader(sslStream, Encoding.ASCII, false, 128))
                     using (var writer = new StreamWriter(sslStream, Encoding.ASCII, 128, false))
                     {