-
Notifications
You must be signed in to change notification settings - Fork 56
feat(docs): validate USB Creator screenshot imports #522
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Eli Bosley (elibosley)
merged 2 commits into
main
from
feat/usb-creator-screenshot-importer
Aug 6, 2026
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,186 @@ | ||
| #!/usr/bin/env node | ||
|
|
||
| import { createHash } from 'node:crypto'; | ||
| import { | ||
| lstat, | ||
| mkdir, | ||
| readFile, | ||
| realpath, | ||
| rename, | ||
| rm, | ||
| writeFile, | ||
| } from 'node:fs/promises'; | ||
| import path from 'node:path'; | ||
| import { fileURLToPath } from 'node:url'; | ||
|
|
||
| const EXPECTED_CATEGORY = 'unraid-os'; | ||
| const EXPECTED_FLOW = 'create-unraid-usb'; | ||
| const EXPECTED_PUBLICATION_KEY = 'usb-creator:linux:create-unraid-usb'; | ||
| const REPOSITORY = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..'); | ||
| const DESTINATION = path.join( | ||
| REPOSITORY, | ||
| 'static/img/unraid-os/getting-started/create-unraid-usb', | ||
| ); | ||
|
|
||
| function fail(message) { | ||
| throw new Error(`USB Creator screenshot import failed: ${message}`); | ||
| } | ||
|
|
||
| function safeSlug(value, label) { | ||
| if (typeof value !== 'string' || !/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(value)) { | ||
| fail(`${label} is not a safe slug`); | ||
| } | ||
| return value; | ||
| } | ||
|
|
||
| function sha256(bytes) { | ||
| return createHash('sha256').update(bytes).digest('hex'); | ||
| } | ||
|
|
||
| async function sourceImage(bundleRoot, relativeImage) { | ||
| if (typeof relativeImage !== 'string' || path.isAbsolute(relativeImage)) { | ||
| fail('step image must be a relative path'); | ||
| } | ||
|
|
||
| const candidate = path.resolve(bundleRoot, relativeImage); | ||
| const relative = path.relative(bundleRoot, candidate); | ||
| if (relative.startsWith('..') || path.isAbsolute(relative)) { | ||
| fail(`step image escapes the bundle: ${relativeImage}`); | ||
| } | ||
|
|
||
| const metadata = await lstat(candidate); | ||
| if (!metadata.isFile() || metadata.isSymbolicLink()) { | ||
| fail(`step image is not a regular file: ${relativeImage}`); | ||
| } | ||
|
|
||
| const resolved = await realpath(candidate); | ||
| const resolvedRelative = path.relative(bundleRoot, resolved); | ||
| if (resolvedRelative.startsWith('..') || path.isAbsolute(resolvedRelative)) { | ||
| fail(`step image resolves outside the bundle: ${relativeImage}`); | ||
| } | ||
| return resolved; | ||
| } | ||
|
|
||
| async function publishDirectory(staging, destination, renameDirectory = rename) { | ||
| const backup = `${destination}.previous-${process.pid}-${Date.now()}`; | ||
| let hadDestination = false; | ||
| try { | ||
| await lstat(destination); | ||
| hadDestination = true; | ||
| } catch (error) { | ||
| if (error.code !== 'ENOENT') throw error; | ||
| } | ||
|
|
||
| if (hadDestination) await renameDirectory(destination, backup); | ||
| try { | ||
| await renameDirectory(staging, destination); | ||
| } catch (error) { | ||
| if (hadDestination) await renameDirectory(backup, destination); | ||
| throw error; | ||
| } | ||
| if (hadDestination) await rm(backup, { recursive: true, force: true }); | ||
| } | ||
|
|
||
| export async function importBundle( | ||
| bundleArgument, | ||
| { destination = DESTINATION, renameDirectory = rename } = {}, | ||
| ) { | ||
| const bundleRoot = await realpath(path.resolve(bundleArgument)); | ||
| const input = JSON.parse( | ||
| await readFile(path.join(bundleRoot, 'guide-input.json'), 'utf8'), | ||
| ); | ||
|
|
||
| if (input.schemaVersion !== 2) fail('schemaVersion must be 2'); | ||
| if (input.categoryCount !== 1 || input.categories?.length !== 1) { | ||
| fail('bundle must contain exactly one category'); | ||
| } | ||
|
|
||
| const category = input.categories[0]; | ||
| if (safeSlug(category.slug, 'category slug') !== EXPECTED_CATEGORY) { | ||
| fail(`unexpected category: ${category.slug}`); | ||
| } | ||
| if (category.flowCount !== 1 || category.flows?.length !== 1) { | ||
| fail('bundle must contain exactly one flow'); | ||
| } | ||
|
|
||
| const flow = category.flows[0]; | ||
| if (safeSlug(flow.slug, 'flow slug') !== EXPECTED_FLOW) { | ||
| fail(`unexpected flow: ${flow.slug}`); | ||
| } | ||
| if (!Array.isArray(flow.steps) || flow.steps.length === 0) { | ||
| fail('flow must contain at least one step'); | ||
| } | ||
| if (flow.stepCount !== flow.steps.length) fail('stepCount does not match steps'); | ||
|
|
||
| const identity = flow.publicationIdentity; | ||
| if ( | ||
| identity?.publicationKey !== EXPECTED_PUBLICATION_KEY || | ||
| typeof identity?.captureId !== 'string' || | ||
| identity.captureId.length === 0 | ||
| ) { | ||
| fail('flow publication identity is incomplete'); | ||
| } | ||
|
|
||
| const resolvedDestination = path.resolve(destination); | ||
| const parent = path.dirname(resolvedDestination); | ||
| await mkdir(parent, { recursive: true }); | ||
| const staging = path.join( | ||
| parent, | ||
| `.create-unraid-usb-${process.pid}-${Date.now()}`, | ||
| ); | ||
| await mkdir(staging); | ||
|
|
||
| try { | ||
| const names = new Set(); | ||
| for (const [index, step] of flow.steps.entries()) { | ||
| if (step.order !== index + 1) fail('steps must have contiguous order'); | ||
| if ( | ||
| step.publicationKey !== identity.publicationKey || | ||
| step.captureId !== identity.captureId | ||
| ) { | ||
| fail(`step ${step.order} does not match the flow publication identity`); | ||
| } | ||
| if (typeof step.sha256 !== 'string' || !/^[a-f0-9]{64}$/.test(step.sha256)) { | ||
| fail(`step ${step.order} has an invalid SHA-256 digest`); | ||
| } | ||
|
|
||
| const source = await sourceImage(bundleRoot, step.image); | ||
| const bytes = await readFile(source); | ||
| if (sha256(bytes) !== step.sha256) { | ||
| fail(`step ${step.order} does not match its accepted digest`); | ||
| } | ||
|
|
||
| const filename = path.basename(step.image); | ||
| if (!/^\d{2}-[a-z0-9]+(?:-[a-z0-9]+)*\.png$/.test(filename)) { | ||
| fail(`step ${step.order} has an unsafe public filename`); | ||
| } | ||
| if (names.has(filename)) fail(`duplicate public filename: ${filename}`); | ||
| names.add(filename); | ||
| await writeFile(path.join(staging, filename), bytes); | ||
| } | ||
|
|
||
| await publishDirectory(staging, resolvedDestination, renameDirectory); | ||
| } catch (error) { | ||
| await rm(staging, { recursive: true, force: true }); | ||
| throw error; | ||
| } | ||
|
|
||
| console.log( | ||
| `Imported ${flow.steps.length} accepted USB Creator screenshots from ${identity.captureId}`, | ||
| ); | ||
| } | ||
|
|
||
| if (process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url)) { | ||
| const bundleArgument = process.argv[2]; | ||
| if (!bundleArgument || process.argv.length !== 3) { | ||
| console.error( | ||
| 'USB Creator screenshot import failed: usage: import-usb-creator-flow.mjs <bundle-directory>', | ||
| ); | ||
| process.exitCode = 1; | ||
| } else { | ||
| importBundle(bundleArgument).catch((error) => { | ||
| console.error(error.message); | ||
| process.exitCode = 1; | ||
| }); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| import { createHash } from 'node:crypto'; | ||
| import { mkdtemp, mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises'; | ||
| import { tmpdir } from 'node:os'; | ||
| import path from 'node:path'; | ||
| import { spawnSync } from 'node:child_process'; | ||
| import test from 'node:test'; | ||
| import assert from 'node:assert/strict'; | ||
| import { importBundle } from './import-usb-creator-flow.mjs'; | ||
|
|
||
| const repository = path.resolve(import.meta.dirname, '..'); | ||
| const importer = path.join(repository, 'scripts/import-usb-creator-flow.mjs'); | ||
|
|
||
| function digest(bytes) { | ||
| return createHash('sha256').update(bytes).digest('hex'); | ||
| } | ||
|
|
||
| async function bundleFixture() { | ||
| const root = await mkdtemp(path.join(tmpdir(), 'usb-creator-bundle-')); | ||
| const imageDirectory = path.join(root, 'images/unraid-os/create-unraid-usb'); | ||
| await mkdir(imageDirectory, { recursive: true }); | ||
| const image = Buffer.from('accepted screenshot fixture'); | ||
| const imagePath = 'images/unraid-os/create-unraid-usb/01-select-release.png'; | ||
| await writeFile(path.join(root, imagePath), image); | ||
| const guide = { | ||
| schemaVersion: 2, | ||
| categoryCount: 1, | ||
| flowCount: 1, | ||
| categories: [ | ||
| { | ||
| category: 'unraid-os', | ||
| slug: 'unraid-os', | ||
| flowCount: 1, | ||
| flows: [ | ||
| { | ||
| flow: 'create-unraid-usb', | ||
| slug: 'create-unraid-usb', | ||
| stepCount: 1, | ||
| publicationIdentity: { | ||
| publicationKey: 'usb-creator:linux:create-unraid-usb', | ||
| captureId: 'test-capture', | ||
| }, | ||
| steps: [ | ||
| { | ||
| order: 1, | ||
| image: imagePath, | ||
| publicationKey: 'usb-creator:linux:create-unraid-usb', | ||
| captureId: 'test-capture', | ||
| sha256: digest(image), | ||
| }, | ||
| ], | ||
| }, | ||
| ], | ||
| }, | ||
| ], | ||
| }; | ||
| await writeFile(path.join(root, 'guide-input.json'), `${JSON.stringify(guide)}\n`); | ||
| return { root, guide }; | ||
| } | ||
|
|
||
| test('imports the verified image set and removes stale images', async () => { | ||
| const fixture = await bundleFixture(); | ||
| const testRoot = await mkdtemp(path.join(tmpdir(), 'usb-creator-import-')); | ||
| const destination = path.join(testRoot, 'published'); | ||
| await mkdir(destination, { recursive: true }); | ||
| await writeFile(path.join(destination, 'stale.png'), 'stale'); | ||
|
|
||
| try { | ||
| await importBundle(fixture.root, { destination }); | ||
| assert.equal( | ||
| await readFile(path.join(destination, '01-select-release.png'), 'utf8'), | ||
| 'accepted screenshot fixture', | ||
| ); | ||
| await assert.rejects(readFile(path.join(destination, 'stale.png'))); | ||
| } finally { | ||
| await rm(fixture.root, { recursive: true, force: true }); | ||
| await rm(testRoot, { recursive: true, force: true }); | ||
| } | ||
| }); | ||
|
|
||
| test('rejects a screenshot whose bytes do not match the accepted digest', async () => { | ||
| const fixture = await bundleFixture(); | ||
| fixture.guide.categories[0].flows[0].steps[0].sha256 = '0'.repeat(64); | ||
| await writeFile( | ||
| path.join(fixture.root, 'guide-input.json'), | ||
| `${JSON.stringify(fixture.guide)}\n`, | ||
| ); | ||
|
|
||
| try { | ||
| const result = spawnSync(process.execPath, [importer, fixture.root], { | ||
| cwd: repository, | ||
| encoding: 'utf8', | ||
| }); | ||
| assert.notEqual(result.status, 0); | ||
| assert.match(result.stderr, /does not match its accepted digest/); | ||
| } finally { | ||
| await rm(fixture.root, { recursive: true, force: true }); | ||
| } | ||
| }); | ||
|
|
||
| test('restores the previous image set when publication fails', async () => { | ||
| const fixture = await bundleFixture(); | ||
| const testRoot = await mkdtemp(path.join(tmpdir(), 'usb-creator-rollback-')); | ||
| const destination = path.join(testRoot, 'published'); | ||
| await mkdir(destination, { recursive: true }); | ||
| await writeFile(path.join(destination, 'previous.png'), 'previous screenshot'); | ||
| let renameCount = 0; | ||
|
|
||
| try { | ||
| await assert.rejects( | ||
| importBundle(fixture.root, { | ||
| destination, | ||
| renameDirectory: async (source, target) => { | ||
| renameCount += 1; | ||
| if (renameCount === 2) throw new Error('simulated publication failure'); | ||
| await rename(source, target); | ||
| }, | ||
| }), | ||
| /simulated publication failure/, | ||
| ); | ||
| assert.equal( | ||
| await readFile(path.join(destination, 'previous.png'), 'utf8'), | ||
| 'previous screenshot', | ||
| ); | ||
| } finally { | ||
| await rm(fixture.root, { recursive: true, force: true }); | ||
| await rm(testRoot, { recursive: true, force: true }); | ||
| } | ||
| }); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.