Initial ISO Protection Detection

BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj

@@ -16,10 +16,10 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-        <PackageReference Include="SabreTools.Serialization" Version="[2.0.2]" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+        <PackageReference Include="SabreTools.Serialization" Version="[2.1.0]" />
         <PackageReference Include="xunit" Version="2.9.3" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

BinaryObjectScanner.Test/FileType/DiskImageTests.cs

@@ -0,0 +1,34 @@
+using System.IO;
+using BinaryObjectScanner.FileType;
+using Xunit;
+
+namespace BinaryObjectScanner.Test.FileType
+{
+    public class DiskImageTests
+    {
+        private static readonly SabreTools.Serialization.Wrappers.ISO9660 wrapper
+            = new(new SabreTools.Data.Models.ISO9660.Volume(), new MemoryStream(new byte[1024]));
+
+        [Fact]
+        public void DetectFile_EmptyString_Null()
+        {
+            string file = string.Empty;
+            var detectable = new ISO9660(wrapper);
+
+            string? actual = detectable.Detect(file, includeDebug: false);
+            Assert.Null(actual);
+        }
+
+        [Fact]
+        public void DetectStream_EmptyStream_Empty()
+        {
+            Stream? stream = new MemoryStream();
+            string file = string.Empty;
+            var detectable = new ISO9660(wrapper);
+
+            string? actual = detectable.Detect(stream, file, includeDebug: false);
+            Assert.NotNull(actual);
+            Assert.Empty(actual);
+        }
+    }
+}

BinaryObjectScanner.Test/Protection/AlphaROMTests.cs

@@ -18,5 +18,18 @@ public void CheckPortableExecutableTest()
             string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
+
+        [Fact]
+        public void CheckDiskImageTest()
+        {
+            string file = "filename";
+            SabreTools.Data.Models.ISO9660.Volume model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.ISO9660 iso = new(model, source);
+
+            var checker = new AlphaROM();
+            string? actual = checker.CheckDiskImage(file, iso, includeDebug: false);
+            Assert.Null(actual);
+        }
     }
 }

BinaryObjectScanner.Test/Protection/CopyLokTests.cs

@@ -18,5 +18,18 @@ public void CheckPortableExecutableTest()
             string? actual = checker.CheckExecutable(file, exe, includeDebug: false);
             Assert.Null(actual);
         }
+
+        [Fact]
+        public void CheckDiskImageTest()
+        {
+            string file = "filename";
+            SabreTools.Data.Models.ISO9660.Volume model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.ISO9660 iso = new(model, source);
+
+            var checker = new CopyLok();
+            string? actual = checker.CheckDiskImage(file, iso, includeDebug: false);
+            Assert.Null(actual);
+        }
     }
 }

BinaryObjectScanner.Test/Protection/LaserLokTests.cs

@@ -40,5 +40,18 @@ public void CheckFilePathTest()
             string? actual = checker.CheckFilePath(path);
             Assert.Null(actual);
         }
+
+        [Fact]
+        public void CheckDiskImageTest()
+        {
+            string file = "filename";
+            SabreTools.Data.Models.ISO9660.Volume model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.ISO9660 iso = new(model, source);
+
+            var checker = new LaserLok();
+            string? actual = checker.CheckDiskImage(file, iso, includeDebug: false);
+            Assert.Null(actual);
+        }
     }
 }

BinaryObjectScanner.Test/Protection/MacrovisionTests.cs

@@ -53,5 +53,18 @@ public void CheckFilePathTest()
             string? actual = checker.CheckFilePath(path);
             Assert.Null(actual);
         }
+
+        [Fact]
+        public void CheckDiskImageTest()
+        {
+            string file = "filename";
+            SabreTools.Data.Models.ISO9660.Volume model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.ISO9660 iso = new(model, source);
+
+            var checker = new Macrovision();
+            string? actual = checker.CheckDiskImage(file, iso, includeDebug: false);
+            Assert.Null(actual);
+        }
     }
 }

BinaryObjectScanner.Test/Protection/ProtectDiscTests.cs

@@ -40,5 +40,18 @@ public void CheckFilePathTest()
             string? actual = checker.CheckFilePath(path);
             Assert.Null(actual);
         }
+
+        [Fact]
+        public void CheckDiskImageTest()
+        {
+            string file = "filename";
+            SabreTools.Data.Models.ISO9660.Volume model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.ISO9660 iso = new(model, source);
+
+            var checker = new ProtectDISC();
+            string? actual = checker.CheckDiskImage(file, iso, includeDebug: false);
+            Assert.Null(actual);
+        }
     }
 }

BinaryObjectScanner.Test/Protection/SecuROMTests.cs

@@ -40,5 +40,18 @@ public void CheckFilePathTest()
             string? actual = checker.CheckFilePath(path);
             Assert.Null(actual);
         }
+
+        [Fact]
+        public void CheckDiskImageTest()
+        {
+            string file = "filename";
+            SabreTools.Data.Models.ISO9660.Volume model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.ISO9660 iso = new(model, source);
+
+            var checker = new SecuROM();
+            string? actual = checker.CheckDiskImage(file, iso, includeDebug: false);
+            Assert.Null(actual);
+        }
     }
 }

BinaryObjectScanner.Test/Protection/StarForceTests.cs

@@ -40,5 +40,18 @@ public void CheckFilePathTest()
             string? actual = checker.CheckFilePath(path);
             Assert.Null(actual);
         }
