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

Merge pull request #2662 from williamchong007/master

Browse Source 
fix #1398, prevent injecting xml without xml suffix
This commit is contained in:
Thomas Huang 2017-12-14 14:34:21 -05:00 committed by GitHub
commit fb5edfe69e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/scripts/contentscript.js
View File

@ -96,7 +96,7 @@ function logStreamDisconnectWarning (remoteLabel, err) {
} }
function shouldInjectWeb3 () { function shouldInjectWeb3 () {
return doctypeCheck() || suffixCheck() return doctypeCheck() && suffixCheck() && documentElementCheck()
} }
function doctypeCheck () { function doctypeCheck () {
@ -104,7 +104,7 @@ function doctypeCheck () {
if (doctype) { if (doctype) {
return doctype.name === 'html' return doctype.name === 'html'
} else { } else {
return false return true
} }
} }
@ -121,6 +121,14 @@ function suffixCheck () {
return true return true
} }
function documentElementCheck () {
var documentElement = document.documentElement.nodeName
if (documentElement) {
return documentElement.toLowerCase() === 'html'
}
return true
}
function redirectToPhishingWarning () { function redirectToPhishingWarning () {
console.log('MetaMask - redirecting to phishing warning') console.log('MetaMask - redirecting to phishing warning')
window.location.href = 'https://metamask.io/phishing.html' window.location.href = 'https://metamask.io/phishing.html'