fix(app): import worker hardenings from the security gate; restore_copy size cap in the core

Page messages validated by field (size and chunk length as safe byte counts, length within
the buffer); the task post wrapped so a refused clone leaves no orphan worker; a second
ready ignored; the 16 MiB copy cap enforced in facade::restore_copy as well as in the
worker (the uncommitted part of R4.3a). Gate verdict PASS, 7 LOW.
This commit is contained in:
bchanot committed 2026-10-18 19:07:06 +02:00
1 parent e0127b0726
commit 8ddf185aa6
4 files changed
+46 -13

No files matched your search

+17 -8
View File
@@ -112,14 +112,22 @@ class ImportClient {
this.fail(this.ready ? 'engine' : 'worker_unavailable', 'messageerror')
this.arm(this.options.startTimeoutMs, 'worker_unavailable')
const { task, file, sheet, module } = this.input
this.worker.postMessage({
v: PROTOCOL_VERSION,
type: 'task',
task,
size: file.size,
sheet,
module,
})
try {
this.worker.postMessage({
v: PROTOCOL_VERSION,
type: 'task',
task,
size: file.size,
sheet,
module,
})
} catch (error) {
// A clone the engine refuses (the Module, say) must not leave an orphan worker.
this.fail(
'worker_unavailable',
error instanceof Error ? error.name : 'post failed',
)
}
}
cancel(): void {
@@ -134,6 +142,7 @@ class ImportClient {
private dispatch(message: WorkerMessage): void {
switch (message.type) {
case 'ready':
if (this.ready) return
this.ready = true
this.arm(this.options.taskTimeoutMs, 'timeout')
void this.feed()
+1 -1
View File
@@ -31,7 +31,7 @@ export type EngineLoader = (
module: WebAssembly.Module | null,
) => Promise<WorkerEngine>
/** The caps the worker checks before reserving a byte (the core enforces the same). */
/** The caps the worker checks before reserving a byte (the core and the sink enforce them too). */
export const MAX_PDF_BYTES = 50 * 1024 * 1024
export const MAX_COPY_BYTES = 16 * 1024 * 1024
+21 -2
View File
@@ -111,9 +111,28 @@ export function isWorkerMessage(data: unknown): data is WorkerMessage {
return ofProtocol(data, WORKER_TYPES)
}
/** True for a message of this protocol, from the page. */
/** True for a well-formed message of this protocol, from the page. */
export function isPageMessage(data: unknown): data is PageMessage {
return ofProtocol(data, PAGE_TYPES)
if (!ofProtocol(data, PAGE_TYPES)) return false
const record = data as {
type: string
size?: unknown
bytes?: unknown
length?: unknown
}
if (record.type === 'task') return isByteCount(record.size)
if (record.type === 'chunk') {
return (
record.bytes instanceof ArrayBuffer &&
isByteCount(record.length) &&
(record.length as number) <= record.bytes.byteLength
)
}
return true
}
function isByteCount(value: unknown): boolean {
return typeof value === 'number' && Number.isSafeInteger(value) && value >= 0
}
/** Error name and first message line, bounded, for a `failed` message. */
+7 -2
View File
@@ -85,8 +85,13 @@ pub fn import_pdf(sheet: &LoadedSheet, bytes: &[u8]) -> String {
pub fn restore_copy(sheet: &LoadedSheet, bytes: Vec<u8>) -> String {
use crate::domain::session::restore_draft;
use crate::ops::{over_value_budget, restore_failure};
let outcome = String::from_utf8(bytes)
.map_err(|_| Failure::new("invalid", "the copy is not valid UTF-8"))
let outcome = Ok(bytes)
.and_then(|bytes: Vec<u8>| {
if bytes.len() > crate::pdf::read::MAX_ATTACHMENT_BYTES {
return Err(Failure::new("invalid", "the copy is over the size cap"));
}
String::from_utf8(bytes).map_err(|_| Failure::new("invalid", "not valid UTF-8"))
})
.and_then(|text| {
let text = text.strip_prefix('\u{FEFF}').map_or(text.as_str(), |t| t);
if over_value_budget(text) {