Skip to content

Commit e08e461

Browse files
Tweak origin check to respect the configured URL
1 parent aaa463d commit e08e461

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

src/vanilla/makecode-frame-driver.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,22 @@ export class MakeCodeFrameDriver {
166166
}
167167
>();
168168

169+
private _expectedOrigin: string | undefined;
170+
private expectedOrigin = () => {
171+
if (this._expectedOrigin) {
172+
return this._expectedOrigin;
173+
}
174+
const src = this.iframe()?.src;
175+
if (src) {
176+
this._expectedOrigin = new URL(src).origin;
177+
return this._expectedOrigin;
178+
}
179+
return undefined;
180+
};
181+
169182
private listener = (event: MessageEvent) => {
170-
if (event.origin !== 'https://makecode.microbit.org') {
183+
const expectedOrigin = this.expectedOrigin();
184+
if (!expectedOrigin || event.origin !== expectedOrigin) {
171185
return;
172186
}
173187
const { data } = event;

0 commit comments

Comments
 (0)