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

Jump to bottom

Feat/add more test cases for body parsing #70

Draft
wants to merge 5 commits into
base: feat/body-parsing-with-audit-fix
Choose a base branch
from
Draft

Feat/add more test cases for body parsing #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ddf4e5
Make test cases as a function named files
wshino Oct 7, 2024
2d6971a
Add test cases for DKIM registries
wshino Oct 12, 2024
a7a7177
Add test cases for EmailAccountRecovery
wshino Oct 12, 2024
2b8f8a4
Add general test cases
wshino Oct 12, 2024
0d317d3
Add upgrade test
wshino Oct 16, 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
19 changes: 19 additions & 0 deletions packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_general.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.12;

import "forge-std/Test.sol";
import "../helpers/StructHelper.sol";

contract EmailAccountRecoveryTest_general is Test, StructHelper {
function test_erifier() public {
assertEq(recoveryController.verifier(), address(verifier));
}

function test_DKIM() public {
assertEq(recoveryController.dkim(), address(dkim));
}

function test_EmailAuthImplementation() public {
assertEq(recoveryController.emailAuthImplementation(), address(emailAuth));
}
}
220 changes: 220 additions & 0 deletions packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_handleAcceptance.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {RecoveryController} from "../helpers/RecoveryController.sol";
import {StructHelper} from "../helpers/StructHelper.sol";
import {SimpleWallet} from "../helpers/SimpleWallet.sol";
import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
import {ERC1967Utils} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Utils.sol";

contract EmailAccountRecoveryTest_handleAcceptance is StructHelper {
constructor() {}
Expand Down Expand Up @@ -35,6 +36,225 @@ contract EmailAccountRecoveryTest_handleAcceptance is StructHelper {
);
}

function testExpectRevertHandleAcceptanceInvalidRecoveredAccount() public {
skipIfZkSync();

EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg();
emailAuthMsg.templateId = recoveryController
.computeAcceptanceTemplateId(0);
emailAuthMsg.commandParams[0] = abi.encode(address(0x0)); // Invalid account

vm.startPrank(someRelayer);
vm.expectRevert(bytes("invalid command params"));
recoveryController.handleAcceptance(emailAuthMsg, 0);
vm.stopPrank();
}

function testExpectRevertHandleAcceptanceInvalidTemplateId() public {
skipIfZkSync();

uint templateIdx = 0;

EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg();
uint templateId = recoveryController.computeAcceptanceTemplateId(
templateIdx
);
emailAuthMsg.templateId = 999; // invalid template id
bytes[] memory commandParamsForAcceptance = new bytes[](1);
commandParamsForAcceptance[0] = abi.encode(address(simpleWallet));
emailAuthMsg.commandParams = commandParamsForAcceptance;

vm.startPrank(someRelayer);
vm.expectRevert(bytes("invalid template id"));
recoveryController.handleAcceptance(emailAuthMsg, 0);
vm.stopPrank();
}

function testExpectRevertHandleAcceptanceInvalidEmailAuthMsgStructure()
public
{
skipIfZkSync();

requestGuardian();

require(
recoveryController.guardians(guardian) ==
RecoveryController.GuardianStatus.REQUESTED
);

uint templateIdx = 0;

// Create an invalid EmailAuthMsg with empty commandParams
EmailAuthMsg memory emailAuthMsg;
emailAuthMsg.templateId = recoveryController
.computeAcceptanceTemplateId(templateIdx);
emailAuthMsg.commandParams = new bytes[](0); // Invalid structure

vm.mockCall(
address(recoveryController.emailAuthImplementationAddr()),
abi.encodeWithSelector(EmailAuth.authEmail.selector, emailAuthMsg),
abi.encode(0x0)
);

vm.startPrank(someRelayer);
vm.expectRevert(bytes("invalid command params"));
recoveryController.handleAcceptance(emailAuthMsg, templateIdx);
vm.stopPrank();
}

function testExpectRevertHandleAcceptanceInvalidVerifier() public {
skipIfZkSync();

requestGuardian();

require(
recoveryController.guardians(guardian) ==
RecoveryController.GuardianStatus.REQUESTED
);

uint templateIdx = 0;

EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg();
uint templateId = recoveryController.computeAcceptanceTemplateId(
templateIdx
);
emailAuthMsg.templateId = templateId;
bytes[] memory commandParamsForAcceptance = new bytes[](1);
commandParamsForAcceptance[0] = abi.encode(address(simpleWallet));
emailAuthMsg.commandParams = commandParamsForAcceptance;

// Set Verifier address to address(0)
vm.store(
address(recoveryController),
bytes32(uint256(0)), // Assuming Verifier is the 1st storage slot in RecoveryController
bytes32(uint256(0))
);

vm.startPrank(someRelayer);
vm.expectRevert(bytes("invalid verifier address"));
recoveryController.handleAcceptance(emailAuthMsg, templateIdx);
vm.stopPrank();
}

