m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

1102: use postMessage instead of injected scripts to bypass CSP

Browse Source
This commit is contained in:
bitpshr 2018-11-07 11:18:21 -05:00 committed by Dan Finlay
parent 1ce3591c8e
commit a224b71837
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/scripts/inpage.js
View File

@ -22,10 +22,17 @@ console.warn('ATTENTION: In an effort to improve user privacy, MetaMask ' +
'accounts. Please see https://bit.ly/2QQHXvF for complete information and up-to-date ' + 'accounts. Please see https://bit.ly/2QQHXvF for complete information and up-to-date ' +
'example code.') 'example code.')
function once(messageType, handler) { /**
* Adds a postMessage listener for a specific message type
*
* @param {string} messageType - postMessage type to listen for
* @param {Function} handler - event handler
* @param {boolean} remove - removes this handler after being triggered
*/
function onMessage(messageType, handler, remove) {
window.addEventListener('message', function ({ data: { type } }) { window.addEventListener('message', function ({ data: { type } }) {
if (type !== messageType) { return } if (type !== messageType) { return }
window.removeEventListener('message', handler) remove && window.removeEventListener('message', handler)
handler.apply(window, arguments) handler.apply(window, arguments)
}) })
} }
@ -47,17 +54,12 @@ var inpageProvider = new MetamaskInpageProvider(metamaskStream)
inpageProvider.setMaxListeners(100) inpageProvider.setMaxListeners(100)
// set up a listener for when MetaMask is locked // set up a listener for when MetaMask is locked
window.addEventListener('message', ({ data: { type } }) => { onMessage('metamasksetlocked', ({ data: { type } }) => { isEnabled = false })
if (type !== 'metamasksetlocked') { return }
isEnabled = false
})
// augment the provider with its enable method // augment the provider with its enable method
inpageProvider.enable = function ({ force } = {}) { inpageProvider.enable = function ({ force } = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
window.removeEventListener('message', providerHandle)
providerHandle = ({ data: { type, error } }) => { providerHandle = ({ data: { type, error } }) => {
if (type !== 'ethereumprovider') { return }
if (typeof error !== 'undefined') { if (typeof error !== 'undefined') {
reject(error) reject(error)
} else { } else {
@ -95,7 +97,7 @@ inpageProvider.enable = function ({ force } = {}) {
.catch(reject) .catch(reject)
} }
} }
window.addEventListener('message', providerHandle) onMessage('ethereumprovider', providerHandle, true)
window.postMessage({ type: 'ETHEREUM_ENABLE_PROVIDER', force }, '*') window.postMessage({ type: 'ETHEREUM_ENABLE_PROVIDER', force }, '*')
}) })
} }
@ -118,10 +120,7 @@ inpageProvider._metamask = new Proxy({
*/ */
isApproved: function() { isApproved: function() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
window.removeEventListener('message', isApprovedHandle)
isApprovedHandle = ({ data: { caching, isApproved, error, type } }) => { isApprovedHandle = ({ data: { caching, isApproved, error, type } }) => {
if (type !== 'ethereumisapproved') { return }
window.removeEventListener('message', isApprovedHandle)
if (typeof error !== 'undefined') { if (typeof error !== 'undefined') {
reject(error) reject(error)
} else { } else {
@ -132,7 +131,7 @@ inpageProvider._metamask = new Proxy({
} }
} }
} }
window.addEventListener('message', isApprovedHandle) onMessage('ethereumisapproved', isApprovedHandle, true)
window.postMessage({ type: 'ETHEREUM_IS_APPROVED' }, '*') window.postMessage({ type: 'ETHEREUM_IS_APPROVED' }, '*')
}) })
}, },
@ -144,17 +143,14 @@ inpageProvider._metamask = new Proxy({
*/ */
isUnlocked: function () { isUnlocked: function () {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
window.removeEventListener('message', isUnlockedHandle)
isUnlockedHandle = ({ data: { isUnlocked, error, type } }) => { isUnlockedHandle = ({ data: { isUnlocked, error, type } }) => {
if (type !== 'metamaskisunlocked') { return }
window.removeEventListener('message', isUnlockedHandle)
if (typeof error !== 'undefined') { if (typeof error !== 'undefined') {
reject(error) reject(error)
} else { } else {
resolve(!!isUnlocked) resolve(!!isUnlocked)
} }
} }
window.addEventListener('message', isUnlockedHandle) onMessage('metamaskisunlocked', isUnlockedHandle, true)
window.postMessage({ type: 'METAMASK_IS_UNLOCKED' }, '*') window.postMessage({ type: 'METAMASK_IS_UNLOCKED' }, '*')
}) })
}, },