@metamask-previews/phishing-controller 17.3.1-preview-4758e65ff → 17.3.1-preview-bbf9454b2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +0 -23
- package/dist/CacheManager.cjs +177 -0
- package/dist/CacheManager.cjs.map +1 -0
- package/dist/CacheManager.d.cts +104 -0
- package/dist/CacheManager.d.cts.map +1 -0
- package/dist/CacheManager.d.mts +104 -0
- package/dist/CacheManager.d.mts.map +1 -0
- package/dist/CacheManager.mjs +173 -0
- package/dist/CacheManager.mjs.map +1 -0
- package/dist/PhishingController.cjs +337 -134
- package/dist/PhishingController.cjs.map +1 -1
- package/dist/PhishingController.d.cts +196 -7
- package/dist/PhishingController.d.cts.map +1 -1
- package/dist/PhishingController.d.mts +196 -7
- package/dist/PhishingController.d.mts.map +1 -1
- package/dist/PhishingController.mjs +335 -114
- package/dist/PhishingController.mjs.map +1 -1
- package/dist/index.cjs +1 -6
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.cts +2 -5
- package/dist/index.d.cts.map +1 -1
- package/dist/index.d.mts +2 -5
- package/dist/index.d.mts.map +1 -1
- package/dist/index.mjs +1 -2
- package/dist/index.mjs.map +1 -1
- package/dist/types.cjs +1 -30
- package/dist/types.cjs.map +1 -1
- package/dist/types.d.cts +0 -155
- package/dist/types.d.cts.map +1 -1
- package/dist/types.d.mts +0 -155
- package/dist/types.d.mts.map +1 -1
- package/dist/types.mjs +0 -29
- package/dist/types.mjs.map +1 -1
- package/dist/utils.cjs +52 -3
- package/dist/utils.cjs.map +1 -1
- package/dist/utils.d.cts +32 -2
- package/dist/utils.d.cts.map +1 -1
- package/dist/utils.d.mts +32 -2
- package/dist/utils.d.mts.map +1 -1
- package/dist/utils.mjs +48 -1
- package/dist/utils.mjs.map +1 -1
- package/package.json +1 -6
- package/dist/PhishingDataService-method-action-types.cjs +0 -7
- package/dist/PhishingDataService-method-action-types.cjs.map +0 -1
- package/dist/PhishingDataService-method-action-types.d.cts +0 -121
- package/dist/PhishingDataService-method-action-types.d.cts.map +0 -1
- package/dist/PhishingDataService-method-action-types.d.mts +0 -121
- package/dist/PhishingDataService-method-action-types.d.mts.map +0 -1
- package/dist/PhishingDataService-method-action-types.mjs +0 -6
- package/dist/PhishingDataService-method-action-types.mjs.map +0 -1
- package/dist/PhishingDataService.cjs +0 -498
- package/dist/PhishingDataService.cjs.map +0 -1
- package/dist/PhishingDataService.d.cts +0 -211
- package/dist/PhishingDataService.d.cts.map +0 -1
- package/dist/PhishingDataService.d.mts +0 -211
- package/dist/PhishingDataService.d.mts.map +0 -1
- package/dist/PhishingDataService.mjs +0 -494
- package/dist/PhishingDataService.mjs.map +0 -1
|
@@ -10,48 +10,73 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
10
10
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
11
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
12
|
};
|
|
13
|
-
var _PhishingController_instances, _PhishingController_detector, _PhishingController_stalelistRefreshInterval, _PhishingController_hotlistRefreshInterval, _PhishingController_c2DomainBlocklistRefreshInterval, _PhishingController_knownRecipients, _PhishingController_transactionRecipients, _PhishingController_transactionRecipientsByTransactionId, _PhishingController_transactionRecipientCounts, _PhishingController_addressBookRecipients, _PhishingController_inProgressHotlistUpdate, _PhishingController_inProgressStalelistUpdate, _PhishingController_isProgressC2DomainBlocklistUpdate, _PhishingController_transactionControllerStateChangeHandler, _PhishingController_addressBookControllerStateChangeHandler, _PhishingController_subscribeToAddressBookControllerStateChange, _PhishingController_subscribeToTransactionControllerStateChange, _PhishingController_isTransactionPatch, _PhishingController_isSimulationDataPatch, _PhishingController_onTransactionControllerStateChange, _PhishingController_onAddressBookControllerStateChange, _PhishingController_getTokensFromTransaction, _PhishingController_scanTokensByChain, _PhishingController_hydrateKnownRecipients, _PhishingController_hydrateKnownRecipientsFromTransactionState, _PhishingController_hydrateKnownRecipientsFromAddressBookState, _PhishingController_setKnownRecipientsFromTransactionState, _PhishingController_updateKnownRecipientsFromTransactionPatches, _PhishingController_getTransactionFromPatchValue, _PhishingController_updateTransactionRecipients, _PhishingController_addTransactionRecipients, _PhishingController_removeTransactionRecipients, _PhishingController_setKnownRecipientsFromAddressBookState, _PhishingController_rebuildKnownRecipients, _PhishingController_getAddressBookRecipients, _PhishingController_getRecipientAddressesFromTransaction, _PhishingController_normalizeAddress, _PhishingController_fetchTokenScanBulkResults, _PhishingController_processBatch, _PhishingController_updateStalelist, _PhishingController_updateHotlist, _PhishingController_updateC2DomainBlocklist,
|
|
13
|
+
var _PhishingController_instances, _PhishingController_detector, _PhishingController_stalelistRefreshInterval, _PhishingController_hotlistRefreshInterval, _PhishingController_c2DomainBlocklistRefreshInterval, _PhishingController_urlScanCache, _PhishingController_tokenScanCache, _PhishingController_addressScanCache, _PhishingController_knownRecipients, _PhishingController_transactionRecipients, _PhishingController_transactionRecipientsByTransactionId, _PhishingController_transactionRecipientCounts, _PhishingController_addressBookRecipients, _PhishingController_inProgressHotlistUpdate, _PhishingController_inProgressStalelistUpdate, _PhishingController_isProgressC2DomainBlocklistUpdate, _PhishingController_transactionControllerStateChangeHandler, _PhishingController_addressBookControllerStateChangeHandler, _PhishingController_subscribeToAddressBookControllerStateChange, _PhishingController_subscribeToTransactionControllerStateChange, _PhishingController_isTransactionPatch, _PhishingController_isSimulationDataPatch, _PhishingController_onTransactionControllerStateChange, _PhishingController_onAddressBookControllerStateChange, _PhishingController_getTokensFromTransaction, _PhishingController_scanTokensByChain, _PhishingController_hydrateKnownRecipients, _PhishingController_hydrateKnownRecipientsFromTransactionState, _PhishingController_hydrateKnownRecipientsFromAddressBookState, _PhishingController_setKnownRecipientsFromTransactionState, _PhishingController_updateKnownRecipientsFromTransactionPatches, _PhishingController_getTransactionFromPatchValue, _PhishingController_updateTransactionRecipients, _PhishingController_addTransactionRecipients, _PhishingController_removeTransactionRecipients, _PhishingController_setKnownRecipientsFromAddressBookState, _PhishingController_rebuildKnownRecipients, _PhishingController_getAddressBookRecipients, _PhishingController_getRecipientAddressesFromTransaction, _PhishingController_normalizeAddress, _PhishingController_fetchTokenScanBulkResults, _PhishingController_processBatch, _PhishingController_updateStalelist, _PhishingController_updateHotlist, _PhishingController_updateC2DomainBlocklist, _PhishingController_queryConfig;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.PhishingController = exports.STALELIST_REFRESH_INTERVAL = exports.HOTLIST_REFRESH_INTERVAL = exports.C2_DOMAIN_BLOCKLIST_REFRESH_INTERVAL = exports.
|
|
15
|
+
exports.PhishingController = exports.phishingListKeyNameMap = exports.ListNames = exports.ListKeys = exports.C2_DOMAIN_BLOCKLIST_URL = exports.METAMASK_HOTLIST_DIFF_URL = exports.METAMASK_STALELIST_URL = exports.STALELIST_REFRESH_INTERVAL = exports.HOTLIST_REFRESH_INTERVAL = exports.C2_DOMAIN_BLOCKLIST_REFRESH_INTERVAL = exports.DEFAULT_ADDRESS_SCAN_CACHE_MAX_SIZE = exports.DEFAULT_ADDRESS_SCAN_CACHE_TTL = exports.DEFAULT_TOKEN_SCAN_CACHE_MAX_SIZE = exports.DEFAULT_TOKEN_SCAN_CACHE_TTL = exports.DEFAULT_URL_SCAN_CACHE_MAX_SIZE = exports.DEFAULT_URL_SCAN_CACHE_TTL = exports.APPROVALS_ENDPOINT = exports.ADDRESS_SCAN_ENDPOINT = exports.TOKEN_BULK_SCANNING_ENDPOINT = exports.SECURITY_ALERTS_BASE_URL = exports.PHISHING_DETECTION_BULK_SCAN_ENDPOINT = exports.PHISHING_DETECTION_SCAN_ENDPOINT = exports.PHISHING_DETECTION_BASE_URL = exports.C2_DOMAIN_BLOCKLIST_ENDPOINT = exports.CLIENT_SIDE_DETECION_BASE_URL = exports.METAMASK_HOTLIST_DIFF_FILE = exports.METAMASK_STALELIST_FILE = exports.PHISHING_CONFIG_BASE_URL = void 0;
|
|
16
16
|
const base_controller_1 = require("@metamask/base-controller");
|
|
17
17
|
const controller_utils_1 = require("@metamask/controller-utils");
|
|
18
|
-
const utils_1 = require("@metamask/utils");
|
|
19
18
|
const transaction_controller_1 = require("@metamask/transaction-controller");
|
|
20
19
|
const punycode_js_1 = require("punycode/punycode.js");
|
|
21
20
|
const address_poisoning_js_1 = require("./address-poisoning.cjs");
|
|
21
|
+
const CacheManager_js_1 = require("./CacheManager.cjs");
|
|
22
22
|
const PathTrie_js_1 = require("./PathTrie.cjs");
|
|
23
23
|
const PhishingDetector_js_1 = require("./PhishingDetector.cjs");
|
|
24
24
|
const types_js_1 = require("./types.cjs");
|
|
25
25
|
const utils_js_1 = require("./utils.cjs");
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
Object.defineProperty(exports, "phishingListKeyNameMap", { enumerable: true, get: function () { return types_js_2.phishingListKeyNameMap; } });
|
|
26
|
+
exports.PHISHING_CONFIG_BASE_URL = 'https://phishing-detection.api.cx.metamask.io';
|
|
27
|
+
exports.METAMASK_STALELIST_FILE = '/v1/stalelist';
|
|
28
|
+
exports.METAMASK_HOTLIST_DIFF_FILE = '/v2/diffsSince';
|
|
29
|
+
exports.CLIENT_SIDE_DETECION_BASE_URL = 'https://client-side-detection.api.cx.metamask.io';
|
|
30
|
+
exports.C2_DOMAIN_BLOCKLIST_ENDPOINT = '/v1/request-blocklist';
|
|
31
|
+
exports.PHISHING_DETECTION_BASE_URL = 'https://dapp-scanning.api.cx.metamask.io';
|
|
32
|
+
exports.PHISHING_DETECTION_SCAN_ENDPOINT = 'v2/scan';
|
|
33
|
+
exports.PHISHING_DETECTION_BULK_SCAN_ENDPOINT = 'bulk-scan';
|
|
34
|
+
exports.SECURITY_ALERTS_BASE_URL = 'https://security-alerts.api.cx.metamask.io';
|
|
35
|
+
exports.TOKEN_BULK_SCANNING_ENDPOINT = '/token/scan-bulk';
|
|
36
|
+
exports.ADDRESS_SCAN_ENDPOINT = '/address/evm/scan';
|
|
37
|
+
exports.APPROVALS_ENDPOINT = '/address/evm/approvals';
|
|
38
|
+
// Cache configuration defaults
|
|
39
|
+
exports.DEFAULT_URL_SCAN_CACHE_TTL = 1 * 60; // 1 minute in seconds
|
|
40
|
+
exports.DEFAULT_URL_SCAN_CACHE_MAX_SIZE = 250;
|
|
41
|
+
exports.DEFAULT_TOKEN_SCAN_CACHE_TTL = 1 * 60; // 1 minute in seconds
|
|
42
|
+
exports.DEFAULT_TOKEN_SCAN_CACHE_MAX_SIZE = 1000;
|
|
43
|
+
exports.DEFAULT_ADDRESS_SCAN_CACHE_TTL = 1 * 60; // 1 minute in seconds
|
|
44
|
+
exports.DEFAULT_ADDRESS_SCAN_CACHE_MAX_SIZE = 1000;
|
|
46
45
|
exports.C2_DOMAIN_BLOCKLIST_REFRESH_INTERVAL = 5 * 60; // 5 mins in seconds
|
|
47
46
|
exports.HOTLIST_REFRESH_INTERVAL = 5 * 60; // 5 mins in seconds
|
|
48
47
|
exports.STALELIST_REFRESH_INTERVAL = 30 * 24 * 60 * 60; // 30 days in seconds
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
48
|
+
exports.METAMASK_STALELIST_URL = `${exports.PHISHING_CONFIG_BASE_URL}${exports.METAMASK_STALELIST_FILE}`;
|
|
49
|
+
exports.METAMASK_HOTLIST_DIFF_URL = `${exports.PHISHING_CONFIG_BASE_URL}${exports.METAMASK_HOTLIST_DIFF_FILE}`;
|
|
50
|
+
exports.C2_DOMAIN_BLOCKLIST_URL = `${exports.CLIENT_SIDE_DETECION_BASE_URL}${exports.C2_DOMAIN_BLOCKLIST_ENDPOINT}`;
|
|
51
|
+
/**
|
|
52
|
+
* Enum containing upstream data provider source list keys.
|
|
53
|
+
* These are the keys denoting lists consumed by the upstream data provider.
|
|
54
|
+
*/
|
|
55
|
+
var ListKeys;
|
|
56
|
+
(function (ListKeys) {
|
|
57
|
+
ListKeys["EthPhishingDetectConfig"] = "eth_phishing_detect_config";
|
|
58
|
+
})(ListKeys || (exports.ListKeys = ListKeys = {}));
|
|
59
|
+
/**
|
|
60
|
+
* Enum containing downstream client attribution names.
|
|
61
|
+
*/
|
|
62
|
+
var ListNames;
|
|
63
|
+
(function (ListNames) {
|
|
64
|
+
ListNames["MetaMask"] = "MetaMask";
|
|
65
|
+
})(ListNames || (exports.ListNames = ListNames = {}));
|
|
66
|
+
/**
|
|
67
|
+
* Maps from downstream client attribution name
|
|
68
|
+
* to list key sourced from upstream data provider.
|
|
69
|
+
*/
|
|
70
|
+
const phishingListNameKeyMap = {
|
|
71
|
+
[ListNames.MetaMask]: ListKeys.EthPhishingDetectConfig,
|
|
72
|
+
};
|
|
73
|
+
/**
|
|
74
|
+
* Maps from list key sourced from upstream data
|
|
75
|
+
* provider to downstream client attribution name.
|
|
76
|
+
*/
|
|
77
|
+
exports.phishingListKeyNameMap = {
|
|
78
|
+
[ListKeys.EthPhishingDetectConfig]: ListNames.MetaMask,
|
|
79
|
+
};
|
|
55
80
|
const controllerName = 'PhishingController';
|
|
56
81
|
const metadata = {
|
|
57
82
|
phishingLists: {
|
|
@@ -90,6 +115,24 @@ const metadata = {
|
|
|
90
115
|
includeInDebugSnapshot: false,
|
|
91
116
|
usedInUi: false,
|
|
92
117
|
},
|
|
118
|
+
urlScanCache: {
|
|
119
|
+
includeInStateLogs: false,
|
|
120
|
+
persist: true,
|
|
121
|
+
includeInDebugSnapshot: false,
|
|
122
|
+
usedInUi: true,
|
|
123
|
+
},
|
|
124
|
+
tokenScanCache: {
|
|
125
|
+
includeInStateLogs: false,
|
|
126
|
+
persist: true,
|
|
127
|
+
includeInDebugSnapshot: false,
|
|
128
|
+
usedInUi: true,
|
|
129
|
+
},
|
|
130
|
+
addressScanCache: {
|
|
131
|
+
includeInStateLogs: false,
|
|
132
|
+
persist: true,
|
|
133
|
+
includeInDebugSnapshot: false,
|
|
134
|
+
usedInUi: true,
|
|
135
|
+
},
|
|
93
136
|
};
|
|
94
137
|
/**
|
|
95
138
|
* Get a default empty state for the controller.
|
|
@@ -104,6 +147,9 @@ const getDefaultState = () => {
|
|
|
104
147
|
hotlistLastFetched: 0,
|
|
105
148
|
stalelistLastFetched: 0,
|
|
106
149
|
c2DomainBlocklistLastFetched: 0,
|
|
150
|
+
urlScanCache: {},
|
|
151
|
+
tokenScanCache: {},
|
|
152
|
+
addressScanCache: {},
|
|
107
153
|
};
|
|
108
154
|
};
|
|
109
155
|
const MESSENGER_EXPOSED_METHODS = [
|
|
@@ -129,10 +175,16 @@ class PhishingController extends base_controller_1.BaseController {
|
|
|
129
175
|
* @param config.stalelistRefreshInterval - Polling interval used to fetch stale list.
|
|
130
176
|
* @param config.hotlistRefreshInterval - Polling interval used to fetch hotlist diff list.
|
|
131
177
|
* @param config.c2DomainBlocklistRefreshInterval - Polling interval used to fetch c2 domain blocklist.
|
|
178
|
+
* @param config.urlScanCacheTTL - Time to live in seconds for cached scan results.
|
|
179
|
+
* @param config.urlScanCacheMaxSize - Maximum number of entries in the scan cache.
|
|
180
|
+
* @param config.tokenScanCacheTTL - Time to live in seconds for cached token scan results.
|
|
181
|
+
* @param config.tokenScanCacheMaxSize - Maximum number of entries in the token scan cache.
|
|
182
|
+
* @param config.addressScanCacheTTL - Time to live in seconds for cached address scan results.
|
|
183
|
+
* @param config.addressScanCacheMaxSize - Maximum number of entries in the address scan cache.
|
|
132
184
|
* @param config.messenger - The controller restricted messenger.
|
|
133
185
|
* @param config.state - Initial state to set on this controller.
|
|
134
186
|
*/
|
|
135
|
-
constructor({ stalelistRefreshInterval = exports.STALELIST_REFRESH_INTERVAL, hotlistRefreshInterval = exports.HOTLIST_REFRESH_INTERVAL, c2DomainBlocklistRefreshInterval = exports.C2_DOMAIN_BLOCKLIST_REFRESH_INTERVAL, messenger, state = {}, }) {
|
|
187
|
+
constructor({ stalelistRefreshInterval = exports.STALELIST_REFRESH_INTERVAL, hotlistRefreshInterval = exports.HOTLIST_REFRESH_INTERVAL, c2DomainBlocklistRefreshInterval = exports.C2_DOMAIN_BLOCKLIST_REFRESH_INTERVAL, urlScanCacheTTL = exports.DEFAULT_URL_SCAN_CACHE_TTL, urlScanCacheMaxSize = exports.DEFAULT_URL_SCAN_CACHE_MAX_SIZE, tokenScanCacheTTL = exports.DEFAULT_TOKEN_SCAN_CACHE_TTL, tokenScanCacheMaxSize = exports.DEFAULT_TOKEN_SCAN_CACHE_MAX_SIZE, addressScanCacheTTL = exports.DEFAULT_ADDRESS_SCAN_CACHE_TTL, addressScanCacheMaxSize = exports.DEFAULT_ADDRESS_SCAN_CACHE_MAX_SIZE, messenger, state = {}, }) {
|
|
136
188
|
super({
|
|
137
189
|
name: controllerName,
|
|
138
190
|
metadata,
|
|
@@ -149,6 +201,9 @@ class PhishingController extends base_controller_1.BaseController {
|
|
|
149
201
|
_PhishingController_stalelistRefreshInterval.set(this, void 0);
|
|
150
202
|
_PhishingController_hotlistRefreshInterval.set(this, void 0);
|
|
151
203
|
_PhishingController_c2DomainBlocklistRefreshInterval.set(this, void 0);
|
|
204
|
+
_PhishingController_urlScanCache.set(this, void 0);
|
|
205
|
+
_PhishingController_tokenScanCache.set(this, void 0);
|
|
206
|
+
_PhishingController_addressScanCache.set(this, void 0);
|
|
152
207
|
_PhishingController_knownRecipients.set(this, void 0);
|
|
153
208
|
_PhishingController_transactionRecipients.set(this, void 0);
|
|
154
209
|
_PhishingController_transactionRecipientsByTransactionId.set(this, void 0);
|
|
@@ -179,18 +234,39 @@ class PhishingController extends base_controller_1.BaseController {
|
|
|
179
234
|
* @returns The API response or null if there was an error.
|
|
180
235
|
*/
|
|
181
236
|
_PhishingController_fetchTokenScanBulkResults.set(this, async (chain, tokens) => {
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
237
|
+
const timeout = 8000; // 8 seconds
|
|
238
|
+
const apiResponse = await (0, controller_utils_1.safelyExecuteWithTimeout)(async () => {
|
|
239
|
+
const response = await fetch(`${exports.SECURITY_ALERTS_BASE_URL}${exports.TOKEN_BULK_SCANNING_ENDPOINT}`, {
|
|
240
|
+
method: 'POST',
|
|
241
|
+
headers: {
|
|
242
|
+
Accept: 'application/json',
|
|
243
|
+
'Content-Type': 'application/json',
|
|
244
|
+
},
|
|
245
|
+
body: JSON.stringify({
|
|
246
|
+
chain,
|
|
247
|
+
tokens,
|
|
248
|
+
}),
|
|
249
|
+
});
|
|
250
|
+
if (!response.ok) {
|
|
251
|
+
return {
|
|
252
|
+
error: `${response.status} ${response.statusText}`,
|
|
253
|
+
status: response.status,
|
|
254
|
+
statusText: response.statusText,
|
|
255
|
+
};
|
|
191
256
|
}
|
|
257
|
+
const data = await response.json();
|
|
258
|
+
return data;
|
|
259
|
+
}, true, timeout);
|
|
260
|
+
if (!apiResponse) {
|
|
261
|
+
console.error(`Error scanning tokens: timeout of ${timeout}ms exceeded`);
|
|
262
|
+
return null;
|
|
263
|
+
}
|
|
264
|
+
if (apiResponse.error) {
|
|
265
|
+
const { status, statusText } = apiResponse;
|
|
266
|
+
console.warn(`Token bulk screening API error: ${status} ${statusText}`);
|
|
192
267
|
return null;
|
|
193
268
|
}
|
|
269
|
+
return apiResponse;
|
|
194
270
|
});
|
|
195
271
|
/**
|
|
196
272
|
* Get token approvals for an EVM address with security enrichments.
|
|
@@ -209,12 +285,32 @@ class PhishingController extends base_controller_1.BaseController {
|
|
|
209
285
|
if (!chain || !(0, utils_js_1.isApprovalSupportedChain)(chain)) {
|
|
210
286
|
return { approvals: [] };
|
|
211
287
|
}
|
|
212
|
-
|
|
213
|
-
|
|
288
|
+
const apiResponse = await (0, controller_utils_1.safelyExecuteWithTimeout)(async () => {
|
|
289
|
+
const res = await fetch(`${exports.SECURITY_ALERTS_BASE_URL}${exports.APPROVALS_ENDPOINT}`, {
|
|
290
|
+
method: 'POST',
|
|
291
|
+
headers: {
|
|
292
|
+
Accept: 'application/json',
|
|
293
|
+
'Content-Type': 'application/json',
|
|
294
|
+
},
|
|
295
|
+
body: JSON.stringify({
|
|
296
|
+
chain,
|
|
297
|
+
address: normalizedAddress,
|
|
298
|
+
}),
|
|
299
|
+
});
|
|
300
|
+
if (!res.ok) {
|
|
301
|
+
return { error: `${res.status} ${res.statusText}` };
|
|
302
|
+
}
|
|
303
|
+
const data = await res.json();
|
|
304
|
+
return data;
|
|
305
|
+
}, true, 5000);
|
|
306
|
+
if (!apiResponse) {
|
|
307
|
+
return { approvals: [] };
|
|
214
308
|
}
|
|
215
|
-
|
|
309
|
+
if (apiResponse.error ||
|
|
310
|
+
!Array.isArray(apiResponse.approvals)) {
|
|
216
311
|
return { approvals: [] };
|
|
217
312
|
}
|
|
313
|
+
return apiResponse;
|
|
218
314
|
};
|
|
219
315
|
/**
|
|
220
316
|
* Process a batch of URLs (up to 50) for phishing detection.
|
|
@@ -223,25 +319,45 @@ class PhishingController extends base_controller_1.BaseController {
|
|
|
223
319
|
* @returns The scan results and errors for this batch.
|
|
224
320
|
*/
|
|
225
321
|
_PhishingController_processBatch.set(this, async (urls) => {
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
322
|
+
const apiResponse = await (0, controller_utils_1.safelyExecuteWithTimeout)(async () => {
|
|
323
|
+
const res = await fetch(`${exports.PHISHING_DETECTION_BASE_URL}/${exports.PHISHING_DETECTION_BULK_SCAN_ENDPOINT}`, {
|
|
324
|
+
method: 'POST',
|
|
325
|
+
headers: {
|
|
326
|
+
Accept: 'application/json',
|
|
327
|
+
'Content-Type': 'application/json',
|
|
328
|
+
},
|
|
329
|
+
body: JSON.stringify({ urls }),
|
|
330
|
+
});
|
|
331
|
+
if (!res.ok) {
|
|
231
332
|
return {
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
},
|
|
333
|
+
error: `${res.status} ${res.statusText}`,
|
|
334
|
+
status: res.status,
|
|
335
|
+
statusText: res.statusText,
|
|
236
336
|
};
|
|
237
337
|
}
|
|
338
|
+
const data = await res.json();
|
|
339
|
+
return data;
|
|
340
|
+
}, true, 15000);
|
|
341
|
+
// Handle timeout or network errors
|
|
342
|
+
if (!apiResponse) {
|
|
343
|
+
return {
|
|
344
|
+
results: {},
|
|
345
|
+
errors: {
|
|
346
|
+
network_error: ['timeout of 15000ms exceeded'],
|
|
347
|
+
},
|
|
348
|
+
};
|
|
349
|
+
}
|
|
350
|
+
// Handle HTTP error responses
|
|
351
|
+
if (apiResponse.error) {
|
|
352
|
+
const { status, statusText } = apiResponse;
|
|
238
353
|
return {
|
|
239
354
|
results: {},
|
|
240
355
|
errors: {
|
|
241
|
-
|
|
356
|
+
api_error: [`${status} ${statusText}`],
|
|
242
357
|
},
|
|
243
358
|
};
|
|
244
359
|
}
|
|
360
|
+
return apiResponse;
|
|
245
361
|
});
|
|
246
362
|
__classPrivateFieldSet(this, _PhishingController_stalelistRefreshInterval, stalelistRefreshInterval, "f");
|
|
247
363
|
__classPrivateFieldSet(this, _PhishingController_hotlistRefreshInterval, hotlistRefreshInterval, "f");
|
|
@@ -253,6 +369,36 @@ class PhishingController extends base_controller_1.BaseController {
|
|
|
253
369
|
__classPrivateFieldSet(this, _PhishingController_addressBookRecipients, new Set(), "f");
|
|
254
370
|
__classPrivateFieldSet(this, _PhishingController_transactionControllerStateChangeHandler, __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_onTransactionControllerStateChange).bind(this), "f");
|
|
255
371
|
__classPrivateFieldSet(this, _PhishingController_addressBookControllerStateChangeHandler, __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_onAddressBookControllerStateChange).bind(this), "f");
|
|
372
|
+
__classPrivateFieldSet(this, _PhishingController_urlScanCache, new CacheManager_js_1.CacheManager({
|
|
373
|
+
cacheTTL: urlScanCacheTTL,
|
|
374
|
+
maxCacheSize: urlScanCacheMaxSize,
|
|
375
|
+
initialCache: this.state.urlScanCache,
|
|
376
|
+
updateState: (cache) => {
|
|
377
|
+
this.update((draftState) => {
|
|
378
|
+
draftState.urlScanCache = cache;
|
|
379
|
+
});
|
|
380
|
+
},
|
|
381
|
+
}), "f");
|
|
382
|
+
__classPrivateFieldSet(this, _PhishingController_tokenScanCache, new CacheManager_js_1.CacheManager({
|
|
383
|
+
cacheTTL: tokenScanCacheTTL,
|
|
384
|
+
maxCacheSize: tokenScanCacheMaxSize,
|
|
385
|
+
initialCache: this.state.tokenScanCache,
|
|
386
|
+
updateState: (cache) => {
|
|
387
|
+
this.update((draftState) => {
|
|
388
|
+
draftState.tokenScanCache = cache;
|
|
389
|
+
});
|
|
390
|
+
},
|
|
391
|
+
}), "f");
|
|
392
|
+
__classPrivateFieldSet(this, _PhishingController_addressScanCache, new CacheManager_js_1.CacheManager({
|
|
393
|
+
cacheTTL: addressScanCacheTTL,
|
|
394
|
+
maxCacheSize: addressScanCacheMaxSize,
|
|
395
|
+
initialCache: this.state.addressScanCache,
|
|
396
|
+
updateState: (cache) => {
|
|
397
|
+
this.update((draftState) => {
|
|
398
|
+
draftState.addressScanCache = cache;
|
|
399
|
+
});
|
|
400
|
+
},
|
|
401
|
+
}), "f");
|
|
256
402
|
this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
|
|
257
403
|
this.updatePhishingDetector();
|
|
258
404
|
__classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_hydrateKnownRecipients).call(this);
|
|
@@ -466,21 +612,47 @@ class PhishingController extends base_controller_1.BaseController {
|
|
|
466
612
|
};
|
|
467
613
|
}
|
|
468
614
|
const [hostname] = (0, utils_js_1.getHostnameFromWebUrl)(url);
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
615
|
+
const cachedResult = __classPrivateFieldGet(this, _PhishingController_urlScanCache, "f").get(scanUrlParam);
|
|
616
|
+
if (cachedResult) {
|
|
617
|
+
return cachedResult;
|
|
472
618
|
}
|
|
473
|
-
|
|
619
|
+
const apiResponse = await (0, controller_utils_1.safelyExecuteWithTimeout)(async () => {
|
|
620
|
+
const res = await fetch(`${exports.PHISHING_DETECTION_BASE_URL}/${exports.PHISHING_DETECTION_SCAN_ENDPOINT}?url=${encodeURIComponent(scanUrlParam)}`, {
|
|
621
|
+
method: 'GET',
|
|
622
|
+
headers: {
|
|
623
|
+
Accept: 'application/json',
|
|
624
|
+
},
|
|
625
|
+
});
|
|
626
|
+
if (!res.ok) {
|
|
627
|
+
return {
|
|
628
|
+
error: `${res.status} ${res.statusText}`,
|
|
629
|
+
};
|
|
630
|
+
}
|
|
631
|
+
const data = await res.json();
|
|
632
|
+
return data;
|
|
633
|
+
}, true, 8000);
|
|
634
|
+
// Need to do it this way because safelyExecuteWithTimeout returns undefined for both timeouts and errors.
|
|
635
|
+
if (!apiResponse) {
|
|
474
636
|
return {
|
|
475
637
|
hostname: '',
|
|
476
638
|
recommendedAction: types_js_1.RecommendedAction.None,
|
|
477
|
-
fetchError:
|
|
639
|
+
fetchError: 'timeout of 8000ms exceeded',
|
|
478
640
|
};
|
|
479
641
|
}
|
|
480
|
-
|
|
642
|
+
else if (apiResponse.error) {
|
|
643
|
+
return {
|
|
644
|
+
hostname: '',
|
|
645
|
+
recommendedAction: types_js_1.RecommendedAction.None,
|
|
646
|
+
fetchError: apiResponse.error,
|
|
647
|
+
};
|
|
648
|
+
}
|
|
649
|
+
const scanResult = apiResponse;
|
|
650
|
+
const result = {
|
|
481
651
|
hostname,
|
|
482
652
|
recommendedAction: scanResult.recommendedAction,
|
|
483
653
|
};
|
|
654
|
+
__classPrivateFieldGet(this, _PhishingController_urlScanCache, "f").set(scanUrlParam, result);
|
|
655
|
+
return result;
|
|
484
656
|
}
|
|
485
657
|
/**
|
|
486
658
|
* Scan multiple URLs for phishing in bulk. It will only scan the hostnames of the URLs.
|
|
@@ -513,7 +685,8 @@ class PhishingController extends base_controller_1.BaseController {
|
|
|
513
685
|
results: {},
|
|
514
686
|
errors: {},
|
|
515
687
|
};
|
|
516
|
-
//
|
|
688
|
+
// Extract hostnames from URLs and check for validity and length constraints
|
|
689
|
+
const urlsToHostnames = {};
|
|
517
690
|
const urlsToFetch = [];
|
|
518
691
|
for (const url of urls) {
|
|
519
692
|
if (url.length > MAX_URL_LENGTH) {
|
|
@@ -522,12 +695,22 @@ class PhishingController extends base_controller_1.BaseController {
|
|
|
522
695
|
];
|
|
523
696
|
continue;
|
|
524
697
|
}
|
|
525
|
-
const [, ok] = (0, utils_js_1.getHostnameFromWebUrl)(url);
|
|
698
|
+
const [hostname, ok] = (0, utils_js_1.getHostnameFromWebUrl)(url);
|
|
526
699
|
if (!ok) {
|
|
527
700
|
combinedResponse.errors[url] = ['url is not a valid web URL'];
|
|
528
701
|
continue;
|
|
529
702
|
}
|
|
530
|
-
|
|
703
|
+
// Check if result is already in cache
|
|
704
|
+
const cachedResult = __classPrivateFieldGet(this, _PhishingController_urlScanCache, "f").get(hostname);
|
|
705
|
+
if (cachedResult) {
|
|
706
|
+
// Use cached result
|
|
707
|
+
combinedResponse.results[url] = cachedResult;
|
|
708
|
+
}
|
|
709
|
+
else {
|
|
710
|
+
// Add to list of URLs to fetch
|
|
711
|
+
urlsToHostnames[url] = hostname;
|
|
712
|
+
urlsToFetch.push(url);
|
|
713
|
+
}
|
|
531
714
|
}
|
|
532
715
|
// If there are URLs to fetch, process them in batches
|
|
533
716
|
if (urlsToFetch.length > 0) {
|
|
@@ -541,7 +724,12 @@ class PhishingController extends base_controller_1.BaseController {
|
|
|
541
724
|
const batchResults = await Promise.all(batches.map((batchUrls) => __classPrivateFieldGet(this, _PhishingController_processBatch, "f").call(this, batchUrls)));
|
|
542
725
|
// Merge results and errors from all batches
|
|
543
726
|
batchResults.forEach((batchResponse) => {
|
|
727
|
+
// Add results to cache and combine with response
|
|
544
728
|
Object.entries(batchResponse.results).forEach(([url, result]) => {
|
|
729
|
+
const hostname = urlsToHostnames[url];
|
|
730
|
+
if (hostname) {
|
|
731
|
+
__classPrivateFieldGet(this, _PhishingController_urlScanCache, "f").set(hostname, result);
|
|
732
|
+
}
|
|
545
733
|
combinedResponse.results[url] = result;
|
|
546
734
|
});
|
|
547
735
|
// Combine errors
|
|
@@ -578,19 +766,56 @@ class PhishingController extends base_controller_1.BaseController {
|
|
|
578
766
|
label: '',
|
|
579
767
|
};
|
|
580
768
|
}
|
|
581
|
-
|
|
582
|
-
|
|
769
|
+
const cacheKey = (0, utils_js_1.buildCacheKey)(normalizedChainId, normalizedAddress);
|
|
770
|
+
const cachedResult = __classPrivateFieldGet(this, _PhishingController_addressScanCache, "f").get(cacheKey);
|
|
771
|
+
if (cachedResult) {
|
|
772
|
+
return {
|
|
773
|
+
result_type: cachedResult.result_type,
|
|
774
|
+
label: cachedResult.label,
|
|
775
|
+
};
|
|
776
|
+
}
|
|
777
|
+
const apiResponse = await (0, controller_utils_1.safelyExecuteWithTimeout)(async () => {
|
|
778
|
+
const res = await fetch(`${exports.SECURITY_ALERTS_BASE_URL}${exports.ADDRESS_SCAN_ENDPOINT}`, {
|
|
779
|
+
method: 'POST',
|
|
780
|
+
headers: {
|
|
781
|
+
Accept: 'application/json',
|
|
782
|
+
'Content-Type': 'application/json',
|
|
783
|
+
},
|
|
784
|
+
body: JSON.stringify({
|
|
785
|
+
chain,
|
|
786
|
+
address: normalizedAddress,
|
|
787
|
+
}),
|
|
788
|
+
});
|
|
789
|
+
if (!res.ok) {
|
|
790
|
+
return {
|
|
791
|
+
error: `${res.status} ${res.statusText}`,
|
|
792
|
+
};
|
|
793
|
+
}
|
|
794
|
+
const data = await res.json();
|
|
795
|
+
return data;
|
|
796
|
+
}, true, 5000);
|
|
797
|
+
if (!apiResponse) {
|
|
583
798
|
return {
|
|
584
|
-
result_type:
|
|
585
|
-
label:
|
|
799
|
+
result_type: types_js_1.AddressScanResultType.ErrorResult,
|
|
800
|
+
label: '',
|
|
586
801
|
};
|
|
587
802
|
}
|
|
588
|
-
|
|
803
|
+
else if (apiResponse.error) {
|
|
589
804
|
return {
|
|
590
805
|
result_type: types_js_1.AddressScanResultType.ErrorResult,
|
|
591
806
|
label: '',
|
|
592
807
|
};
|
|
593
808
|
}
|
|
809
|
+
const scanResult = apiResponse;
|
|
810
|
+
const result = {
|
|
811
|
+
result_type: scanResult.result_type,
|
|
812
|
+
label: scanResult.label,
|
|
813
|
+
};
|
|
814
|
+
__classPrivateFieldGet(this, _PhishingController_addressScanCache, "f").set(cacheKey, result);
|
|
815
|
+
return {
|
|
816
|
+
result_type: scanResult.result_type,
|
|
817
|
+
label: scanResult.label,
|
|
818
|
+
};
|
|
594
819
|
}
|
|
595
820
|
/**
|
|
596
821
|
* Scan multiple tokens for malicious activity in bulk.
|
|
@@ -623,20 +848,32 @@ class PhishingController extends base_controller_1.BaseController {
|
|
|
623
848
|
// EVM addresses are case-insensitive; non-EVM addresses (e.g. Solana
|
|
624
849
|
// base58) are case-sensitive and must not be lowercased.
|
|
625
850
|
const caseSensitive = !normalizedChainId.startsWith('0x');
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
851
|
+
// Split tokens into cached results and tokens that need to be fetched
|
|
852
|
+
const { cachedResults, tokensToFetch } = (0, utils_js_1.splitCacheHits)(__classPrivateFieldGet(this, _PhishingController_tokenScanCache, "f"), normalizedChainId, tokens, caseSensitive);
|
|
853
|
+
const results = { ...cachedResults };
|
|
854
|
+
// If there are tokens to fetch, call the bulk token scan API
|
|
855
|
+
if (tokensToFetch.length > 0) {
|
|
856
|
+
const apiResponse = await __classPrivateFieldGet(this, _PhishingController_fetchTokenScanBulkResults, "f").call(this, chain, tokensToFetch);
|
|
857
|
+
if (apiResponse?.results) {
|
|
858
|
+
// Process API results and update cache
|
|
859
|
+
for (const tokenAddress of tokensToFetch) {
|
|
860
|
+
const normalizedAddress = caseSensitive
|
|
861
|
+
? tokenAddress
|
|
862
|
+
: tokenAddress.toLowerCase();
|
|
863
|
+
const tokenResult = apiResponse.results[normalizedAddress];
|
|
864
|
+
if (tokenResult?.result_type) {
|
|
865
|
+
const result = {
|
|
866
|
+
result_type: tokenResult.result_type,
|
|
867
|
+
chain: tokenResult.chain || normalizedChainId,
|
|
868
|
+
address: tokenResult.address || normalizedAddress,
|
|
869
|
+
};
|
|
870
|
+
// Update cache
|
|
871
|
+
const cacheKey = (0, utils_js_1.buildCacheKey)(normalizedChainId, normalizedAddress, caseSensitive);
|
|
872
|
+
__classPrivateFieldGet(this, _PhishingController_tokenScanCache, "f").set(cacheKey, {
|
|
873
|
+
result_type: tokenResult.result_type,
|
|
874
|
+
});
|
|
875
|
+
results[normalizedAddress] = result;
|
|
876
|
+
}
|
|
640
877
|
}
|
|
641
878
|
}
|
|
642
879
|
}
|
|
@@ -644,7 +881,7 @@ class PhishingController extends base_controller_1.BaseController {
|
|
|
644
881
|
}
|
|
645
882
|
}
|
|
646
883
|
exports.PhishingController = PhishingController;
|
|
647
|
-
_PhishingController_detector = new WeakMap(), _PhishingController_stalelistRefreshInterval = new WeakMap(), _PhishingController_hotlistRefreshInterval = new WeakMap(), _PhishingController_c2DomainBlocklistRefreshInterval = new WeakMap(), _PhishingController_knownRecipients = new WeakMap(), _PhishingController_transactionRecipients = new WeakMap(), _PhishingController_transactionRecipientsByTransactionId = new WeakMap(), _PhishingController_transactionRecipientCounts = new WeakMap(), _PhishingController_addressBookRecipients = new WeakMap(), _PhishingController_inProgressHotlistUpdate = new WeakMap(), _PhishingController_inProgressStalelistUpdate = new WeakMap(), _PhishingController_isProgressC2DomainBlocklistUpdate = new WeakMap(), _PhishingController_transactionControllerStateChangeHandler = new WeakMap(), _PhishingController_addressBookControllerStateChangeHandler = new WeakMap(), _PhishingController_fetchTokenScanBulkResults = new WeakMap(), _PhishingController_processBatch = new WeakMap(), _PhishingController_instances = new WeakSet(), _PhishingController_subscribeToAddressBookControllerStateChange = function _PhishingController_subscribeToAddressBookControllerStateChange() {
|
|
884
|
+
_PhishingController_detector = new WeakMap(), _PhishingController_stalelistRefreshInterval = new WeakMap(), _PhishingController_hotlistRefreshInterval = new WeakMap(), _PhishingController_c2DomainBlocklistRefreshInterval = new WeakMap(), _PhishingController_urlScanCache = new WeakMap(), _PhishingController_tokenScanCache = new WeakMap(), _PhishingController_addressScanCache = new WeakMap(), _PhishingController_knownRecipients = new WeakMap(), _PhishingController_transactionRecipients = new WeakMap(), _PhishingController_transactionRecipientsByTransactionId = new WeakMap(), _PhishingController_transactionRecipientCounts = new WeakMap(), _PhishingController_addressBookRecipients = new WeakMap(), _PhishingController_inProgressHotlistUpdate = new WeakMap(), _PhishingController_inProgressStalelistUpdate = new WeakMap(), _PhishingController_isProgressC2DomainBlocklistUpdate = new WeakMap(), _PhishingController_transactionControllerStateChangeHandler = new WeakMap(), _PhishingController_addressBookControllerStateChangeHandler = new WeakMap(), _PhishingController_fetchTokenScanBulkResults = new WeakMap(), _PhishingController_processBatch = new WeakMap(), _PhishingController_instances = new WeakSet(), _PhishingController_subscribeToAddressBookControllerStateChange = function _PhishingController_subscribeToAddressBookControllerStateChange() {
|
|
648
885
|
this.messenger.subscribe(
|
|
649
886
|
// eslint-disable-next-line no-restricted-syntax
|
|
650
887
|
'AddressBookController:stateChange', __classPrivateFieldGet(this, _PhishingController_addressBookControllerStateChangeHandler, "f"));
|
|
@@ -865,17 +1102,16 @@ async function _PhishingController_updateStalelist() {
|
|
|
865
1102
|
let hotlistDiffsResponse = null;
|
|
866
1103
|
let c2DomainBlocklistResponse = null;
|
|
867
1104
|
try {
|
|
868
|
-
const stalelistPromise = __classPrivateFieldGet(this, _PhishingController_instances, "m",
|
|
869
|
-
const c2DomainBlocklistPromise = __classPrivateFieldGet(this, _PhishingController_instances, "m",
|
|
1105
|
+
const stalelistPromise = __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_queryConfig).call(this, exports.METAMASK_STALELIST_URL);
|
|
1106
|
+
const c2DomainBlocklistPromise = __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_queryConfig).call(this, exports.C2_DOMAIN_BLOCKLIST_URL);
|
|
870
1107
|
[stalelistResponse, c2DomainBlocklistResponse] = await Promise.all([
|
|
871
1108
|
stalelistPromise,
|
|
872
1109
|
c2DomainBlocklistPromise,
|
|
873
1110
|
]);
|
|
874
1111
|
// Fetching hotlist diffs relies on having a lastUpdated timestamp to do `GET /v1/diffsSince/:timestamp`,
|
|
875
1112
|
// so it doesn't make sense to call if there is not a timestamp to begin with.
|
|
876
|
-
|
|
877
|
-
|
|
878
|
-
hotlistDiffsResponse = await __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_safelyCallService).call(this, () => this.messenger.call('PhishingDataService:getHotlistDiffs', stalelistData.lastUpdated));
|
|
1113
|
+
if (stalelistResponse?.data && stalelistResponse.data.lastUpdated > 0) {
|
|
1114
|
+
hotlistDiffsResponse = await __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_queryConfig).call(this, `${exports.METAMASK_HOTLIST_DIFF_URL}/${stalelistResponse.data.lastUpdated}`);
|
|
879
1115
|
}
|
|
880
1116
|
}
|
|
881
1117
|
finally {
|
|
@@ -904,9 +1140,9 @@ async function _PhishingController_updateStalelist() {
|
|
|
904
1140
|
c2DomainBlocklist: c2DomainBlocklistResponse
|
|
905
1141
|
? c2DomainBlocklistResponse.recentlyAdded
|
|
906
1142
|
: [],
|
|
907
|
-
name:
|
|
1143
|
+
name: exports.phishingListKeyNameMap.eth_phishing_detect_config,
|
|
908
1144
|
};
|
|
909
|
-
const newMetaMaskListState = (0, utils_js_1.applyDiffs)(metamaskListState, hotlistDiffsResponse.data,
|
|
1145
|
+
const newMetaMaskListState = (0, utils_js_1.applyDiffs)(metamaskListState, hotlistDiffsResponse.data, ListKeys.EthPhishingDetectConfig);
|
|
910
1146
|
this.update((draftState) => {
|
|
911
1147
|
draftState.phishingLists = [newMetaMaskListState];
|
|
912
1148
|
});
|
|
@@ -925,7 +1161,7 @@ async function _PhishingController_updateHotlist() {
|
|
|
925
1161
|
return;
|
|
926
1162
|
}
|
|
927
1163
|
const lastDiffTimestamp = Math.max(...this.state.phishingLists.map(({ lastUpdated }) => lastUpdated));
|
|
928
|
-
hotlistResponse = await __classPrivateFieldGet(this, _PhishingController_instances, "m",
|
|
1164
|
+
hotlistResponse = await __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_queryConfig).call(this, `${exports.METAMASK_HOTLIST_DIFF_URL}/${lastDiffTimestamp}`);
|
|
929
1165
|
}
|
|
930
1166
|
finally {
|
|
931
1167
|
// Set `hotlistLastFetched` even for failed requests to prevent server from being overwhelmed with
|
|
@@ -939,7 +1175,7 @@ async function _PhishingController_updateHotlist() {
|
|
|
939
1175
|
}
|
|
940
1176
|
const hotlist = hotlistResponse.data;
|
|
941
1177
|
const newPhishingLists = this.state.phishingLists.map((phishingList) => {
|
|
942
|
-
const updatedList = (0, utils_js_1.applyDiffs)(phishingList, hotlist,
|
|
1178
|
+
const updatedList = (0, utils_js_1.applyDiffs)(phishingList, hotlist, phishingListNameKeyMap[phishingList.name], [], []);
|
|
943
1179
|
return updatedList;
|
|
944
1180
|
});
|
|
945
1181
|
this.update((draftState) => {
|
|
@@ -954,7 +1190,7 @@ async function _PhishingController_updateHotlist() {
|
|
|
954
1190
|
* this function that prevents redundant configuration updates.
|
|
955
1191
|
*/
|
|
956
1192
|
async function _PhishingController_updateC2DomainBlocklist() {
|
|
957
|
-
const c2DomainBlocklistResponse = await __classPrivateFieldGet(this, _PhishingController_instances, "m",
|
|
1193
|
+
const c2DomainBlocklistResponse = await __classPrivateFieldGet(this, _PhishingController_instances, "m", _PhishingController_queryConfig).call(this, `${exports.C2_DOMAIN_BLOCKLIST_URL}?timestamp=${(0, utils_js_1.roundToNearestMinute)(this.state.c2DomainBlocklistLastFetched)}`);
|
|
958
1194
|
if (!c2DomainBlocklistResponse) {
|
|
959
1195
|
return;
|
|
960
1196
|
}
|
|
@@ -964,55 +1200,22 @@ async function _PhishingController_updateC2DomainBlocklist() {
|
|
|
964
1200
|
const recentlyAddedC2Domains = c2DomainBlocklistResponse.recentlyAdded;
|
|
965
1201
|
const recentlyRemovedC2Domains = c2DomainBlocklistResponse.recentlyRemoved;
|
|
966
1202
|
const newPhishingLists = this.state.phishingLists.map((phishingList) => {
|
|
967
|
-
const updatedList = (0, utils_js_1.applyDiffs)(phishingList, [],
|
|
1203
|
+
const updatedList = (0, utils_js_1.applyDiffs)(phishingList, [], phishingListNameKeyMap[phishingList.name], recentlyAddedC2Domains, recentlyRemovedC2Domains);
|
|
968
1204
|
return updatedList;
|
|
969
1205
|
});
|
|
970
1206
|
this.update((draftState) => {
|
|
971
1207
|
draftState.phishingLists = newPhishingLists;
|
|
972
1208
|
});
|
|
973
1209
|
this.updatePhishingDetector();
|
|
974
|
-
},
|
|
975
|
-
|
|
976
|
-
|
|
977
|
-
|
|
978
|
-
|
|
979
|
-
|
|
980
|
-
|
|
981
|
-
|
|
982
|
-
|
|
983
|
-
async function _PhishingController_safelyCallService(call) {
|
|
984
|
-
try {
|
|
985
|
-
return await call();
|
|
986
|
-
}
|
|
987
|
-
catch (error) {
|
|
988
|
-
console.error(error);
|
|
989
|
-
return null;
|
|
990
|
-
}
|
|
991
|
-
}, _PhishingController_callWithTimeout =
|
|
992
|
-
/**
|
|
993
|
-
* Awaits a promise, rejecting if it does not settle within the given
|
|
994
|
-
* timeout. On timeout, any eventual rejection of the original promise is
|
|
995
|
-
* suppressed to avoid unhandled rejections.
|
|
996
|
-
*
|
|
997
|
-
* @param promise - The promise to await.
|
|
998
|
-
* @param timeout - The timeout in milliseconds.
|
|
999
|
-
* @returns The result of the promise.
|
|
1000
|
-
*/
|
|
1001
|
-
async function _PhishingController_callWithTimeout(promise, timeout) {
|
|
1002
|
-
let timer;
|
|
1003
|
-
try {
|
|
1004
|
-
return await Promise.race([
|
|
1005
|
-
promise,
|
|
1006
|
-
new Promise((_resolve, reject) => {
|
|
1007
|
-
timer = setTimeout(() => {
|
|
1008
|
-
promise.catch(() => undefined);
|
|
1009
|
-
reject(new Error(`timeout of ${timeout}ms exceeded`));
|
|
1010
|
-
}, timeout);
|
|
1011
|
-
}),
|
|
1012
|
-
]);
|
|
1013
|
-
}
|
|
1014
|
-
finally {
|
|
1015
|
-
clearTimeout(timer);
|
|
1210
|
+
}, _PhishingController_queryConfig = async function _PhishingController_queryConfig(input) {
|
|
1211
|
+
const response = await (0, controller_utils_1.safelyExecute)(() => fetch(input, { cache: 'no-cache' }), true);
|
|
1212
|
+
switch (response?.status) {
|
|
1213
|
+
case 200: {
|
|
1214
|
+
return await response.json();
|
|
1215
|
+
}
|
|
1216
|
+
default: {
|
|
1217
|
+
return null;
|
|
1218
|
+
}
|
|
1016
1219
|
}
|
|
1017
1220
|
};
|
|
1018
1221
|
exports.default = PhishingController;
|