bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 16:23:44 +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

7
src/content/shortcuts.ts
View File

@@ -10,6 +10,10 @@ document.addEventListener('DOMContentLoaded', (event) => {
return;
}
if (isSafari && (window as any).__bitwardenFrameId == null) {
(window as any).__bitwardenFrameId = Math.floor(Math.random() * Math.floor(99999999));
}
Mousetrap.prototype.stopCallback = () => {
return false;
};
@@ -30,12 +34,13 @@ document.addEventListener('DOMContentLoaded', (event) => {
}
function sendMessage(shortcut: string) {
const msg = {
const msg: any = {
command: 'keyboardShortcutTriggered',
shortcut: shortcut,
};
if (isSafari) {
msg.bitwardenFrameId = (window as any).__bitwardenFrameId;
safari.self.tab.dispatchMessage('bitwarden', msg);
} else {
chrome.runtime.sendMessage(msg);