Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PhishingDetect to support IPFS CID blocking #4465

Merged
merged 17 commits into from
Jul 16, 2024
Merged

PhishingDetect to support IPFS CID blocking #4465

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c8b9130
Bump eth-phishing-detect to new version, supporting IPFS CID blocking
409H Jun 26, 2024
e0749c9
Bump version
409H Jun 26, 2024
dd373f8
Update package.json
409H Jun 28, 2024
dba66fc
Add util method to fetch href from a URL object
409H Jul 1, 2024
30f6fcc
Modified logic to accept full URL
409H Jul 1, 2024
f896da1
Fixed tests to use formatHostnameToUrl as we pass in a full href inst…
409H Jul 1, 2024
eaf8608
Fix logic to check for CID
409H Jul 1, 2024
255d1ab
Add test cases for IPFS CID blocking (and not blocking)
409H Jul 1, 2024
82434c8
Downgrade dependancy, since main logic is now in this package
409H Jul 1, 2024
686f69e
Merge branch 'main' into feature/phishing-controller-ipfs
409H Jul 6, 2024
565e01f
Fix phishing bypass tests
409H Jul 9, 2024
69d9047
Fix lint issue, move formatHostnameToUrl to tests file as per comment
409H Jul 10, 2024
f963137
Fix lint issue with misused promise
409H Jul 10, 2024
9b33a3b
Removed unneeded function param
409H Jul 10, 2024
f08d826
Update packages/phishing-controller/src/PhishingDetector.ts
409H Jul 10, 2024
e7c43cd
Update packages/phishing-controller/src/PhishingDetector.test.ts
409H Jul 10, 2024
6a998ee
Merge branch 'main' into feature/phishing-controller-ipfs
409H Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 47 additions & 28 deletions packages/phishing-controller/src/PhishingController.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
type PhishingControllerActions,
type PhishingControllerOptions,
} from './PhishingController';
import { formatHostnameToUrl } from './tests/utils';

const controllerName = 'PhishingController';

