Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: changed behavior for the validation of depositors and borrowers in deposit() and repay()

Browse Source
This commit is contained in:
The3D 2021-05-20 18:48:30 +02:00
parent f2e8c2337d
commit f228a5d16a
2 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contracts/misc/PermissionedWETHGateway.sol
View File

@ -37,7 +37,7 @@ contract PermissionedWETHGateway is WETHGateway {
) public payable override { ) public payable override {
ILendingPool pool = ILendingPool(lendingPool); ILendingPool pool = ILendingPool(lendingPool);
require(_isDepositorOrBorrowerOrLiquidator(msg.sender, pool), Errors.USER_UNAUTHORIZED); require(_isInRole(msg.sender, DataTypes.Roles.DEPOSITOR, pool), Errors.USER_UNAUTHORIZED);
super.depositETH(lendingPool, onBehalfOf, referralCode); super.depositETH(lendingPool, onBehalfOf, referralCode);
} }
@ -57,12 +57,12 @@ contract PermissionedWETHGateway is WETHGateway {
) public payable override { ) public payable override {
ILendingPool pool = ILendingPool(lendingPool); ILendingPool pool = ILendingPool(lendingPool);
require(_isDepositorOrBorrowerOrLiquidator(msg.sender, pool), Errors.USER_UNAUTHORIZED); require(_isInRole(msg.sender, DataTypes.Roles.BORROWER, pool), Errors.USER_UNAUTHORIZED);
super.repayETH(lendingPool, amount, rateMode, onBehalfOf); super.repayETH(lendingPool, amount, rateMode, onBehalfOf);
} }
function _isDepositorOrBorrowerOrLiquidator(address user, ILendingPool pool) function _isInRole(address user, DataTypes.Roles role, ILendingPool pool)
internal internal
view view
returns (bool) returns (bool)
@ -72,12 +72,6 @@ contract PermissionedWETHGateway is WETHGateway {
IPermissionManager manager = IPermissionManager manager =
IPermissionManager(provider.getAddress(keccak256('PERMISSION_MANAGER'))); IPermissionManager(provider.getAddress(keccak256('PERMISSION_MANAGER')));
uint256[] memory roles = new uint256[](3); return manager.isInRole(user, uint256(role));
roles[0] = uint256(DataTypes.Roles.DEPOSITOR);
roles[1] = uint256(DataTypes.Roles.BORROWER);
roles[2] = uint256(DataTypes.Roles.LIQUIDATOR);
return manager.isInAnyRole(msg.sender, roles);
} }
} }

31
contracts/protocol/lendingpool/PermissionedLendingPool.sol
View File

@ -18,15 +18,19 @@ contract PermissionedLendingPool is LendingPool {
modifier onlyDepositors(address user) { modifier onlyDepositors(address user) {
require( require(
_isDepositorOrBorrowerOrLiquidator(msg.sender) && _isInRole(user, DataTypes.Roles.DEPOSITOR) &&
((user == msg.sender) || _isInRole(user, DataTypes.Roles.DEPOSITOR)), ((user == msg.sender) || _isInRole(msg.sender, DataTypes.Roles.DEPOSITOR)),
Errors.DEPOSITOR_UNAUTHORIZED Errors.DEPOSITOR_UNAUTHORIZED
); );
_; _;
} }
modifier onlyBorrowers(address user) { modifier onlyBorrowers(address user) {
require(_isInRole(user, DataTypes.Roles.BORROWER), Errors.BORROWER_UNAUTHORIZED); require(
_isInRole(user, DataTypes.Roles.BORROWER) &&
((user == msg.sender) || _isInRole(msg.sender, DataTypes.Roles.BORROWER)),
Errors.BORROWER_UNAUTHORIZED
);
_; _;
} }
@ -35,11 +39,6 @@ contract PermissionedLendingPool is LendingPool {
_; _;
} }
modifier onlyDepositorsOrBorrowersOrLiquidators {
require(_isDepositorOrBorrowerOrLiquidator(msg.sender), Errors.USER_UNAUTHORIZED);
_;
}
modifier onlyStableRateManagers { modifier onlyStableRateManagers {
require( require(
_isInRole(msg.sender, DataTypes.Roles.STABLE_RATE_MANAGER), _isInRole(msg.sender, DataTypes.Roles.STABLE_RATE_MANAGER),
@ -129,7 +128,7 @@ contract PermissionedLendingPool is LendingPool {
uint256 amount, uint256 amount,
uint256 rateMode, uint256 rateMode,
address onBehalfOf address onBehalfOf
) public virtual override onlyDepositorsOrBorrowersOrLiquidators returns (uint256) { ) public virtual override onlyBorrowers(onBehalfOf) returns (uint256) {
return super.repay(asset, amount, rateMode, onBehalfOf); return super.repay(asset, amount, rateMode, onBehalfOf);
} }
@ -268,18 +267,4 @@ contract PermissionedLendingPool is LendingPool {
uint256(role) uint256(role)
); );
} }
function _isDepositorOrBorrowerOrLiquidator(address user) internal view returns (bool) {
uint256[] memory roles = new uint256[](3);
roles[0] = uint256(DataTypes.Roles.DEPOSITOR);
roles[1] = uint256(DataTypes.Roles.BORROWER);
roles[2] = uint256(DataTypes.Roles.LIQUIDATOR);
return
IPermissionManager(_addressesProvider.getAddress(PERMISSION_MANAGER)).isInAnyRole(
user,
roles
);
}
} }