From 4d8f4f757eb5987fce595d162621b611cbb5c8cf Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Tue, 1 Sep 2026 09:34:09 +0000 Subject: [PATCH 1/3] fix(agent): validate document frame numeric domains --- .../agent/crdt/docFrameClient.numeric.test.ts | 58 +++++++++++++++++++ .../extensions/agent/crdt/docFrameClient.ts | 14 +++-- 2 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 src/workbench/extensions/agent/crdt/docFrameClient.numeric.test.ts diff --git a/src/workbench/extensions/agent/crdt/docFrameClient.numeric.test.ts b/src/workbench/extensions/agent/crdt/docFrameClient.numeric.test.ts new file mode 100644 index 00000000000..b353697489e --- /dev/null +++ b/src/workbench/extensions/agent/crdt/docFrameClient.numeric.test.ts @@ -0,0 +1,58 @@ +import { describe, expect, it } from 'vitest' + +import { encodeBase64, parseServerDocFrame } from './docFrameClient' + +const updateFrame = (seq: unknown) => ({ + type: 'doc_update', + data: { + v: 1, + workflow_id: 'wf-1', + seq, + update_b64: encodeBase64(new Uint8Array()) + } +}) + +const awarenessFrame = (expiresAt: unknown) => ({ + type: 'awareness', + data: { + v: 1, + workflow_id: 'wf-1', + actor: 'human:user:tab-a', + expires_at: expiresAt + } +}) + +describe('doc frame numeric domains', () => { + it.for([-1, 1.5, Number.POSITIVE_INFINITY, Number.NaN])( + 'rejects an invalid doc_update seq: %s', + (seq) => { + expect(parseServerDocFrame(updateFrame(seq))).toBeNull() + } + ) + + it.for([-1, 1.5, Number.POSITIVE_INFINITY, Number.NaN])( + 'rejects an invalid awareness expiry: %s', + (expiresAt) => { + expect(parseServerDocFrame(awarenessFrame(expiresAt))).toBeNull() + } + ) + + it.for([ + ['doc_subscribed', { ok: true }], + ['doc_reset', {}] + ])('rejects an invalid %s seq', (type, data) => { + expect( + parseServerDocFrame({ + type, + data: { v: 1, workflow_id: 'wf-1', seq: -1, ...data } + }) + ).toBeNull() + }) + + it('accepts finite non-negative integer sequence and expiry values', () => { + expect(parseServerDocFrame(updateFrame(0))?.data).toMatchObject({ seq: 0 }) + expect(parseServerDocFrame(awarenessFrame(0))?.data).toMatchObject({ + expiresAt: 0 + }) + }) +}) diff --git a/src/workbench/extensions/agent/crdt/docFrameClient.ts b/src/workbench/extensions/agent/crdt/docFrameClient.ts index 9917b4a4254..a90c48226f0 100644 --- a/src/workbench/extensions/agent/crdt/docFrameClient.ts +++ b/src/workbench/extensions/agent/crdt/docFrameClient.ts @@ -168,7 +168,7 @@ export function parseServerDocFrame(value: unknown): ServerDocFrame | null { if ( frame.type === 'doc_update' && - typeof data.seq === 'number' && + isNonNegativeInteger(data.seq) && typeof data.update_b64 === 'string' ) { return { @@ -187,13 +187,17 @@ export function parseServerDocFrame(value: unknown): ServerDocFrame | null { } } - if (frame.type === 'doc_subscribed' && typeof data.ok === 'boolean') { + if ( + frame.type === 'doc_subscribed' && + typeof data.ok === 'boolean' && + (data.seq === undefined || isNonNegativeInteger(data.seq)) + ) { return { type: frame.type, data: { workflowId: data.workflow_id, ok: data.ok, - ...(typeof data.seq === 'number' && { seq: data.seq }), + ...(data.seq !== undefined && { seq: data.seq }), ...(typeof data.code === 'string' && { code: data.code }), ...(typeof data.message === 'string' && { message: data.message }) } @@ -216,7 +220,7 @@ export function parseServerDocFrame(value: unknown): ServerDocFrame | null { (item): item is string => typeof item === 'string' ) : [], - ...(typeof data.seq === 'number' && { seq: data.seq }), + ...(isNonNegativeInteger(data.seq) && { seq: data.seq }), ...(typeof data.code === 'string' && { code: data.code }), ...(typeof data.message === 'string' && { message: data.message }), // PoC diagnostics: surface the failure verbatim (object, not array). @@ -225,7 +229,7 @@ export function parseServerDocFrame(value: unknown): ServerDocFrame | null { } } - if (frame.type === 'doc_reset' && typeof data.seq === 'number') { + if (frame.type === 'doc_reset' && isNonNegativeInteger(data.seq)) { return { type: frame.type, data: { From 89422f02228ca3c125197bfdf62ea867137907f9 Mon Sep 17 00:00:00 2001 From: bymyself Date: Tue, 1 Sep 2026 09:57:00 +0000 Subject: [PATCH 2/3] test(agent): cover subscribed and reset numeric boundaries Addresses https://github.com/Comfy-Org/ComfyUI_frontend/pull/16487#discussion_r3902819510 --- .../agent/crdt/docFrameClient.numeric.test.ts | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/src/workbench/extensions/agent/crdt/docFrameClient.numeric.test.ts b/src/workbench/extensions/agent/crdt/docFrameClient.numeric.test.ts index b353697489e..ae062da5ad4 100644 --- a/src/workbench/extensions/agent/crdt/docFrameClient.numeric.test.ts +++ b/src/workbench/extensions/agent/crdt/docFrameClient.numeric.test.ts @@ -22,6 +22,19 @@ const awarenessFrame = (expiresAt: unknown) => ({ } }) +const sequencedFrame = ( + type: 'doc_subscribed' | 'doc_reset', + seq: unknown +) => ({ + type, + data: { + v: 1, + workflow_id: 'wf-1', + seq, + ...(type === 'doc_subscribed' && { ok: true }) + } +}) + describe('doc frame numeric domains', () => { it.for([-1, 1.5, Number.POSITIVE_INFINITY, Number.NaN])( 'rejects an invalid doc_update seq: %s', @@ -37,16 +50,19 @@ describe('doc frame numeric domains', () => { } ) - it.for([ - ['doc_subscribed', { ok: true }], - ['doc_reset', {}] - ])('rejects an invalid %s seq', (type, data) => { - expect( - parseServerDocFrame({ - type, - data: { v: 1, workflow_id: 'wf-1', seq: -1, ...data } + describe.for(['doc_subscribed', 'doc_reset'] as const)('%s seq', (type) => { + it.for([-1, 1.5, Number.POSITIVE_INFINITY, Number.NaN, '1'])( + 'rejects an invalid value: %s', + (seq) => { + expect(parseServerDocFrame(sequencedFrame(type, seq))).toBeNull() + } + ) + + it('accepts zero', () => { + expect(parseServerDocFrame(sequencedFrame(type, 0))?.data).toMatchObject({ + seq: 0 }) - ).toBeNull() + }) }) it('accepts finite non-negative integer sequence and expiry values', () => { From 1b7f122e72c0d78d60ca82fa4c6b59feaa298104 Mon Sep 17 00:00:00 2001 From: bymyself Date: Thu, 3 Sep 2026 16:50:27 +0000 Subject: [PATCH 3/3] fix(agent): reject invalid ops result sequences --- .../agent/crdt/docFrameClient.numeric.test.ts | 38 ++++++++++++++++++- .../extensions/agent/crdt/docFrameClient.ts | 6 ++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/src/workbench/extensions/agent/crdt/docFrameClient.numeric.test.ts b/src/workbench/extensions/agent/crdt/docFrameClient.numeric.test.ts index ae062da5ad4..98db007801d 100644 --- a/src/workbench/extensions/agent/crdt/docFrameClient.numeric.test.ts +++ b/src/workbench/extensions/agent/crdt/docFrameClient.numeric.test.ts @@ -35,6 +35,23 @@ const sequencedFrame = ( } }) +const docOpsResultFrame = (seq?: unknown) => ({ + type: 'doc_ops_result', + data: { + v: 1, + workflow_id: 'wf-1', + ok: true, + applied: [], + skipped: [], + ...(seq !== undefined && { seq }) + } +}) + +const sequencedFrameTypes: ReadonlyArray<'doc_subscribed' | 'doc_reset'> = [ + 'doc_subscribed', + 'doc_reset' +] + describe('doc frame numeric domains', () => { it.for([-1, 1.5, Number.POSITIVE_INFINITY, Number.NaN])( 'rejects an invalid doc_update seq: %s', @@ -50,7 +67,7 @@ describe('doc frame numeric domains', () => { } ) - describe.for(['doc_subscribed', 'doc_reset'] as const)('%s seq', (type) => { + describe.for(sequencedFrameTypes)('%s seq', (type) => { it.for([-1, 1.5, Number.POSITIVE_INFINITY, Number.NaN, '1'])( 'rejects an invalid value: %s', (seq) => { @@ -65,6 +82,25 @@ describe('doc frame numeric domains', () => { }) }) + it.for([-1, 1.5, Number.POSITIVE_INFINITY, Number.NaN, '1'])( + 'rejects an invalid doc_ops_result seq: %s', + (seq) => { + expect(parseServerDocFrame(docOpsResultFrame(seq))).toBeNull() + } + ) + + it('accepts a valid doc_ops_result seq', () => { + expect(parseServerDocFrame(docOpsResultFrame(0))?.data).toMatchObject({ + seq: 0 + }) + }) + + it('accepts doc_ops_result without seq', () => { + expect(parseServerDocFrame(docOpsResultFrame())?.data).not.toHaveProperty( + 'seq' + ) + }) + it('accepts finite non-negative integer sequence and expiry values', () => { expect(parseServerDocFrame(updateFrame(0))?.data).toMatchObject({ seq: 0 }) expect(parseServerDocFrame(awarenessFrame(0))?.data).toMatchObject({ diff --git a/src/workbench/extensions/agent/crdt/docFrameClient.ts b/src/workbench/extensions/agent/crdt/docFrameClient.ts index a90c48226f0..b13ecdd9fd7 100644 --- a/src/workbench/extensions/agent/crdt/docFrameClient.ts +++ b/src/workbench/extensions/agent/crdt/docFrameClient.ts @@ -204,7 +204,11 @@ export function parseServerDocFrame(value: unknown): ServerDocFrame | null { } } - if (frame.type === 'doc_ops_result' && typeof data.ok === 'boolean') { + if ( + frame.type === 'doc_ops_result' && + typeof data.ok === 'boolean' && + (data.seq === undefined || isNonNegativeInteger(data.seq)) + ) { return { type: frame.type, data: {