Skip to content

fix(devtools-kit): guard SuperJSON.parse against non-string message payloads #4

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.

Sign up for GitHub

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

Open
arena-ai-coding-agent wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(devtools-kit): guard SuperJSON.parse against non-string message payloads #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions packages/devtools-kit/src/messaging/presets/broadcast-channel/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ export function createBroadcastChannel(): MergeableChannelOptions {
},
on: (handler) => {
channel.onmessage = (event) => {
// The channel can receive payloads that are not JSON strings (e.g. an
// object) when it is shared with other code. Parsing a non-string
// value throws `SyntaxError: "[object Object]" is not valid JSON`.
if (typeof event.data !== 'string')
return
const parsed = SuperJSON.parse<{ event: string, data: unknown }>(event.data)
if (parsed.event === __DEVTOOLS_KIT_BROADCAST_MESSAGING_EVENT_KEY) {
handler(parsed.data)
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools-kit/src/messaging/presets/extension/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export function createExtensionServerChannel(): MergeableChannelOptions {
},
on: (handler) => {
const listener = (event: MessageEvent) => {
if (event.data.source === __DEVTOOLS_KIT_EXTENSION_MESSAGING_EVENT_KEY__.PROXY_TO_SERVER && event.data.payload) {
if (event.data.source === __DEVTOOLS_KIT_EXTENSION_MESSAGING_EVENT_KEY__.PROXY_TO_SERVER && typeof event.data.payload === 'string') {
handler(SuperJSON.parse(event.data.payload))
}
}
Expand Down
4 changes: 4 additions & 0 deletions packages/devtools-kit/src/messaging/presets/vite/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ export function createViteClientChannel(): MergeableChannelOptions {
},
on: (handler) => {
client?.on(__DEVTOOLS_KIT_VITE_MESSAGING_EVENT_KEY, (event) => {
// Only parse string payloads; parsing an object/other value throws
// `SyntaxError: "[object Object]" is not valid JSON`.
if (typeof event !== 'string')
return
handler(SuperJSON.parse(event))
})
},
Expand Down
4 changes: 4 additions & 0 deletions packages/devtools-kit/src/messaging/presets/vite/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ export function createViteServerChannel(): MergeableChannelOptions {
return {
post: data => ws?.send(__DEVTOOLS_KIT_VITE_MESSAGING_EVENT_KEY, SuperJSON.stringify(data)),
on: handler => ws?.on(__DEVTOOLS_KIT_VITE_MESSAGING_EVENT_KEY, (event) => {
// Only parse string payloads; parsing an object/other value throws
// `SyntaxError: "[object Object]" is not valid JSON`.
if (typeof event !== 'string')
return
handler(SuperJSON.parse(event))
}),
}
Expand Down