function testExpectRevertHandleAcceptanceInvalidDKIMRegistry() public {
skipIfZkSync();

requestGuardian();

require(
recoveryController.guardians(guardian) ==
RecoveryController.GuardianStatus.REQUESTED
);

uint templateIdx = 0;

EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg();
uint templateId = recoveryController.computeAcceptanceTemplateId(
templateIdx
);
emailAuthMsg.templateId = templateId;
bytes[] memory commandParamsForAcceptance = new bytes[](1);
commandParamsForAcceptance[0] = abi.encode(address(simpleWallet));
emailAuthMsg.commandParams = commandParamsForAcceptance;

// Set DKIMRegistry address to address(0)
vm.store(
address(recoveryController),
bytes32(uint256(1)), // Assuming DKIMRegistry is the 2nd storage slot in RecoveryController
bytes32(uint256(0))
);

vm.startPrank(someRelayer);
vm.expectRevert(bytes("invalid dkim registry address"));
recoveryController.handleAcceptance(emailAuthMsg, templateIdx);
vm.stopPrank();
}

function testExpectRevertHandleAcceptanceInvalidEmailAuthImplementationAddr()
public
{
skipIfZkSync();

requestGuardian();

require(
recoveryController.guardians(guardian) ==
RecoveryController.GuardianStatus.REQUESTED
);

uint templateIdx = 0;

EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg();
uint templateId = recoveryController.computeAcceptanceTemplateId(
templateIdx
);
emailAuthMsg.templateId = templateId;
bytes[] memory commandParamsForAcceptance = new bytes[](1);
commandParamsForAcceptance[0] = abi.encode(address(simpleWallet));
emailAuthMsg.commandParams = commandParamsForAcceptance;

// Set EmailAuthImplementationAddr address to address(0)
vm.store(
address(recoveryController),
bytes32(uint256(2)), // Assuming EmailAuthImplementationAddr is the 3rd storage slot in RecoveryController
bytes32(uint256(0))
);

vm.startPrank(someRelayer);
vm.expectRevert(
abi.encodeWithSelector(
ERC1967Utils.ERC1967InvalidImplementation.selector,
address(0)
)
);
recoveryController.handleAcceptance(emailAuthMsg, templateIdx);
vm.stopPrank();
}

function testExpectRevertHandleAcceptanceInvalidController() public {
skipIfZkSync();

// First, request and accept a guardian
requestGuardian();
uint templateIdx = 0;
EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg();
uint templateId = recoveryController.computeAcceptanceTemplateId(
templateIdx
);
emailAuthMsg.templateId = templateId;
bytes[] memory commandParamsForAcceptance = new bytes[](1);
commandParamsForAcceptance[0] = abi.encode(address(simpleWallet));
emailAuthMsg.commandParams = commandParamsForAcceptance;

vm.mockCall(
address(recoveryController.emailAuthImplementationAddr()),
abi.encodeWithSelector(EmailAuth.authEmail.selector, emailAuthMsg),
abi.encode(0x0)
);

vm.prank(someRelayer);
recoveryController.handleAcceptance(emailAuthMsg, templateIdx);

require(
recoveryController.guardians(guardian) ==
RecoveryController.GuardianStatus.ACCEPTED,
"Guardian should be accepted"
);

// Now, set an invalid controller for the guardian's EmailAuth contract
address invalidController = address(0x1234);
vm.mockCall(
guardian,
abi.encodeWithSelector(bytes4(keccak256("controller()"))),
abi.encode(invalidController)
);

// Try to handle acceptance again, which should fail due to invalid controller
vm.expectRevert("invalid controller");
vm.prank(someRelayer);
recoveryController.handleAcceptance(emailAuthMsg, templateIdx);
}

function testHandleAcceptance() public {
skipIfZkSync();

Expand Down
122 changes: 121 additions & 1 deletion packages/contracts/test/EmailAccountRecovery/EmailAccountRecovery_handleRecovery.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity ^0.8.12;
import "forge-std/Test.sol";
import "forge-std/console.sol";
import {EmailAuth, EmailAuthMsg} from "../../src/EmailAuth.sol";
import {RecoveryController} from "../helpers/RecoveryController.sol";
import {RecoveryController, EmailAccountRecovery} from "../helpers/RecoveryController.sol";
import {StructHelper} from "../helpers/StructHelper.sol";
import {SimpleWallet} from "../helpers/SimpleWallet.sol";
import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
Expand Down Expand Up @@ -73,6 +73,126 @@ contract EmailAccountRecoveryTest_handleRecovery is StructHelper {
);
}

