GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-04 18:41:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

IMPROVE getEventSourceUrl

Browse Source
This commit is contained in:
Norbert de Langen 2020-03-12 19:13:05 +01:00
parent 5cc9470ede
commit 9249dcd121
No known key found for this signature in database
GPG Key ID: 976651DA156C2825
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/channel-postmessage/src/index.ts
View File

@ -166,27 +166,19 @@ export class PostmsgTransport {
const getEventSourceUrl = (event: MessageEvent) => {
const frames: HTMLIFrameElement[] = [...document.getElementsByTagName('iframe')];
let result = event.origin;
let frame;
let remainder;
try {
// try to find the originating iframe by matching it's contentWindow
// This might not be cross-origin safe
[frame, ...remainder] = frames.filter(element => element.contentWindow === event.source);
const src = frame.getAttribute('src');
const { pathname, origin } = new URL(src);
result = origin + pathname;
} catch (e) {
// if the contentWindow access was not allowed we match on origin alone
[frame, ...remainder] = frames.filter(element => {
// try to find the originating iframe by matching it's contentWindow
// This might not be cross-origin safe
const [frame, ...remainder] = frames.filter(element => {
try {
return element.contentWindow === event.source;
} catch (err) {
const src = element.getAttribute('src');
const { origin } = new URL(src);
return origin === event.origin;
});
}
}
});
// If we found multiple matches, there's going to be trouble
if (remainder.length) {
@ -194,7 +186,9 @@ const getEventSourceUrl = (event: MessageEvent) => {
return null;
}
return result;
const src = frame.getAttribute('src');
const { origin, pathname } = new URL(src);
return origin + pathname;
};
/**