Update to BurnOutSharp 1.5.0

CHANGELIST.md

@@ -19,6 +19,7 @@
 - Add option to allow users to select dumping program
 - ~~Updated to DIC version 20201101~~
 - Add support for `/ps` DIC flag
+- Updated to BurnOutSharp 1.5.0
 
 ### 1.17.1 (2020-09-14)
 - Shuffled some shared, internal UI variables

DICUI.Avalonia/DICUI.Avalonia.csproj

@@ -21,13 +21,15 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="0.9.12" />
     <PackageReference Include="Avalonia.Desktop" Version="0.9.12" />
-    <PackageReference Include="BurnOutSharp" PrivateAssets="analyzers;build" ExcludeAssets="contentFiles" Version="1.4.1" GeneratePathProperty="true" />
+    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="1.5.0" GeneratePathProperty="true">
+      <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(PkgBurnOutSharp)\content\**" PackagePath="contentFiles\any\any;content" CopyToOutputDirectory="Always" PackageCopyToOutput="true"/>
+    <Content Include="$(PkgBurnOutSharp)\content\**" PackagePath="contentFiles\any\any;content" CopyToOutputDirectory="Always" PackageCopyToOutput="true" />
   </ItemGroup>
     
   <ItemGroup>

DICUI.Check/DICUI.Check.csproj

@@ -22,11 +22,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BurnOutSharp" PrivateAssets="analyzers;build" ExcludeAssets="contentFiles" Version="1.4.1" GeneratePathProperty="true" />
+    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="1.5.0" GeneratePathProperty="true">
+      <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   
   <ItemGroup>
-    <Content Include="$(PkgBurnOutSharp)\content\**" PackagePath="contentFiles\any\any;content" CopyToOutputDirectory="Always" PackageCopyToOutput="true"/>
+    <Content Include="$(PkgBurnOutSharp)\content\**" PackagePath="contentFiles\any\any;content" CopyToOutputDirectory="Always" PackageCopyToOutput="true" />
   </ItemGroup>
 
   <ItemGroup>

DICUI.Library/DICUI.Library.csproj

@@ -67,13 +67,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BurnOutSharp" PrivateAssets="analyzers;build" ExcludeAssets="contentFiles" Version="1.4.1" GeneratePathProperty="true" />
+    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="1.5.0" GeneratePathProperty="true">
+      <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.Management" Version="4.7.0" />
   </ItemGroup>
   
   <ItemGroup>
-    <Content Include="$(PkgBurnOutSharp)\content\**" PackagePath="contentFiles\any\any;content" CopyToOutputDirectory="Always" PackageCopyToOutput="true"/>
+    <Content Include="$(PkgBurnOutSharp)\content\**" PackagePath="contentFiles\any\any;content" CopyToOutputDirectory="Always" PackageCopyToOutput="true" />
   </ItemGroup>
 
   <ItemGroup>

DICUI.Library/Utilities/Tools.cs

@@ -4,8 +4,74 @@ using DICUI.Web;
 
 namespace DICUI.Utilities
 {
-    public class Tools
+    public static class Tools
     {
+        #region Byte Arrays
+
+        /// <summary>
+        /// Search for a byte array in another array
+        /// </summary>
+        public static bool Contains(this byte[] stack, byte[] needle, out int position, int start = 0, int end = -1)
+        {
+            // Initialize the found position to -1
+            position = -1;
+
+            // If either array is null or empty, we can't do anything
+            if (stack == null || stack.Length == 0 || needle == null || needle.Length == 0)
+                return false;
+
+            // If the needle array is larger than the stack array, it can't be contained within
+            if (needle.Length > stack.Length)
+                return false;
+
+            // If start or end are not set properly, set them to defaults
+            if (start < 0)
+                start = 0;
+            if (end < 0)
+                end = stack.Length - needle.Length;
+
+            for (int i = start; i < end; i++)
+            {
+                if (stack.EqualAt(needle, i))
+                {
+                    position = i;
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// See if a byte array starts with another
+        /// </summary>
+        public static bool StartsWith(this byte[] stack, byte[] needle)
+        {
+            return stack.Contains(needle, out int _, start: 0, end: 1);
+        }
+
+        /// <summary>
+        /// Get if a stack at a certain index is equal to a needle
+        /// </summary>
+        private static bool EqualAt(this byte[] stack, byte[] needle, int index)
+        {
+            // If we're too close to the end of the stack, return false
+            if (needle.Length >= stack.Length - index)
+                return false;
+
+            for (int i = 0; i < needle.Length; i++)
+            {
+                if (stack[i + index] != needle[i])
+                    return false;
+            }
+
+            return true;
+        }
+
+        #endregion
+
+        #region Versioning
+
         /// <summary>
         /// Check for a new DICUI version
         /// </summary>
@@ -44,5 +110,6 @@ namespace DICUI.Utilities
             return $"{assemblyVersion.Major}.{assemblyVersion.Minor}" + (assemblyVersion.Build != 0 ? $".{assemblyVersion.Build}" : string.Empty);
         }
 
+        #endregion
     }
 }

DICUI.Library/Utilities/Validators.cs

@@ -1044,30 +1044,32 @@ namespace DICUI.Utilities
         /// <returns>Copy protection detected in the envirionment, if any</returns>
         public static async Task<string> RunProtectionScanOnPath(string path, IProgress<FileProtection> progress = null)
         {
-#if NET_FRAMEWORK
             try
             {
                 var found = await Task.Run(() =>
                 {
-                    return ProtectionFind.Scan(path, includePosition: false, progress: progress);
+                    var scanner = new Scanner(progress)
+                    {
+                        IncludePosition = false, // Debug flag to include protection position in file
+                        ScanAllFiles = false, // Forces all files to be scanned as executables
+                        ScanArchives = true, // Allows archives to have internals extracted and scanned
+                        ScanPackers = false, // Allows executable packers to be detected
+                    };
+                    return scanner.GetProtections(path);
                 });
 
                 if (found == null || found.Count == 0)
                     return "None found";
 
-                // Strip out "CD Check" instances due to false positives
+                // Join the output protections for writing
                 return string.Join("\n", found
-                    .Where(kvp => !kvp.Value.Equals("CD Check", StringComparison.OrdinalIgnoreCase))
-                    .Select(kvp => kvp.Key + ": " + kvp.Value.Replace("CD Check,", string.Empty).Replace("CD Check", string.Empty).Trim())
-                    .ToArray());
+                    .Where(kvp => kvp.Value != null && kvp.Value.Any())
+                    .Select(kvp => $"{kvp.Key}: {string.Join(", ", kvp.Value)}"));
             }
             catch (Exception ex)
             {
                 return $"Path could not be scanned! {ex}";
             }
-#else
-            return "Copy protection scanning is not available on .NET Core builds";
-#endif
         }
     }
 }

DICUI/DICUI.csproj

@@ -21,7 +21,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BurnOutSharp" PrivateAssets="analyzers;build" ExcludeAssets="contentFiles" Version="1.4.1" GeneratePathProperty="true" />
+    <PackageReference Include="BurnOutSharp" PrivateAssets="build; analyzers" ExcludeAssets="contentFiles" Version="1.5.0" GeneratePathProperty="true">
+      <IncludeAssets>runtime; compile; build; native; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
   </ItemGroup>