diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-07-13 06:42:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-13 06:42:23 +0800 |
| commit | 13758074994155000d9b25dd9216c4f3117c79ad (patch) | |
| tree | dd730af651805d0a77bd8a01816721f5a4b30159 | |
| parent | ebe76664266d3c712ec14ac4aef7fc48b3f1b5c3 (diff) | |
| parent | f82f8a9fa46d4fe59b0f9a13313a3a55ce120f28 (diff) | |
| download | tangerine-wallet-browser-13758074994155000d9b25dd9216c4f3117c79ad.tar tangerine-wallet-browser-13758074994155000d9b25dd9216c4f3117c79ad.tar.gz tangerine-wallet-browser-13758074994155000d9b25dd9216c4f3117c79ad.tar.bz2 tangerine-wallet-browser-13758074994155000d9b25dd9216c4f3117c79ad.tar.lz tangerine-wallet-browser-13758074994155000d9b25dd9216c4f3117c79ad.tar.xz tangerine-wallet-browser-13758074994155000d9b25dd9216c4f3117c79ad.tar.zst tangerine-wallet-browser-13758074994155000d9b25dd9216c4f3117c79ad.zip | |
Merge branch 'master' into UpdateMetadata
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/manifest.json | 6 | ||||
| -rw-r--r-- | app/scripts/blacklister.js | 13 | ||||
| -rw-r--r-- | circle.yml | 2 | ||||
| -rw-r--r-- | gulpfile.js | 1 | ||||
| -rw-r--r-- | package.json | 3 |
6 files changed, 24 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index cb3fcfb83..02bebbb4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Current Master +- Now detects and blocks known phishing sites. - No longer validate nonce client-side in retry loop. - Fix bug where insufficient balance error was sometimes shown on successful transactions. diff --git a/app/manifest.json b/app/manifest.json index f3a1ebeff..ac6364059 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -52,6 +52,12 @@ ], "run_at": "document_start", "all_frames": true + }, + { + "run_at": "document_end", + "matches": ["http://*/*", "https://*/*"], + "js": ["scripts/blacklister.js"], + "css": ["css/blacklister.css"] } ], "permissions": [ diff --git a/app/scripts/blacklister.js b/app/scripts/blacklister.js new file mode 100644 index 000000000..a45265a75 --- /dev/null +++ b/app/scripts/blacklister.js @@ -0,0 +1,13 @@ +const blacklistedDomains = require('etheraddresslookup/blacklists/domains.json')
+
+function detectBlacklistedDomain() {
+ var strCurrentTab = window.location.hostname
+ if (blacklistedDomains && blacklistedDomains.includes(strCurrentTab)) {
+ window.location.href = 'https://metamask.io/phishing.html'
+ }
+}
+
+window.addEventListener('load', function() {
+ detectBlacklistedDomain()
+})
+
diff --git a/circle.yml b/circle.yml index 1f018ac24..66eed17d7 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: node: - version: 8.0.0 + version: 8.1.4 dependencies: pre: - "npm i -g testem" diff --git a/gulpfile.js b/gulpfile.js index cc723704a..53de7a7d9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -172,6 +172,7 @@ gulp.task('default', ['lint'], function () { const jsFiles = [ 'inpage', 'contentscript', + 'blacklister', 'background', 'popup', ] diff --git a/package.json b/package.json index 8a394ad75..d3de895c3 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "start": "npm run dev", "dev": "gulp dev --debug", "disc": "gulp disc --debug", - "clear": "rm -rf node_modules/eth-contract-metadata", + "clear": "rm -rf node_modules/eth-contract-metadata && rm -rf node_modules/etheraddresslookup", "dist": "npm run clear && npm install && gulp dist", "test": "npm run lint && npm run test-unit && npm run test-integration", "test-unit": "METAMASK_ENV=test mocha --require test/helper.js --recursive \"test/unit/**/*.js\"", @@ -69,6 +69,7 @@ "eth-sig-util": "^1.1.1", "eth-simple-keyring": "^1.1.1", "eth-token-tracker": "^1.1.2", + "etheraddresslookup": "github:409H/EtherAddressLookup", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", "ethereumjs-wallet": "^0.6.0", |