Fix encrypted RAR5 archive comments

This commit is contained in:
Adam Hathcock
2026-10-02 13:33:50 +01:00
parent c083c6efd8
commit b67a8a4ead
10 changed files with 201 additions and 9 deletions

View File

@@ -138,7 +138,7 @@ public partial class RarHeaderFactory
.ConfigureAwait(false);
if (fh.FileName == "CMT")
{
fh.PackedStream = new ReadOnlySubStream(reader.BaseStream, fh.CompressedSize);
fh.PackedStream = CreatePackedStream(fh, reader.BaseStream);
}
else
{

View File

@@ -122,7 +122,7 @@ public partial class RarHeaderFactory
var fh = FileHeader.Create(header, reader, HeaderType.Service);
if (fh.FileName == "CMT")
{
fh.PackedStream = new ReadOnlySubStream(reader.BaseStream, fh.CompressedSize);
fh.PackedStream = CreatePackedStream(fh, reader.BaseStream);
}
else
{
@@ -223,4 +223,20 @@ public partial class RarHeaderFactory
}
}
}
private Stream CreatePackedStream(FileHeader header, Stream stream)
{
var packedStream = new ReadOnlySubStream(stream, header.CompressedSize);
// Service data has its own encryption metadata, independent of header encryption.
if (header.Rar5CryptoInfo is not null)
{
return new RarCryptoWrapper(
packedStream,
header.Rar5CryptoInfo.Salt,
new CryptKey5(Options.Password, header.Rar5CryptoInfo)
);
}
return packedStream;
}
}

View File

@@ -66,9 +66,11 @@ public abstract class RarVolume : Volume
var fh = (FileHeader)header;
if (fh.FileName == "CMT")
{
var buffer = new byte[fh.CompressedSize];
fh.PackedStream.NotNull().ReadFully(buffer);
Comment = Encoding.UTF8.GetString(buffer, 0, buffer.Length - 1);
// Read the logical service size, not the potentially padded packed size.
var buffer = new byte[checked((int)fh.UncompressedSize)];
using var packedStream = fh.PackedStream.NotNull();
packedStream.ReadFully(buffer);
Comment = DecodeComment(buffer);
}
}
break;
@@ -115,12 +117,12 @@ public abstract class RarVolume : Volume
var fh = (FileHeader)header;
if (fh.FileName == "CMT")
{
var buffer = new byte[fh.CompressedSize];
await fh
.PackedStream.NotNull()
var buffer = new byte[checked((int)fh.UncompressedSize)];
using var packedStream = fh.PackedStream.NotNull();
await packedStream
.ReadFullyAsync(buffer, cancellationToken)
.ConfigureAwait(false);
Comment = Encoding.UTF8.GetString(buffer, 0, buffer.Length - 1);
Comment = DecodeComment(buffer);
}
}
break;
@@ -128,6 +130,15 @@ public abstract class RarVolume : Volume
}
}
private static string DecodeComment(byte[] buffer)
{
// Like UnRAR, stop at the first NUL. Encrypted comments can include
// padding in their unpacked size as well as their packed size.
var terminator = Array.IndexOf(buffer, (byte)0);
var length = terminator < 0 ? buffer.Length : terminator;
return Encoding.UTF8.GetString(buffer, 0, length);
}
private void EnsureArchiveHeaderLoaded()
{
if (ArchiveHeader is null)