Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions packages/verify/bin/h5p-verify.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,13 @@ try {
readyTimeout: seconds(args.values.ready, 60_000),
settle: seconds(args.values.settle, 3_000)
})
if (args.values.json) console.log(JSON.stringify(report, null, 2))
else if (args.values.quiet) console.log(summarize(report).split('\n')[0])
else console.log(summarize(report))
process.exit(report.verdict === 'pass' ? 0 : 1)
const text = args.values.json ? JSON.stringify(report, null, 2) : args.values.quiet ? summarize(report).split('\n')[0] : summarize(report)
// The process ends once the report is written: `process.exit` drops what is still waiting, and
// Node writes to a pipe asynchronously on macOS, so a program reading the report through one got
// its first 8 kB (#117). A reader that has gone away ends it too.
const code = report.verdict === 'pass' ? 0 : 1
process.stdout.once('error', () => process.exit(code))
process.stdout.write(`${text}\n`, () => process.exit(code))
} catch (error) {
console.error(error instanceof VerifyError ? error.message : error)
process.exit(2)
Expand Down
15 changes: 15 additions & 0 deletions packages/verify/tests/verify.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { execFile } from 'node:child_process'
import { existsSync } from 'node:fs'
import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
import { tmpdir } from 'node:os'
import { join, resolve } from 'node:path'
import { promisify } from 'node:util'
import { BlobReader, BlobWriter, type Entry, TextReader, Uint8ArrayReader, Uint8ArrayWriter, ZipReader, ZipWriter } from '@zip.js/zip.js'
import { afterAll, beforeAll, describe, expect, it } from 'vitest'
import { contentChanges, summarize, verifyPackage } from '../lib/verify.mjs'
Expand All @@ -11,6 +13,7 @@ import { contentChanges, summarize, verifyPackage } from '../lib/verify.mjs'
* content. Each case launches a browser, so the timeouts are generous.
*/

const bin = resolve(import.meta.dirname, '../bin/h5p-verify.mjs')
const content = resolve(import.meta.dirname, '../../../apps/demo/demo/content')
const quiz = join(content, 'quiz.h5p')
/** The workspace's library pack, served by the verifier itself, so the untrusted cases need no network. */
Expand Down Expand Up @@ -236,6 +239,18 @@ describe('h5p-verify', () => {
expect(report.warnings).toContain('content check: questions[0].params.question: markup removed: <form>, <input>')
}, 120_000)

it('prints a report larger than a pipe holds whole to a program that reads it through one (#117)', async () => {
// Each field the semantics do not name is removed and reported: a report of tens of kilobytes.
const file = await quizWithContent('many-changes.h5p', (params) => {
for (let index = 0; index < 300; index++) params[`unknownField${index}`] = 'a value no library reads'
})
const out = join(dir, 'many-changes')
const { stdout } = await promisify(execFile)(process.execPath, [bin, file, '--untrusted', '--libraries', pack, '--json', '--out', out], { maxBuffer: 1 << 26 })

expect(Buffer.byteLength(stdout)).toBeGreaterThan(16 * 1024)
expect(JSON.parse(stdout)).toEqual(JSON.parse(await readFile(join(out, 'report.json'), 'utf8')))
}, 120_000)

it('played untrusted, passes the quiz unchanged', async () => {
const report = await verifyPackage({ file: quiz, untrusted: true, libraries: pack })

Expand Down
Loading