Validate PPI face payload metadata
This commit is contained in:
@@ -25,6 +25,14 @@ void append_u32(std::vector<std::byte>& bytes, std::uint32_t value)
|
||||
bytes.push_back(static_cast<std::byte>((value >> 24U) & 0xffU));
|
||||
}
|
||||
|
||||
void append_u32_be(std::vector<std::byte>& bytes, std::uint32_t value)
|
||||
{
|
||||
bytes.push_back(static_cast<std::byte>((value >> 24U) & 0xffU));
|
||||
bytes.push_back(static_cast<std::byte>((value >> 16U) & 0xffU));
|
||||
bytes.push_back(static_cast<std::byte>((value >> 8U) & 0xffU));
|
||||
bytes.push_back(static_cast<std::byte>(value & 0xffU));
|
||||
}
|
||||
|
||||
void append_f32(std::vector<std::byte>& bytes, float value)
|
||||
{
|
||||
append_u32(bytes, std::bit_cast<std::uint32_t>(value));
|
||||
@@ -78,6 +86,38 @@ void append_minimal_body(std::vector<std::byte>& bytes)
|
||||
append_u32(bytes, 0);
|
||||
}
|
||||
|
||||
std::vector<std::byte> png_ihdr_payload(
|
||||
std::uint32_t width,
|
||||
std::uint32_t height,
|
||||
std::uint8_t bit_depth = 8U,
|
||||
std::uint8_t color_type = 6U)
|
||||
{
|
||||
std::vector<std::byte> bytes {
|
||||
std::byte { 0x89 },
|
||||
std::byte { 0x50 },
|
||||
std::byte { 0x4e },
|
||||
std::byte { 0x47 },
|
||||
std::byte { 0x0d },
|
||||
std::byte { 0x0a },
|
||||
std::byte { 0x1a },
|
||||
std::byte { 0x0a },
|
||||
};
|
||||
append_u32_be(bytes, 13);
|
||||
bytes.push_back(std::byte { 'I' });
|
||||
bytes.push_back(std::byte { 'H' });
|
||||
bytes.push_back(std::byte { 'D' });
|
||||
bytes.push_back(std::byte { 'R' });
|
||||
append_u32_be(bytes, width);
|
||||
append_u32_be(bytes, height);
|
||||
bytes.push_back(static_cast<std::byte>(bit_depth));
|
||||
bytes.push_back(static_cast<std::byte>(color_type));
|
||||
bytes.push_back(std::byte { 0 });
|
||||
bytes.push_back(std::byte { 0 });
|
||||
bytes.push_back(std::byte { 0 });
|
||||
append_u32_be(bytes, 0);
|
||||
return bytes;
|
||||
}
|
||||
|
||||
std::vector<std::byte> minimal_project()
|
||||
{
|
||||
auto bytes = valid_header();
|
||||
@@ -86,6 +126,40 @@ std::vector<std::byte> minimal_project()
|
||||
return bytes;
|
||||
}
|
||||
|
||||
std::vector<std::byte> project_with_single_face_payload(std::vector<std::byte> payload)
|
||||
{
|
||||
auto bytes = valid_header();
|
||||
bytes.resize(ppi_header_size + (128U * 128U * 4U), std::byte { 0 });
|
||||
|
||||
append_u32(bytes, 64);
|
||||
append_u32(bytes, 32);
|
||||
append_u32(bytes, 1);
|
||||
append_u32(bytes, 1);
|
||||
append_u32(bytes, 0);
|
||||
append_f32(bytes, 1.0F);
|
||||
append_u32(bytes, 3);
|
||||
append_ascii(bytes, "Ink");
|
||||
append_u32(bytes, 0);
|
||||
bytes.push_back(std::byte { 0 });
|
||||
bytes.push_back(std::byte { 1 });
|
||||
append_u32(bytes, 1);
|
||||
append_u32(bytes, 100);
|
||||
|
||||
append_u32(bytes, 1);
|
||||
append_u32(bytes, 2);
|
||||
append_u32(bytes, 3);
|
||||
append_u32(bytes, 10);
|
||||
append_u32(bytes, 7);
|
||||
append_u32(bytes, static_cast<std::uint32_t>(payload.size()));
|
||||
bytes.insert(bytes.end(), payload.begin(), payload.end());
|
||||
|
||||
for (std::uint32_t i = 1; i < 6U; ++i) {
|
||||
append_u32(bytes, 0);
|
||||
}
|
||||
append_u32(bytes, 0);
|
||||
return bytes;
|
||||
}
|
||||
|
||||
void parses_legacy_ppi_header(pp::tests::Harness& h)
|
||||
{
|
||||
const auto bytes = valid_header();
|
||||
@@ -178,10 +252,42 @@ void parses_minimal_project_body_summary(pp::tests::Harness& h)
|
||||
PP_EXPECT(h, summary.value().body.declared_frame_count == 1U);
|
||||
PP_EXPECT(h, summary.value().body.total_layer_frames == 1U);
|
||||
PP_EXPECT(h, summary.value().body.dirty_face_count == 0U);
|
||||
PP_EXPECT(h, summary.value().body.rgba_face_payload_count == 0U);
|
||||
PP_EXPECT(h, summary.value().body.compressed_face_bytes == 0U);
|
||||
PP_EXPECT(h, summary.value().body.info_bytes == 0U);
|
||||
}
|
||||
|
||||
void validates_dirty_face_png_payload_metadata(pp::tests::Harness& h)
|
||||
{
|
||||
const auto project = project_with_single_face_payload(png_ihdr_payload(8, 4));
|
||||
const auto summary = parse_ppi_project_summary(project);
|
||||
|
||||
PP_EXPECT(h, summary.ok());
|
||||
PP_EXPECT(h, summary.value().body.dirty_face_count == 1U);
|
||||
PP_EXPECT(h, summary.value().body.rgba_face_payload_count == 1U);
|
||||
PP_EXPECT(h, summary.value().body.compressed_face_bytes == 33U);
|
||||
}
|
||||
|
||||
void rejects_invalid_dirty_face_png_payloads(pp::tests::Harness& h)
|
||||
{
|
||||
auto mismatched_dimensions = project_with_single_face_payload(png_ihdr_payload(7, 4));
|
||||
auto non_rgba = project_with_single_face_payload(png_ihdr_payload(8, 4, 8, 2));
|
||||
auto bad_signature_payload = png_ihdr_payload(8, 4);
|
||||
bad_signature_payload[0] = std::byte { 0 };
|
||||
auto bad_signature = project_with_single_face_payload(bad_signature_payload);
|
||||
|
||||
const auto mismatched_result = parse_ppi_project_summary(mismatched_dimensions);
|
||||
const auto non_rgba_result = parse_ppi_project_summary(non_rgba);
|
||||
const auto bad_signature_result = parse_ppi_project_summary(bad_signature);
|
||||
|
||||
PP_EXPECT(h, !mismatched_result.ok());
|
||||
PP_EXPECT(h, mismatched_result.status().code == StatusCode::invalid_argument);
|
||||
PP_EXPECT(h, !non_rgba_result.ok());
|
||||
PP_EXPECT(h, non_rgba_result.status().code == StatusCode::invalid_argument);
|
||||
PP_EXPECT(h, !bad_signature_result.ok());
|
||||
PP_EXPECT(h, bad_signature_result.status().code == StatusCode::invalid_argument);
|
||||
}
|
||||
|
||||
void rejects_invalid_project_body_summaries(pp::tests::Harness& h)
|
||||
{
|
||||
auto truncated = minimal_project();
|
||||
@@ -216,6 +322,8 @@ int main()
|
||||
harness.run("parses_project_layout_with_thumbnail_and_body", parses_project_layout_with_thumbnail_and_body);
|
||||
harness.run("rejects_project_layout_with_truncated_thumbnail", rejects_project_layout_with_truncated_thumbnail);
|
||||
harness.run("parses_minimal_project_body_summary", parses_minimal_project_body_summary);
|
||||
harness.run("validates_dirty_face_png_payload_metadata", validates_dirty_face_png_payload_metadata);
|
||||
harness.run("rejects_invalid_dirty_face_png_payloads", rejects_invalid_dirty_face_png_payloads);
|
||||
harness.run("rejects_invalid_project_body_summaries", rejects_invalid_project_body_summaries);
|
||||
return harness.finish();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user