Fix for sherlock issues 46, 43, 42 #10
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Mar 29, 2023
zobront
reviewed
Apr 7, 2023
Comment on lines
+505
to
+517
| (address[] memory modulesWith1, address next) = safe.getModulesPaginated(SENTINEL_OWNERS, 1); | ||
| // ensure that there is only one module... | ||
| if ( | ||
| // if the length is 0, we know this module has been removed | ||
| // forgefmt: disable-next-line | ||
| modulesWith1.length == 0 | ||
| /* per Safe ModuleManager.sol#137, "If all entries fit into a single page, the next pointer will be 0x1", ie SENTINEL_OWNERS. | ||
| Therefore, if `next` is not SENTINEL_OWNERS, we know another module has been added. */ | ||
| || next != SENTINEL_OWNERS | ||
| ) { | ||
| revert SignersCannotChangeModules(); | ||
| } // ...and that the only module is this contract | ||
| else if (modulesWith1[0] != address(this)) { |
There was a problem hiding this comment.
This looks fine. You are checking three conditions with the same error message (and we exit the if early if modulesWith1.length == 0, so the indexing will work), so probably easiest to just stack them into one statement like:
if(
modulesWith1.length == 0
|| next != SENTINEL_OWNERS
|| modulesWith1[0] != address(this)
) ...
Honestly, I would probably just get a page of 2 modules and simply check:
if(modulesWith1.length != 1 || modulesWIth1[0] != address(this)) ...But either way works. This solution will accomplish the goal, so marking it as approved.
Fix for sherlock issue 93
Fix for sherlock issue 41
Fix for sherlock issue 38
Fix for sherlock issue 50
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Address the following issues by disallowing any modules other than (M)HSG:
sherlock-audit/2023-02-hats-judging#46
sherlock-audit/2023-02-hats-judging#43
sherlock-audit/2023-02-hats-judging#42