openpencil/packages/cli/tests/commands/diff.test.ts
Danila Poyarkov e2a3aa3f80
fix: validate parsed JSON at untrusted boundaries with Valibot (#855)
* fix: validate parsed JSON at untrusted boundaries with Valibot

Clipboard HTML, library revisions from shared storage, MCP and automation
WebSocket messages, the MCP discovery file, sidecar output and AI/MCP tool
arguments were JSON.parse'd and cast to their expected types, so a
malformed payload reached the document or crashed paste. They now go
through v.pipe(v.string(), v.parseJson(), Schema), which reports bad JSON
and a wrong shape as the same validation failure.

The path_set tool rejects an invalid VectorNetwork and shares its parser
with create_vector. The CLI library catalog validates its files and runs
revisions through the same size, identity and content-hash checks as the
app; reading image bytes as index-keyed records also stops them coming
back empty. Hand-rolled typeof readers for plugin data, document metadata,
caches and preferences become schemas with their behaviour preserved, and
readCacheJSON takes a schema for its payload.

open-pencil/no-unvalidated-json-parse rejects type assertions on
JSON.parse results other than `as unknown` in src and packages/*/src.

* refactor: validate parsed JSON in tests and tooling

Extend open-pencil/no-unvalidated-json-parse beyond source: tests, helpers and repo tooling now parse JSON through Valibot schemas instead of asserting a type. The shared fixture reader returns a validated object; its old array annotation never matched the fixtures.

* fix: validate clipboard geometry bytes, library images and model catalogs

Clipboard geometry blobs and library image bytes must be bytes at contiguous indexes, so out-of-range or gapped values are rejected instead of silently becoming different geometry or images; serialized library nodes must carry source metadata. The models.dev and OpenRouter responses are validated like their cached copies, and activate-tab rejects a CDP frame it cannot read instead of hanging.

* refactor: extend the JSON validation lint to .json() results

no-unvalidated-json-parse now also rejects type assertions on Response, Bun.file and shell .json() results, the same unchecked parse in another form. MCP server tests read /health through a validated readHealth helper and discovery files through parseDiscoveryInfo; the remaining tooling reads its JSON through schemas.

* test: validate the RPC request body in the CLI app export test

* test: validate CLI JSON output in the tool and app command tests

* test: compare the malformed models.dev fallback with the curated list
2026-10-04 17:01:50 +00:00

99 lines
3.5 KiB
TypeScript

import { describe, expect, setDefaultTimeout, test } from 'bun:test'
import { mkdtemp, readFile, writeFile } from 'node:fs/promises'
import { tmpdir } from 'node:os'
import { join } from 'node:path'
import * as v from 'valibot'
import { CLI_ENTRY, FIXTURES } from '#cli-tests/helpers/paths'
setDefaultTimeout(60_000)
const FIXTURE = join(FIXTURES, 'gold-preview.fig')
const LOGO = '0:10'
const TITLE = '0:9'
const PNG_SIGNATURE = [0x89, 0x50, 0x4e, 0x47]
async function cli(args: string[]) {
const proc = Bun.spawn([process.execPath, CLI_ENTRY, ...args], { stdout: 'pipe', stderr: 'pipe' })
const [stdout, stderr] = await Promise.all([
new Response(proc.stdout).text(),
new Response(proc.stderr).text()
])
return { stdout: stdout.trim(), stderr: stderr.trim(), exitCode: await proc.exited }
}
describe('diff CLI', () => {
test('show, apply, and files round-trip an attribute patch headlessly', async () => {
const dir = await mkdtemp(join(tmpdir(), 'open-pencil-diff-'))
const patchPath = join(dir, 'logo.diff')
const outPath = join(dir, 'out.fig')
const shown = await cli([
'diff',
'show',
LOGO,
FIXTURE,
'--attributes',
'name="Brand" opacity={0.5}'
])
expect(shown.exitCode).toBe(0)
expect(shown.stdout).toBe(`@@ /Logo #${LOGO}\n-name="Logo"\n+name="Brand"\n+opacity={0.5}`)
await writeFile(patchPath, shown.stdout)
const applied = await cli(['diff', 'apply', patchPath, FIXTURE, '--output', outPath, '--json'])
expect(applied.exitCode).toBe(0)
expect(JSON.parse(applied.stdout)).toMatchObject({ applied: 1, failed: 0 })
// Matched by path, the renamed logo reads as removed and added.
const files = await cli(['diff', 'files', FIXTURE, outPath, '--json'])
// Like diff(1), a difference exits 1.
expect(files.exitCode).toBe(1)
const result = v.parse(
v.pipe(v.string(), v.parseJson(), v.object({ diff: v.string() })),
files.stdout
)
expect(result.diff).toContain(`/Logo #${LOGO} removed`)
expect(result.diff).toContain('opacity={0.5}')
const stalePath = join(dir, 'stale.diff')
await writeFile(stalePath, shown.stdout.replace('-name="Logo"', '-name="Other"'))
const stale = await cli(['diff', 'apply', stalePath, FIXTURE, '--dry-run', '--json'])
expect(stale.exitCode).toBe(1)
expect(stale.stdout).toContain('name: expected name=\\"Other\\", found name=\\"Logo\\"')
})
test.each([
[['--page', 'Nope'], 'Neither document has a page named "Nope"'],
[['--depth', 'abc'], '--depth must be a non-negative integer, got "abc"'],
[['--depth=-1'], '--depth must be a non-negative integer, got "-1"']
])('files rejects %p instead of reporting a match', async (options, error) => {
const result = await cli(['diff', 'files', FIXTURE, FIXTURE, ...options])
expect(result.exitCode).toBe(2)
expect(result.stderr).toContain(error)
})
test('visual writes a PNG and reports the changed area', async () => {
const dir = await mkdtemp(join(tmpdir(), 'open-pencil-diff-'))
const output = join(dir, 'diff.png')
const result = await cli([
'diff',
'visual',
FIXTURE,
'--from',
TITLE,
'--to',
TITLE,
'--output',
output,
'--max-edge',
'256',
'--json'
])
expect(result.exitCode).toBe(0)
expect(JSON.parse(result.stdout)).toMatchObject({ changedPixels: 0, changedBounds: null })
expect([...(await readFile(output)).subarray(0, 4)]).toEqual(PNG_SIGNATURE)
})
})