diff --git a/tests/Titano.Core.Tests/Packaging/PackagingFixture.cs b/tests/Titano.Core.Tests/Packaging/PackagingFixture.cs index 94109aee..704841eb 100644 --- a/tests/Titano.Core.Tests/Packaging/PackagingFixture.cs +++ b/tests/Titano.Core.Tests/Packaging/PackagingFixture.cs @@ -109,10 +109,12 @@ internal sealed class PackagingFixture(TestContext context) BinaryPrimitives.ReadInt32LittleEndian(image.AsSpan(0x3C)) + 4 + 20 + 112 + 4 * 8; /// Assembles an installer by hand from a manifest and data region, bypassing the writer's checks. - public string Craft(PayloadManifest manifest, byte[] data, string name = "crafted.exe") + public string Craft(PayloadManifest manifest, byte[] data, string name = "crafted.exe") => Craft(manifest.ToJsonBytes(), data, name); + + /// Same with raw manifest bytes, which need not be valid JSON; the footer hash always matches them. + public string Craft(byte[] json, byte[] data, string name = "crafted.exe") { var stub = CraftStub; - var json = manifest.ToJsonBytes(); using var ms = new MemoryStream(); ms.Write(stub); ms.Write(json); diff --git a/tests/Titano.Core.Tests/Packaging/PayloadIntegrityTests.cs b/tests/Titano.Core.Tests/Packaging/PayloadIntegrityTests.cs index a9ba9231..512782dc 100644 --- a/tests/Titano.Core.Tests/Packaging/PayloadIntegrityTests.cs +++ b/tests/Titano.Core.Tests/Packaging/PayloadIntegrityTests.cs @@ -142,6 +142,19 @@ public sealed class PayloadIntegrityTests(TestContext context) Assert.Equal(PayloadError.UnsafePath, Assert.Throws(() => PayloadReader.Open(installer)).Error); } + [Theory] + [Case("not json at all")] + [Case("{\"formatVersion\":1,\"version\":\"1.0\"}")] + [Case("{\"formatVersion\":1,\"product\":null,\"version\":\"1.0\"}")] + [Case("{\"formatVersion\":2,\"product\":\"Titano\",\"version\":\"1.0\",\"components\":[{\"id\":\"Titano\",\"displayName\":\"Titano\"}]}")] + [Case("{\"formatVersion\":1,\"product\":\"..\",\"version\":\"1.0\",\"components\":[{\"id\":\"Titano\",\"displayName\":\"Titano\"}]}")] + [Case("{\"formatVersion\":1,\"product\":\"Titano\",\"version\":\"1.0\",\"components\":[]}")] + public void MalformedManifestWithMatchingHashIsCorrupt(string json) + { + var installer = _fx.Craft(System.Text.Encoding.UTF8.GetBytes(json), []); + Assert.Equal(PayloadError.Corrupt, Assert.Throws(() => PayloadReader.Open(installer)).Error); + } + [Test] public void DeclaredSizeBeyondTheDeflateLimitIsRejectedUpFront() {