SabreTools/BinaryObjectScanner
1
0
Fork 0
mirror of https://github.com/SabreTools/BinaryObjectScanner.git synced 2026-08-07 08:29:21 +00:00
Code Issues 295 Packages Projects Releases 20 Wiki Activity

Reduce redundant code in content matchers now

Browse Source
This commit is contained in:
Matt Nadareski
2021-08-25 20:26:43 -07:00
parent d26a89b8ab
commit 6cde7b8bef
59 changed files with 102 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
BurnOutSharp/FileType/Executable.cs
View File

@@ -6,6 +6,7 @@ using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using BurnOutSharp.Matching;
using BurnOutSharp.Tools;
namespace BurnOutSharp.FileType
@@ -88,18 +89,32 @@ namespace BurnOutSharp.FileType
if (stream.CanSeek)
stream.Seek(0, SeekOrigin.Begin);
// TODO: Find a way to combine the outputs of GetContentMatchSet to make this more efficient
// If they can be combined, we can have it do a Unique check per file
// Iterate through all content checks
Parallel.ForEach(contentCheckClasses, contentCheckClass =>
{
// TODO: Find a way to combine the outputs of GetContentMatchSet
// TODO: Have CheckContents take priority over GetContentMatchSet results
string protection = contentCheckClass.CheckContents(file, fileContent, scanner.IncludeDebug);
// Track if any protection is found
bool foundProtection = false;
// If we have a valid content check based on settings
if (!contentCheckClass.GetType().Namespace.ToLowerInvariant().Contains("packertype") || scanner.ScanPackers)
// Check using custom content checks first
string protection = contentCheckClass.CheckContents(file, fileContent, scanner.IncludeDebug);
foundProtection |= !string.IsNullOrWhiteSpace(protection);
if (ShouldAddProtection(contentCheckClass, scanner, protection))
Utilities.AppendToDictionary(protections, file, protection);
// If we didn't find anything in a custom check, use the content match sets
if (!foundProtection)
{
if (!string.IsNullOrWhiteSpace(protection))
Utilities.AppendToDictionary(protections, file, protection);
var contentMatchSets = contentCheckClass.GetContentMatchSets();
if (contentMatchSets != null && contentMatchSets.Any())
{
protection = MatchUtil.GetFirstMatch(file, fileContent, contentMatchSets, scanner.IncludeDebug);
foundProtection |= !string.IsNullOrWhiteSpace(protection);
if (ShouldAddProtection(contentCheckClass, scanner, protection))
Utilities.AppendToDictionary(protections, file, protection);
}
}
// If we have an IScannable implementation
@@ -126,5 +141,23 @@ namespace BurnOutSharp.FileType
.Where(t => t.IsClass && t.GetInterface(nameof(IContentCheck)) != null)
.Select(t => Activator.CreateInstance(t) as IContentCheck);
}
/// <summary>
/// Check to see if a protection should be added or not
/// </summary>
/// <param name="contentCheckClass">Class that was last used to check</param>
/// <param name="scanner">Scanner object for state tracking</param>
/// <param name="protection">The protection result to be checked</param>
private bool ShouldAddProtection(IContentCheck contentCheckClass, Scanner scanner, string protection)
{
// If we have a valid content check based on settings
if (!contentCheckClass.GetType().Namespace.ToLowerInvariant().Contains("packertype") || scanner.ScanPackers)
{
if (!string.IsNullOrWhiteSpace(protection))
return true;
}
return false;
}
}
}

6
BurnOutSharp/PackerType/AdvancedInstaller.cs
View File

@@ -24,10 +24,6 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/PackerType/Armadillo.cs
View File

@@ -19,10 +19,6 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/PackerType/CExe.cs
View File

@@ -32,11 +32,7 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentDictionary<string, ConcurrentQueue<string>> Scan(Scanner scanner, string file)

6
BurnOutSharp/PackerType/EXEStealth.cs
View File

@@ -23,10 +23,6 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/PackerType/InnoSetup.cs
View File

@@ -35,11 +35,7 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentDictionary<string, ConcurrentQueue<string>> Scan(Scanner scanner, string file)

