Merge pull request #18246 from michaelnebel/csharp/fixwarnings

C#: Fix some new compiler warnings
github · Dec 12, 2024 · a52a549 · a52a549
2 parents 5d18e23 + 684c80c
commit a52a549
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/csharp/.config/dotnet-tools.json b/csharp/.config/dotnet-tools.json
@@ -3,10 +3,10 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "9.0.1",
+      "version": "9.0.2",
       "commands": [
         "paket"
       ]
     }
   }
-}
+}
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs
@@ -604,6 +604,16 @@ private bool IsFeedReachable(string feed, int timeoutMilliSeconds, int tryCount,
                 {
                     httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, _) =>
                     {
+                        if (chain is null || cert is null)
+                        {
+                            var msg = cert is null && chain is null
+                                ? "certificate and chain"
+                                : chain is null
+                                    ? "chain"
+                                    : "certificate";
+                            logger.LogWarning($"Dependabot proxy certificate validation failed due to missing {msg}");
+                            return false;
+                        }
                         chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;
                         chain.ChainPolicy.CustomTrustStore.Add(this.dependabotProxy.Certificate);
                         return chain.Build(cert);

diff --git a/csharp/paket.lock b/csharp/paket.lock