function testExpectRevertHandleRecoveryInvalidRecoveredAccount() public {
skipIfZkSync();

EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg();
emailAuthMsg.templateId = recoveryController.computeRecoveryTemplateId(0);
emailAuthMsg.commandParams[0] = abi.encode(address(0x0)); // Invalid account

vm.startPrank(someRelayer);
vm.expectRevert(bytes("invalid account in email"));
recoveryController.handleRecovery(emailAuthMsg, 0);
vm.stopPrank();
}
function testExpectRevertHandleRecoveryInvalidAccountInEmail() public {
skipIfZkSync();

handleAcceptance();

uint templateIdx = 0;

EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg();
emailAuthMsg.templateId = recoveryController.computeRecoveryTemplateId(
templateIdx
);
bytes[] memory commandParamsForRecovery = new bytes[](2);
commandParamsForRecovery[0] = abi.encode(address(0x0)); // Invalid account
commandParamsForRecovery[1] = abi.encode(newSigner);
emailAuthMsg.commandParams = commandParamsForRecovery;

vm.mockCall(
address(recoveryController.emailAuthImplementationAddr()),
abi.encodeWithSelector(EmailAuth.authEmail.selector, emailAuthMsg),
abi.encode(0x0)
);

vm.startPrank(someRelayer);
vm.expectRevert(bytes("invalid account in email"));
recoveryController.handleRecovery(emailAuthMsg, templateIdx);
vm.stopPrank();
}

function testExpectRevertHandleRecoveryGuardianCodeLengthZero() public {
skipIfZkSync();

handleAcceptance();

uint templateIdx = 0;

EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg();
emailAuthMsg.templateId = recoveryController.computeRecoveryTemplateId(
templateIdx
);
bytes[] memory commandParamsForRecovery = new bytes[](2);
commandParamsForRecovery[0] = abi.encode(simpleWallet);
commandParamsForRecovery[1] = abi.encode(newSigner);
emailAuthMsg.commandParams = commandParamsForRecovery;

// Mock guardian with no code
vm.etch(guardian, "");

vm.startPrank(someRelayer);
vm.expectRevert(bytes("guardian is not deployed"));
recoveryController.handleRecovery(emailAuthMsg, templateIdx);
vm.stopPrank();
}

function testExpectRevertHandleRecoveryTemplateIdMismatch() public {
skipIfZkSync();

handleAcceptance();

uint templateIdx = 0;

EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg();
emailAuthMsg.templateId = 999; // Invalid template ID
bytes[] memory commandParamsForRecovery = new bytes[](2);
commandParamsForRecovery[0] = abi.encode(simpleWallet);
commandParamsForRecovery[1] = abi.encode(newSigner);
emailAuthMsg.commandParams = commandParamsForRecovery;

vm.mockCall(
address(recoveryController.emailAuthImplementationAddr()),
abi.encodeWithSelector(EmailAuth.authEmail.selector, emailAuthMsg),
abi.encode(0x0)
);

vm.startPrank(someRelayer);
vm.expectRevert(bytes("invalid template id"));
recoveryController.handleRecovery(emailAuthMsg, templateIdx);
vm.stopPrank();
}

function testExpectRevertHandleRecoveryAuthEmailFailure() public {
skipIfZkSync();

handleAcceptance();

uint templateIdx = 0;

EmailAuthMsg memory emailAuthMsg = buildEmailAuthMsg();
emailAuthMsg.templateId = recoveryController.computeRecoveryTemplateId(
templateIdx
);
bytes[] memory commandParamsForRecovery = new bytes[](2);
commandParamsForRecovery[0] = abi.encode(simpleWallet);
commandParamsForRecovery[1] = abi.encode(newSigner);
emailAuthMsg.commandParams = commandParamsForRecovery;

// Mock authEmail to fail
vm.mockCallRevert(
address(recoveryController.emailAuthImplementationAddr()),
abi.encodeWithSelector(EmailAuth.authEmail.selector, emailAuthMsg),
"REVERT_MESSAGE"
);

vm.startPrank(someRelayer);
vm.expectRevert(); // Expect any revert due to authEmail failure
recoveryController.handleRecovery(emailAuthMsg, templateIdx);
vm.stopPrank();
}

function testHandleRecovery() public {
skipIfZkSync();

Expand Down
Loading
Loading