mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-11-21 17:37:01 +01:00
Confirmation page alerts (#20125)
This commit is contained in:
Jyoti Puri
GitHub
parent
03f315e82d
commit
8c46f85764
@ -13,3 +13,4 @@ INFURA_PROJECT_ID=00000000000
|
||||
; Set this to test changes to the phishing warning page.
|
||||
;PHISHING_WARNING_PAGE_URL=
|
||||
BLOCKAID_FILE_CDN=
|
||||
BLOCKAID_PUBLIC_KEY=
|
||||
|
||||
@ -2415,6 +2415,12 @@ export default class TransactionController extends EventEmitter {
|
||||
|
||||
let uiCustomizations;
|
||||
|
||||
///: BEGIN:ONLY_INCLUDE_IN(blockaid)
|
||||
if (securityAlertResponse?.result_type === BlockaidResultType.Failed) {
|
||||
uiCustomizations = ['security_alert_failed'];
|
||||
} else {
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
// eslint-disable-next-line no-lonely-if
|
||||
if (securityProviderResponse?.flagAsDangerous === 1) {
|
||||
uiCustomizations = ['flagged_as_malicious'];
|
||||
} else if (securityProviderResponse?.flagAsDangerous === 2) {
|
||||
@ -2422,6 +2428,9 @@ export default class TransactionController extends EventEmitter {
|
||||
} else {
|
||||
uiCustomizations = null;
|
||||
}
|
||||
///: BEGIN:ONLY_INCLUDE_IN(blockaid)
|
||||
}
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
|
||||
/** The transaction status property is not considered sensitive and is now included in the non-anonymous event */
|
||||
let properties = {
|
||||
|
||||
@ -2652,6 +2652,83 @@ describe('Transaction Controller', function () {
|
||||
);
|
||||
});
|
||||
|
||||
it('should call _trackMetaMetricsEvent with the correct payload when blockaid verification fails', async function () {
|
||||
const txMeta = {
|
||||
id: 1,
|
||||
status: TransactionStatus.unapproved,
|
||||
txParams: {
|
||||
from: fromAccount.address,
|
||||
to: '0x1678a085c290ebd122dc42cba69373b5953b831d',
|
||||
gasPrice: '0x77359400',
|
||||
gas: '0x7b0d',
|
||||
nonce: '0x4b',
|
||||
},
|
||||
type: TransactionType.simpleSend,
|
||||
origin: 'other',
|
||||
chainId: currentChainId,
|
||||
time: 1624408066355,
|
||||
metamaskNetworkId: currentNetworkId,
|
||||
securityAlertResponse: {
|
||||
result_type: BlockaidResultType.Failed,
|
||||
reason: 'some error',
|
||||
},
|
||||
};
|
||||
const expectedPayload = {
|
||||
actionId,
|
||||
initialEvent: 'Transaction Added',
|
||||
successEvent: 'Transaction Approved',
|
||||
failureEvent: 'Transaction Rejected',
|
||||
uniqueIdentifier: 'transaction-added-1',
|
||||
persist: true,
|
||||
category: MetaMetricsEventCategory.Transactions,
|
||||
properties: {
|
||||
network: '5',
|
||||
referrer: 'other',
|
||||
source: MetaMetricsTransactionEventSource.Dapp,
|
||||
status: 'unapproved',
|
||||
transaction_type: TransactionType.simpleSend,
|
||||
chain_id: '0x5',
|
||||
eip_1559_version: '0',
|
||||
gas_edit_attempted: 'none',
|
||||
gas_edit_type: 'none',
|
||||
account_type: 'MetaMask',
|
||||
asset_type: AssetType.native,
|
||||
token_standard: TokenStandard.none,
|
||||
device_model: 'N/A',
|
||||
transaction_speed_up: false,
|
||||
ui_customizations: ['security_alert_failed'],
|
||||
security_alert_reason: 'some error',
|
||||
security_alert_response: BlockaidResultType.Failed,
|
||||
},
|
||||
sensitiveProperties: {
|
||||
baz: 3.0,
|
||||
foo: 'bar',
|
||||
gas_price: '2',
|
||||
gas_limit: '0x7b0d',
|
||||
transaction_contract_method: undefined,
|
||||
transaction_replaced: undefined,
|
||||
first_seen: 1624408066355,
|
||||
transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
|
||||
},
|
||||
};
|
||||
|
||||
await txController._trackTransactionMetricsEvent(
|
||||
txMeta,
|
||||
TransactionMetaMetricsEvent.added,
|
||||
actionId,
|
||||
{
|
||||
baz: 3.0,
|
||||
foo: 'bar',
|
||||
},
|
||||
);
|
||||
assert.equal(createEventFragmentSpy.callCount, 1);
|
||||
assert.equal(finalizeEventFragmentSpy.callCount, 0);
|
||||
assert.deepEqual(
|
||||
createEventFragmentSpy.getCall(0).args[0],
|
||||
expectedPayload,
|
||||
);
|
||||
});
|
||||
|
||||
it('should call _trackMetaMetricsEvent with the correct payload (extra params) when flagAsDangerous is malicious', async function () {
|
||||
const txMeta = {
|
||||
id: 1,
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
import {
|
||||
BlockaidReason,
|
||||
BlockaidResultType,
|
||||
} from '../../../../shared/constants/security-provider';
|
||||
import { createPPOMMiddleware } from './ppom-middleware';
|
||||
|
||||
Object.defineProperty(globalThis, 'fetch', {
|
||||
@ -13,10 +17,16 @@ Object.defineProperty(globalThis, 'performance', {
|
||||
describe('PPOMMiddleware', () => {
|
||||
it('should call ppomController.usePPOM for requests of type confirmation', async () => {
|
||||
const useMock = jest.fn();
|
||||
const controller = {
|
||||
const ppomController = {
|
||||
usePPOM: useMock,
|
||||
};
|
||||
const middlewareFunction = createPPOMMiddleware(controller as any);
|
||||
const preferenceController = {
|
||||
store: { getState: () => ({ securityAlertsEnabled: true }) },
|
||||
};
|
||||
const middlewareFunction = createPPOMMiddleware(
|
||||
ppomController as any,
|
||||
preferenceController as any,
|
||||
);
|
||||
await middlewareFunction(
|
||||
{ method: 'eth_sendTransaction' },
|
||||
undefined,
|
||||
@ -26,25 +36,85 @@ describe('PPOMMiddleware', () => {
|
||||
});
|
||||
|
||||
it('should add validation response on confirmation requests', async () => {
|
||||
const controller = {
|
||||
const ppomController = {
|
||||
usePPOM: async () => Promise.resolve('VALIDATION_RESULT'),
|
||||
};
|
||||
const middlewareFunction = createPPOMMiddleware(controller as any);
|
||||
const req = { method: 'eth_sendTransaction', ppomResponse: undefined };
|
||||
const preferenceController = {
|
||||
store: { getState: () => ({ securityAlertsEnabled: true }) },
|
||||
};
|
||||
const middlewareFunction = createPPOMMiddleware(
|
||||
ppomController as any,
|
||||
preferenceController as any,
|
||||
);
|
||||
const req = {
|
||||
method: 'eth_sendTransaction',
|
||||
securityAlertResponse: undefined,
|
||||
};
|
||||
await middlewareFunction(req, undefined, () => undefined);
|
||||
expect(req.ppomResponse).toBeDefined();
|
||||
expect(req.securityAlertResponse).toBeDefined();
|
||||
});
|
||||
|
||||
it('should not do validation if user has not enabled preference', async () => {
|
||||
const ppomController = {
|
||||
usePPOM: async () => Promise.resolve('VALIDATION_RESULT'),
|
||||
};
|
||||
const preferenceController = {
|
||||
store: { getState: () => ({ securityAlertsEnabled: false }) },
|
||||
};
|
||||
const middlewareFunction = createPPOMMiddleware(
|
||||
ppomController as any,
|
||||
preferenceController as any,
|
||||
);
|
||||
const req = {
|
||||
method: 'eth_sendTransaction',
|
||||
securityAlertResponse: undefined,
|
||||
};
|
||||
await middlewareFunction(req, undefined, () => undefined);
|
||||
expect(req.securityAlertResponse).toBeUndefined();
|
||||
});
|
||||
|
||||
it('should set Failed type in response if usePPOM throw error', async () => {
|
||||
const ppomController = {
|
||||
usePPOM: async () => {
|
||||
throw new Error('some error');
|
||||
},
|
||||
};
|
||||
const preferenceController = {
|
||||
store: { getState: () => ({ securityAlertsEnabled: true }) },
|
||||
};
|
||||
const middlewareFunction = createPPOMMiddleware(
|
||||
ppomController as any,
|
||||
preferenceController as any,
|
||||
);
|
||||
const req = {
|
||||
method: 'eth_sendTransaction',
|
||||
securityAlertResponse: undefined,
|
||||
};
|
||||
await middlewareFunction(req, undefined, () => undefined);
|
||||
expect((req.securityAlertResponse as any)?.result_type).toBe(
|
||||
BlockaidResultType.Failed,
|
||||
);
|
||||
expect((req.securityAlertResponse as any)?.reason).toBe(
|
||||
BlockaidReason.failed,
|
||||
);
|
||||
});
|
||||
|
||||
it('should call next method when ppomController.usePPOM completes', async () => {
|
||||
const ppom = {
|
||||
validateJsonRpc: () => undefined,
|
||||
};
|
||||
const controller = {
|
||||
const ppomController = {
|
||||
usePPOM: async (callback: any) => {
|
||||
callback(ppom);
|
||||
},
|
||||
};
|
||||
const middlewareFunction = createPPOMMiddleware(controller as any);
|
||||
const preferenceController = {
|
||||
store: { getState: () => ({ securityAlertsEnabled: true }) },
|
||||
};
|
||||
const middlewareFunction = createPPOMMiddleware(
|
||||
ppomController as any,
|
||||
preferenceController as any,
|
||||
);
|
||||
const nextMock = jest.fn();
|
||||
await middlewareFunction(
|
||||
{ method: 'eth_sendTransaction' },
|
||||
@ -55,12 +125,18 @@ describe('PPOMMiddleware', () => {
|
||||
});
|
||||
|
||||
it('should call next method when ppomController.usePPOM throws error', async () => {
|
||||
const controller = {
|
||||
const ppomController = {
|
||||
usePPOM: async (_callback: any) => {
|
||||
throw Error('Some error');
|
||||
},
|
||||
};
|
||||
const middlewareFunction = createPPOMMiddleware(controller as any);
|
||||
const preferenceController = {
|
||||
store: { getState: () => ({ securityAlertsEnabled: true }) },
|
||||
};
|
||||
const middlewareFunction = createPPOMMiddleware(
|
||||
ppomController as any,
|
||||
preferenceController as any,
|
||||
);
|
||||
const nextMock = jest.fn();
|
||||
await middlewareFunction(
|
||||
{ method: 'eth_sendTransaction' },
|
||||
@ -75,12 +151,18 @@ describe('PPOMMiddleware', () => {
|
||||
const ppom = {
|
||||
validateJsonRpc: validateMock,
|
||||
};
|
||||
const controller = {
|
||||
const ppomController = {
|
||||
usePPOM: async (callback: any) => {
|
||||
callback(ppom);
|
||||
},
|
||||
};
|
||||
const middlewareFunction = createPPOMMiddleware(controller as any);
|
||||
const preferenceController = {
|
||||
store: { getState: () => ({ securityAlertsEnabled: true }) },
|
||||
};
|
||||
const middlewareFunction = createPPOMMiddleware(
|
||||
ppomController as any,
|
||||
preferenceController as any,
|
||||
);
|
||||
await middlewareFunction(
|
||||
{ method: 'eth_sendTransaction' },
|
||||
undefined,
|
||||
@ -94,12 +176,18 @@ describe('PPOMMiddleware', () => {
|
||||
const ppom = {
|
||||
validateJsonRpc: validateMock,
|
||||
};
|
||||
const controller = {
|
||||
const ppomController = {
|
||||
usePPOM: async (callback: any) => {
|
||||
callback(ppom);
|
||||
},
|
||||
};
|
||||
const middlewareFunction = createPPOMMiddleware(controller as any);
|
||||
const preferenceController = {
|
||||
store: { getState: () => ({ securityAlertsEnabled: true }) },
|
||||
};
|
||||
const middlewareFunction = createPPOMMiddleware(
|
||||
ppomController as any,
|
||||
preferenceController as any,
|
||||
);
|
||||
await middlewareFunction(
|
||||
{ method: 'eth_someRequest' },
|
||||
undefined,
|
||||
|
||||
@ -1,7 +1,14 @@
|
||||
import { PPOM } from '@blockaid/ppom';
|
||||
|
||||
import { PPOMController } from '@metamask/ppom-validator';
|
||||
|
||||
import {
|
||||
BlockaidReason,
|
||||
BlockaidResultType,
|
||||
} from '../../../../shared/constants/security-provider';
|
||||
import PreferencesController from 'app/scripts/controllers/preferences';
|
||||
|
||||
const { sentry } = global as any;
|
||||
|
||||
const ConfirmationMethods = Object.freeze([
|
||||
'eth_sendRawTransaction',
|
||||
'eth_sendTransaction',
|
||||
@ -23,19 +30,33 @@ const ConfirmationMethods = Object.freeze([
|
||||
* the request will be forwarded to the next middleware, together with the PPOM response.
|
||||
*
|
||||
* @param ppomController - Instance of PPOMController.
|
||||
* @param preferencesController - Instance of PreferenceController.
|
||||
* @returns PPOMMiddleware function.
|
||||
*/
|
||||
export function createPPOMMiddleware(ppomController: PPOMController) {
|
||||
export function createPPOMMiddleware(
|
||||
ppomController: PPOMController,
|
||||
preferencesController: PreferencesController,
|
||||
) {
|
||||
return async (req: any, _res: any, next: () => void) => {
|
||||
try {
|
||||
if (ConfirmationMethods.includes(req.method)) {
|
||||
const securityAlertsEnabled =
|
||||
preferencesController.store.getState()?.securityAlertsEnabled;
|
||||
if (securityAlertsEnabled && ConfirmationMethods.includes(req.method)) {
|
||||
// eslint-disable-next-line require-atomic-updates
|
||||
req.ppomResponse = await ppomController.usePPOM(async (ppom: PPOM) => {
|
||||
req.securityAlertResponse = await ppomController.usePPOM(
|
||||
async (ppom: PPOM) => {
|
||||
return ppom.validateJsonRpc(req);
|
||||
});
|
||||
},
|
||||
);
|
||||
}
|
||||
} catch (error: unknown) {
|
||||
} catch (error: any) {
|
||||
sentry?.captureException(error);
|
||||
console.error('Error validating JSON RPC using PPOM: ', error);
|
||||
req.securityAlertResponse = {
|
||||
result_type: BlockaidResultType.Failed,
|
||||
reason: BlockaidReason.failed,
|
||||
description: 'Validating the confirmation failed by throwing error.',
|
||||
};
|
||||
} finally {
|
||||
next();
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
/* eslint-disable */
|
||||
// The contents of this file were provided by the Blockaid team and pasted verbatim
|
||||
|
||||
let wasm;
|
||||
|
||||
@ -6,9 +7,7 @@ const heap = new Array(128).fill(undefined);
|
||||
|
||||
heap.push(undefined, null, true, false);
|
||||
|
||||
function getObject(idx) {
|
||||
return heap[idx];
|
||||
}
|
||||
function getObject(idx) { return heap[idx]; }
|
||||
|
||||
let heap_next = heap.length;
|
||||
|
||||
@ -24,7 +23,9 @@ function takeObject(idx) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
let WASM_VECTOR_LEN = 0;
|
||||
const cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } );
|
||||
|
||||
if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); };
|
||||
|
||||
let cachedUint8Memory0 = null;
|
||||
|
||||
@ -35,17 +36,25 @@ function getUint8Memory0() {
|
||||
return cachedUint8Memory0;
|
||||
}
|
||||
|
||||
const cachedTextEncoder =
|
||||
typeof TextEncoder !== 'undefined'
|
||||
? new TextEncoder('utf-8')
|
||||
: {
|
||||
encode: () => {
|
||||
throw Error('TextEncoder not available');
|
||||
},
|
||||
};
|
||||
function getStringFromWasm0(ptr, len) {
|
||||
ptr = ptr >>> 0;
|
||||
return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
|
||||
}
|
||||
|
||||
const encodeString =
|
||||
typeof cachedTextEncoder.encodeInto === 'function'
|
||||
function addHeapObject(obj) {
|
||||
if (heap_next === heap.length) heap.push(heap.length + 1);
|
||||
const idx = heap_next;
|
||||
heap_next = heap[idx];
|
||||
|
||||
heap[idx] = obj;
|
||||
return idx;
|
||||
}
|
||||
|
||||
let WASM_VECTOR_LEN = 0;
|
||||
|
||||
const cachedTextEncoder = (typeof TextEncoder !== 'undefined' ? new TextEncoder('utf-8') : { encode: () => { throw Error('TextEncoder not available') } } );
|
||||
|
||||
const encodeString = (typeof cachedTextEncoder.encodeInto === 'function'
|
||||
? function (arg, view) {
|
||||
return cachedTextEncoder.encodeInto(arg, view);
|
||||
}
|
||||
@ -54,17 +63,16 @@ const encodeString =
|
||||
view.set(buf);
|
||||
return {
|
||||
read: arg.length,
|
||||
written: buf.length,
|
||||
};
|
||||
written: buf.length
|
||||
};
|
||||
});
|
||||
|
||||
function passStringToWasm0(arg, malloc, realloc) {
|
||||
|
||||
if (realloc === undefined) {
|
||||
const buf = cachedTextEncoder.encode(arg);
|
||||
const ptr = malloc(buf.length, 1) >>> 0;
|
||||
getUint8Memory0()
|
||||
.subarray(ptr, ptr + buf.length)
|
||||
.set(buf);
|
||||
getUint8Memory0().subarray(ptr, ptr + buf.length).set(buf);
|
||||
WASM_VECTOR_LEN = buf.length;
|
||||
return ptr;
|
||||
}
|
||||
@ -78,7 +86,7 @@ function passStringToWasm0(arg, malloc, realloc) {
|
||||
|
||||
for (; offset < len; offset++) {
|
||||
const code = arg.charCodeAt(offset);
|
||||
if (code > 0x7f) break;
|
||||
if (code > 0x7F) break;
|
||||
mem[ptr + offset] = code;
|
||||
}
|
||||
|
||||
@ -86,7 +94,7 @@ function passStringToWasm0(arg, malloc, realloc) {
|
||||
if (offset !== 0) {
|
||||
arg = arg.slice(offset);
|
||||
}
|
||||
ptr = realloc(ptr, len, (len = offset + arg.length * 3), 1) >>> 0;
|
||||
ptr = realloc(ptr, len, len = offset + arg.length * 3, 1) >>> 0;
|
||||
const view = getUint8Memory0().subarray(ptr + offset, ptr + len);
|
||||
const ret = encodeString(arg, view);
|
||||
|
||||
@ -110,33 +118,6 @@ function getInt32Memory0() {
|
||||
return cachedInt32Memory0;
|
||||
}
|
||||
|
||||
const cachedTextDecoder =
|
||||
typeof TextDecoder !== 'undefined'
|
||||
? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true })
|
||||
: {
|
||||
decode: () => {
|
||||
throw Error('TextDecoder not available');
|
||||
},
|
||||
};
|
||||
|
||||
if (typeof TextDecoder !== 'undefined') {
|
||||
cachedTextDecoder.decode();
|
||||
}
|
||||
|
||||
function getStringFromWasm0(ptr, len) {
|
||||
ptr = ptr >>> 0;
|
||||
return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
|
||||
}
|
||||
|
||||
function addHeapObject(obj) {
|
||||
if (heap_next === heap.length) heap.push(heap.length + 1);
|
||||
const idx = heap_next;
|
||||
heap_next = heap[idx];
|
||||
|
||||
heap[idx] = obj;
|
||||
return idx;
|
||||
}
|
||||
|
||||
function debugString(val) {
|
||||
// primitive types
|
||||
const type = typeof val;
|
||||
@ -216,6 +197,7 @@ function makeMutClosure(arg0, arg1, dtor, f) {
|
||||
} finally {
|
||||
if (--state.cnt === 0) {
|
||||
dtor(a, state.b);
|
||||
|
||||
} else {
|
||||
state.a = a;
|
||||
}
|
||||
@ -225,19 +207,16 @@ function makeMutClosure(arg0, arg1, dtor, f) {
|
||||
|
||||
return real;
|
||||
}
|
||||
function __wbg_adapter_20(arg0, arg1, arg2) {
|
||||
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke(
|
||||
arg0,
|
||||
arg1,
|
||||
addHeapObject(arg2),
|
||||
);
|
||||
function __wbg_adapter_20(arg0, arg1) {
|
||||
wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h71774d49975c327c(arg0, arg1);
|
||||
}
|
||||
|
||||
function __wbg_adapter_21(arg0, arg1) {
|
||||
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__destroy(
|
||||
arg0,
|
||||
arg1,
|
||||
);
|
||||
function __wbg_adapter_23(arg0, arg1, arg2) {
|
||||
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h3f3246d02d2f05cb(arg0, arg1, addHeapObject(arg2));
|
||||
}
|
||||
|
||||
function __wbg_adapter_24(arg0, arg1) {
|
||||
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__destroy__h2b1bef6683dbac4f(arg0, arg1);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -272,19 +251,15 @@ function handleError(f, args) {
|
||||
wasm.__wbindgen_exn_store(addHeapObject(e));
|
||||
}
|
||||
}
|
||||
function __wbg_adapter_39(arg0, arg1, arg2, arg3) {
|
||||
wasm.wasm_bindgen__convert__closures__invoke2_mut(
|
||||
arg0,
|
||||
arg1,
|
||||
addHeapObject(arg2),
|
||||
addHeapObject(arg3),
|
||||
);
|
||||
function __wbg_adapter_52(arg0, arg1, arg2, arg3) {
|
||||
wasm.wasm_bindgen__convert__closures__invoke2_mut__h724d112298dfe4d5(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
|
||||
}
|
||||
|
||||
/**
|
||||
* JavaScript wrapper for [`PPOM`]
|
||||
*/
|
||||
export class PPOM {
|
||||
|
||||
static __wrap(ptr) {
|
||||
ptr = ptr >>> 0;
|
||||
const obj = Object.create(PPOM.prototype);
|
||||
@ -320,10 +295,7 @@ export class PPOM {
|
||||
* @returns {Promise<any>}
|
||||
*/
|
||||
validateJsonRpc(request) {
|
||||
const ret = wasm.ppom_validateJsonRpc(
|
||||
this.__wbg_ptr,
|
||||
addHeapObject(request),
|
||||
);
|
||||
const ret = wasm.ppom_validateJsonRpc(this.__wbg_ptr, addHeapObject(request));
|
||||
return takeObject(ret);
|
||||
}
|
||||
}
|
||||
@ -333,12 +305,11 @@ async function __wbg_load(module, imports) {
|
||||
if (typeof WebAssembly.instantiateStreaming === 'function') {
|
||||
try {
|
||||
return await WebAssembly.instantiateStreaming(module, imports);
|
||||
|
||||
} catch (e) {
|
||||
if (module.headers.get('Content-Type') != 'application/wasm') {
|
||||
console.warn(
|
||||
'`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n',
|
||||
e,
|
||||
);
|
||||
console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
|
||||
|
||||
} else {
|
||||
throw e;
|
||||
}
|
||||
@ -347,11 +318,13 @@ async function __wbg_load(module, imports) {
|
||||
|
||||
const bytes = await module.arrayBuffer();
|
||||
return await WebAssembly.instantiate(bytes, imports);
|
||||
|
||||
} else {
|
||||
const instance = await WebAssembly.instantiate(module, imports);
|
||||
|
||||
if (instance instanceof WebAssembly.Instance) {
|
||||
return { instance, module };
|
||||
|
||||
} else {
|
||||
return instance;
|
||||
}
|
||||
@ -365,26 +338,30 @@ function __wbg_get_imports() {
|
||||
const ret = getObject(arg0).buffer;
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_call_01734de55d61e11d = function () {
|
||||
return handleError(function (arg0, arg1, arg2) {
|
||||
imports.wbg.__wbg_call_01734de55d61e11d = function() { return handleError(function (arg0, arg1, arg2) {
|
||||
const ret = getObject(arg0).call(getObject(arg1), getObject(arg2));
|
||||
return addHeapObject(ret);
|
||||
}, arguments);
|
||||
};
|
||||
imports.wbg.__wbg_call_4c92f6aec1e1d6e6 = function () {
|
||||
return handleError(function (arg0, arg1, arg2, arg3) {
|
||||
const ret = getObject(arg0).call(
|
||||
getObject(arg1),
|
||||
getObject(arg2),
|
||||
getObject(arg3),
|
||||
);
|
||||
}, arguments) };
|
||||
imports.wbg.__wbg_call_4c92f6aec1e1d6e6 = function() { return handleError(function (arg0, arg1, arg2, arg3) {
|
||||
const ret = getObject(arg0).call(getObject(arg1), getObject(arg2), getObject(arg3));
|
||||
return addHeapObject(ret);
|
||||
}, arguments) };
|
||||
imports.wbg.__wbg_clearTimeout_76877dbc010e786d = function(arg0) {
|
||||
const ret = clearTimeout(takeObject(arg0));
|
||||
return addHeapObject(ret);
|
||||
}, arguments);
|
||||
};
|
||||
imports.wbg.__wbg_from_d7c216d4616bb368 = function(arg0) {
|
||||
const ret = Array.from(getObject(arg0));
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_getTime_5e2054f832d82ec9 = function(arg0) {
|
||||
const ret = getObject(arg0).getTime();
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_getTimezoneOffset_8aee3445f323973e = function(arg0) {
|
||||
const ret = getObject(arg0).getTimezoneOffset();
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_get_44be0491f933a435 = function(arg0, arg1) {
|
||||
const ret = getObject(arg0)[arg1 >>> 0];
|
||||
return addHeapObject(ret);
|
||||
@ -401,6 +378,10 @@ function __wbg_get_imports() {
|
||||
const ret = getObject(arg0).length;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbg_new0_c0be7df4b6bd481f = function() {
|
||||
const ret = new Date();
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_new_43f1b47c28813cbd = function(arg0, arg1) {
|
||||
try {
|
||||
var state0 = {a: arg0, b: arg1};
|
||||
@ -408,7 +389,7 @@ function __wbg_get_imports() {
|
||||
const a = state0.a;
|
||||
state0.a = 0;
|
||||
try {
|
||||
return __wbg_adapter_39(a, state0.b, arg0, arg1);
|
||||
return __wbg_adapter_52(a, state0.b, arg0, arg1);
|
||||
} finally {
|
||||
state0.a = a;
|
||||
}
|
||||
@ -423,12 +404,10 @@ function __wbg_get_imports() {
|
||||
const ret = new Uint8Array(getObject(arg0));
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_parse_670c19d4e984792e = function () {
|
||||
return handleError(function (arg0, arg1) {
|
||||
imports.wbg.__wbg_parse_670c19d4e984792e = function() { return handleError(function (arg0, arg1) {
|
||||
const ret = JSON.parse(getStringFromWasm0(arg0, arg1));
|
||||
return addHeapObject(ret);
|
||||
}, arguments);
|
||||
};
|
||||
}, arguments) };
|
||||
imports.wbg.__wbg_ppom_new = function(arg0) {
|
||||
const ret = PPOM.__wrap(arg0);
|
||||
return addHeapObject(ret);
|
||||
@ -437,15 +416,17 @@ function __wbg_get_imports() {
|
||||
const ret = Promise.resolve(getObject(arg0));
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbg_setTimeout_75cb9b6991a4031d = function() { return handleError(function (arg0, arg1) {
|
||||
const ret = setTimeout(getObject(arg0), arg1);
|
||||
return addHeapObject(ret);
|
||||
}, arguments) };
|
||||
imports.wbg.__wbg_set_5cf90238115182c3 = function(arg0, arg1, arg2) {
|
||||
getObject(arg0).set(getObject(arg1), arg2 >>> 0);
|
||||
};
|
||||
imports.wbg.__wbg_stringify_e25465938f3f611f = function () {
|
||||
return handleError(function (arg0) {
|
||||
imports.wbg.__wbg_stringify_e25465938f3f611f = function() { return handleError(function (arg0) {
|
||||
const ret = JSON.stringify(getObject(arg0));
|
||||
return addHeapObject(ret);
|
||||
}, arguments);
|
||||
};
|
||||
}, arguments) };
|
||||
imports.wbg.__wbg_then_b2267541e2a73865 = function(arg0, arg1, arg2) {
|
||||
const ret = getObject(arg0).then(getObject(arg1), getObject(arg2));
|
||||
return addHeapObject(ret);
|
||||
@ -463,23 +444,17 @@ function __wbg_get_imports() {
|
||||
const ret = false;
|
||||
return ret;
|
||||
};
|
||||
imports.wbg.__wbindgen_closure_wrapper_wasm_bindgen__closure__Closure_T___wrap__breaks_if_inlined =
|
||||
function (arg0, arg1, arg2) {
|
||||
const ret = makeMutClosure(
|
||||
arg0,
|
||||
arg1,
|
||||
__wbg_adapter_21,
|
||||
__wbg_adapter_20,
|
||||
);
|
||||
imports.wbg.__wbindgen_closure_wrapper_wasm_bindgen__closure__Closure_T___wrap__breaks_if_inlined__h1d7bf0f00ff7214d = function(arg0, arg1, arg2) {
|
||||
const ret = makeMutClosure(arg0, arg1, __wbg_adapter_20, __wbg_adapter_20);
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbindgen_closure_wrapper_wasm_bindgen__closure__Closure_T___wrap__breaks_if_inlined__hc2986dfcd9d6621f = function(arg0, arg1, arg2) {
|
||||
const ret = makeMutClosure(arg0, arg1, __wbg_adapter_24, __wbg_adapter_23);
|
||||
return addHeapObject(ret);
|
||||
};
|
||||
imports.wbg.__wbindgen_debug_string = function(arg0, arg1) {
|
||||
const ret = debugString(getObject(arg1));
|
||||
const ptr1 = passStringToWasm0(
|
||||
ret,
|
||||
wasm.__wbindgen_malloc,
|
||||
wasm.__wbindgen_realloc,
|
||||
);
|
||||
const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
|
||||
const len1 = WASM_VECTOR_LEN;
|
||||
getInt32Memory0()[arg0 / 4 + 1] = len1;
|
||||
getInt32Memory0()[arg0 / 4 + 0] = ptr1;
|
||||
@ -501,10 +476,8 @@ function __wbg_get_imports() {
|
||||
};
|
||||
imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
|
||||
const obj = getObject(arg1);
|
||||
const ret = typeof obj === 'string' ? obj : undefined;
|
||||
var ptr1 = isLikeNone(ret)
|
||||
? 0
|
||||
: passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
|
||||
const ret = typeof(obj) === 'string' ? obj : undefined;
|
||||
var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
|
||||
var len1 = WASM_VECTOR_LEN;
|
||||
getInt32Memory0()[arg0 / 4 + 1] = len1;
|
||||
getInt32Memory0()[arg0 / 4 + 0] = ptr1;
|
||||
@ -520,7 +493,9 @@ function __wbg_get_imports() {
|
||||
return imports;
|
||||
}
|
||||
|
||||
function __wbg_init_memory(imports, maybe_memory) {}
|
||||
function __wbg_init_memory(imports, maybe_memory) {
|
||||
|
||||
}
|
||||
|
||||
function __wbg_finalize_init(instance, module) {
|
||||
wasm = instance.exports;
|
||||
@ -552,13 +527,10 @@ function initSync(module) {
|
||||
async function __wbg_init(input) {
|
||||
if (wasm !== undefined) return wasm;
|
||||
|
||||
|
||||
const imports = __wbg_get_imports();
|
||||
|
||||
if (
|
||||
typeof input === 'string' ||
|
||||
(typeof Request === 'function' && input instanceof Request) ||
|
||||
(typeof URL === 'function' && input instanceof URL)
|
||||
) {
|
||||
if (typeof input === 'string' || (typeof Request === 'function' && input instanceof Request) || (typeof URL === 'function' && input instanceof URL)) {
|
||||
input = fetch(input);
|
||||
}
|
||||
|
||||
@ -569,5 +541,5 @@ async function __wbg_init(input) {
|
||||
return __wbg_finalize_init(instance, module);
|
||||
}
|
||||
|
||||
export { initSync };
|
||||
export { initSync }
|
||||
export default __wbg_init;
|
||||
|
||||
@ -656,6 +656,7 @@ export default class MetamaskController extends EventEmitter {
|
||||
this.preferencesController.store,
|
||||
),
|
||||
cdnBaseUrl: process.env.BLOCKAID_FILE_CDN,
|
||||
blockaidPublicKey: process.env.BLOCKAID_PUBLIC_KEY,
|
||||
});
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
|
||||
@ -4054,7 +4055,9 @@ export default class MetamaskController extends EventEmitter {
|
||||
engine.push(this.permissionLogController.createMiddleware());
|
||||
|
||||
///: BEGIN:ONLY_INCLUDE_IN(blockaid)
|
||||
engine.push(createPPOMMiddleware(this.ppomController));
|
||||
engine.push(
|
||||
createPPOMMiddleware(this.ppomController, this.preferencesController),
|
||||
);
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
|
||||
engine.push(
|
||||
|
||||
@ -120,6 +120,7 @@ features:
|
||||
blockaid:
|
||||
env:
|
||||
- BLOCKAID_FILE_CDN: null
|
||||
- BLOCKAID_PUBLIC_KEY: null
|
||||
|
||||
###
|
||||
# Build Type code extensions. Things like different support links, warning pages, banners
|
||||
@ -230,6 +231,8 @@ env:
|
||||
- EDITOR_URL: ''
|
||||
# CDN for blockaid files
|
||||
- BLOCKAID_FILE_CDN
|
||||
# Blockaid public key for verifying signatures of data files downloaded from CDN
|
||||
- BLOCKAID_PUBLIC_KEY
|
||||
|
||||
###
|
||||
# Meta variables
|
||||
|
||||
@ -50,6 +50,7 @@ export enum BlockaidReason {
|
||||
|
||||
// Locally defined
|
||||
notApplicable = 'NotApplicable',
|
||||
failed = 'Failed',
|
||||
}
|
||||
|
||||
export enum BlockaidResultType {
|
||||
@ -57,6 +58,7 @@ export enum BlockaidResultType {
|
||||
Warning = 'Warning',
|
||||
Benign = 'Benign',
|
||||
// Locally defined
|
||||
Failed = 'Failed',
|
||||
NotApplicable = 'NotApplicable',
|
||||
}
|
||||
|
||||
|
||||
@ -13,6 +13,9 @@ import Typography from '../../../ui/typography';
|
||||
import { TypographyVariant } from '../../../../helpers/constants/design-system';
|
||||
|
||||
import { isSuspiciousResponse } from '../../../../../shared/modules/security-provider.utils';
|
||||
///: BEGIN:ONLY_INCLUDE_IN(blockaid)
|
||||
import BlockaidBannerAlert from '../../security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert';
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
import SecurityProviderBannerMessage from '../../security-provider-banner-message/security-provider-banner-message';
|
||||
|
||||
import { ConfirmPageContainerSummary, ConfirmPageContainerWarning } from '.';
|
||||
@ -222,6 +225,13 @@ export default class ConfirmPageContainerContent extends Component {
|
||||
{ethGasPriceWarning && (
|
||||
<ConfirmPageContainerWarning warning={ethGasPriceWarning} />
|
||||
)}
|
||||
{
|
||||
///: BEGIN:ONLY_INCLUDE_IN(blockaid)
|
||||
<BlockaidBannerAlert
|
||||
securityAlertResponse={txData?.securityAlertResponse}
|
||||
/>
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
}
|
||||
{isSuspiciousResponse(txData?.securityProviderResponse) && (
|
||||
<SecurityProviderBannerMessage
|
||||
securityProviderResponse={txData.securityProviderResponse}
|
||||
|
||||
@ -197,4 +197,26 @@ describe('Confirm Page Container Content', () => {
|
||||
);
|
||||
expect(getByRole('button', { name: 'Buy' })).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('should display security alert if present', () => {
|
||||
const { getByText } = renderWithProvider(
|
||||
<ConfirmPageContainerContent
|
||||
{...props}
|
||||
txData={{
|
||||
securityAlertResponse: {
|
||||
resultType: 'Malicious',
|
||||
reason: 'blur_farming',
|
||||
description:
|
||||
'A SetApprovalForAll request was made on {contract}. We found the operator {operator} to be malicious',
|
||||
args: {
|
||||
contract: '0xa7206d878c5c3871826dfdb42191c49b1d11f466',
|
||||
operator: '0x92a3b9773b1763efa556f55ccbeb20441962d9b2',
|
||||
},
|
||||
},
|
||||
}}
|
||||
/>,
|
||||
store,
|
||||
);
|
||||
expect(getByText('This is a deceptive request')).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
exports[`Security Provider Banner Alert should match snapshot 1`] = `
|
||||
<div>
|
||||
<div
|
||||
class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-danger box--margin-top-4 box--margin-right-4 box--margin-left-4 box--padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-error-muted box--rounded-sm"
|
||||
class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-danger box--margin-4 box--padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-error-muted box--rounded-sm"
|
||||
>
|
||||
<span
|
||||
class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-error-default"
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||
|
||||
exports[`Blockaid Banner Alert should render 'danger' UI when ppomResponse.resultType is 'Malicious 1`] = `
|
||||
exports[`Blockaid Banner Alert should render 'danger' UI when securityAlertResponse.result_type is 'Malicious 1`] = `
|
||||
<div
|
||||
class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-danger box--margin-top-4 box--margin-right-4 box--margin-left-4 box--padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-error-muted box--rounded-sm"
|
||||
class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-danger box--margin-4 box--padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-error-muted box--rounded-sm"
|
||||
>
|
||||
<span
|
||||
class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-error-default"
|
||||
@ -46,9 +46,9 @@ exports[`Blockaid Banner Alert should render 'danger' UI when ppomResponse.resul
|
||||
</div>
|
||||
`;
|
||||
|
||||
exports[`Blockaid Banner Alert should render 'warning' UI when ppomResponse.resultType is 'Warning 1`] = `
|
||||
exports[`Blockaid Banner Alert should render 'warning' UI when securityAlertResponse.result_type is 'Warning 1`] = `
|
||||
<div
|
||||
class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-warning box--margin-top-4 box--margin-right-4 box--margin-left-4 box--padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-warning-muted box--rounded-sm"
|
||||
class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-warning box--margin-4 box--padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-warning-muted box--rounded-sm"
|
||||
>
|
||||
<span
|
||||
class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-warning-default"
|
||||
@ -95,7 +95,7 @@ exports[`Blockaid Banner Alert should render 'warning' UI when ppomResponse.resu
|
||||
exports[`Blockaid Banner Alert should render details when provided 1`] = `
|
||||
<div>
|
||||
<div
|
||||
class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-warning box--margin-top-4 box--margin-right-4 box--margin-left-4 box--padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-warning-muted box--rounded-sm"
|
||||
class="box mm-banner-base mm-banner-alert mm-banner-alert--severity-warning box--margin-4 box--padding-3 box--padding-left-2 box--display-flex box--gap-2 box--flex-direction-row box--background-color-warning-muted box--rounded-sm"
|
||||
>
|
||||
<span
|
||||
class="mm-box mm-icon mm-icon--size-lg mm-box--display-inline-block mm-box--color-warning-default"
|
||||
|
||||
@ -39,12 +39,19 @@ const REASON_TO_DESCRIPTION_TKEY = Object.freeze({
|
||||
/** List of suspicious reason(s). Other reasons will be deemed as deceptive. */
|
||||
const SUSPCIOUS_REASON = [BlockaidReason.rawSignatureFarming];
|
||||
|
||||
function BlockaidBannerAlert({
|
||||
ppomResponse: { reason, resultType, features },
|
||||
}) {
|
||||
function BlockaidBannerAlert({ securityAlertResponse }) {
|
||||
const t = useContext(I18nContext);
|
||||
|
||||
if (resultType === BlockaidResultType.Benign) {
|
||||
if (!securityAlertResponse) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const { reason, result_type: resultType, features } = securityAlertResponse;
|
||||
|
||||
if (
|
||||
resultType === BlockaidResultType.Benign ||
|
||||
resultType === BlockaidResultType.Failed
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@ -84,7 +91,7 @@ function BlockaidBannerAlert({
|
||||
}
|
||||
|
||||
BlockaidBannerAlert.propTypes = {
|
||||
ppomResponse: PropTypes.object,
|
||||
securityAlertResponse: PropTypes.object,
|
||||
};
|
||||
|
||||
export default BlockaidBannerAlert;
|
||||
|
||||
@ -16,27 +16,27 @@ export default {
|
||||
features: {
|
||||
control: 'array',
|
||||
description:
|
||||
'ppomResponse.features value which is a list displayed as SecurityProviderBannerAlert details',
|
||||
'securityAlertResponse.features value which is a list displayed as SecurityProviderBannerAlert details',
|
||||
},
|
||||
reason: {
|
||||
control: 'select',
|
||||
options: Object.values(BlockaidReason),
|
||||
description: 'ppomResponse.reason value',
|
||||
description: 'securityAlertResponse.reason value',
|
||||
},
|
||||
resultType: {
|
||||
result_type: {
|
||||
control: 'select',
|
||||
options: Object.values(BlockaidResultType),
|
||||
description: 'ppomResponse.resultType value',
|
||||
description: 'securityAlertResponse.result_type value',
|
||||
},
|
||||
},
|
||||
args: {
|
||||
features: mockFeatures,
|
||||
reason: BlockaidReason.setApprovalForAll,
|
||||
resultType: BlockaidResultType.Warning,
|
||||
result_type: BlockaidResultType.Warning,
|
||||
},
|
||||
};
|
||||
|
||||
export const DefaultStory = (args) => (
|
||||
<BlockaidBannerAlert ppomResponse={args} />
|
||||
<BlockaidBannerAlert securityAlertResponse={args} />
|
||||
);
|
||||
DefaultStory.storyName = 'Default';
|
||||
|
||||
@ -7,8 +7,8 @@ import {
|
||||
} from '../../../../../shared/constants/security-provider';
|
||||
import BlockaidBannerAlert from '.';
|
||||
|
||||
const mockPpomResponse = {
|
||||
resultType: BlockaidResultType.Warning,
|
||||
const mockSecurityAlertResponse = {
|
||||
result_type: BlockaidResultType.Warning,
|
||||
reason: BlockaidReason.setApprovalForAll,
|
||||
description:
|
||||
'A SetApprovalForAll request was made on {contract}. We found the operator {operator} to be malicious',
|
||||
@ -19,12 +19,20 @@ const mockPpomResponse = {
|
||||
};
|
||||
|
||||
describe('Blockaid Banner Alert', () => {
|
||||
it(`should not render when ppomResponse.resultType is '${BlockaidResultType.Benign}'`, () => {
|
||||
it('should not render when securityAlertResponse is not present', () => {
|
||||
const { container } = renderWithLocalization(
|
||||
<BlockaidBannerAlert securityAlertResponse={undefined} />,
|
||||
);
|
||||
|
||||
expect(container.querySelector('.mm-banner-alert')).toBeNull();
|
||||
});
|
||||
|
||||
it(`should not render when securityAlertResponse.result_type is '${BlockaidResultType.Benign}'`, () => {
|
||||
const { container } = renderWithLocalization(
|
||||
<BlockaidBannerAlert
|
||||
ppomResponse={{
|
||||
...mockPpomResponse,
|
||||
resultType: BlockaidResultType.Benign,
|
||||
securityAlertResponse={{
|
||||
...mockSecurityAlertResponse,
|
||||
result_type: BlockaidResultType.Benign,
|
||||
}}
|
||||
/>,
|
||||
);
|
||||
@ -32,12 +40,25 @@ describe('Blockaid Banner Alert', () => {
|
||||
expect(container.querySelector('.mm-banner-alert')).toBeNull();
|
||||
});
|
||||
|
||||
it(`should render '${Severity.Danger}' UI when ppomResponse.resultType is '${BlockaidResultType.Malicious}`, () => {
|
||||
it(`should not render when securityAlertResponse.result_type is '${BlockaidResultType.Failed}'`, () => {
|
||||
const { container } = renderWithLocalization(
|
||||
<BlockaidBannerAlert
|
||||
ppomResponse={{
|
||||
...mockPpomResponse,
|
||||
resultType: BlockaidResultType.Malicious,
|
||||
securityAlertResponse={{
|
||||
...mockSecurityAlertResponse,
|
||||
result_type: BlockaidResultType.Failed,
|
||||
}}
|
||||
/>,
|
||||
);
|
||||
|
||||
expect(container.querySelector('.mm-banner-alert')).toBeNull();
|
||||
});
|
||||
|
||||
it(`should render '${Severity.Danger}' UI when securityAlertResponse.result_type is '${BlockaidResultType.Malicious}`, () => {
|
||||
const { container } = renderWithLocalization(
|
||||
<BlockaidBannerAlert
|
||||
securityAlertResponse={{
|
||||
...mockSecurityAlertResponse,
|
||||
result_type: BlockaidResultType.Malicious,
|
||||
}}
|
||||
/>,
|
||||
);
|
||||
@ -49,9 +70,9 @@ describe('Blockaid Banner Alert', () => {
|
||||
expect(dangerBannerAlert).toMatchSnapshot();
|
||||
});
|
||||
|
||||
it(`should render '${Severity.Warning}' UI when ppomResponse.resultType is '${BlockaidResultType.Warning}`, () => {
|
||||
it(`should render '${Severity.Warning}' UI when securityAlertResponse.result_type is '${BlockaidResultType.Warning}`, () => {
|
||||
const { container } = renderWithLocalization(
|
||||
<BlockaidBannerAlert ppomResponse={mockPpomResponse} />,
|
||||
<BlockaidBannerAlert securityAlertResponse={mockSecurityAlertResponse} />,
|
||||
);
|
||||
const warningBannerAlert = container.querySelector(
|
||||
'.mm-banner-alert--severity-warning',
|
||||
@ -63,7 +84,7 @@ describe('Blockaid Banner Alert', () => {
|
||||
|
||||
it('should render title, "This is a deceptive request"', () => {
|
||||
const { getByText } = renderWithLocalization(
|
||||
<BlockaidBannerAlert ppomResponse={mockPpomResponse} />,
|
||||
<BlockaidBannerAlert securityAlertResponse={mockSecurityAlertResponse} />,
|
||||
);
|
||||
|
||||
expect(getByText('This is a deceptive request')).toBeInTheDocument();
|
||||
@ -72,8 +93,8 @@ describe('Blockaid Banner Alert', () => {
|
||||
it('should render title, "This is a suspicious request", when the reason is "raw_signature_farming"', () => {
|
||||
const { getByText } = renderWithLocalization(
|
||||
<BlockaidBannerAlert
|
||||
ppomResponse={{
|
||||
...mockPpomResponse,
|
||||
securityAlertResponse={{
|
||||
...mockSecurityAlertResponse,
|
||||
reason: BlockaidReason.rawSignatureFarming,
|
||||
}}
|
||||
/>,
|
||||
@ -90,7 +111,10 @@ describe('Blockaid Banner Alert', () => {
|
||||
|
||||
const { container, getByText } = renderWithLocalization(
|
||||
<BlockaidBannerAlert
|
||||
ppomResponse={{ ...mockPpomResponse, features: mockFeatures }}
|
||||
securityAlertResponse={{
|
||||
...mockSecurityAlertResponse,
|
||||
features: mockFeatures,
|
||||
}}
|
||||
/>,
|
||||
);
|
||||
|
||||
@ -133,7 +157,7 @@ describe('Blockaid Banner Alert', () => {
|
||||
it(`should render for '${reason}' correctly`, () => {
|
||||
const { getByText } = renderWithLocalization(
|
||||
<BlockaidBannerAlert
|
||||
ppomResponse={{ ...mockPpomResponse, reason }}
|
||||
securityAlertResponse={{ ...mockSecurityAlertResponse, reason }}
|
||||
/>,
|
||||
);
|
||||
|
||||
|
||||
@ -36,13 +36,7 @@ function SecurityProviderBannerAlert({
|
||||
const t = useContext(I18nContext);
|
||||
|
||||
return (
|
||||
<BannerAlert
|
||||
title={title}
|
||||
severity={severity}
|
||||
marginTop={4}
|
||||
marginRight={4}
|
||||
marginLeft={4}
|
||||
>
|
||||
<BannerAlert title={title} severity={severity} margin={4}>
|
||||
<Text marginTop={2}>{description}</Text>
|
||||
|
||||
{details && (
|
||||
|
||||
@ -42,6 +42,9 @@ import {
|
||||
Text,
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
} from '../../component-library';
|
||||
///: BEGIN:ONLY_INCLUDE_IN(blockaid)
|
||||
import BlockaidBannerAlert from '../security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert';
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
|
||||
import Box from '../../ui/box/box';
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
@ -150,12 +153,18 @@ export default class SignatureRequestOriginal extends Component {
|
||||
|
||||
return (
|
||||
<div className="request-signature__body">
|
||||
{
|
||||
///: BEGIN:ONLY_INCLUDE_IN(blockaid)
|
||||
<BlockaidBannerAlert
|
||||
securityAlertResponse={txData?.securityAlertResponse}
|
||||
/>
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
}
|
||||
{isSuspiciousResponse(txData?.securityProviderResponse) && (
|
||||
<SecurityProviderBannerMessage
|
||||
securityProviderResponse={txData.securityProviderResponse}
|
||||
/>
|
||||
)}
|
||||
|
||||
{
|
||||
///: BEGIN:ONLY_INCLUDE_IN(build-mmi)
|
||||
this.props.selectedAccount.address ===
|
||||
@ -183,7 +192,6 @@ export default class SignatureRequestOriginal extends Component {
|
||||
)
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
}
|
||||
|
||||
<div className="request-signature__origin">
|
||||
{
|
||||
// Use legacy authorship header for snaps
|
||||
@ -211,7 +219,6 @@ export default class SignatureRequestOriginal extends Component {
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
}
|
||||
</div>
|
||||
|
||||
<Typography
|
||||
className="request-signature__content__title"
|
||||
variant={TypographyVariant.H3}
|
||||
@ -229,7 +236,6 @@ export default class SignatureRequestOriginal extends Component {
|
||||
>
|
||||
{this.context.t('signatureRequestGuidance')}
|
||||
</Typography>
|
||||
|
||||
<div className={classnames('request-signature__notice')}>{notice}</div>
|
||||
<div className="request-signature__rows">
|
||||
{rows.map(({ name, value }, index) => {
|
||||
|
||||
@ -180,4 +180,20 @@ describe('SignatureRequestOriginal', () => {
|
||||
).toBeNull();
|
||||
expect(screen.queryByText('OpenSea')).toBeNull();
|
||||
});
|
||||
|
||||
it('should display security alert if present', () => {
|
||||
props.txData.securityAlertResponse = {
|
||||
resultType: 'Malicious',
|
||||
reason: 'blur_farming',
|
||||
description:
|
||||
'A SetApprovalForAll request was made on {contract}. We found the operator {operator} to be malicious',
|
||||
args: {
|
||||
contract: '0xa7206d878c5c3871826dfdb42191c49b1d11f466',
|
||||
operator: '0x92a3b9773b1763efa556f55ccbeb20441962d9b2',
|
||||
},
|
||||
};
|
||||
|
||||
render();
|
||||
expect(screen.getByText('This is a deceptive request')).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
@ -38,6 +38,9 @@ import {
|
||||
import SecurityProviderBannerMessage from '../security-provider-banner-message/security-provider-banner-message';
|
||||
import ConfirmPageContainerNavigation from '../confirm-page-container/confirm-page-container-navigation';
|
||||
import { getMostRecentOverviewPage } from '../../../ducks/history/history';
|
||||
///: BEGIN:ONLY_INCLUDE_IN(blockaid)
|
||||
import BlockaidBannerAlert from '../security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert';
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
import LedgerInstructionField from '../ledger-instruction-field';
|
||||
|
||||
import SignatureRequestHeader from '../signature-request-header';
|
||||
@ -133,13 +136,18 @@ export default function SignatureRequestSIWE({ txData }) {
|
||||
isSIWEDomainValid={isSIWEDomainValid}
|
||||
subjectMetadata={targetSubjectMetadata}
|
||||
/>
|
||||
|
||||
{
|
||||
///: BEGIN:ONLY_INCLUDE_IN(blockaid)
|
||||
<BlockaidBannerAlert
|
||||
securityAlertResponse={txData?.securityAlertResponse}
|
||||
/>
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
}
|
||||
{showSecurityProviderBanner && (
|
||||
<SecurityProviderBannerMessage
|
||||
securityProviderResponse={txData.securityProviderResponse}
|
||||
/>
|
||||
)}
|
||||
|
||||
<Message data={formatMessageParams(parsedMessage, t)} />
|
||||
{!isMatchingAddress && (
|
||||
<BannerAlert
|
||||
@ -154,13 +162,11 @@ export default function SignatureRequestSIWE({ txData }) {
|
||||
])}
|
||||
</BannerAlert>
|
||||
)}
|
||||
|
||||
{isLedgerWallet && (
|
||||
<div className="confirm-approve-content__ledger-instruction-wrapper">
|
||||
<LedgerInstructionField showDataInstruction />
|
||||
</div>
|
||||
)}
|
||||
|
||||
{!isSIWEDomainValid && (
|
||||
<BannerAlert
|
||||
severity={SEVERITIES.DANGER}
|
||||
|
||||
@ -225,4 +225,31 @@ describe('SignatureRequestSIWE (Sign in with Ethereum)', () => {
|
||||
expect(mockShowModal).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
it('should display security alert if present', () => {
|
||||
const store = configureStore(mockStoreInitialState);
|
||||
const txData = cloneDeep(mockProps.txData);
|
||||
|
||||
const { getByText } = renderWithProvider(
|
||||
<SignatureRequestSIWE
|
||||
{...mockProps}
|
||||
txData={{
|
||||
...txData,
|
||||
securityAlertResponse: {
|
||||
resultType: 'Malicious',
|
||||
reason: 'blur_farming',
|
||||
description:
|
||||
'A SetApprovalForAll request was made on {contract}. We found the operator {operator} to be malicious',
|
||||
args: {
|
||||
contract: '0xa7206d878c5c3871826dfdb42191c49b1d11f466',
|
||||
operator: '0x92a3b9773b1763efa556f55ccbeb20441962d9b2',
|
||||
},
|
||||
},
|
||||
}}
|
||||
/>,
|
||||
store,
|
||||
);
|
||||
|
||||
expect(getByText('This is a deceptive request')).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
@ -90,6 +90,9 @@ import { mmiActionsFactory } from '../../../store/institutional/institution-back
|
||||
import { showCustodyConfirmLink } from '../../../store/institutional/institution-actions';
|
||||
import { useMMICustodySignMessage } from '../../../hooks/useMMICustodySignMessage';
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
///: BEGIN:ONLY_INCLUDE_IN(blockaid)
|
||||
import BlockaidBannerAlert from '../security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert';
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
|
||||
import Message from './signature-request-message';
|
||||
import Footer from './signature-request-footer';
|
||||
@ -245,6 +248,13 @@ const SignatureRequest = ({ txData }) => {
|
||||
<SignatureRequestHeader txData={txData} />
|
||||
</div>
|
||||
<div className="signature-request-content">
|
||||
{
|
||||
///: BEGIN:ONLY_INCLUDE_IN(blockaid)
|
||||
<BlockaidBannerAlert
|
||||
securityAlertResponse={txData?.securityAlertResponse}
|
||||
/>
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
}
|
||||
{(txData?.securityProviderResponse?.flagAsDangerous !== undefined &&
|
||||
txData?.securityProviderResponse?.flagAsDangerous !==
|
||||
SECURITY_PROVIDER_MESSAGE_SEVERITY.NOT_MALICIOUS) ||
|
||||
|
||||
@ -447,5 +447,38 @@ describe('Signature Request Component', () => {
|
||||
container.querySelector('.request-signature__mismatch-info'),
|
||||
).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('should display security alert if present', () => {
|
||||
const msgParams = {
|
||||
from: '0xd8f6a2ffb0fc5952d16c9768b71cfd35b6399aa5',
|
||||
data: JSON.stringify(messageData),
|
||||
version: 'V4',
|
||||
origin: 'test',
|
||||
};
|
||||
|
||||
const { getByText } = renderWithProvider(
|
||||
<SignatureRequest
|
||||
{...baseProps}
|
||||
conversionRate={null}
|
||||
txData={{
|
||||
msgParams,
|
||||
securityAlertResponse: {
|
||||
resultType: 'Malicious',
|
||||
reason: 'blur_farming',
|
||||
description:
|
||||
'A SetApprovalForAll request was made on {contract}. We found the operator {operator} to be malicious',
|
||||
args: {
|
||||
contract: '0xa7206d878c5c3871826dfdb42191c49b1d11f466',
|
||||
operator: '0x92a3b9773b1763efa556f55ccbeb20441962d9b2',
|
||||
},
|
||||
},
|
||||
}}
|
||||
unapprovedMessagesCount={2}
|
||||
/>,
|
||||
store,
|
||||
);
|
||||
|
||||
expect(getByText('This is a deceptive request')).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@ -60,6 +60,9 @@ import {
|
||||
NUM_W_OPT_DECIMAL_COMMA_OR_DOT_REGEX,
|
||||
} from '../../../shared/constants/tokens';
|
||||
import { isSuspiciousResponse } from '../../../shared/modules/security-provider.utils';
|
||||
///: BEGIN:ONLY_INCLUDE_IN(blockaid)
|
||||
import BlockaidBannerAlert from '../../components/app/security-provider-banner-alert/blockaid-banner-alert/blockaid-banner-alert';
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
import { ConfirmPageContainerNavigation } from '../../components/app/confirm-page-container';
|
||||
import { useSimulationFailureWarning } from '../../hooks/useSimulationFailureWarning';
|
||||
import SimulationErrorMessage from '../../components/ui/simulation-error-message';
|
||||
@ -311,6 +314,13 @@ export default function TokenAllowance({
|
||||
<Box>
|
||||
<ConfirmPageContainerNavigation />
|
||||
</Box>
|
||||
{
|
||||
///: BEGIN:ONLY_INCLUDE_IN(blockaid)
|
||||
<BlockaidBannerAlert
|
||||
securityAlertResponse={txData?.securityAlertResponse}
|
||||
/>
|
||||
///: END:ONLY_INCLUDE_IN
|
||||
}
|
||||
{isSuspiciousResponse(txData?.securityProviderResponse) && (
|
||||
<SecurityProviderBannerMessage
|
||||
securityProviderResponse={txData.securityProviderResponse}
|
||||
|
||||
@ -491,4 +491,28 @@ describe('TokenAllowancePage', () => {
|
||||
expect(queryByText('Account 1')).toBeInTheDocument();
|
||||
expect(queryByText('Account 2')).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('should display security alert if present', () => {
|
||||
const { getByText } = renderWithProvider(
|
||||
<TokenAllowance
|
||||
{...props}
|
||||
txData={{
|
||||
...props.txData,
|
||||
securityAlertResponse: {
|
||||
resultType: 'Malicious',
|
||||
reason: 'blur_farming',
|
||||
description:
|
||||
'A SetApprovalForAll request was made on {contract}. We found the operator {operator} to be malicious',
|
||||
args: {
|
||||
contract: '0xa7206d878c5c3871826dfdb42191c49b1d11f466',
|
||||
operator: '0x92a3b9773b1763efa556f55ccbeb20441962d9b2',
|
||||
},
|
||||
},
|
||||
}}
|
||||
/>,
|
||||
store,
|
||||
);
|
||||
|
||||
expect(getByText('This is a deceptive request')).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
Loading…
Reference in New Issue
Block a user