Merge pull request #885 from morluto/fix/plist-prototype-keys

fix(plist): read XML plists containing a __proto__ key
This commit is contained in:
Kaoru0822
2026-10-07 00:46:50 -07:00
committed by GitHub
10 changed files with 278 additions and 28 deletions
+14
View File
@@ -86,6 +86,20 @@ describe("inert keyed archive decoding", () => {
]);
},
);
it("reports an XML archive dictionary keyed __proto__ as omitted", () => {
const xml = build({ ...archive, $objects: ["$null", "value"] }).replace(
"<key>$top</key>",
"<key>__proto__</key><string>x</string><key>$top</key>",
);
const graph = decodeKeyedArchiveBytes(Buffer.from(xml), {
offset: 0,
limit: 2,
});
expect(graph.objects.map(({ value }) => value)).toEqual(["$null", "value"]);
expect(graph.limitations).toContain(
"1 dictionary entry keyed __proto__ was omitted because REA results cannot represent that key.",
);
});
it("rejects missing roots, malformed plist, and non-keyed archives", () => {
expect(() =>
decodeKeyedArchiveBytes(Buffer.from("bplist00bad"), {
+16 -5
View File
@@ -1,9 +1,13 @@
import { createHash } from "node:crypto";
import { TextDecoder } from "node:util";
import { parse, parseBinary } from "plist";
import { parseBinary } from "plist";
import { z } from "zod";
import type { JsonValue } from "../domain/jsonValue.js";
import { projectPlistValue } from "../domain/plistValue.js";
import {
omittedPrototypeKeysLimitation,
parseXmlPropertyList,
} from "../domain/propertyListKeys.js";
import {
keyedArchiveInputSchema,
keyedArchiveResultSchema,
@@ -22,12 +26,19 @@ export const decodeKeyedArchiveBytes = (
if (bytes.length > MAX_BYTES)
throw new RangeError("Keyed archive exceeds 64 MiB");
const binary = bytes.subarray(0, 8).toString("ascii") === "bplist00";
const parsed: unknown = binary
? parseBinary(bytes)
: parse(decodeXmlPlistText(bytes));
const parsed = binary
? { value: parseBinary(bytes), omittedPrototypeKeys: 0 }
: parseXmlPropertyList(decodeXmlPlistText(bytes));
const graph = projectKeyedArchive(normalizePlist(parsed.value), selection);
return {
archive_format: binary ? ("binary-plist" as const) : ("xml-plist" as const),
...projectKeyedArchive(normalizePlist(parsed), selection),
...graph,
limitations: [
...graph.limitations,
...(parsed.omittedPrototypeKeys === 0
? []
: [omittedPrototypeKeysLimitation(parsed.omittedPrototypeKeys)]),
],
};
};