Skip to content

Fix: prevent setExpenditureState from bypassing isValidLocalSkill /claim #1346 #1348

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

Open
jialfaro wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix: prevent setExpenditureState from bypassing isValidLocalSkill /claim #1346 #1348

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions contracts/colony/ColonyExpenditure.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,22 @@ contract ColonyExpenditure is ColonyStorage {
"colony-expenditure-bad-payout-modifier"
);
}

// Restrict dynamic array indexing into expenditure slot fields.
// For the 'skills' array (offset == 3) we allow:
// - writing the array length (keys.length == 2)
// - writing the first element skills[0] (keys.length == 3 && keys[2] == 0) but only if the skill id is a valid local skill.
// For all other fields we require keys.length == 2 (no indexing into nested arrays/mappings).
if (offset == 3) {
if (_keys.length == 3) {
require(uint256(_keys[2]) == 0, "colony-expenditure-bad-keys");
require(isValidLocalSkill(uint256(_value)), "colony-not-valid-local-skill");
} else {
require(_keys.length == 2, "colony-expenditure-bad-keys");
}
} else {
require(_keys.length == 2, "colony-expenditure-bad-keys");
}
} else {
require(false, "colony-expenditure-bad-slot");
}
Expand Down