我使用SevenZipSharp打包到7z档案并从各种档案中打开包装.多年来它一直运作良好.
今天我有一个.tgz存档在第二阶段解包失败:
从.tgz中提取.tar工作,但解压.tar失败了.这只是一个受影响的单个档案.所有其他.tgz运作良好..tar本身并没有错,因为使用7-zip软件解压缩也是有效的.
经过大量的测试后,我和一位同事发现了原因:
我们必须调试SevenZipSharp DLL才能找到它的失败.DLL通过读取前16个字节并将其与签名列表进行比较来检测存档的类型.这对于大多数类型的归档都是正确的,但.tar归档是错误的,因为.tar文件头以归档的文件名开头:TAR @ Wikipedia.签名"ustar"(如果存在)位于地址257(0x0101).
SevenZipSharp知道并在此地址检查"ustar",但前提是检测失败.不幸的是,我们的TAR档案名称是"x42202.tar".并且.dmg文件的标题(Apple Disk Image)由一个单独的"x"组成(多么愚蠢,只使用一个字节作为签名??).所以实际上有一个成功的文件类型检测,只是检测结果是错误的.
(我知道,链接的维基百科说,.dmg标题签名是"koly",但我确认我在互联网上找到了一个下载的.dmg文件.)
因此我们修改了代码FileSignatureChecker.cs以避免.tar存档的错误存档类型检测.
您可以在下面找到原始代码和修改后的代码.
代码库是最新的SevenZipSharp版本,可以在CodePlex存档中找到.显然,这是不是正在积极开发更多,因为版本号已多年没有改变,如果它仍然活跃的CodePlex已经退休后它会移动.
修改后的代码更新2018-11-16错误修正:如果找到则未返回enSpecialFormat.
原始代码
public static InArchiveFormat CheckSignature (Stream stream, out int offset, out bool isExecutable)
{
offset = 0;
if (!stream.CanRead)
{
throw new ArgumentException ("The stream must be readable.");
}
if (stream.Length < SIGNATURE_SIZE)
{
throw new ArgumentException ("The stream is invalid.");
}
#region Get file signature
var signature = new byte[SIGNATURE_SIZE];
int bytesRequired = SIGNATURE_SIZE;
int index = 0;
stream.Seek (0, SeekOrigin.Begin);
while (bytesRequired > 0)
{
int bytesRead = stream.Read (signature, index, bytesRequired);
bytesRequired -= bytesRead;
index += bytesRead;
}
string actualSignature = BitConverter.ToString (signature);
#endregion
InArchiveFormat suspectedFormat = InArchiveFormat.XZ; // any except PE and Cab
isExecutable = false;
foreach (string expectedSignature in Formats.InSignatureFormats.Keys)
{
if (actualSignature.StartsWith (expectedSignature, StringComparison.OrdinalIgnoreCase) ||
actualSignature.Substring (6).StartsWith (expectedSignature, StringComparison.OrdinalIgnoreCase) &&
Formats.InSignatureFormats[expectedSignature] == InArchiveFormat.Lzh)
{
if (Formats.InSignatureFormats[expectedSignature] == InArchiveFormat.PE)
{
suspectedFormat = InArchiveFormat.PE;
isExecutable = true;
}
else
{
return Formats.InSignatureFormats[expectedSignature];
}
}
}
// Many Microsoft formats
if (actualSignature.StartsWith ("D0-CF-11-E0-A1-B1-1A-E1", StringComparison.OrdinalIgnoreCase))
{
suspectedFormat = InArchiveFormat.Cab; // != InArchiveFormat.XZ
}
#region SpecialDetect
try
{
SpecialDetect (stream, 257, InArchiveFormat.Tar);
}
catch (ArgumentException) { }
if (SpecialDetect (stream, 0x8001, InArchiveFormat.Iso))
{
return InArchiveFormat.Iso;
}
if (SpecialDetect (stream, 0x8801, InArchiveFormat.Iso))
{
return InArchiveFormat.Iso;
}
if (SpecialDetect (stream, 0x9001, InArchiveFormat.Iso))
{
return InArchiveFormat.Iso;
}
if (SpecialDetect (stream, 0x9001, InArchiveFormat.Iso))
{
return InArchiveFormat.Iso;
}
if (SpecialDetect (stream, 0x400, InArchiveFormat.Hfs))
{
return InArchiveFormat.Hfs;
}
#region Last resort for tar - can mistake
if (stream.Length >= 1024)
{
stream.Seek (-1024, SeekOrigin.End);
byte[] buf = new byte[1024];
stream.Read (buf, 0, 1024);
bool istar = true;
for (int i = 0; i < 1024; i++)
{
istar = istar && buf[i] == 0;
}
if (istar)
{
return InArchiveFormat.Tar;
}
}
#endregion
#endregion
#region Check if it is an SFX archive or a file with an embedded archive.
if (suspectedFormat != InArchiveFormat.XZ)
{
#region Get first Min(stream.Length, SFX_SCAN_LENGTH) bytes
var scanLength = Math.Min (stream.Length, SFX_SCAN_LENGTH);
signature = new byte[scanLength];
bytesRequired = (int)scanLength;
index = 0;
stream.Seek (0, SeekOrigin.Begin);
while (bytesRequired > 0)
{
int bytesRead = stream.Read (signature, index, bytesRequired);
bytesRequired -= bytesRead;
index += bytesRead;
}
actualSignature = BitConverter.ToString (signature);
#endregion
foreach (var format in new InArchiveFormat[]
{
InArchiveFormat.Zip,
InArchiveFormat.SevenZip,
InArchiveFormat.Rar,
InArchiveFormat.Cab,
InArchiveFormat.Arj
})
{
int pos = actualSignature.IndexOf (Formats.InSignatureFormatsReversed[format]);
if (pos > -1)
{
offset = pos / 3;
return format;
}
}
// Nothing
if (suspectedFormat == InArchiveFormat.PE)
{
return InArchiveFormat.PE;
}
}
#endregion
throw new ArgumentException ("The stream is invalid or no corresponding signature was found.");
}
Run Code Online (Sandbox Code Playgroud)
修改后的代码
public static InArchiveFormat CheckSignature (Stream stream, out int offset, out bool isExecutable)
{
offset = 0;
if (!stream.CanRead)
{
throw new ArgumentException ("The stream must be readable.");
}
if (stream.Length < SIGNATURE_SIZE)
{
throw new ArgumentException ("The stream is invalid.");
}
#region Get file signature
var signature = new byte[SIGNATURE_SIZE];
int bytesRequired = SIGNATURE_SIZE;
int index = 0;
stream.Seek (0, SeekOrigin.Begin);
while (bytesRequired > 0)
{
int bytesRead = stream.Read (signature, index, bytesRequired);
bytesRequired -= bytesRead;
index += bytesRead;
}
string actualSignature = BitConverter.ToString (signature);
#endregion Get file signature
InArchiveFormat suspectedFormat = InArchiveFormat.XZ; // any except PE and Cab
isExecutable = false;
InArchiveFormat enDetectedFormat = (InArchiveFormat)(-1);
InArchiveFormat enSpecialFormat = (InArchiveFormat)(-1);
foreach (string expectedSignature in Formats.InSignatureFormats.Keys)
{
if (actualSignature.StartsWith (expectedSignature, StringComparison.OrdinalIgnoreCase) ||
actualSignature.Substring (6).StartsWith (expectedSignature, StringComparison.OrdinalIgnoreCase) &&
Formats.InSignatureFormats[expectedSignature] == InArchiveFormat.Lzh)
{
if (Formats.InSignatureFormats[expectedSignature] == InArchiveFormat.PE)
{
suspectedFormat = InArchiveFormat.PE;
isExecutable = true;
}
else
{
enDetectedFormat = Formats.InSignatureFormats[expectedSignature];
break;
}
}
}
// Many Microsoft formats
if (actualSignature.StartsWith ("D0-CF-11-E0-A1-B1-1A-E1", StringComparison.OrdinalIgnoreCase))
{
suspectedFormat = InArchiveFormat.Cab; // != InArchiveFormat.XZ
}
#region SpecialDetect
if (SpecialDetect (stream, 257, InArchiveFormat.Tar))
{
enSpecialFormat = InArchiveFormat.Tar;
}
else if (SpecialDetect (stream, 0x8001, InArchiveFormat.Iso))
{
enSpecialFormat = InArchiveFormat.Iso;
}
else if (SpecialDetect (stream, 0x8801, InArchiveFormat.Iso))
{
enSpecialFormat = InArchiveFormat.Iso;
}
else if (SpecialDetect (stream, 0x9001, InArchiveFormat.Iso))
{
enSpecialFormat = InArchiveFormat.Iso;
}
else if (SpecialDetect (stream, 0x9001, InArchiveFormat.Iso))
{
enSpecialFormat = InArchiveFormat.Iso;
}
else if (SpecialDetect (stream, 0x400, InArchiveFormat.Hfs))
{
enSpecialFormat = InArchiveFormat.Hfs;
}
#region Last resort for tar - can mistake
bool bPossiblyTAR = false;
if (stream.Length >= 1024)
{
stream.Seek (-1024, SeekOrigin.End);
byte[] buf = new byte[1024];
stream.Read (buf, 0, 1024);
bPossiblyTAR = true;
for (int i = 0; i < 1024; i++)
{
bPossiblyTAR = bPossiblyTAR && buf[i] == 0;
}
}
// TAR header starts with the filename of the archive.
// The filename can be anything, including the Identifiers of the various archive formats.
// This means that a TAR can be misinterpreted as any type of archive.
if (enSpecialFormat == InArchiveFormat.Tar
|| bPossiblyTAR)
{
var fs = stream as FileStream;
if (fs != null)
{
string sStreamFilename = fs.Name;
if (sStreamFilename.EndsWith (".tar", StringComparison.InvariantCultureIgnoreCase))
enDetectedFormat = InArchiveFormat.Tar;
}
}
#endregion Last resort for tar - can mistake
if (enDetectedFormat != (InArchiveFormat)(-1))
return enDetectedFormat;
if (enSpecialFormat != (InArchiveFormat)(-1))
return enSpecialFormat;
#endregion SpecialDetect
#region Check if it is an SFX archive or a file with an embedded archive.
if (suspectedFormat != InArchiveFormat.XZ)
{
#region Get first Min(stream.Length, SFX_SCAN_LENGTH) bytes
var scanLength = Math.Min (stream.Length, SFX_SCAN_LENGTH);
signature = new byte[scanLength];
bytesRequired = (int)scanLength;
index = 0;
stream.Seek (0, SeekOrigin.Begin);
while (bytesRequired > 0)
{
int bytesRead = stream.Read (signature, index, bytesRequired);
bytesRequired -= bytesRead;
index += bytesRead;
}
actualSignature = BitConverter.ToString (signature);
#endregion Get first Min(stream.Length, SFX_SCAN_LENGTH) bytes
foreach (var format in new InArchiveFormat[]
{
InArchiveFormat.Zip,
InArchiveFormat.SevenZip,
InArchiveFormat.Rar,
InArchiveFormat.Cab,
InArchiveFormat.Arj
})
{
int pos = actualSignature.IndexOf (Formats.InSignatureFormatsReversed[format]);
if (pos > -1)
{
offset = pos / 3;
return format;
}
}
// Nothing
if (suspectedFormat == InArchiveFormat.PE)
{
return InArchiveFormat.PE;
}
}
#endregion Check if it is an SFX archive or a file with an embedded archive.
throw new ArgumentException ("The stream is invalid or no corresponding signature was found.");
}
Run Code Online (Sandbox Code Playgroud)
| 归档时间: |
|
| 查看次数: |
69 次 |
| 最近记录: |