SabreTools/BinaryObjectScanner
1
0
Fork 0
mirror of https://github.com/SabreTools/BinaryObjectScanner.git synced 2026-04-24 15:13:23 +00:00
Code Issues 295 Packages Projects Releases 20 Wiki Activity

Make extractable packers safer

Browse Source
This commit is contained in:
Matt Nadareski
2023-03-13 22:53:57 -04:00
parent 3d8134bbd3
commit 6406248840
3 changed files with 44 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
BinaryObjectScanner.Packer/WinRARSFX.cs
View File

@@ -5,6 +5,7 @@ using BinaryObjectScanner.Interfaces;
using BinaryObjectScanner.Wrappers;
using SharpCompress.Archives;
using SharpCompress.Archives.Rar;
using SharpCompress.Readers;
namespace BinaryObjectScanner.Packer
{
@@ -46,12 +47,15 @@ namespace BinaryObjectScanner.Packer
{
try
{
string tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
Directory.CreateDirectory(tempPath);
// Should be using stream instead of file, but stream fails to extract anything. My guess is that the executable portion of the archive is causing stream to fail, but not file.
using (RarArchive zipFile = RarArchive.Open(file, new SharpCompress.Readers.ReaderOptions() { LookForHeader = true }))
using (RarArchive zipFile = RarArchive.Open(file, new ReaderOptions() { LookForHeader = true }))
{
if (!zipFile.IsComplete)
return null;
string tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
Directory.CreateDirectory(tempPath);
foreach (var entry in zipFile.Entries)
{
try
@@ -68,9 +72,9 @@ namespace BinaryObjectScanner.Packer
if (includeDebug) Console.WriteLine(ex);
}
}
}
return tempPath;
return tempPath;
}
}
catch (Exception ex)
{

13
BinaryObjectScanner.Packer/WinZipSFX.cs
View File

@@ -81,12 +81,15 @@ namespace BinaryObjectScanner.Packer
{
try
{
string tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
Directory.CreateDirectory(tempPath);
// Should be using stream instead of file, but stream fails to extract anything. My guess is that the executable portion of the archive is causing stream to fail, but not file.
using (ZipArchive zipFile = ZipArchive.Open(file))
{
if (!zipFile.IsComplete)
return null;
string tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
Directory.CreateDirectory(tempPath);
foreach (var entry in zipFile.Entries)
{
try
@@ -103,9 +106,9 @@ namespace BinaryObjectScanner.Packer
if (includeDebug) Console.WriteLine(ex);
}
}
}
return tempPath;
return tempPath;
}
}
catch (Exception ex)
{

28
BinaryObjectScanner.Packer/WiseInstaller.cs
View File

@@ -230,7 +230,19 @@ namespace BinaryObjectScanner.Packer
{
// TODO: Try to find where the file data lives and how to get it
Wise unpacker = new Wise();
unpacker.ExtractTo(file, tempPath);
if (!unpacker.ExtractTo(file, tempPath))
{
try
{
Directory.Delete(tempPath, true);
}
catch (Exception ex)
{
if (includeDebug) Console.WriteLine(ex);
}
return null;
}
}
catch (Exception ex)
{
@@ -333,7 +345,19 @@ namespace BinaryObjectScanner.Packer
else
{
Wise unpacker = new Wise();
unpacker.ExtractTo(file, tempPath);
if (!unpacker.ExtractTo(file, tempPath))
{
try
{
Directory.Delete(tempPath, true);
}
catch (Exception ex)
{
if (includeDebug) Console.WriteLine(ex);
}
return null;
}
}
return tempPath;