poanetwork
/
tokenbridge-contracts
mirror of https://github.com/poanetwork/tokenbridge-contracts.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Deny reentrant execution of signatures in the ForeignAMB (#577)

This commit is contained in:
Kirill Fedoseev 2021-02-28 05:03:43 +03:00 committed by GitHub
parent cdef2c6d69
commit 44c84e4be0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contracts/upgradeable_contracts/arbitrary_message/BasicForeignAMB.sol
View File

@ -13,9 +13,15 @@ contract BasicForeignAMB is BasicAMB, MessageRelay, MessageDelivery {
* @param _signatures bytes blob with signatures to be validated
*/
function executeSignatures(bytes _data, bytes _signatures) external {
// this checks prevents execution of other messages, while some other message is being processed
// nested executeSignatures is considered to be unsafe,
// since it allows to change/reset the AMB context variables (messageId, messageSender, messageSourceChainId)
// while processing nested message
require(messageId() == bytes32(0));
Message.hasEnoughValidSignatures(_data, _signatures, validatorContract(), true);
bytes32 messageId;
bytes32 msgId;
address sender;
address executor;
uint32 gasLimit;
@ -23,13 +29,13 @@ contract BasicForeignAMB is BasicAMB, MessageRelay, MessageDelivery {
uint256[2] memory chainIds;
bytes memory data;
(messageId, sender, executor, gasLimit, dataType, chainIds, data) = ArbitraryMessage.unpackData(_data);
(msgId, sender, executor, gasLimit, dataType, chainIds, data) = ArbitraryMessage.unpackData(_data);
require(_isMessageVersionValid(messageId));
require(_isMessageVersionValid(msgId));
require(_isDestinationChainIdValid(chainIds[1]));
require(!relayedMessages(messageId));
setRelayedMessages(messageId, true);
processMessage(sender, executor, messageId, gasLimit, dataType, chainIds[0], data);
require(!relayedMessages(msgId));
setRelayedMessages(msgId, true);
processMessage(sender, executor, msgId, gasLimit, dataType, chainIds[0], data);
}
/**