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

Remove fallback phishing warning configuration (#20327)

Browse Source 
* Remove fallback phishing warning configuration

The package `@metamask/phishing-controller` has been updated from v4
v6. The only breaking changes are a minimum Node.js version bump, and
the removal of the fallback phishing configuration.

The fallback phishing configuration was resulting in MetaMask being
incorrectly flagged as malware, and the stale config was causing
problems for sites that had been blocked in the past but have since
been unblocked. This should substantially reduce the bundle size as
well.

* Update LavaMoat policies

* Update test state to include example blocked site

---------

Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
This commit is contained in:
Mark Stacey 2023-07-31 22:26:40 -02:30 committed by GitHub
parent 36b1991b44
commit 990dc33fc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 38 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/scripts/metamask-controller.test.js
View File

@ -177,6 +177,18 @@ const firstTimeState = {
}, },
}, },
}, },
PhishingController: {
phishingLists: [
{
allowlist: [],
blocklist: ['test.metamask-phishing.io'],
fuzzylist: [],
tolerance: 0,
version: 0,
name: 'MetaMask',
},
],
},
}; };
const noop = () => undefined; const noop = () => undefined;
@ -205,7 +217,7 @@ describe('MetaMaskController', function () {
eth_phishing_detect_config: { eth_phishing_detect_config: {
fuzzylist: [], fuzzylist: [],
allowlist: [], allowlist: [],
blocklist: ['127.0.0.1'], blocklist: ['test.metamask-phishing.io'],
name: ListNames.MetaMask, name: ListNames.MetaMask,
}, },
phishfort_hotlist: { phishfort_hotlist: {
@ -218,7 +230,11 @@ describe('MetaMaskController', function () {
.reply( .reply(
200, 200,
JSON.stringify([ JSON.stringify([
{ url: '127.0.0.1', targetList: 'blocklist', timestamp: 0 }, {
url: 'test.metamask-phishing.io',
targetList: 'blocklist',
timestamp: 0,
},
]), ]),
); );
@ -963,7 +979,7 @@ describe('MetaMaskController', function () {
it('sets up phishing stream for untrusted communication', async function () { it('sets up phishing stream for untrusted communication', async function () {
const phishingMessageSender = { const phishingMessageSender = {
url: 'http://myethereumwalletntw.com', url: 'http://test.metamask-phishing.io',
tab: {}, tab: {},
}; };

26
lavamoat/browserify/beta/policy.json
View File

@ -1772,34 +1772,12 @@
"fetch": true "fetch": true
}, },
"packages": { "packages": {
"@metamask/phishing-controller>@metamask/base-controller": true, "@metamask/base-controller": true,
"@metamask/phishing-controller>@metamask/controller-utils": true, "@metamask/controller-utils": true,
"@metamask/phishing-warning>eth-phishing-detect": true, "@metamask/phishing-warning>eth-phishing-detect": true,
"punycode": true "punycode": true
} }
}, },
"@metamask/phishing-controller>@metamask/base-controller": {
"packages": {
"immer": true
}
},
"@metamask/phishing-controller>@metamask/controller-utils": {
"globals": {
"URL": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
"ethereumjs-util": true,
"ethjs>ethjs-unit": true
}
},
"@metamask/phishing-warning>eth-phishing-detect": { "@metamask/phishing-warning>eth-phishing-detect": {
"packages": { "packages": {
"eslint>optionator>fast-levenshtein": true "eslint>optionator>fast-levenshtein": true

26
lavamoat/browserify/desktop/policy.json
View File

@ -1930,34 +1930,12 @@
"fetch": true "fetch": true
}, },
"packages": { "packages": {
"@metamask/phishing-controller>@metamask/base-controller": true, "@metamask/base-controller": true,
"@metamask/phishing-controller>@metamask/controller-utils": true, "@metamask/controller-utils": true,
"@metamask/phishing-warning>eth-phishing-detect": true, "@metamask/phishing-warning>eth-phishing-detect": true,
"punycode": true "punycode": true
} }
}, },
"@metamask/phishing-controller>@metamask/base-controller": {
"packages": {
"immer": true
}
},
"@metamask/phishing-controller>@metamask/controller-utils": {
"globals": {
"URL": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
"ethereumjs-util": true,
"ethjs>ethjs-unit": true
}
},
"@metamask/phishing-warning>eth-phishing-detect": { "@metamask/phishing-warning>eth-phishing-detect": {
"packages": { "packages": {
"eslint>optionator>fast-levenshtein": true "eslint>optionator>fast-levenshtein": true

26
lavamoat/browserify/flask/policy.json
View File

@ -1930,34 +1930,12 @@
"fetch": true "fetch": true
}, },
"packages": { "packages": {
"@metamask/phishing-controller>@metamask/base-controller": true, "@metamask/base-controller": true,
"@metamask/phishing-controller>@metamask/controller-utils": true, "@metamask/controller-utils": true,
"@metamask/phishing-warning>eth-phishing-detect": true, "@metamask/phishing-warning>eth-phishing-detect": true,
"punycode": true "punycode": true
} }
}, },
"@metamask/phishing-controller>@metamask/base-controller": {
"packages": {
"immer": true
}
},
"@metamask/phishing-controller>@metamask/controller-utils": {
"globals": {
"URL": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
"ethereumjs-util": true,
"ethjs>ethjs-unit": true
}
},
"@metamask/phishing-warning>eth-phishing-detect": { "@metamask/phishing-warning>eth-phishing-detect": {
"packages": { "packages": {
"eslint>optionator>fast-levenshtein": true "eslint>optionator>fast-levenshtein": true

26
lavamoat/browserify/main/policy.json
View File

@ -1772,34 +1772,12 @@
"fetch": true "fetch": true
}, },
"packages": { "packages": {
"@metamask/phishing-controller>@metamask/base-controller": true, "@metamask/base-controller": true,
"@metamask/phishing-controller>@metamask/controller-utils": true, "@metamask/controller-utils": true,
"@metamask/phishing-warning>eth-phishing-detect": true, "@metamask/phishing-warning>eth-phishing-detect": true,
"punycode": true "punycode": true
} }
}, },
"@metamask/phishing-controller>@metamask/base-controller": {
"packages": {
"immer": true
}
},
"@metamask/phishing-controller>@metamask/controller-utils": {
"globals": {
"URL": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
"ethereumjs-util": true,
"ethjs>ethjs-unit": true
}
},
"@metamask/phishing-warning>eth-phishing-detect": { "@metamask/phishing-warning>eth-phishing-detect": {
"packages": { "packages": {
"eslint>optionator>fast-levenshtein": true "eslint>optionator>fast-levenshtein": true

26
lavamoat/browserify/mmi/policy.json
View File

@ -2000,34 +2000,12 @@
"fetch": true "fetch": true
}, },
"packages": { "packages": {
"@metamask/phishing-controller>@metamask/base-controller": true, "@metamask/base-controller": true,
"@metamask/phishing-controller>@metamask/controller-utils": true, "@metamask/controller-utils": true,
"@metamask/phishing-warning>eth-phishing-detect": true, "@metamask/phishing-warning>eth-phishing-detect": true,
"punycode": true "punycode": true
} }
}, },
"@metamask/phishing-controller>@metamask/base-controller": {
"packages": {
"immer": true
}
},
"@metamask/phishing-controller>@metamask/controller-utils": {
"globals": {
"URL": true,
"console.error": true,
"fetch": true,
"setTimeout": true
},
"packages": {
"@metamask/controller-utils>@spruceid/siwe-parser": true,
"@metamask/utils": true,
"browserify>buffer": true,
"eslint>fast-deep-equal": true,
"eth-ens-namehash": true,
"ethereumjs-util": true,
"ethjs>ethjs-unit": true
}
},
"@metamask/phishing-warning>eth-phishing-detect": { "@metamask/phishing-warning>eth-phishing-detect": {
"packages": { "packages": {
"eslint>optionator>fast-levenshtein": true "eslint>optionator>fast-levenshtein": true

2
package.json
View File

@ -256,7 +256,7 @@
"@metamask/notification-controller": "^3.0.0", "@metamask/notification-controller": "^3.0.0",
"@metamask/obs-store": "^8.1.0", "@metamask/obs-store": "^8.1.0",
"@metamask/permission-controller": "^4.0.0", "@metamask/permission-controller": "^4.0.0",
"@metamask/phishing-controller": "^4.0.0", "@metamask/phishing-controller": "^6.0.0",
"@metamask/post-message-stream": "^6.0.0", "@metamask/post-message-stream": "^6.0.0",
"@metamask/ppom-validator": "^0.1.2", "@metamask/ppom-validator": "^0.1.2",
"@metamask/providers": "^11.1.0", "@metamask/providers": "^11.1.0",

16
yarn.lock
View File

@ -3909,7 +3909,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@metamask/controller-utils@npm:^3.0.0, @metamask/controller-utils@npm:^3.1.0, @metamask/controller-utils@npm:^3.4.0": "@metamask/controller-utils@npm:^3.0.0, @metamask/controller-utils@npm:^3.4.0":
version: 3.4.0 version: 3.4.0
resolution: "@metamask/controller-utils@npm:3.4.0" resolution: "@metamask/controller-utils@npm:3.4.0"
dependencies: dependencies:
@ -4494,16 +4494,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@metamask/phishing-controller@npm:^4.0.0": "@metamask/phishing-controller@npm:^6.0.0":
version: 4.0.0 version: 6.0.0
resolution: "@metamask/phishing-controller@npm:4.0.0" resolution: "@metamask/phishing-controller@npm:6.0.0"
dependencies: dependencies:
"@metamask/base-controller": ^2.0.0 "@metamask/base-controller": ^3.2.0
"@metamask/controller-utils": ^3.1.0 "@metamask/controller-utils": ^4.3.0
"@types/punycode": ^2.1.0 "@types/punycode": ^2.1.0
eth-phishing-detect: ^1.2.0 eth-phishing-detect: ^1.2.0
punycode: ^2.1.1 punycode: ^2.1.1
checksum: 15de581f7bec21d75531167275c68d7bbeae7fdaad02268749ba0a71c4d3ccb53718d963d6583e90c337407f65b7fcc9a89eb76c6f731802c2668a8425d5df89 checksum: 13a85865cef1515f6d0ee1cd02da37e5e6b98c493676e3a80195294725b717aa17651a0c24d2e841f790bbd22ae16911cc16bab7846da8266f4ee03007a17f4e
languageName: node languageName: node
linkType: hard linkType: hard
@ -24273,7 +24273,7 @@ __metadata:
"@metamask/notification-controller": ^3.0.0 "@metamask/notification-controller": ^3.0.0
"@metamask/obs-store": ^8.1.0 "@metamask/obs-store": ^8.1.0
"@metamask/permission-controller": ^4.0.0 "@metamask/permission-controller": ^4.0.0
"@metamask/phishing-controller": ^4.0.0 "@metamask/phishing-controller": ^6.0.0
"@metamask/phishing-warning": ^2.1.0 "@metamask/phishing-warning": ^2.1.0
"@metamask/post-message-stream": ^6.0.0 "@metamask/post-message-stream": ^6.0.0
"@metamask/ppom-validator": ^0.1.2 "@metamask/ppom-validator": ^0.1.2