diff --git a/blacklists/domains.json b/blacklists/domains.json index 75aeddbf..82380f18 100644 --- a/blacklists/domains.json +++ b/blacklists/domains.json @@ -322,7 +322,6 @@ "myetherwallet.coffee", "myetherwallet.college", "myetherwallet.cologne", - "myetherwallet.com", "myetherwallet.comcast", "myetherwallet.commbank", "myetherwallet.community", diff --git a/js/DomManipulator.js b/js/DomManipulator.js index ae655c23..c12651fe 100644 --- a/js/DomManipulator.js +++ b/js/DomManipulator.js @@ -44,7 +44,7 @@ class EtherAddressLookup { //Update the DOM once all settings have been received... setTimeout(function() { if(this.intSettingsCount === this.intSettingsTotalCount) { - if(this.blBlacklistDomains === false) { + if(this.blBlacklistDomains) { this.blacklistedDomainCheck(); } this.convertAddressToLink(); @@ -55,7 +55,6 @@ class EtherAddressLookup { //Finds Ethereum addresses and converts to a link to a block explorer convertAddressToLink() { - console.log("converting"); var arrWhitelistedTags = new Array("code", "span", "p", "td", "li"); var strRegex = /(^|\s|:|-)((?:0x)?[0-9a-fA-F]{40})(?:\s|$)/gi; @@ -65,7 +64,6 @@ class EtherAddressLookup { //Loop through the whitelisted content for(var x=0; x

ATTENTION

We have detected this domain to have malicious " + - "intent and have prevented you from interacting with it.


This is " + - "because you have
enabled 'Warn of blacklisted domains' setting
on EtherAddressLookup Chrome " + - "Extension. You
can turn this setting off to interact with this site
but it's advised not to." + - "

We blacklisted it for a reason.
"; - - objBlacklistedDomain.appendChild(objBlacklistedDomainText); - document.body.appendChild(objBlacklistedDomain); - } + objAjax.send(); + objAjax.onreadystatechange = function () { + if (objAjax.readyState === 4) { + var arrBlacklistedDomains = JSON.parse(objAjax.responseText); + var strCurrentTab = window.location.hostname; + + if (arrBlacklistedDomains.includes(strCurrentTab)) { + var objBlacklistedDomain = document.createElement("div"); + objBlacklistedDomain.style.cssText = "position:absolute;z-index:999999999;top:0%;left:0%;width:100%;height:100%;background:#fff;color:#000;text-align:center;" + + var objBlacklistedDomainText = document.createElement("div"); + objBlacklistedDomainText.style.cssText = "padding:5%;color:#57618F;"; + objBlacklistedDomainText.innerHTML = "" + + "

ATTENTION

We have detected this domain to have malicious " + + "intent and have prevented you from interacting with it.


This is " + + "because you have
enabled 'Warn of blacklisted domains' setting
on EtherAddressLookup Chrome " + + "Extension. You
can turn this setting off to interact with this site
but it's advised not to." + + "

We blacklisted it for a reason.
"; + + objBlacklistedDomain.appendChild(objBlacklistedDomainText); + document.body.appendChild(objBlacklistedDomain); } } } diff --git a/manifest.json b/manifest.json index 890d42b6..b0b93163 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "name": "EtherAddressLookup", "short_name": "EtherAddressLookup", "description": "Adds links to strings that look like Ethereum addresses to your favorite blockchain explorer.", - "version": "1.3", + "version": "1.3.1", "browser_action": { "default_icon": "images/icon.png",