8
BurnOutSharp/PackerType/InstallerVISE.cs
View File

@@ -22,13 +22,9 @@ namespace BurnOutSharp.PackerType
};
}
//TODO: Add exact version detection for Windows builds, make sure versions before 3.X are detected as well, and detect the Mac builds.
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
//TODO: Add exact version detection for Windows builds, make sure versions before 3.X are detected as well, and detect the Mac builds.
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
// TODO: Add Installer VISE extraction
// https://github.com/Bioruebe/UniExtract2

3
BurnOutSharp/PackerType/IntelInstallationFramework.cs
View File

@@ -61,8 +61,7 @@ namespace BurnOutSharp.PackerType
return $"Intel Installation Framework {Utilities.GetFileVersion(file)}";
}
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
return null;
}
}
}

3
BurnOutSharp/PackerType/MicrosoftCABSFX.cs
View File

@@ -72,8 +72,7 @@ namespace BurnOutSharp.PackerType
return "Microsoft CAB SFX";
}
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
return null;
}
/// <inheritdoc/>

6
BurnOutSharp/PackerType/NSIS.cs
View File

@@ -31,11 +31,7 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
public static string GetVersion(string file, byte[] fileContent, List<int> positions)
{

6
BurnOutSharp/PackerType/PECompact.cs
View File

@@ -29,11 +29,7 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
// TODO: Improve version detection, Protection ID is able to detect ranges of versions. For example, 1.66-1.84 or 2.20-3.02.
public static string GetVersion(string file, byte[] fileContent, List<int> positions)

6
BurnOutSharp/PackerType/SetupFactory.cs
View File

@@ -49,11 +49,7 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentDictionary<string, ConcurrentQueue<string>> Scan(Scanner scanner, string file)

6
BurnOutSharp/PackerType/UPX.cs
View File

@@ -47,11 +47,7 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
public static string GetVersion(string file, byte[] fileContent, List<int> positions)
{

6
BurnOutSharp/PackerType/WinRARSFX.cs
View File

@@ -30,11 +30,7 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
public ConcurrentDictionary<string, ConcurrentQueue<string>> Scan(Scanner scanner, string file)
{

6
BurnOutSharp/PackerType/WinZipSFX.cs
View File

@@ -33,11 +33,7 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
// TODO: Find a way to generically detect 2.X versions and improve exact version detection for SFX PE versions bundled with WinZip 11+

6
BurnOutSharp/PackerType/WiseInstaller.cs
View File

@@ -24,11 +24,7 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentDictionary<string, ConcurrentQueue<string>> Scan(Scanner scanner, string file)

6
BurnOutSharp/PackerType/dotFuscator.cs
View File

@@ -21,10 +21,6 @@ namespace BurnOutSharp.PackerType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/ProtectionType/ActiveMARK.cs
View File

@@ -24,10 +24,6 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/ProtectionType/AlphaROM.cs
View File

@@ -16,10 +16,6 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/ProtectionType/Bitpool.cs
View File

@@ -28,11 +28,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/CDCheck.cs
View File

@@ -23,11 +23,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
// These content checks are too broad to be useful
private static string CheckContentsBroad(string file, byte[] fileContent, bool includeDebug = false)

6
BurnOutSharp/ProtectionType/CDCops.cs
View File

@@ -26,11 +26,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/CDKey.cs
View File

@@ -24,10 +24,6 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/ProtectionType/CDLock.cs
View File

@@ -23,11 +23,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/CDSHiELDSE.cs
View File

@@ -16,10 +16,6 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/ProtectionType/CactusDataShield.cs
View File

@@ -27,11 +27,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/CengaProtectDVD.cs
View File

@@ -16,10 +16,6 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/ProtectionType/CodeLock.cs
View File

@@ -27,10 +27,6 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/ProtectionType/CopyKiller.cs
View File

@@ -21,11 +21,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/DVDCops.cs
View File

@@ -22,11 +22,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
public static string GetVersion(string file, byte[] fileContent, List<int> positions)
{

6
BurnOutSharp/ProtectionType/ElectronicArts.cs
View File

@@ -99,10 +99,6 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/ProtectionType/GFWL.cs
View File

@@ -47,11 +47,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/ImpulseReactor.cs
View File

@@ -45,11 +45,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/Intenium.cs
View File

@@ -32,10 +32,6 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/ProtectionType/JoWooDXProt.cs
View File

@@ -36,11 +36,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
public static string GetVersion(string file, byte[] fileContent, List<int> positions)
{

6
BurnOutSharp/ProtectionType/KeyLock.cs
View File

@@ -20,10 +20,6 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

3
BurnOutSharp/ProtectionType/LaserLock.cs
View File

@@ -64,8 +64,7 @@ namespace BurnOutSharp.ProtectionType
if (file != null && string.Equals(Path.GetFileName(file), "NOMOUSE.SP", StringComparison.OrdinalIgnoreCase))
return $"LaserLock {GetVersion16Bit(fileContent)}" + (includeDebug ? $" (Index 71)" : string.Empty);
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
return null;
}
/// <inheritdoc/>

6
BurnOutSharp/ProtectionType/MediaMaxCD3.cs
View File

@@ -24,11 +24,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/OnlineRegistration.cs
View File

@@ -24,10 +24,6 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/ProtectionType/Origin.cs
View File

@@ -17,11 +17,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/PSXAntiModchip.cs
View File

@@ -44,10 +44,6 @@ namespace BurnOutSharp.ProtectionType
// TODO: Figure out PSX binary header so this can be checked explicitly
// TODO: Detect Red Hand protection
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/ProtectionType/ProtectDisc.cs
View File

@@ -25,11 +25,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
public static string GetVersion6till8(string file, byte[] fileContent, List<int> positions)
{

6
BurnOutSharp/ProtectionType/RingPROTECH.cs
View File

@@ -20,10 +20,6 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/ProtectionType/SVKProtector.cs
View File

@@ -16,10 +16,6 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/ProtectionType/SafeDisc.cs
View File

@@ -84,11 +84,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/SafeLock.cs
View File

@@ -17,11 +17,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/SecuROM.cs
View File

@@ -56,11 +56,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/SmartE.cs
View File

@@ -18,11 +18,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/SolidShield.cs
View File

@@ -93,11 +93,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/StarForce.cs
View File

@@ -117,11 +117,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/Sysiphus.cs
View File

@@ -27,11 +27,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
public static string GetVersion(string file, byte[] fileContent, List<int> positions)
{

6
BurnOutSharp/ProtectionType/Tages.cs
View File

@@ -39,11 +39,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/ThreePLock.cs
View File

@@ -30,10 +30,6 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/ProtectionType/ThreeTwoOneStudios.cs
View File

@@ -24,10 +24,6 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

6
BurnOutSharp/ProtectionType/VOBProtectCDDVD.cs
View File

@@ -33,11 +33,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/WTMCDProtect.cs
View File

@@ -37,11 +37,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/XCP.cs
View File

@@ -45,11 +45,7 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
/// <inheritdoc/>
public ConcurrentQueue<string> CheckDirectoryPath(string path, IEnumerable<string> files)

6
BurnOutSharp/ProtectionType/XtremeProtector.cs
View File

@@ -16,10 +16,6 @@ namespace BurnOutSharp.ProtectionType
}
/// <inheritdoc/>
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false)
{
var matchers = GetContentMatchSets();
return MatchUtil.GetFirstMatch(file, fileContent, matchers, includeDebug);
}
public string CheckContents(string file, byte[] fileContent, bool includeDebug = false) => null;
}
}

4
BurnOutSharp/Tools/Utilities.cs
View File

@@ -22,6 +22,10 @@ namespace BurnOutSharp.Tools
/// <param name="value">String value to add</param>
public static void AppendToDictionary(ConcurrentDictionary<string, ConcurrentQueue<string>> original, string key, string value)
{
// If the value is empty, don't add it
if (string.IsNullOrWhiteSpace(value))
return;
var values = new ConcurrentQueue<string>();
values.Enqueue(value);
AppendToDictionary(original, key, values);