+
+        [Fact]
+        public void CheckDiskImageTest()
+        {
+            string file = "filename";
+            SabreTools.Data.Models.ISO9660.Volume model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.ISO9660 iso = new(model, source);
+
+            var checker = new StarForce();
+            string? actual = checker.CheckDiskImage(file, iso, includeDebug: false);
+            Assert.Null(actual);
+        }
     }
 }

BinaryObjectScanner.Test/Protection/TAGESTests.cs

@@ -40,5 +40,18 @@ public void CheckFilePathTest()
             string? actual = checker.CheckFilePath(path);
             Assert.Null(actual);
         }
+
+        [Fact]
+        public void CheckDiskImageTest()
+        {
+            string file = "filename";
+            SabreTools.Data.Models.ISO9660.Volume model = new();
+            Stream source = new MemoryStream(new byte[1024]);
+            SabreTools.Serialization.Wrappers.ISO9660 iso = new(model, source);
+
+            var checker = new TAGES();
+            string? actual = checker.CheckDiskImage(file, iso, includeDebug: false);
+            Assert.Null(actual);
+        }
     }
 }

BinaryObjectScanner/BinaryObjectScanner.csproj

@@ -49,9 +49,9 @@
         <PackageReference Include="GrindCore.SharpCompress" Version="0.40.4-alpha" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
         <PackageReference Include="MinThreadingBridge" Version="0.11.4" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))" />
         <PackageReference Include="SabreTools.Hashing" Version="[1.5.1]" />
-        <PackageReference Include="SabreTools.IO" Version="[1.7.6]" />
-        <PackageReference Include="SabreTools.Serialization" Version="[2.0.2]" />
-        <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.9" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
+        <PackageReference Include="SabreTools.IO" Version="[1.8.0]" />
+        <PackageReference Include="SabreTools.Serialization" Version="[2.1.0]" />
+        <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.10" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
     </ItemGroup>
 
 </Project>

BinaryObjectScanner/Data/StaticChecks.cs

@@ -22,6 +22,18 @@ public static IContentCheck[] ContentCheckClasses
             }
         }
 
+        /// <summary>
+        /// Cache for all IISOCheck<ISO> types
+        /// </summary>
+        public static IDiskImageCheck<ISO9660>[] ISO9660CheckClasses
+        {
+            get
+            {
+                iso9660CheckClasses ??= InitCheckClasses<IDiskImageCheck<ISO9660>>();
+                return iso9660CheckClasses;
+            }
+        }
+
         /// <summary>
         /// Cache for all IExecutableCheck<LinearExecutable> types
         /// </summary>
@@ -91,6 +103,12 @@ public static IExecutableCheck<PortableExecutable>[] PortableExecutableCheckClas
         /// </summary>
         private static IContentCheck[]? contentCheckClasses;
 
+
+        /// <summary>
+        /// Cache for all IISOCheck<ISO9660> types
+        /// </summary>
+        private static IDiskImageCheck<ISO9660>[]? iso9660CheckClasses;
+
         /// <summary>
         /// Cache for all IExecutableCheck<LinearExecutable> types
         /// </summary>

BinaryObjectScanner/FileType/DiskImage.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using BinaryObjectScanner.Data;
+using BinaryObjectScanner.Interfaces;
+using SabreTools.IO.Extensions;
+using SabreTools.Serialization.Wrappers;
+
+namespace BinaryObjectScanner.FileType
+{
+    /// <summary>
+    /// Disk image file
+    /// </summary>
+    public abstract class DiskImage<T> : DetectableBase<T>
+        where T : WrapperBase
+    {
+        /// <inheritdoc/>
+        public DiskImage(T wrapper) : base(wrapper) { }
+
+        #region Check Runners
+
+        /// <summary>
+        /// Handle a single file based on all ISO check implementations
+        /// </summary>
+        /// <param name="file">Name of the source file of the ISO, for tracking</param>
+        /// <param name="checks">Set of checks to use</param>
+        /// <param name="includeDebug">True to include debug data, false otherwise</param>
+        /// <returns>Set of protections in file, empty on error</returns>
+        protected IDictionary<U, string> RunISOChecks<U>(string file, U[] checks, bool includeDebug)
+            where U : IDiskImageCheck<T>
+        {
+            // Create the output dictionary
+            var protections = new CheckDictionary<U>();
+
+            // Iterate through all checks
+            checks.IterateWithAction(checkClass =>
+            {
+                // Get the protection for the class, if possible
+                var protection = checkClass.CheckDiskImage(file, _wrapper, includeDebug);
+                if (string.IsNullOrEmpty(protection))
+                    return;
+
+                protections.Append(checkClass, protection);
+            });
+
+            return protections;
+        }
+
+        #endregion
+    }
+}

BinaryObjectScanner/FileType/Executable.cs

@@ -76,7 +76,6 @@ protected IDictionary<IContentCheck, string> RunContentChecks(string? file, Stre
         /// <param name="file">Name of the source file of the executable, for tracking</param>
         /// <param name="exe">Executable to scan</param>
         /// <param name="checks">Set of checks to use</param>
-        /// <param name="scanner">Scanner for handling recursive protections</param>
         /// <param name="includeDebug">True to include debug data, false otherwise</param>
         /// <returns>Set of protections in file, empty on error</returns>
         protected IDictionary<U, string> RunExecutableChecks<U>(string file, T exe, U[] checks, bool includeDebug)