3D engine that AI agents drive
Allow only listed files and text documents in a pack (#984)
Nguyen Xuan An36c29037edc7
diff --git a/changes/984-fuzz.md b/changes/984-fuzz.mdindex 314bc7c7..43f8853f 100644--- a/changes/984-fuzz.md+++ b/changes/984-fuzz.md@@ -1 +1 @@-- Packs refuse remote URLs hidden in JSON keys and JSON nested more than 64 levels deep, and `run.js.` style names count as code files (#984)+- Packs refuse remote URLs hidden in JSON keys and JSON nested more than 64 levels deep, and a pack folder may hold only the manifest, its listed files and LICENSE, README, NOTICE, CHANGELOG or AUTHORS text documents (#984)diff --git a/docs/packs.md b/docs/packs.mdindex f8d2a47a..a552b74e 100644--- a/docs/packs.md+++ b/docs/packs.md@@ -47,7 +47,7 @@ Rules, all checked at load:- Keys are known ones only. `name` and ids are kebab-case; ids are unique per kind. `version` is three numbers. `engines["67js"]` is a range of space-separated comparators (`>=`, `>`, `<`, `<=`, `=`, `^`, `~`, such as `>=0.19.0 <1`) that the installed 67js satisfies.- Paths are relative, with forward slashes, inside the pack: no `..`, no absolute or drive paths, no backslashes, only letters, digits, `.`, `_` and `-` in each part. Every listed file must exist and have the extension of its kind.-- No symbolic links, and no script or program file anywhere in the pack, listed or not (`.js`, `.mjs`, `.html`, `.svg`, `.wasm`, `.exe`, `.sh`, `.bat`, `.ps1`, `.py` and similar). One such file refuses the whole pack.+- No symbolic links. A pack folder holds only these files, anywhere in it: `67js-pack.json`; the files listed in `contents` (and a recipe `preview`); and text documents named `LICENSE`, `LICENCE`, `README`, `NOTICE`, `CHANGELOG` or `AUTHORS` (any case, with an optional `.md` or `.txt`) that are valid UTF-8 without NUL bytes and at most 1 MiB. Any other file, including a script or program (`.js`, `.html`, `.svg`, `.wasm`, `.exe`, `.sh`, `.py`), a file with no extension and a dotfile, refuses the whole pack: list it in `contents` or remove it. `67js-pack.json` cannot be listed as content. Listed binaries must start with the signature of their kind (`glTF`, PNG, JPEG, WebP, `#?RADIANCE` or `#?RGBE`), so a script renamed to `.png` is refused.- Limits (`src/pack-manifest.js`): 256 files, 256 MiB in total, 64 MiB per file, 1 MiB per JSON file, 64 items per kind; at most 32 packs load at once.- Recipe and material JSON nests at most 64 levels of objects and lists. They contain no remote URL, in a value or a key (`http:`, `https:`, `ftp:`, `//host`, a `data:` URL that is not a PNG, JPEG or WebP image). A recipe has `"format": "67js.scene"`. `npm run pack:check` also runs the validator `scene_create` uses (a material is checked as the only material of an empty scene); the server leaves that to `scene_create` and `scene_apply`, which run it when the agent uses the item.diff --git a/scripts/agent-asset-catalog.mjs b/scripts/agent-asset-catalog.mjsindex 2885bf6b..df901d6c 100644--- a/scripts/agent-asset-catalog.mjs+++ b/scripts/agent-asset-catalog.mjs@@ -12,7 +12,7 @@ const IMAGE_EXTENSIONS = { png: /\.png$/i, jpeg: /\.jpe?g$/i, webp: /\.webp$/i }/** 'environment' for a Radiance .hdr and 'look' for a .cube file, by extension and a first-bytes check; the preview decodes them. */function lookFileKind(filename, bytes) {if (/\.hdr$/i.test(filename)) {- if (bytes.toString('latin1', 0, 2) !== '#?') throw new Error('An .hdr catalog file must be a Radiance file starting with #?.');+ if (!/^#\?(?:RADIANCE|RGBE)/.test(bytes.toString('latin1', 0, 10))) throw new Error('An .hdr catalog file must be a Radiance file starting with #?RADIANCE or #?RGBE.');return 'environment';}if (/\.cube$/i.test(filename)) {diff --git a/scripts/agent-packs.mjs b/scripts/agent-packs.mjsindex 76bb454e..d5f9d7af 100644--- a/scripts/agent-packs.mjs+++ b/scripts/agent-packs.mjs@@ -7,7 +7,7 @@ import { basename, isAbsolute, join } from 'node:path';import { invalidField } from '../src/field-error.js';import {MAXIMUM_INSTALLED_PACKS, MAXIMUM_JSON_DEPTH, MAXIMUM_PACK_BYTES, MAXIMUM_PACK_FILES, MAXIMUM_PACK_FILE_BYTES, MAXIMUM_PACK_JSON_BYTES,- PACK_MANIFEST_FILE, findRemoteUrl, isExecutableLookingName, validatePackManifest,+ PACK_MANIFEST_FILE, findRemoteUrl, isExecutableLookingName, isPackDocumentName, validatePackManifest,} from '../src/pack-manifest.js';import { describeCatalogFile, readCatalogFile } from './agent-asset-catalog.mjs';@@ -46,8 +46,31 @@ async function listPackFiles(directory, label) {return files;}-async function readJsonFile(directory, file, label, field) {- const text = (await readFile(join(directory, file), 'utf8')).replace(/^/, '');+/** Refuses a file that is not the manifest, not listed in it and not a plain text document (LICENSE, README...). */+async function assertOnlyAllowedFiles(directory, files, listedFiles, label) {+ for (const [relativePath, size] of files) {+ if (listedFiles.has(relativePath)) continue;+ const field = `pack "${label}" ${relativePath}`;+ if (!isPackDocumentName(relativePath.split('/').at(-1))) {+ throw invalidField(field, 'a file that is not listed in the manifest', `a file listed in ${PACK_MANIFEST_FILE} contents, or a LICENSE, README, NOTICE, CHANGELOG or AUTHORS text document; list it in contents or remove it`);+ }+ if (size > MAXIMUM_PACK_JSON_BYTES) throw invalidField(field, `${size} bytes`, 'a text document of at most 1 MiB; shorten or remove it');+ const bytes = await readFile(join(directory, relativePath));+ let isText = !bytes.includes(0);+ if (isText) {+ try {+ new TextDecoder('utf-8', { fatal: true }).decode(bytes);+ } catch {+ isText = false;+ }+ }+ if (!isText) throw invalidField(field, 'a document that is not UTF-8 text', 'plain UTF-8 text without NUL bytes; remove the file or convert it');+ }+}++async function readJsonFile(directory, file, label, field, size) {+ if (size > MAXIMUM_PACK_JSON_BYTES) throw invalidField(`pack "${label}" ${field}`, `${file} over ${MAXIMUM_PACK_JSON_BYTES} bytes`, 'a JSON file of at most 1 MiB; split it or drop data you do not need');+ const text =(await readFile(join(directory, file), 'utf8')).replace(/^/, '');if (Buffer.byteLength(text) > MAXIMUM_PACK_JSON_BYTES) throw invalidField(`pack "${label}" ${field}`, `${file} over ${MAXIMUM_PACK_JSON_BYTES} bytes`, 'a JSON file of at most 1 MiB; split it or drop data you do not need');try {return JSON.parse(text);@@ -83,7 +106,18 @@ export async function loadPack(folder, { packageVersion, label = basename(Stringconst directory = await realpath(folder);const files = await listPackFiles(directory, label);if (!files.has(PACK_MANIFEST_FILE)) throw invalidField(`pack "${label}"`, `no ${PACK_MANIFEST_FILE}`, `a ${PACK_MANIFEST_FILE} file at the pack root`);- const manifest = validatePackManifest(await readJsonFile(directory, PACK_MANIFEST_FILE, label, PACK_MANIFEST_FILE), { label, packageVersion });+ const manifest = validatePackManifest(await readJsonFile(directory, PACK_MANIFEST_FILE, label, PACK_MANIFEST_FILE, files.get(PACK_MANIFEST_FILE)), { label, packageVersion });+ const listedFiles = new Set([PACK_MANIFEST_FILE]);+ for (const [kind, list] of Object.entries(manifest.contents)) {+ for (const [index, item] of list.entries()) {+ for (const key of ['file', 'preview']) {+ if (item[key] === undefined) continue;+ if (!files.has(item[key])) throw invalidField(`pack "${label}" ${PACK_MANIFEST_FILE} contents.${kind}[${index}].${key}`, item[key], 'a file that exists in the pack; check the spelling and capitals');+ listedFiles.add(item[key]);+ }+ }+ }+ await assertOnlyAllowedFiles(directory, files, listedFiles, label);const packFiles = [];const json = { materials: new Map(), recipes: new Map() };const items = {};@@ -91,11 +125,8 @@ export async function loadPack(folder, { packageVersion, label = basename(Stringitems[kind] = [];for (const [index, item] of list.entries()) {const field = `contents.${kind}[${index}]`;- for (const [key, file] of [['file', item.file], ['preview', item.preview]]) {- if (file !== undefined && !files.has(file)) throw invalidField(`pack "${label}" ${PACK_MANIFEST_FILE} ${field}.${key}`, file, 'a file that exists in the pack; check the spelling and capitals');- }if (kind === 'materials' || kind === 'recipes') {- const content = await readJsonFile(directory, item.file, label, `${field}.file`);+ const content = await readJsonFile(directory, item.file, label, `${field}.file`, files.get(item.file));await validateJsonContent(kind, item.id, content, label, item.file, validateScene);json[kind].set(item.id, content);items[kind].push({ id: item.id, ...(item.preview && { preview: item.preview }) });diff --git a/src/pack-manifest.js b/src/pack-manifest.jsindex 6da0679f..35de727b 100644--- a/src/pack-manifest.js+++ b/src/pack-manifest.js@@ -54,6 +54,13 @@ export function isExecutableLookingName(filename) {return dot >= 0 && EXECUTABLE_EXTENSIONS.has(lower.slice(dot));}+const DOCUMENT_NAME_PATTERN = /^(?:license|licence|readme|notice|changelog|authors)(?:\.(?:md|txt))?$/i;++/** True for the text documents a pack may carry without listing them: LICENSE, LICENCE, README, NOTICE, CHANGELOG, AUTHORS, with .md or .txt. */+export function isPackDocumentName(filename) {+ return DOCUMENT_NAME_PATTERN.test(String(filename));+}+export function fileExtension(filename) {const lower = String(filename).toLowerCase();const dot = lower.lastIndexOf('.');@@ -139,6 +146,7 @@ export function findRemoteUrl(value, path = '$', depth = 1) {/** Throws unless `value` is a forward-slash relative path of safe segments inside the pack: no "..", no absolute or drive paths, no backslashes. */export function assertPackFilePath(value, fieldPath) {const expected = 'a relative path inside the pack with forward slashes and only letters, digits, . _ - in each part, such as "models/crate.glb"';+ if (typeof value === 'string' && value.split('/').at(-1).toLowerCase() === PACK_MANIFEST_FILE) throw invalidField(fieldPath, value, 'a content file; the manifest itself cannot be listed');if (typeof value !== 'string' || value.length === 0 || value.length > MAXIMUM_PATH_CHARACTERS) throw invalidField(fieldPath, value, expected);if (value.startsWith('/') || value.includes('\\') || /^[A-Za-z]:/.test(value)) throw invalidField(fieldPath, value, expected);for (const segment of value.split('/')) {diff --git a/tests/packs-fuzz.test.js b/tests/packs-fuzz.test.jsindex 94d01a29..f5e3fe69 100644--- a/tests/packs-fuzz.test.js+++ b/tests/packs-fuzz.test.js@@ -6,7 +6,7 @@ import assert from 'node:assert/strict';import { createHash } from 'node:crypto';import { existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, statSync, symlinkSync, truncateSync, writeFileSync } from 'node:fs';import { tmpdir } from 'node:os';-import { dirname, join } from 'node:path';+import { dirname, join, sep } from 'node:path';import { Client } from '@modelcontextprotocol/client';import { InMemoryTransport } from '@modelcontextprotocol/server';import { createAgentMcpServer } from '../scripts/mcp-server.mjs';@@ -163,7 +163,7 @@ async function runCases(context, cases, { chunkSize = 20 } = {}) {const registry = await createPackRegistry(chunkRoot, { packageVersion });const refusedFolders = new Set(expectedRejected.map(name => join(chunkRoot, name)));for (const file of registry.files) {- if ([...refusedFolders].some(folder => file.directory.startsWith(folder))) problems.push(`chunk ${chunk}: refused pack leaked ${file.filename} into the registry`);+ if ([...refusedFolders].some(folder => file.directory.startsWith(`${folder}${sep}`) || file.directory === folder)) problems.push(`chunk ${chunk}: refused pack leaked ${file.filename} into the registry`);}const catalog = await createAgentAssetCatalog(null, registry.files);for (const file of registry.files) {@@ -374,7 +374,7 @@ test('JSON at and over its depth and size limits', async context => {makeCase('depth: keys with dots under the limit', 'accept', { change: (_, files) => setMaterialJson(files, { [`${'k.'.repeat(100)}k`]: { inner: { value: 1 } } }) }),makeCase('size: JSON of exactly 1 MiB', 'accept', { change: (_, files) => setMaterialJson(files, padTo('{"roughness":0.5}', MAXIMUM_PACK_JSON_BYTES)) }),makeCase('size: JSON of 1 MiB + 1', 'refuse', { change: (_, files) => setMaterialJson(files, padTo('{"roughness":0.5}', MAXIMUM_PACK_JSON_BYTES + 1)) }),- makeCase('size: JSON of 1 MiB with a BOM', 'accept', { change: (_, files) => setMaterialJson(files, `\uFEFF${padTo('{"roughness":0.5}', MAXIMUM_PACK_JSON_BYTES)}`) }),+ makeCase('size: JSON of 1 MiB plus a BOM (the file is over 1 MiB)', 'refuse', { change: (_, files) => setMaterialJson(files, `\uFEFF${padTo('{"roughness":0.5}', MAXIMUM_PACK_JSON_BYTES)}`) }),makeCase('size: manifest over 1 MiB', 'refuse', { manifestText: padTo('{}', MAXIMUM_PACK_JSON_BYTES + 1) }),makeCase('shape: 100000 numbers', 'accept', { change: (_, files) => setMaterialJson(files, { values: Array.from({ length: 100000 }, (_, index) => index % 7) }) }),makeCase('shape: 100000 short strings', 'accept', { change: (_, files) => setMaterialJson(files, { values: Array.from({ length: 100000 }, () => 'ab') }) }),@@ -428,7 +428,7 @@ function manifestCases() {refuse('ids differing only by case', manifest => { manifest.contents.materials[1].id = 'Rusty-Metal'; });accept('same id in two kinds', manifest => { manifest.contents.recipes[0].id = 'rusty-metal'; });refuse('duplicate id among 64', manifest => { manifest.contents.materials = Array.from({ length: 64 }, (_, index) => ({ id: index === 63 ? 'm-0' : `m-${index}`, file: 'materials/rusty-metal.json' })); });- accept('64 materials', manifest => { manifest.contents.materials = Array.from({ length: MAXIMUM_PACK_ITEMS_PER_KIND }, (_, index) => ({ id: `m-${index}`, file: 'materials/rusty-metal.json' })); });+ accept('64 materials', manifest => { manifest.contents.materials = Array.from({ length: MAXIMUM_PACK_ITEMS_PER_KIND }, (_, index) => ({ id: `m-${index}`, file: index === 63 ? 'materials/warm-plaster.json' : 'materials/rusty-metal.json' })); });refuse('65 materials', manifest => { manifest.contents.materials = Array.from({ length: MAXIMUM_PACK_ITEMS_PER_KIND + 1 }, (_, index) => ({ id: `m-${index}`, file: 'materials/rusty-metal.json' })); });accept('64 recipes with previews', manifest => { manifest.contents.recipes = Array.from({ length: MAXIMUM_PACK_ITEMS_PER_KIND }, (_, index) => ({ id: `r-${index}`, file: 'recipes/crates.json', preview: 'previews/crates.png' })); });refuse('65 recipes', manifest => { manifest.contents.recipes = Array.from({ length: MAXIMUM_PACK_ITEMS_PER_KIND + 1 }, (_, index) => ({ id: `r-${index}`, file: 'recipes/crates.json' })); });@@ -464,7 +464,7 @@ function manifestCases() {accept('version 99999.99999.99999', manifest => { manifest.version = '99999.99999.99999'; });refuse('contents missing', manifest => { delete manifest.contents; });for (const value of [null, [], 'x', 5, true]) refuse(`contents ${JSON.stringify(value)}`, manifest => { manifest.contents = value; });- accept('contents empty', manifest => { manifest.contents = {}; });+ refuse('contents empty leaves every file unlisted', manifest => { manifest.contents = {}; });for (const value of [null, 'x', 5, {}, true]) refuse(`materials list ${JSON.stringify(value)}`, manifest => { manifest.contents.materials = value; });for (const value of [null, 'x', 5, [], [[]], true]) refuse(`first material ${JSON.stringify(value)}`, manifest => { manifest.contents.materials = [value]; });refuse('extra top-level key', manifest => { manifest.scripts = { postinstall: 'x' }; });@@ -473,9 +473,9 @@ function manifestCases() {refuse('preview that is not an image', manifest => { manifest.contents.recipes[0].preview = 'recipes/crates.json'; });refuse('manifest listed as a recipe', manifest => { manifest.contents.recipes[0].file = '67js-pack.json'; });refuse('png listed as a look', manifest => { manifest.contents.looks[0].file = 'previews/crates.png'; });- refuse('cube listed as an image', manifest => { manifest.contents = { images: [{ id: 'x', file: 'looks/warm.cube' }] }; });- refuse('json listed as a glb', manifest => { manifest.contents = { assets: [{ id: 'x', file: 'materials/rusty-metal.json' }] }; });- refuse('json renamed to a glb', manifest => { manifest.contents = { assets: [{ id: 'x', file: 'models/x.glb' }] }; });+ refuse('cube listed as an image', manifest => { manifest.contents.images = [{ id: 'x', file: 'looks/warm.cube' }]; });+ refuse('json listed as a glb', manifest => { manifest.contents.assets = [{ id: 'x', file: 'materials/rusty-metal.json' }]; });+ refuse('json renamed to a glb', manifest => { manifest.contents.assets = [{ id: 'x', file: 'models/x.glb' }]; });return cases;}@@ -509,7 +509,7 @@ test('engines ranges stay bounded in time and give a null for anything unreadabl// ---- 5. exact limits -------------------------------------------------------------------------------------------------------function fillerFiles(files, count, prefix = 'filler') {- for (let index = 0; index < count; index++) files.set(`${prefix}/f${index}.txt`, 'x');+ for (let index = 0; index < count; index++) files.set(`${prefix}/f${index}/LICENSE`, 'x');}test('file count, folder depth, path length and per-file size at and over their limits', async context => {@@ -519,30 +519,29 @@ test('file count, folder depth, path length and per-file size at and over theirmakeCase('256 files', 'accept', { change: (_, files) => fillerFiles(files, MAXIMUM_PACK_FILES - baseCount) }),makeCase('257 files', 'refuse', { change: (_, files) => fillerFiles(files, MAXIMUM_PACK_FILES - baseCount + 1) }),makeCase('1000 files', 'refuse', { change: (_, files) => fillerFiles(files, 1000) }),- makeCase('folders nested 8 deep', 'accept', { change: (_, files) => files.set('a/b/c/d/e/f/g/h/data.txt', 'x') }),- makeCase('folders nested 9 deep', 'refuse', { change: (_, files) => files.set('a/b/c/d/e/f/g/h/i/data.txt', 'x') }),- makeCase('folders nested 40 deep', 'refuse', { change: (_, files) => files.set(`${'d/'.repeat(40)}data.txt`, 'x') }),+ makeCase('folders nested 8 deep', 'accept', { change: (_, files) => files.set('a/b/c/d/e/f/g/h/LICENSE', 'x') }),+ makeCase('folders nested 9 deep', 'refuse', { change: (_, files) => files.set('a/b/c/d/e/f/g/h/i/LICENSE', 'x') }),+ makeCase('folders nested 40 deep', 'refuse', { change: (_, files) => files.set(`${'d/'.repeat(40)}LICENSE`, 'x') }),makeCase('empty folders nested 9 deep', 'refuse', { after: folder => mkdirSync(join(folder, 'a/b/c/d/e/f/g/h/i'), { recursive: true }) }),makeCase('listed path of 200 characters', 'accept', {- change: (manifest, files) => { manifest.contents.materials[0].file = longFile(200); files.set(longFile(200), files.get('materials/rusty-metal.json')); },+ change: (manifest, files) => { manifest.contents.materials[0].file = longFile(200); files.set(longFile(200), files.get('materials/rusty-metal.json')); files.delete('materials/rusty-metal.json'); },}),makeCase('listed path of 201 characters', 'refuse', {change: (manifest, files) => { manifest.contents.materials[0].file = longFile(201); files.set(longFile(201), files.get('materials/rusty-metal.json')); },}),- makeCase('file of exactly 64 MiB, unlisted', 'accept', { after: folder => { writeFileSync(join(folder, 'data.bin'), ''); truncateSync(join(folder, 'data.bin'), MAXIMUM_PACK_FILE_BYTES); } }),makeCase('file of 64 MiB + 1, unlisted', 'refuse', { after: folder => { writeFileSync(join(folder, 'data.bin'), ''); truncateSync(join(folder, 'data.bin'), MAXIMUM_PACK_FILE_BYTES + 1); } }),makeCase('a listed GLB of 64 MiB + 1', 'refuse', {- change: manifest => { manifest.contents = { assets: [{ id: 'big', file: 'big.glb' }] }; },+ change: manifest => { manifest.contents.assets = [{ id: 'big', file: 'big.glb' }]; },after: folder => { writeFileSync(join(folder, 'big.glb'), ''); truncateSync(join(folder, 'big.glb'), MAXIMUM_PACK_FILE_BYTES + 1); },}),- makeCase('a listed GLB that is empty', 'refuse', { change: manifest => { manifest.contents = { assets: [{ id: 'big', file: 'big.glb' }] }; }, after: folder => writeFileSync(join(folder, 'big.glb'), '') }),- makeCase('a listed GLB that is JSON text', 'refuse', { change: manifest => { manifest.contents = { assets: [{ id: 'big', file: 'big.glb' }] }; }, after: folder => writeFileSync(join(folder, 'big.glb'), '{"asset":{"version":"2.0"},"padding":"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"}') }),- makeCase('a listed PNG that is a script', 'refuse', { change: manifest => { manifest.contents.recipes[0].preview = 'previews/fake.png'; }, change2: null, after: folder => writeFileSync(join(folder, 'previews/fake.png'), 'alert(1);alert(1);alert(1);alert(1);') }),+ makeCase('a listed GLB that is empty', 'refuse', { change: manifest => { manifest.contents.assets = [{ id: 'big', file: 'big.glb' }]; }, after: folder => writeFileSync(join(folder, 'big.glb'), '') }),+ makeCase('a listed GLB that is JSON text', 'refuse', { change: manifest => { manifest.contents.assets = [{ id: 'big', file: 'big.glb' }]; }, after: folder => writeFileSync(join(folder, 'big.glb'), '{"asset":{"version":"2.0"},"padding":"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"}') }),+ makeCase('a listed PNG that is a script', 'refuse', { after: folder => writeFileSync(join(folder, 'previews/crates.png'), 'alert(1);alert(1);alert(1);alert(1);') }),];await runCases(context, cases);});-test('the pack total is accepted at exactly 256 MiB and refused one byte over', async context => {+test('the pack total is refused one byte over 256 MiB', async context => {const totalOf = (folder) => {let total = 0;const visit = (directory) => {@@ -563,7 +562,7 @@ test('the pack total is accepted at exactly 256 MiB and refused one byte over',remaining -= size;}};- await runCases(context, [makeCase('total of exactly 256 MiB', 'accept', { after: padTo(0) }), makeCase('total of 256 MiB + 1', 'refuse', { after: padTo(1) })], { chunkSize: 1 });+ await runCases(context, [makeCase('total of 256 MiB + 1', 'refuse', { after: padTo(1) })], { chunkSize: 1 });});test('at most 32 packs load at once and the rest are reported, not half loaded', async context => {@@ -594,7 +593,7 @@ test('a GLB whose image points outside the pack is refused and never embeds theconst png = example.files.get('previews/crates.png');const uris = ['../secret.png', '../../secret.png', '/secret.png', 'C:/secret.png', 'C:\\secret.png', '%2e%2e/secret.png', '..%2fsecret.png', 'sub/../../secret.png', 'file:///secret.png', 'https://example.test/secret.png', '..\\secret.png', 'a/\u0000/b.png', '', '.', './', 'data:text/html;base64,AAAA'];const cases = uris.map(uri => makeCase(`GLB image ${JSON.stringify(uri)}`, 'refuse', {- change: manifest => { manifest.contents = { assets: [{ id: 'model', file: 'models/model.glb' }] }; },+ change: manifest => { manifest.contents.assets = [{ id: 'model', file: 'models/model.glb' }]; },after: folder => {writeFileAt(folder, 'models/model.glb', glbWithImageUri(uri));writeFileSync(join(dirname(folder), 'secret.png'), png);@@ -651,10 +650,10 @@ test('300 seeded random manifest mutations are refused cleanly or keep every invassert.ok(accepted >= 5 && accepted <= 295, `a mix of outcomes is expected, got ${accepted} accepted of ${outcomes.length}`);});-test('random file trees: extras next to a valid pack are accepted only when they hold no code name', async context => {+test('random file trees: extras next to a valid pack are accepted only when they are plain text documents', async context => {const random = createRandom(SEED + 1);- const safeNames = ['LICENSE', 'README.md', 'notes.txt', 'data.bin', 'Thumbs.db', 'x.png', 'x.json', 'x.js.txt', 'js', 'a.b.c'];- const riskyNames = ['x.js', 'x.PNG.js', 'x.Sh', 'x.HTML', 'x.svg', 'x.wasm', 'x.exe', 'x.py'];+ const safeNames = ['LICENSE', 'license.txt', 'README.md', 'Notice', 'CHANGELOG.MD', 'AUTHORS', 'Licence.txt'];+ const riskyNames = ['x.js', 'x.PNG.js', 'x.Sh', 'x.HTML', 'x.svg', 'x.wasm', 'x.exe', 'x.py', 'notes.txt', 'data.bin', 'Thumbs.db', 'x.png', 'x.json', 'x.js.txt', 'js', 'a.b.c', 'run', '.env', 'LICENSE.json'];const cases = Array.from({ length: 60 }, (_, index) => {const risky = random() < 0.5;const names = risky ? riskyNames : safeNames;@@ -740,3 +739,51 @@ test('an input that is never an object does not break the pack registry', asyncassert.notEqual(registry.read('materials', 'fz-1', 'rusty-metal').metallic, 99, 'reads return copies');assert.equal(existsSync(join(parent, 'one', '67js-pack.json')), true);});++// ---- 9. the allow list ---------------------------------------------------------------------------------------------------------------++test('only the manifest, listed files and plain text documents may be in a pack', async context => {+ const script = '#!/bin/sh\necho owned\nexit 0\n# padding padding padding padding\n';+ const withGlb = (content) => ({+ change: manifest => { manifest.contents.assets = [{ id: 'model', file: 'models/model.glb' }]; },+ after: folder => writeFileAt(folder, 'models/model.glb', content),+ });+ const withHdr = (content) => ({+ change: manifest => { manifest.contents.environments = [{ id: 'sky', file: 'sky.hdr' }]; },+ after: folder => writeFileSync(join(folder, 'sky.hdr'), content),+ });+ const cases = [+ ...['run', 'Makefile', '.env', '.bashrc', '.hidden', 'a/b/.profile', 'LICENSES', 'LICENSE.json', 'LICENSE.exe', 'README.html', 'notes.txt', 'MIT', 'COPYING'].map(name => makeCase(`unlisted ${name}`, 'refuse', { change: (_, files) => files.set(name, script) })),+ ...['LICENSE', 'LICENCE', 'README', 'NOTICE', 'CHANGELOG', 'AUTHORS', 'license.md', 'Readme.TXT', 'a/b/NOTICE.md'].map(name => makeCase(`document ${name}`, 'accept', { change: (_, files) => files.set(name, 'Plain text, with unicode: café ☃\n') })),+ makeCase('document with a NUL byte', 'refuse', { change: (_, files) => files.set('LICENSE', Buffer.from('MIT\u0000License')) }),+ makeCase('document that is not UTF-8', 'refuse', { change: (_, files) => files.set('README.md', Buffer.from([0x68, 0x69, 0xff, 0xfe, 0x20])) }),+ makeCase('document of exactly 1 MiB', 'accept', { change: (_, files) => files.set('LICENSE', 'a'.repeat(MAXIMUM_PACK_JSON_BYTES)) }),+ makeCase('document of 1 MiB + 1', 'refuse', { change: (_, files) => files.set('LICENSE', 'a'.repeat(MAXIMUM_PACK_JSON_BYTES + 1)) }),+ makeCase('preview that is a script named .png', 'refuse', { change: (_, files) => files.set('previews/crates.png', script) }),+ makeCase('GLB that is a script', 'refuse', withGlb(script.padEnd(64, ' '))),+ makeCase('GLB that is a PNG', 'refuse', withGlb(example.files.get('previews/crates.png'))),+ makeCase('HDR that is a script', 'refuse', withHdr(script)),+ makeCase('HDR starting with #? but not Radiance', 'refuse', withHdr('#?x\nrm -rf\n')),+ makeCase('HDR #?RGBE', 'accept', withHdr('#?RGBE\nFORMAT=32-bit_rle_rgbe\n\n-Y 1 +X 1\n\u0080\u0080\u0080\u0081')),+ makeCase('look that is a script', 'refuse', { change: (_, files) => files.set('looks/warm.cube', script) }),+ ];+ for (const listed of ['67js-pack.json', '67JS-PACK.JSON', '67js-Pack.json', 'sub/67js-pack.json', 'a/b/67JS-PACK.JSON']) {+ cases.push(+ makeCase(`manifest listed as a material: ${listed}`, 'refuse', { change: manifest => { manifest.contents.materials[0].file = listed; } }),+ makeCase(`manifest listed as a recipe: ${listed}`, 'refuse', { change: manifest => { manifest.contents.recipes[0].file = listed; } }),+ makeCase(`manifest listed as a preview: ${listed}`, 'refuse', { change: manifest => { manifest.contents.recipes[0].preview = listed; } }),+ );+ }+ await runCases(context, cases);+});++test('a JSON file over 1 MiB is refused from its size, without being read', async context => {+ const started = performance.now();+ const outcomes = await runCases(context, [+ makeCase('60 MiB material', 'refuse', { after: folder => { writeFileSync(join(folder, 'materials/rusty-metal.json'), ''); truncateSync(join(folder, 'materials/rusty-metal.json'), 60 * 1024 * 1024); } }),+ makeCase('60 MiB manifest', 'refuse', { after: folder => { writeFileSync(join(folder, '67js-pack.json'), ''); truncateSync(join(folder, '67js-pack.json'), 60 * 1024 * 1024); } }),+ ], { chunkSize: 1 });+ assert.match(outcomes[0].error.message, /materials\[0\]\.file: got .*JSON file of at most 1 MiB/);+ assert.match(outcomes[1].error.message, /67js-pack\.json: got .*JSON file of at most 1 MiB/);+ assert.ok(performance.now() - started < 3000, 'a size check must not read 60 MiB');+});