Expand Down Expand Up @@ -218,14 +219,18 @@ describe('PhishingController', () => {
expect(controller.isStalelistOutOfDate()).toBe(false);
await controller.maybeUpdateState();
expect(
controller.test('this-should-not-be-in-default-blocklist.com'),
controller.test(
formatHostnameToUrl('this-should-not-be-in-default-blocklist.com'),
),
).toMatchObject({
result: false,
type: 'all',
});

expect(
controller.test('this-should-not-be-in-default-allowlist.com'),
controller.test(
formatHostnameToUrl('this-should-not-be-in-default-allowlist.com'),
),
).toMatchObject({
result: false,
type: 'all',
Expand All @@ -235,14 +240,18 @@ describe('PhishingController', () => {
await controller.maybeUpdateState();

expect(
controller.test('this-should-not-be-in-default-blocklist.com'),
controller.test(
formatHostnameToUrl('this-should-not-be-in-default-blocklist.com'),
),
).toMatchObject({
result: true,
type: 'blocklist',
});

expect(
controller.test('this-should-not-be-in-default-allowlist.com'),
controller.test(
formatHostnameToUrl('this-should-not-be-in-default-allowlist.com'),
),
).toMatchObject({
result: false,
type: 'allowlist',
Expand Down Expand Up @@ -479,7 +488,7 @@ describe('PhishingController', () => {
.reply(200, { data: [] });
const controller = getPhishingController();
await controller.updateStalelist();
expect(controller.test('metamask.io')).toMatchObject({
expect(controller.test(formatHostnameToUrl('metamask.io'))).toMatchObject({
result: false,
type: 'allowlist',
name: ListNames.MetaMask,
Expand Down Expand Up @@ -513,7 +522,7 @@ describe('PhishingController', () => {

const controller = getPhishingController();
await controller.updateStalelist();
expect(controller.test('i❤.ws')).toMatchObject({
expect(controller.test(formatHostnameToUrl('i❤.ws'))).toMatchObject({
result: false,
type: 'all',
});
Expand Down Expand Up @@ -546,7 +555,7 @@ describe('PhishingController', () => {

const controller = getPhishingController();
await controller.updateStalelist();
expect(controller.test('xn--i-7iq.ws')).toMatchObject({
expect(controller.test(formatHostnameToUrl('xn--i-7iq.ws'))).toMatchObject({
result: false,
type: 'all',
});
Expand Down Expand Up @@ -579,7 +588,7 @@ describe('PhishingController', () => {

const controller = getPhishingController();
await controller.updateStalelist();
expect(controller.test('etnerscan.io')).toMatchObject({
expect(controller.test(formatHostnameToUrl('etnerscan.io'))).toMatchObject({
result: true,
type: 'blocklist',
name: ListNames.MetaMask,
Expand Down Expand Up @@ -612,7 +621,9 @@ describe('PhishingController', () => {
.reply(200, { data: [] });
const controller = getPhishingController();
await controller.updateStalelist();
expect(controller.test('myetherẉalletṭ.com')).toMatchObject({
expect(
controller.test(formatHostnameToUrl('myetherẉalletṭ.com')),
).toMatchObject({
result: true,
type: 'blocklist',
name: ListNames.MetaMask,
Expand Down Expand Up @@ -646,7 +657,9 @@ describe('PhishingController', () => {

const controller = getPhishingController();
await controller.updateStalelist();
expect(controller.test('xn--myetherallet-4k5fwn.com')).toMatchObject({
expect(
controller.test(formatHostnameToUrl('xn--myetherallet-4k5fwn.com')),
).toMatchObject({
result: true,
type: 'blocklist',
name: ListNames.MetaMask,
Expand Down Expand Up @@ -689,7 +702,9 @@ describe('PhishingController', () => {
const controller = getPhishingController();
await controller.updateStalelist();
expect(
controller.test('e4d600ab9141b7a9859511c77e63b9b3.com'),
controller.test(
formatHostnameToUrl('e4d600ab9141b7a9859511c77e63b9b3.com'),
),
).toMatchObject({
result: true,
type: 'blocklist',
Expand Down Expand Up @@ -725,7 +740,9 @@ describe('PhishingController', () => {
const controller = getPhishingController();
await controller.updateStalelist();
expect(
controller.test('e4d600ab9141b7a9859511c77e63b9b3.com'),
controller.test(
formatHostnameToUrl('e4d600ab9141b7a9859511c77e63b9b3.com'),
),
).toMatchObject({
result: false,
type: 'all',
Expand Down Expand Up @@ -758,7 +775,7 @@ describe('PhishingController', () => {
.reply(200, { data: [] });
const controller = getPhishingController();
await controller.updateStalelist();
expect(controller.test('opensea.io')).toMatchObject({
expect(controller.test(formatHostnameToUrl('opensea.io'))).toMatchObject({
result: false,
type: 'allowlist',
name: ListNames.MetaMask,
Expand Down Expand Up @@ -791,7 +808,7 @@ describe('PhishingController', () => {
.reply(200, { data: [] });
const controller = getPhishingController();
await controller.updateStalelist();
expect(controller.test('ohpensea.io')).toMatchObject({
expect(controller.test(formatHostnameToUrl('ohpensea.io'))).toMatchObject({
result: true,
type: 'fuzzy',
name: ListNames.MetaMask,
Expand Down Expand Up @@ -825,7 +842,9 @@ describe('PhishingController', () => {
const controller = getPhishingController();
await controller.updateStalelist();
expect(
controller.test('this-is-the-official-website-of-opensea.io'),
controller.test(
formatHostnameToUrl('this-is-the-official-website-of-opensea.io'),
),
).toMatchObject({
result: false,
type: 'all',
Expand Down Expand Up @@ -860,12 +879,12 @@ describe('PhishingController', () => {
await controller.updateStalelist();
const unsafeDomain = 'electrum.mx';
assert.equal(
controller.test(unsafeDomain).result,
controller.test(formatHostnameToUrl(unsafeDomain)).result,
true,
'Example unsafe domain seems to be safe',
);
controller.bypass(unsafeDomain);
expect(controller.test(unsafeDomain)).toMatchObject({
controller.bypass(formatHostnameToUrl(unsafeDomain));
expect(controller.test(formatHostnameToUrl(unsafeDomain))).toMatchObject({
result: false,
type: 'all',
});
Expand Down Expand Up @@ -899,13 +918,13 @@ describe('PhishingController', () => {
await controller.updateStalelist();
const unsafeDomain = 'electrum.mx';
assert.equal(
controller.test(unsafeDomain).result,
controller.test(formatHostnameToUrl(unsafeDomain)).result,
true,
'Example unsafe domain seems to be safe',
);
controller.bypass(unsafeDomain);
controller.bypass(unsafeDomain);
expect(controller.test(unsafeDomain)).toMatchObject({
controller.bypass(formatHostnameToUrl(unsafeDomain));
controller.bypass(formatHostnameToUrl(unsafeDomain));
expect(controller.test(formatHostnameToUrl(unsafeDomain))).toMatchObject({
result: false,
type: 'all',
});
Expand Down Expand Up @@ -939,12 +958,12 @@ describe('PhishingController', () => {
await controller.updateStalelist();
const unsafeDomain = 'myetherẉalletṭ.com';
assert.equal(
controller.test(unsafeDomain).result,
controller.test(formatHostnameToUrl(unsafeDomain)).result,
true,
'Example unsafe domain seems to be safe',
);
controller.bypass(unsafeDomain);
expect(controller.test(unsafeDomain)).toMatchObject({
controller.bypass(formatHostnameToUrl(unsafeDomain));
expect(controller.test(formatHostnameToUrl(unsafeDomain))).toMatchObject({
result: false,
type: 'all',
});
Expand Down Expand Up @@ -978,12 +997,12 @@ describe('PhishingController', () => {
await controller.updateStalelist();
const unsafeDomain = 'xn--myetherallet-4k5fwn.com';
assert.equal(
controller.test(unsafeDomain).result,
controller.test(formatHostnameToUrl(unsafeDomain)).result,
true,
'Example unsafe domain seems to be safe',
);
controller.bypass(unsafeDomain);
expect(controller.test(unsafeDomain)).toMatchObject({
controller.bypass(formatHostnameToUrl(unsafeDomain));
expect(controller.test(formatHostnameToUrl(unsafeDomain))).toMatchObject({
result: false,
type: 'all',
});
Expand Down
Loading
Loading