Skip to content

Commit 05d7261

Browse files
authored
fix: restrict runtime and playground message dispatch (#3816)
1 parent caa72de commit 05d7261

4 files changed

Lines changed: 119 additions & 33 deletions

File tree

‎packages/core/src/runtime/bridge.test.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,27 @@ function makeControlMessage(action: string, extra?: Record<string, unknown>) {
3333
}
3434

3535
describe("installRuntimeControlBridge", () => {
36+
it("ignores inherited and unknown action names from an authorized sender", () => {
37+
const deps = createMockDeps();
38+
const handler = installRuntimeControlBridge(deps);
39+
try {
40+
for (const action of [
41+
"__proto__",
42+
"constructor",
43+
"hasOwnProperty",
44+
"__defineGetter__",
45+
"toString",
46+
"unknown",
47+
]) {
48+
expect(() => handler(makeControlMessage(action))).not.toThrow();
49+
}
50+
expect(deps.onPlay).not.toHaveBeenCalled();
51+
handler(makeControlMessage("play"));
52+
expect(deps.onPlay).toHaveBeenCalledOnce();
53+
} finally {
54+
window.removeEventListener("message", handler);
55+
}
56+
});
3657
it("rejects foreign and null senders before dispatching controls", () => {
3758
const foreign = document.createElement("iframe");
3859
document.body.append(foreign);

‎packages/core/src/runtime/bridge.ts‎

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -54,37 +54,40 @@ type ControlHandler = (data: BridgeControlData, deps: BridgeDeps) => void;
5454
// Per-action dispatchers. Splitting the handler into a lookup table keeps the
5555
// top-level message listener trivial (one map lookup), and each action's logic
5656
// becomes individually testable / inheritable for fallow's CRAP analysis.
57-
const CONTROL_HANDLERS: Record<string, ControlHandler> = {
58-
play: (_d, deps) => deps.onPlay(),
59-
pause: (_d, deps) => deps.onPause(),
60-
"stop-media": (_d, deps) => deps.onStopMedia(),
61-
seek: (data, deps) => deps.onSeek(resolveSeekTimeSeconds(data, deps), data.seekMode ?? "commit"),
62-
tick: (_d, deps) => deps.onTick(),
63-
"set-muted": (data, deps) => deps.onSetMuted(Boolean(data.muted)),
64-
"set-volume": (data, deps) =>
65-
deps.onSetVolume(Math.max(0, Math.min(1, Number(data.volume ?? 1)))),
66-
"set-media-output-muted": (data, deps) => deps.onSetMediaOutputMuted(Boolean(data.muted)),
67-
"set-native-media-sync-disabled": (data, deps) =>
68-
deps.onSetNativeMediaSyncDisabled(Boolean(data.disabled)),
69-
"set-web-audio-media-disabled": (data, deps) =>
70-
deps.onSetWebAudioMediaDisabled(Boolean(data.disabled)),
71-
"set-playback-rate": (data, deps) => deps.onSetPlaybackRate(Number(data.playbackRate ?? 1)),
72-
"set-root-duration": (data, deps) => deps.onSetRootDuration(Number(data.durationSeconds ?? 0)),
73-
"set-color-grading": (data, deps) =>
74-
deps.onSetColorGrading(data.target ?? null, data.grading ?? null),
75-
"set-color-grading-compare": (data, deps) =>
76-
deps.onSetColorGradingCompare(data.target ?? null, data.compare ?? null),
77-
"enable-pick-mode": (_d, deps) => deps.onEnablePickMode(),
78-
"disable-pick-mode": (_d, deps) => deps.onDisablePickMode(),
79-
"flash-elements": (data) => handleFlashElements(data),
80-
"set-runtime-data": (data, deps) => {
81-
if (typeof data.channel === "string")
82-
deps.onSetRuntimeData?.(data.channel, data.payload, data.requestId);
83-
},
84-
"clear-runtime-data": (data, deps) => {
85-
if (typeof data.channel === "string") deps.onClearRuntimeData?.(data.channel, data.requestId);
86-
},
87-
};
57+
const CONTROL_HANDLERS = new Map<string, ControlHandler>(
58+
Object.entries({
59+
play: (_d, deps) => deps.onPlay(),
60+
pause: (_d, deps) => deps.onPause(),
61+
"stop-media": (_d, deps) => deps.onStopMedia(),
62+
seek: (data, deps) =>
63+
deps.onSeek(resolveSeekTimeSeconds(data, deps), data.seekMode ?? "commit"),
64+
tick: (_d, deps) => deps.onTick(),
65+
"set-muted": (data, deps) => deps.onSetMuted(Boolean(data.muted)),
66+
"set-volume": (data, deps) =>
67+
deps.onSetVolume(Math.max(0, Math.min(1, Number(data.volume ?? 1)))),
68+
"set-media-output-muted": (data, deps) => deps.onSetMediaOutputMuted(Boolean(data.muted)),
69+
"set-native-media-sync-disabled": (data, deps) =>
70+
deps.onSetNativeMediaSyncDisabled(Boolean(data.disabled)),
71+
"set-web-audio-media-disabled": (data, deps) =>
72+
deps.onSetWebAudioMediaDisabled(Boolean(data.disabled)),
73+
"set-playback-rate": (data, deps) => deps.onSetPlaybackRate(Number(data.playbackRate ?? 1)),
74+
"set-root-duration": (data, deps) => deps.onSetRootDuration(Number(data.durationSeconds ?? 0)),
75+
"set-color-grading": (data, deps) =>
76+
deps.onSetColorGrading(data.target ?? null, data.grading ?? null),
77+
"set-color-grading-compare": (data, deps) =>
78+
deps.onSetColorGradingCompare(data.target ?? null, data.compare ?? null),
79+
"enable-pick-mode": (_d, deps) => deps.onEnablePickMode(),
80+
"disable-pick-mode": (_d, deps) => deps.onDisablePickMode(),
81+
"flash-elements": (data) => handleFlashElements(data),
82+
"set-runtime-data": (data, deps) => {
83+
if (typeof data.channel === "string")
84+
deps.onSetRuntimeData?.(data.channel, data.payload, data.requestId);
85+
},
86+
"clear-runtime-data": (data, deps) => {
87+
if (typeof data.channel === "string") deps.onClearRuntimeData?.(data.channel, data.requestId);
88+
},
89+
} satisfies Record<string, ControlHandler>),
90+
);
8891

8992
function resolveSeekTimeSeconds(data: BridgeControlData, deps: BridgeDeps): number {
9093
const explicitSeconds = Number(data.timeSeconds);
@@ -129,7 +132,7 @@ export function installRuntimeControlBridge(deps: BridgeDeps): (event: MessageEv
129132
if (rejectUnsupportedProtocol(data)) return;
130133
const action = data.action;
131134
if (typeof action !== "string") return;
132-
const fn = CONTROL_HANDLERS[action];
135+
const fn = CONTROL_HANDLERS.get(action);
133136
if (fn) fn(data, deps);
134137
};
135138
window.addEventListener("message", handler);
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
// @vitest-environment jsdom
2+
import pageHtml from "../index.html?raw";
3+
import { expect, it, vi } from "vitest";
4+
5+
// Keep initialization at the asynchronous persistence boundary while exercising
6+
// the real static UI and its registered message listener.
7+
vi.mock("./fileAdapter.js", () => ({
8+
createFileAdapter: () => new Promise(() => {}),
9+
}));
10+
11+
it("accepts only current-preview messages with registered string types", async () => {
12+
document.documentElement.innerHTML = pageHtml;
13+
vi.stubGlobal(
14+
"ResizeObserver",
15+
class {
16+
observe() {}
17+
},
18+
);
19+
const listeners = vi.spyOn(window, "addEventListener");
20+
try {
21+
await import("./main.js");
22+
const handler = listeners.mock.calls.find(([type]) => type === "message")?.[1];
23+
if (typeof handler !== "function") throw new Error("Message listener not installed");
24+
const frame = document.getElementById("preview-frame") as HTMLIFrameElement;
25+
const original = frame.contentWindow;
26+
const send = (source: MessageEventSource | null, data: unknown) =>
27+
handler.call(window, new MessageEvent("message", { source, data }));
28+
send(original, { type: "hf:duration", duration: 12 });
29+
expect(document.getElementById("tl-dur")!.textContent).toBe("12.0s");
30+
for (const source of [window, null]) send(source, { type: "hf:duration", duration: 99 });
31+
expect(document.getElementById("tl-dur")!.textContent).toBe("12.0s");
32+
for (const type of [
33+
"__proto__",
34+
"constructor",
35+
"hasOwnProperty",
36+
"__defineGetter__",
37+
"toString",
38+
"unknown",
39+
["hf:duration"],
40+
null,
41+
]) {
42+
expect(() => send(original, { type, duration: 99 })).not.toThrow();
43+
}
44+
expect(document.getElementById("tl-dur")!.textContent).toBe("12.0s");
45+
const replacement = document.createElement("iframe");
46+
replacement.id = frame.id;
47+
frame.replaceWith(replacement);
48+
send(original, { type: "hf:duration", duration: 99 });
49+
expect(document.getElementById("tl-dur")!.textContent).toBe("12.0s");
50+
send(replacement.contentWindow, { type: "hf:time", time: 3 });
51+
expect(document.getElementById("tl-time")!.textContent).toBe("3.0s");
52+
window.removeEventListener("message", handler);
53+
} finally {
54+
listeners.mockRestore();
55+
vi.unstubAllGlobals();
56+
document.documentElement.innerHTML = "";
57+
}
58+
});

‎packages/sdk-playground/src/main.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1357,7 +1357,11 @@ const MSG_HANDLERS: Record<string, (data: any) => void> = {
13571357
};
13581358

13591359
function onWindowMessage(e: MessageEvent) {
1360-
const handler = e.data && MSG_HANDLERS[e.data.type];
1360+
const frame = getFrame()?.contentWindow;
1361+
if (!frame || e.source !== frame) return;
1362+
const type = e.data?.type;
1363+
if (typeof type !== "string" || !Object.hasOwn(MSG_HANDLERS, type)) return;
1364+
const handler = MSG_HANDLERS[type];
13611365
if (handler) handler(e.data);
13621366
}
13631367

0 commit comments

Comments
 (0)