fix: unc file paths (#316)

snyk · Oct 18, 2024 · 62cbd5b · 62cbd5b
1 parent d5636c9
commit 62cbd5b
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 11 deletions.
diff --git a/...xtension.2022/Language/JTokenExtension.cs → ...tension.2022/Extension/JTokenExtension.cs b/...xtension.2022/Language/JTokenExtension.cs → ...tension.2022/Extension/JTokenExtension.cs
@@ -1,7 +1,7 @@
 using System;
 using Newtonsoft.Json.Linq;
 
-namespace Snyk.VisualStudio.Extension.Language
+namespace Snyk.VisualStudio.Extension.Extension
 {
     public static class JTokenExtension
     {

diff --git a/Snyk.VisualStudio.Extension.2022/Extension/UriExtensions.cs b/Snyk.VisualStudio.Extension.2022/Extension/UriExtensions.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Snyk.VisualStudio.Extension.Extension;
+
+public static class UriExtensions
+{
+    public static string UncAwareAbsolutePath(this Uri uri)
+    {
+        if (uri == null) return string.Empty;
+        return uri.IsUnc ? uri.LocalPath : uri.AbsolutePath;
+    }
+}
diff --git a/Snyk.VisualStudio.Extension.2022/Language/SnykLanguageClientCustomTarget.cs b/Snyk.VisualStudio.Extension.2022/Language/SnykLanguageClientCustomTarget.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using Snyk.Common.Authentication;
+using Snyk.VisualStudio.Extension.Extension;
 using Snyk.VisualStudio.Extension.Service;
 using StreamJsonRpc;
 
@@ -36,9 +37,9 @@ public async Task OnPublishDiagnostics316(JToken arg)
             var parsedUri = new Uri(uri.ToString());
             if (diagnosticsArray == null || diagnosticsArray.Count == 0)
             {
-                snykCodeIssueDictionary.TryRemove(parsedUri.AbsolutePath, out _);
-                snykOssIssueDictionary.TryRemove(parsedUri.AbsolutePath, out _);
-                snykIaCIssueDictionary.TryRemove(parsedUri.AbsolutePath, out _);
+                snykCodeIssueDictionary.TryRemove(parsedUri.UncAwareAbsolutePath(), out _);
+                snykOssIssueDictionary.TryRemove(parsedUri.UncAwareAbsolutePath(), out _);
+                snykIaCIssueDictionary.TryRemove(parsedUri.UncAwareAbsolutePath(), out _);
                 return;
             }
 
@@ -60,13 +61,13 @@ public async Task OnPublishDiagnostics316(JToken arg)
             switch (source)
             {
                 case "code":
-                    snykCodeIssueDictionary.TryAdd(parsedUri.AbsolutePath, dataList);
+                    snykCodeIssueDictionary.TryAdd(parsedUri.UncAwareAbsolutePath(), dataList);
                     break;
                 case "oss":
-                     snykOssIssueDictionary.TryAdd(parsedUri.AbsolutePath, dataList);
+                     snykOssIssueDictionary.TryAdd(parsedUri.UncAwareAbsolutePath(), dataList);
                     break;
                 case "iac":
-                    snykIaCIssueDictionary.TryAdd(parsedUri.AbsolutePath, dataList);
+                    snykIaCIssueDictionary.TryAdd(parsedUri.UncAwareAbsolutePath(), dataList);
                     break;
                 default:
                     throw new InvalidProductTypeException();

diff --git a/Snyk.VisualStudio.Extension.2022/Language/SnykLanguageClientMiddleware.cs b/Snyk.VisualStudio.Extension.2022/Language/SnykLanguageClientMiddleware.cs
@@ -5,6 +5,7 @@
 using Newtonsoft.Json.Linq;
 using Serilog;
 using Snyk.Common;
+using Snyk.VisualStudio.Extension.Extension;
 
 namespace Snyk.VisualStudio.Extension.Language
 {

diff --git a/Snyk.VisualStudio.Extension.2022/Snyk.VisualStudio.Extension.2022.csproj b/Snyk.VisualStudio.Extension.2022/Snyk.VisualStudio.Extension.2022.csproj
@@ -62,10 +62,11 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="Extension\JTokenExtension.cs" />
+    <Compile Include="Extension\UriExtensions.cs" />
     <Compile Include="Language\CustomInitializationOptions.cs" />
     <Compile Include="Language\ILanguageClientManager.cs" />
     <Compile Include="Language\InvalidProductTypeException.cs" />
-    <Compile Include="Language\JTokenExtension.cs" />
     <Compile Include="Language\LsConstants.cs" />
     <Compile Include="Language\LsAnalysisResult.cs" />
     <Compile Include="Language\SatisfyImportExtension.cs" />

diff --git a/Snyk.VisualStudio.Extension.2022/UI/Tree/SnykFilterableTree.xaml.cs b/Snyk.VisualStudio.Extension.2022/UI/Tree/SnykFilterableTree.xaml.cs
@@ -105,7 +105,7 @@ public IDictionary<string, IEnumerable<Issue>> OssResult
                 var lowSeverityCount = 0;
                 var currentFolder = ThreadHelper.JoinableTaskFactory.Run(async () =>
                     await SnykVSPackage.ServiceProvider.SolutionService.GetSolutionFolderAsync()).Replace("\\","/");
-                foreach (var kv in value.Where(x=>x.Key.Contains(currentFolder)))
+                foreach (var kv in value.Where(x=>x.Key.Replace("\\", "/").Contains(currentFolder)))
                 {
                     var filePath = kv.Key;
                     var issueList = kv.Value.ToList();
@@ -188,7 +188,7 @@ public IDictionary<string, IEnumerable<Issue>> IacResults
                 var lowSeverityCount = 0;
                 var currentFolder = ThreadHelper.JoinableTaskFactory.Run(async () =>
                     await SnykVSPackage.ServiceProvider.SolutionService.GetSolutionFolderAsync()).Replace("\\", "/");
-                foreach (var kv in value.Where(x => x.Key.Contains(currentFolder)))
+                foreach (var kv in value.Where(x => x.Key.Replace("\\", "/").Contains(currentFolder)))
                 {
                     var filePath = kv.Key;
                     var issues = kv.Value.ToList();
@@ -373,7 +373,7 @@ private void AppendSnykCodeIssues(RootTreeNode rootNode, IDictionary<string, IEn
             rootNode.Clean();
             var currentFolder = ThreadHelper.JoinableTaskFactory.Run(async () =>
                 await SnykVSPackage.ServiceProvider.SolutionService.GetSolutionFolderAsync()).Replace("\\", "/");
-            foreach (var kv in analysisResult.Where(x => x.Key.Contains(currentFolder)))
+            foreach (var kv in analysisResult.Where(x => x.Key.Replace("\\", "/").Contains(currentFolder)))
             {
                 var filePath = kv.Key;
                 var issueList = kv.Value.ToList();