Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix writeTimeoutPacket vuln #83

Merged
merged 2 commits into from
Apr 12, 2024
Merged

fix writeTimeoutPacket vuln #83

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a8010a
fix writeTimeoutPacket vuln
RnkSngh Apr 11, 2024
787cbe3
cleanup code
RnkSngh Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion contracts/core/Dispatcher.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,11 @@ contract Dispatcher is OwnableUpgradeable, UUPSUpgradeable, IDispatcher {
/**
* Generate a timeout packet for the given packet
*/
function writeTimeoutPacket(IbcPacket calldata packet) external {
function writeTimeoutPacket(IbcPacket calldata packet, Ics23Proof calldata proof) external {
_lightClient.verifyMembership(
proof, Ibc.packetCommitmentProofKey(packet), abi.encode(Ibc.packetCommitmentProofValue(packet))
);

address receiver = _getAddressFromPort(packet.src.portId);
// verify packet does not have a receipt
bool hasReceipt = _recvPacketReceipt[receiver][packet.dest.channelId][packet.sequence];
Expand Down
2 changes: 2 additions & 0 deletions contracts/interfaces/IDispatcher.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ interface IDispatcher is IbcDispatcher, IbcEventsEmitter {

function timeout(IbcPacket calldata packet, Ics23Proof calldata proof) external;

function writeTimeoutPacket(IbcPacket calldata packet, Ics23Proof calldata proof) external;

function recvPacket(IbcPacket calldata packet, Ics23Proof calldata proof) external;

function getOptimisticConsensusState(uint256 height)
Expand Down
2 changes: 1 addition & 1 deletion test/Dispatcher.proof.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ contract DispatcherIbcWithRealProofs is DispatcherIbcWithRealProofsSuite {
(dispatcherProxy, dispatcherImplementation) = deployDispatcherProxyAndImpl(portPrefix1, consensusStateManager);

address targetMarsAddress = 0x71C95911E9a5D330f4D621842EC243EE1343292e;
deployCodeTo("Mars.sol", abi.encode(address(dispatcherProxy)), targetMarsAddress);
deployCodeTo("Mars.sol:Mars", abi.encode(address(dispatcherProxy)), targetMarsAddress);
mars = Mars(payable(targetMarsAddress));

portId1 = "polyibc.eth1.71C95911E9a5D330f4D621842EC243EE1343292e";
Expand Down
20 changes: 19 additions & 1 deletion test/Dispatcher.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ contract PacketSenderTestBase is ChannelOpenTestBaseSetup {

// Test Chains B receives a packet from Chain A
contract DispatcherRecvPacketTestSuite is ChannelOpenTestBaseSetup {
IbcEndpoint src = IbcEndpoint("polyibc.bsc.9876543210", "channel-99");
IbcEndpoint src = IbcEndpoint("polyibc.bsc.58b604DB8886656695442374D8E940D814F2eDd4", "channel-99");
IbcEndpoint dest;
bytes payload = bytes("msgPayload");
bytes appAck = abi.encodePacked('{ "account": "account", "reply": "got the message" }');
Expand Down Expand Up @@ -387,6 +387,24 @@ contract DispatcherRecvPacketTestSuite is ChannelOpenTestBaseSetup {
dispatcherProxy.recvPacket(IbcPacket(src, dest, 3, payload, ZERO_HEIGHT, maxTimeout), validProof);
}

// Can't spoof a timeed out packet
function test_writeTimeoutPacket_cannot_Spoof_Packet() public {
IbcPacket memory spoofedPacket = IbcPacket(src, dest, 1, payload, ZERO_HEIGHT, 1);
spoofedPacket.timeoutTimestamp = 1; // Set really low timeout timestamp
vm.mockCallRevert(
address(dummyConsStateManager),
abi.encodeWithSelector(
DummyLightClient.verifyMembership.selector,
validProof,
Ibc.packetCommitmentProofKey(spoofedPacket),
abi.encode(Ibc.packetCommitmentProofValue(spoofedPacket))
),
abi.encodeWithSelector(ProofVerifier.InvalidProofValue.selector)
);
vm.expectRevert(abi.encodeWithSelector(ProofVerifier.InvalidProofValue.selector));
dispatcherProxy.writeTimeoutPacket(spoofedPacket, validProof);
}

// TODO: add tests for unordered channel, wrong port, and invalid proof
}

Expand Down
12 changes: 6 additions & 6 deletions test/upgradeableProxy/upgrades/DispatcherV2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,15 +473,15 @@ contract DispatcherV2 is OwnableUpgradeable, UUPSUpgradeable, IDispatcher {
/**
* Generate a timeout packet for the given packet
*/
function writeTimeoutPacket(IbcPacket calldata packet) external {
// verify `receiver` is the original packet sender
// if (!portIdAddressMatch(receiver, packet.src.portId)) {
// revert IBCErrors.receiverNotIntendedPacketDestination();
// }
function writeTimeoutPacket(IbcPacket calldata packet, Ics23Proof calldata proof) external {
_lightClient.verifyMembership(
proof, Ibc.packetCommitmentProofKey(packet), abi.encode(Ibc.packetCommitmentProofValue(packet))
);

address receiver = _getAddressFromPort(packet.dest.portId);
address receiver = _getAddressFromPort(packet.src.portId);
// verify packet does not have a receipt
bool hasReceipt = _recvPacketReceipt[receiver][packet.dest.channelId][packet.sequence];

if (hasReceipt) {
revert IBCErrors.packetReceiptAlreadyExists();
}
Expand Down
Loading