bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-18 01:03:35 +00:00
Code Issues Releases Wiki Activity

add bitwardenFrameId checks to all content scripts

Browse Source
This commit is contained in:
Kyle Spearrin
2018-09-27 11:07:17 -04:00
parent 1873df7f20
commit 3d26e8fdb7
5 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/content/autofiller.ts
View File

@@ -7,13 +7,20 @@ document.addEventListener('DOMContentLoaded', (event) => {
navigator.userAgent.indexOf('Chrome') === -1;
if (isSafari) {
if ((window as any).__bitwardenFrameId == null) {
(window as any).__bitwardenFrameId = Math.floor(Math.random() * Math.floor(99999999));
}
const responseCommand = 'autofillerAutofillOnPageLoadEnabledResponse';
safari.self.tab.dispatchMessage('bitwarden', {
command: 'bgGetDataForTab',
responseCommand: responseCommand,
bitwardenFrameId: (window as any).__bitwardenFrameId,
});
safari.self.addEventListener('message', (msgEvent: any) => {
const msg = msgEvent.message;
if (msg.bitwardenFrameId != null && (window as any).__bitwardenFrameId !== msg.bitwardenFrameId) {
return;
}
if (msg.command === responseCommand && msg.data.autofillEnabled === true) {
setInterval(() => doFillIfNeeded(), 500);
} else if (msg.command === 'fillForm' && pageHref === msg.url) {
@@ -52,12 +59,13 @@ document.addEventListener('DOMContentLoaded', (event) => {
}
pageHref = window.location.href;
const msg = {
const msg: any = {
command: 'bgCollectPageDetails',
sender: 'autofiller',
};
if (isSafari) {
msg.bitwardenFrameId = (window as any).__bitwardenFrameId;
safari.self.tab.dispatchMessage('bitwarden', msg);
} else {
chrome.runtime.sendMessage(msg);