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

Fix EIP-712 input validation order (#17156)

Browse Source
This commit is contained in:
Frederik Bolding 2023-01-13 16:57:08 +01:00 committed by GitHub
parent 00aee11c2a
commit 7b852c3ff2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,10 +197,6 @@ export default class TypedMessageManager extends EventEmitter {
data = JSON.parse(params.data); data = JSON.parse(params.data);
}, '"data" must be a valid JSON string.'); }, '"data" must be a valid JSON string.');
const validation = jsonschema.validate(data, TYPED_MESSAGE_SCHEMA); const validation = jsonschema.validate(data, TYPED_MESSAGE_SCHEMA);
assert.ok(
data.primaryType in data.types,
`Primary type of "${data.primaryType}" has no type definition.`,
);
if (validation.errors.length !== 0) { if (validation.errors.length !== 0) {
throw ethErrors.rpc.invalidParams({ throw ethErrors.rpc.invalidParams({
message: message:
@ -208,6 +204,10 @@ export default class TypedMessageManager extends EventEmitter {
data: validation.errors.map((v) => v.message.toString()), data: validation.errors.map((v) => v.message.toString()),
}); });
} }
assert.ok(
data.primaryType in data.types,
`Primary type of "${data.primaryType}" has no type definition.`,
);
let { chainId } = data.domain; let { chainId } = data.domain;
if (chainId) { if (chainId) {
const activeChainId = parseInt(this._getCurrentChainId(), 16); const activeChainId = parseInt(this._getCurrentChainId(), 16);