1853

pending completion

Build # 1853

Build Type

Pull #429

travis-ci

Committed by

web-flow

Commit Message

ACL: add `noPermissionManager` modifier

Move protection checks to external interfaces and improve DRYness.

For consistency with:
https://github.com/aragon/aragon-apps/commit/62035c025
https://github.com/aragon/aragon-apps/pull/438

Pull Request Pull Request #429: Add `petrifyPermission` function to ACL

Run Details

170 of 176 branches covered (96.59%)

Branch coverage included in aggregate %.

4 of 4 new or added lines in 1 file covered. (100.0%)

469 of 470 relevant lines covered (99.79%)

491.52 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

93.33

/contracts/apm/APMRegistry.sol

pragma solidity 0.4.24;

import "../lib/ens/AbstractENS.sol";
import "../ens/ENSSubdomainRegistrar.sol";
import "../factory/AppProxyFactory.sol";
import "../apps/AragonApp.sol";
import "../acl/ACL.sol";
import "./Repo.sol";


contract APMRegistryConstants {
    // Cant have a regular APM appId because it is used to build APM
    // TODO: recheck this
    string public constant APM_APP_NAME = "apm-registry";
    string public constant REPO_APP_NAME = "apm-repo";
    string public constant ENS_SUB_APP_NAME = "apm-enssub";
}


contract APMRegistry is AragonApp, AppProxyFactory, APMRegistryConstants {
    AbstractENS public ens;
    ENSSubdomainRegistrar public registrar;

    // bytes32 public constant CREATE_REPO_ROLE = keccak256("CREATE_REPO_ROLE");
    bytes32 public constant CREATE_REPO_ROLE = 0x2a9494d64846c9fdbf0158785aa330d8bc9caf45af27fa0e8898eb4d55adcea6;

    event NewRepo(bytes32 id, string name, address repo);

    /**
    * NEEDS CREATE_NAME_ROLE and POINT_ROOTNODE_ROLE permissions on registrar
    * @param _registrar ENSSubdomainRegistrar instance that holds registry root node ownership
    */
    function initialize(ENSSubdomainRegistrar _registrar) public onlyInit {
        initialized();

        registrar = _registrar;
        ens = registrar.ens();

        registrar.pointRootNode(this);

        // Check APM has all permissions it needss
        ACL acl = ACL(kernel().acl());
        require(acl.hasPermission(this, registrar, registrar.CREATE_NAME_ROLE()));
        require(acl.hasPermission(this, acl, acl.CREATE_PERMISSIONS_ROLE()));
    }

    /**
    * @notice Create new repo in registry with `_name`
    * @param _name Repo name, must be ununsed
    * @param _dev Address that will be given permission to create versions
    */
    function newRepo(string _name, address _dev) public auth(CREATE_REPO_ROLE) returns (Repo) {
        return _newRepo(_name, _dev);
    }

    /**
    * @notice Create new repo in registry with `_name` and first repo version
    * @param _name Repo name
    * @param _dev Address that will be given permission to create versions
    * @param _initialSemanticVersion Semantic version for new repo version
    * @param _contractAddress address for smart contract logic for version (if set to 0, it uses last versions' contractAddress)
    * @param _contentURI External URI for fetching new version's content
    */
    function newRepoWithVersion(
        string _name,
        address _dev,
        uint16[3] _initialSemanticVersion,
        address _contractAddress,
        bytes _contentURI
    ) public auth(CREATE_REPO_ROLE) returns (Repo)
    {
        Repo repo = _newRepo(_name, this); // need to have permissions to create version
        repo.newVersion(_initialSemanticVersion, _contractAddress, _contentURI);

        // Give permissions to _dev
        ACL acl = ACL(kernel().acl());
        acl.revokePermission(this, repo, repo.CREATE_VERSION_ROLE());
        acl.grantPermission(_dev, repo, repo.CREATE_VERSION_ROLE());
        acl.setPermissionManager(_dev, repo, repo.CREATE_VERSION_ROLE());
        return repo;
    }

    function _newRepo(string _name, address _dev) internal returns (Repo) {
        require(bytes(_name).length > 0);

        Repo repo = newClonedRepo();

        ACL(kernel().acl()).createPermission(_dev, repo, repo.CREATE_VERSION_ROLE(), _dev);

        // Creates [name] subdomain in the rootNode and sets registry as resolver
        // This will fail if repo name already exists
        bytes32 node = registrar.createNameAndPoint(keccak256(abi.encodePacked(_name)), repo);

        emit NewRepo(node, _name, repo);

        return repo;
    }

    function newClonedRepo() internal returns (Repo repo) {
        repo = Repo(newAppProxy(kernel(), repoAppId()));
        repo.initialize();
    }

    function repoAppId() internal view returns (bytes32) {
        return keccak256(abi.encodePacked(registrar.rootNode(), keccak256(abi.encodePacked(REPO_APP_NAME))));
    }
}

