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

Closes #229: Safe can be added as owner of itself #259

Merged
merged 2 commits into from
Feb 23, 2021
Merged

Closes #229: Safe can be added as owner of itself #259

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc7b64e
Add checks to disallow Safe as owner of itself with default methods
rmeissner Feb 22, 2021
58ef109
Merge branch 'development' into feature/issue_229_safe_as_owner
rmeissner Feb 23, 2021
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
10 changes: 5 additions & 5 deletions contracts/base/OwnerManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ contract OwnerManager is SelfAuthorized {
for (uint256 i = 0; i < _owners.length; i++) {
// Owner address cannot be null.
address owner = _owners[i];
require(owner != address(0) && owner != SENTINEL_OWNERS, "Invalid owner address provided");
require(owner != address(0) && owner != SENTINEL_OWNERS && owner != address(this), "Invalid owner address provided");
// No duplicate owners allowed.
require(owners[owner] == address(0), "Duplicate owner address provided");
owners[currentOwner] = owner;
Expand All @@ -54,8 +54,8 @@ contract OwnerManager is SelfAuthorized {
public
authorized
{
// Owner address cannot be null.
require(owner != address(0) && owner != SENTINEL_OWNERS, "Invalid owner address provided");
// Owner address cannot be null, the sentinel or the Safe itself.
require(owner != address(0) && owner != SENTINEL_OWNERS && owner != address(this), "Invalid owner address provided");
// No duplicate owners allowed.
require(owners[owner] == address(0), "Address is already an owner");
owners[owner] = owners[SENTINEL_OWNERS];
Expand Down Expand Up @@ -101,8 +101,8 @@ contract OwnerManager is SelfAuthorized {
public
authorized
{
// Owner address cannot be null.
require(newOwner != address(0) && newOwner != SENTINEL_OWNERS, "Invalid owner address provided");
// Owner address cannot be null, the sentinel or the Safe itself.
require(newOwner != address(0) && newOwner != SENTINEL_OWNERS && newOwner != address(this), "Invalid owner address provided");
// No duplicate owners allowed.
require(owners[newOwner] == address(0), "Address is already an owner");
// Validate oldOwner address and check that it corresponds to owner index.
Expand Down
16 changes: 16 additions & 0 deletions test/core/GnosisSafe.OwnerManager.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ describe("OwnerManager", async () => {
await expect(safe.addOwnerWithThreshold(user2.address, 1)).to.be.revertedWith("Method can only be called from this contract")
})

it('can not set Safe itself', async () => {
const { safe } = await setupTests()

await expect(
executeContractCallWithSigners(safe, safe, "addOwnerWithThreshold", [safe.address, 1], [user1])
).to.emit(safe, "ExecutionFailure")
})

it('can not set sentinel', async () => {
const { safe } = await setupTests()

Expand Down Expand Up @@ -202,6 +210,14 @@ describe("OwnerManager", async () => {
await expect(safe.swapOwner(AddressOne, user1.address, user2.address)).to.be.revertedWith("Method can only be called from this contract")
})

it('can not swap in Safe itseld', async () => {
const { safe } = await setupTests()

await expect(
executeContractCallWithSigners(safe, safe, "swapOwner", [AddressOne, user1.address, safe.address], [user1])
).to.emit(safe, "ExecutionFailure")
})

it('can not swap in sentinel', async () => {
const { safe } = await setupTests()

Expand Down
7 changes: 7 additions & 0 deletions test/core/GnosisSafe.Setup.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@ describe("GnosisSafe", async () => {
).to.be.revertedWith("Invalid owner address provided")
})

it('should revert if Safe itself is used as an owner', async () => {
const { template } = await setupTests()
await expect(
template.setup([user2.address, template.address], 2, AddressZero, "0x", AddressZero, AddressZero, 0, AddressZero)
).to.be.revertedWith("Invalid owner address provided")
})

it('should revert if sentinel is used as an owner', async () => {
const { template } = await setupTests()
await expect(
Expand Down