Skip to content

test for param validation and fix inappropriate path #41

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

Merged
leekt merged 2 commits into from
Oct 27, 2023
Merged

test for param validation and fix inappropriate path #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d75e18e
stash
leekt Oct 27, 2023
8289389
fix:sessionkey param validation
leekt Oct 27, 2023
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
2 changes: 1 addition & 1 deletion src/executor/RecoveryAction.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pragma solidity ^0.8.0;

import "src/interfaces/IValidator.sol";
import "src/interfaces/IKernelValidator.sol";

contract RecoveryAction {
function doRecovery(address _validator, bytes calldata _data) external {
Expand Down
5 changes: 3 additions & 2 deletions src/validator/WeightedECDSAValidator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
pragma solidity ^0.8.0;

import "src/common/Types.sol";
import {UserOperation} from "account-abstraction/interfaces/UserOperation.sol";
import {UserOperation} from "I4337/interfaces/UserOperation.sol";
import {ECDSA} from "solady/utils/ECDSA.sol";
import {EIP712} from "solady/utils/EIP712.sol";
import {IKernelValidator} from "src/interfaces/IValidator.sol";
import {IKernelValidator} from "src/interfaces/IKernelValidator.sol";
import {SIG_VALIDATION_FAILED} from "src/common/Constants.sol";

struct WeightedECDSAValidatorStorage {
uint24 totalWeight;
Expand Down
32 changes: 25 additions & 7 deletions test/foundry/validator/SessionKeyValidator.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ contract SessionKeyValidatorTest is KernelECDSATest {
ParamRule[] memory paramRules = new ParamRule[](2);
paramRules[0] = ParamRule({
offset: 0,
condition: ParamCondition.EQUAL,
condition: ParamCondition(i % 6),
param: bytes32(uint256(100))
});
paramRules[1] = ParamRule({
offset: 32,
condition: ParamCondition.NOT_EQUAL,
condition: ParamCondition((i+1) % 6),
param: bytes32(uint256(100))
});
permissions[i] = Permission({
Expand All @@ -78,11 +78,29 @@ contract SessionKeyValidatorTest is KernelECDSATest {
}
}

function _generateParam(ParamCondition condition, bool correct) internal pure returns(uint256 param) {
if(condition == ParamCondition.EQUAL) {
param = correct ? 100 : 101;
} else if(condition == ParamCondition.GREATER_THAN) {
param = correct ? 101 : 100;
} else if(condition == ParamCondition.LESS_THAN) {
param = correct ? 99 : 100;
} else if(condition == ParamCondition.NOT_EQUAL) {
param = correct ? 101 : 100;
} else if(condition == ParamCondition.GREATER_THAN_OR_EQUAL) {
param = correct ? 100 : 99;
} else if(condition == ParamCondition.LESS_THAN_OR_EQUAL) {
param = correct ? 100 : 101;
}
}

function _buildUserOp(
Permission[] memory permissions,
SessionData memory sessionData,
uint256 indexToUse,
uint8 usingPaymasterMode
uint8 usingPaymasterMode,
bool param1Faulty,
bool param2Faulty
) internal view returns (UserOperation memory op) {
op = entryPoint.fillUserOp(
address(kernel),
Expand All @@ -92,8 +110,8 @@ contract SessionKeyValidatorTest is KernelECDSATest {
0,
abi.encodeWithSelector(
permissions[indexToUse].sig,
1, // since EQ
1 // since NOT_EQ
_generateParam(ParamCondition(indexToUse%6), !param1Faulty), // since EQ
_generateParam(ParamCondition((indexToUse+1)%6), !param2Faulty) // since NOT_EQ
),
Operation.Call
)
Expand Down Expand Up @@ -170,7 +188,7 @@ contract SessionKeyValidatorTest is KernelECDSATest {
vm.assume(config.validAfter < type(uint32).max && config.interval < type(uint32).max && config.runs < type(uint32).max);
config.paymasterMode = config.paymasterMode % 3;
config.usingPaymasterMode = config.usingPaymasterMode % 3;
bool shouldFail = (config.usingPaymasterMode < config.paymasterMode) || (1000 < config.validAfter) || config.faultySig;
bool shouldFail = (config.usingPaymasterMode < config.paymasterMode) || (1000 < config.validAfter) || config.faultySig || config.param1Faulty || config.param2Faulty;
config.runs = config.runs % 10;
config.earlyRun = config.runs == 0 ? 0 : config.earlyRun % config.runs;
if(config.interval == 0 || config.validAfter == 0) {
Expand All @@ -194,7 +212,7 @@ contract SessionKeyValidatorTest is KernelECDSATest {
nonce: uint256(lastNonce) + 1//lastNonce + 1
});
// now encode data to op
UserOperation memory op = _buildUserOp(permissions, sessionData, config.indexToUse, config.usingPaymasterMode);
UserOperation memory op = _buildUserOp(permissions, sessionData, config.indexToUse, config.usingPaymasterMode, config.param1Faulty, config.param2Faulty);
op.signature = bytes.concat(
op.signature,
abi.encodePacked(
Expand Down