1	pragma solidity 0.4.24;
2
3	import "../lib/ens/AbstractENS.sol";
4	import "../ens/ENSSubdomainRegistrar.sol";
5	import "../factory/AppProxyFactory.sol";
6	import "../apps/AragonApp.sol";
7	import "../acl/ACL.sol";
8	import "./Repo.sol";
9
10
11	contract APMRegistryConstants {
12	// Cant have a regular APM appId because it is used to build APM
13	// TODO: recheck this
14	string public constant APM_APP_NAME = "apm-registry";
15	string public constant REPO_APP_NAME = "apm-repo";
16	string public constant ENS_SUB_APP_NAME = "apm-enssub";
17	}
18
19
20	contract APMRegistry is AragonApp, AppProxyFactory, APMRegistryConstants {
21	AbstractENS public ens;
22	ENSSubdomainRegistrar public registrar;
23
24	// bytes32 public constant CREATE_REPO_ROLE = keccak256("CREATE_REPO_ROLE");
25	bytes32 public constant CREATE_REPO_ROLE = 0x2a9494d64846c9fdbf0158785aa330d8bc9caf45af27fa0e8898eb4d55adcea6;
26
27	event NewRepo(bytes32 id, string name, address repo);
28
29	/**
30	* NEEDS CREATE_NAME_ROLE and POINT_ROOTNODE_ROLE permissions on registrar
31	* @param _registrar ENSSubdomainRegistrar instance that holds registry root node ownership
32	*/
33	function initialize(ENSSubdomainRegistrar _registrar) public onlyInit {
34	initialized();	23✔
35
36	registrar = _registrar;	23✔
37	ens = registrar.ens();	23✔
38
39	registrar.pointRootNode(this);	23✔
40
41	// Check APM has all permissions it needss
42	ACL acl = ACL(kernel().acl());	23✔
43	require(acl.hasPermission(this, registrar, registrar.CREATE_NAME_ROLE()));	23!
44	require(acl.hasPermission(this, acl, acl.CREATE_PERMISSIONS_ROLE()));	23!
45	}
46
47	/**
48	* @notice Create new repo in registry with `_name`
49	* @param _name Repo name, must be ununsed
50	* @param _dev Address that will be given permission to create versions
51	*/
52	function newRepo(string _name, address _dev) public auth(CREATE_REPO_ROLE) returns (Repo) {
53	return _newRepo(_name, _dev);	8✔
54	}
55
56	/**
57	* @notice Create new repo in registry with `_name` and first repo version
58	* @param _name Repo name
59	* @param _dev Address that will be given permission to create versions
60	* @param _initialSemanticVersion Semantic version for new repo version
61	* @param _contractAddress address for smart contract logic for version (if set to 0, it uses last versions' contractAddress)
62	* @param _contentURI External URI for fetching new version's content
63	*/
64	function newRepoWithVersion(
65	string _name,
66	address _dev,
67	uint16[3] _initialSemanticVersion,
68	address _contractAddress,
69	bytes _contentURI
70	) public auth(CREATE_REPO_ROLE) returns (Repo)
71	{
72	Repo repo = _newRepo(_name, this); // need to have permissions to create version	70✔
73	repo.newVersion(_initialSemanticVersion, _contractAddress, _contentURI);	70✔
74
75	// Give permissions to _dev
76	ACL acl = ACL(kernel().acl());	70✔
77	acl.revokePermission(this, repo, repo.CREATE_VERSION_ROLE());	70✔
78	acl.grantPermission(_dev, repo, repo.CREATE_VERSION_ROLE());	70✔
79	acl.setPermissionManager(_dev, repo, repo.CREATE_VERSION_ROLE());	70✔
80	return repo;	70✔
81	}
82
83	function _newRepo(string _name, address _dev) internal returns (Repo) {
84	require(bytes(_name).length > 0);	78✔
85
86	Repo repo = newClonedRepo();	77✔
87
88	ACL(kernel().acl()).createPermission(_dev, repo, repo.CREATE_VERSION_ROLE(), _dev);	77✔
89
90	// Creates [name] subdomain in the rootNode and sets registry as resolver
91	// This will fail if repo name already exists
92	bytes32 node = registrar.createNameAndPoint(keccak256(abi.encodePacked(_name)), repo);	77✔
93
94	emit NewRepo(node, _name, repo);	77✔
95
96	return repo;	77✔
97	}
98
99	function newClonedRepo() internal returns (Repo repo) {
100	repo = Repo(newAppProxy(kernel(), repoAppId()));	77✔
101	repo.initialize();	77✔
102	}
103
104	function repoAppId() internal view returns (bytes32) {
105	return keccak256(abi.encodePacked(registrar.rootNode(), keccak256(abi.encodePacked(REPO_APP_NAME))));	77✔
106	}
107	}

aragon / aragonOS / 1853

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous