m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

add back strict equality checks in typed-message-manager, ensure that chainId comparison bases are both ints (#11340)

Browse Source
This commit is contained in:
Alex Donesky 2021-06-23 16:32:23 -05:00 committed by GitHub
parent 6416a1ef98
commit 23f0270af2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/scripts/lib/typed-message-manager.js
View File

@ -1,5 +1,5 @@
import EventEmitter from 'events'; import EventEmitter from 'events';
import assert from 'assert'; import { strict as assert } from 'assert';
import { ObservableStore } from '@metamask/obs-store'; import { ObservableStore } from '@metamask/obs-store';
import { ethErrors } from 'eth-rpc-errors'; import { ethErrors } from 'eth-rpc-errors';
import { typedSignatureHash, TYPED_MESSAGE_SCHEMA } from 'eth-sig-util'; import { typedSignatureHash, TYPED_MESSAGE_SCHEMA } from 'eth-sig-util';
@ -177,7 +177,7 @@ export default class TypedMessageManager extends EventEmitter {
break; break;
case 'V3': case 'V3':
case 'V4': { case 'V4': {
assert.strictEqual( assert.equal(
typeof params.data, typeof params.data,
'string', 'string',
'"params.data" must be a string.', '"params.data" must be a string.',
@ -191,18 +191,21 @@ export default class TypedMessageManager extends EventEmitter {
data.primaryType in data.types, data.primaryType in data.types,
`Primary type of "${data.primaryType}" has no type definition.`, `Primary type of "${data.primaryType}" has no type definition.`,
); );
assert.strictEqual( assert.equal(
validation.errors.length, validation.errors.length,
0, 0,
'Signing data must conform to EIP-712 schema. See https://git.io/fNtcx.', 'Signing data must conform to EIP-712 schema. See https://git.io/fNtcx.',
); );
const { chainId } = data.domain; let { chainId } = data.domain;
if (chainId) { if (chainId) {
const activeChainId = parseInt(this._getCurrentChainId(), 16); const activeChainId = parseInt(this._getCurrentChainId(), 16);
assert.ok( assert.ok(
!Number.isNaN(activeChainId), !Number.isNaN(activeChainId),
`Cannot sign messages for chainId "${chainId}", because MetaMask is switching networks.`, `Cannot sign messages for chainId "${chainId}", because MetaMask is switching networks.`,
); );
if (typeof chainId === 'string') {
chainId = parseInt(chainId, 16);
}
assert.equal( assert.equal(
chainId, chainId,
activeChainId, activeChainId,