Merge pull request #20 from advanced-security/jsinglet/repo-library-issue

exception for installing packs

Author: jsinglet

src/CodeQLToolkit.Features/Query/Commands/Targets/InstallQueryPacksCommandTarget.cs

@@ -1,4 +1,5 @@
 using CodeQLToolkit.Shared.CodeQL;
+using CodeQLToolkit.Shared.Utils;
 using Microsoft.VisualBasic;
 using System;
 using System.Collections.Generic;
@@ -26,7 +27,35 @@ public override void Run()
 
             installation.EnableCustomCodeQLBundles = UseBundle;
 
+            //
             installation.IsInstalledOrDie();
+            //
+
+
+            // filter the packs that are part of a custom bundle if we are using bundles.
+            if(UseBundle)
+            {
+                // load the config
+                var config = QLTConfig.LoadFromFile(Base);
+
+                Log<InstallQueryPacksCommandTarget>.G().LogInformation("In bundle mode so filtering bundled packs...");
+
+                
+                foreach (var pack in config.ExportedCustomizationPacks)
+                {
+                    Log<InstallQueryPacksCommandTarget>.G().LogInformation($"Pack {pack} will NOT installed because it is part of the bundle...");
+                }
+
+                files = files.Where(f => !config.ExportedCustomizationPacks.Any(p => CodeQLPackReader.read(f).Name == p)).ToArray();
+
+                Log<InstallQueryPacksCommandTarget>.G().LogInformation($"Got {files.Length} packs after filtering...");
+
+                foreach (var file in files)
+                {
+                    Log<InstallQueryPacksCommandTarget>.G().LogInformation($"Pack {CodeQLPackReader.read(file).Name} in {file} will installed because it is not part of the bundle...");
+                }
+            }
+
 
             foreach ( string file in files )
             {

src/CodeQLToolkit.Shared/CodeQLToolkit.Shared.csproj

@@ -13,6 +13,7 @@
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.2" />
     <PackageReference Include="Scriban" Version="5.7.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageReference Include="YamlDotNet" Version="15.1.2" />
   </ItemGroup>
 
 </Project>

src/CodeQLToolkit.Shared/Utils/PackReader.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using YamlDotNet.RepresentationModel;
+
+namespace CodeQLToolkit.Shared.Utils
+{
+    public class CodeQLPack
+    {
+        public string Name { get; set; }
+    }
+    public class CodeQLPackReader
+    {
+        public static CodeQLPack read(string path)
+        {
+            var pack = new CodeQLPack();
+
+            using (var reader = new StreamReader(path))
+            {
+                var yaml = new YamlStream();
+                yaml.Load(reader);
+
+                var root = (YamlMappingNode)yaml.Documents[0].RootNode;
+
+                foreach (var e in root.Children)
+                {
+                    if(e.Key.ToString() == "name")
+                    {
+                        pack.Name = e.Value.ToString();
+                    }
+                }
+
+
+
+            }
+
+            return pack;
+        }
+    }
+}

src/CodeQLToolkit.Shared/Utils/QLTConfig.cs

@@ -52,5 +52,21 @@ public void ToFile()
             var data = JsonConvert.SerializeObject(this, Formatting.Indented);
             File.WriteAllText(CodeQLConfigFilePath, data);
         }
+
+        public static QLTConfig? LoadFromFile(string baseDir)
+        {
+            var config = new QLTConfig()
+            {
+                Base = baseDir
+            };
+            
+
+            if (File.Exists(config.CodeQLConfigFilePath))
+            {
+                return config.FromFile();
+            }
+
+            return null;
+        }
     }
 }

test/CodeQLToolkit.Shared.Tests/Utils/PackReaderTests.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CodeQLToolkit.Shared.Tests.Utils
+{
+    public class PackReaderTests
+    {
+        public string TestFile { get; set; }
+        [SetUp]
+        public void Setup()
+        {
+            var doc = @"
+---
+library: true
+name: qlt2/stuff2
+version: 0.0.1
+description: Default description
+suites: 
+license: 
+dependencies:
+  codeql/cpp-all: ""0.12.2""
+";
+
+            TestFile = Path.Combine(Path.GetTempPath(), "qlpack.yml");
+
+            File.WriteAllText(TestFile, doc);
+        }
+
+        [Test]
+        public void TestReadPackName()
+        {
+            Assert.AreEqual("qlt2/stuff2", CodeQLPackReader.read(TestFile).Name);
+        }
+    }
+}