Skip to content

Commit 8093d9a

Browse files
committed
1 parent 546ec2e commit 8093d9a

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

extensions/ql-vscode/src/compare/view/Compare.tsx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,14 @@ export function Compare(_: {}): JSX.Element {
3131

3232
useEffect(() => {
3333
window.addEventListener('message', (evt: MessageEvent) => {
34-
const msg: ToCompareViewMessage = evt.data;
35-
switch (msg.t) {
36-
case 'setComparisons':
37-
setComparison(msg);
34+
if (evt.origin === window.origin) {
35+
const msg: ToCompareViewMessage = evt.data;
36+
switch (msg.t) {
37+
case 'setComparisons':
38+
setComparison(msg);
39+
}
40+
} else {
41+
console.error(`Invalid event origin ${evt.origin}`);
3842
}
3943
});
4044
});
@@ -60,8 +64,8 @@ export function Compare(_: {}): JSX.Element {
6064
{hasRows ? (
6165
<CompareTable comparison={comparison}></CompareTable>
6266
) : (
63-
<div className="vscode-codeql__compare-message">{message}</div>
64-
)}
67+
<div className="vscode-codeql__compare-message">{message}</div>
68+
)}
6569
</>
6670
);
6771
} catch (err) {

extensions/ql-vscode/src/view/results.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,10 @@ class App extends React.Component<{}, ResultsViewState> {
275275

276276
componentDidMount(): void {
277277
this.vscodeMessageHandler = (evt) =>
278-
this.handleMessage(evt.data as IntoResultsViewMsg);
278+
evt.origin === window.origin
279+
? this.handleMessage(evt.data as IntoResultsViewMsg)
280+
: console.error(`Invalid event origin ${evt.origin}`);
281+
279282
window.addEventListener('message', this.vscodeMessageHandler);
280283
}
281284

0 commit comments

Comments
 (0)