Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Commit 457875b

Browse files
author
Simon Stone
authored
Add network admin ACL rules, bump Composer version to 0.14.0 (#100)
Signed-off-by: Simon Stone <[email protected]>
1 parent f3a4fff commit 457875b

File tree

20 files changed

+211
-51
lines changed

20 files changed

+211
-51
lines changed

‎packages/animaltracking-network/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"engines": {
3-
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0"
3+
"composer": "^0.14.0"
44
},
55
"name": "animaltracking-network",
66
"version": "0.1.10",
@@ -36,8 +36,8 @@
3636
"devDependencies": {
3737
"browserfs": "^1.2.0",
3838
"chai": "^3.5.0",
39-
"composer-cli": "^0.11.0",
40-
"composer-connector-embedded": "^0.11.0",
39+
"composer-cli": "^0.14.0-0",
40+
"composer-connector-embedded": "^0.14.0-0",
4141
"eslint": "^3.6.1",
4242
"jsdoc": "^3.4.1",
4343
"license-check": "^1.1.5",

‎packages/animaltracking-network/permissions.acl

+16
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,20 @@ rule SystemACL {
1515
operation: ALL
1616
resource: "org.hyperledger.composer.system.**"
1717
action: ALLOW
18+
}
19+
20+
rule NetworkAdminUser {
21+
description: "Grant business network administrators full access to user resources"
22+
participant: "org.hyperledger.composer.system.NetworkAdmin"
23+
operation: ALL
24+
resource: "**"
25+
action: ALLOW
26+
}
27+
28+
rule NetworkAdminSystem {
29+
description: "Grant business network administrators full access to system resources"
30+
participant: "org.hyperledger.composer.system.NetworkAdmin"
31+
operation: ALL
32+
resource: "org.hyperledger.composer.system.**"
33+
action: ALLOW
1834
}

‎packages/basic-sample-network/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"engines": {
3-
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0"
3+
"composer": "^0.14.0"
44
},
55
"name": "basic-sample-network",
66
"version": "0.1.10",
@@ -34,11 +34,11 @@
3434
"browserfs": "^1.2.0",
3535
"chai": "^3.5.0",
3636
"chai-as-promised": "^6.0.0",
37-
"composer-admin": "^0.11.0",
38-
"composer-cli": "^0.11.0",
39-
"composer-client": "^0.11.0",
40-
"composer-connector-embedded": "^0.11.0",
41-
"composer-cucumber-steps": "^0.11.0",
37+
"composer-admin": "^0.14.0-0",
38+
"composer-cli": "^0.14.0-0",
39+
"composer-client": "^0.14.0-0",
40+
"composer-connector-embedded": "^0.14.0-0",
41+
"composer-cucumber-steps": "^0.14.0-0",
4242
"cucumber": "^2.2.0",
4343
"eslint": "^3.6.1",
4444
"istanbul": "^0.4.5",

‎packages/basic-sample-network/permissions.acl

+16
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,20 @@ rule SystemACL {
3232
operation: ALL
3333
resource: "org.hyperledger.composer.system.**"
3434
action: ALLOW
35+
}
36+
37+
rule NetworkAdminUser {
38+
description: "Grant business network administrators full access to user resources"
39+
participant: "org.hyperledger.composer.system.NetworkAdmin"
40+
operation: ALL
41+
resource: "**"
42+
action: ALLOW
43+
}
44+
45+
rule NetworkAdminSystem {
46+
description: "Grant business network administrators full access to system resources"
47+
participant: "org.hyperledger.composer.system.NetworkAdmin"
48+
operation: ALL
49+
resource: "org.hyperledger.composer.system.**"
50+
action: ALLOW
3551
}

‎packages/bond-network/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"engines": {
3-
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0"
3+
"composer": "^0.14.0"
44
},
55
"name": "bond-network",
66
"version": "0.1.10",
@@ -34,10 +34,10 @@
3434
"devDependencies": {
3535
"browserfs": "^1.2.0",
3636
"chai": "^3.5.0",
37-
"composer-admin": "^0.11.0",
38-
"composer-cli": "^0.11.0",
39-
"composer-client": "^0.11.0",
40-
"composer-connector-embedded": "^0.11.0",
37+
"composer-admin": "^0.14.0-0",
38+
"composer-cli": "^0.14.0-0",
39+
"composer-client": "^0.14.0-0",
40+
"composer-connector-embedded": "^0.14.0-0",
4141
"eslint": "^3.6.1",
4242
"istanbul": "^0.4.5",
4343
"jsdoc": "^3.4.1",

‎packages/bond-network/permissions.acl

+17-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ rule Issuer {
66
participant(i): "org.acme.bond.Issuer"
77
operation: ALL
88
resource(a): "org.acme.bond.BondAsset"
9-
condition: (a.bond.issuer.memberId === i.memberId)
9+
condition: (a.bond.issuer.memberId === i.memberId)
1010
action: ALLOW
1111
}
1212

@@ -24,4 +24,20 @@ rule SystemACL {
2424
operation: ALL
2525
resource: "org.hyperledger.composer.system.**"
2626
action: ALLOW
27+
}
28+
29+
rule NetworkAdminUser {
30+
description: "Grant business network administrators full access to user resources"
31+
participant: "org.hyperledger.composer.system.NetworkAdmin"
32+
operation: ALL
33+
resource: "**"
34+
action: ALLOW
35+
}
36+
37+
rule NetworkAdminSystem {
38+
description: "Grant business network administrators full access to system resources"
39+
participant: "org.hyperledger.composer.system.NetworkAdmin"
40+
operation: ALL
41+
resource: "org.hyperledger.composer.system.**"
42+
action: ALLOW
2743
}

‎packages/carauction-network/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"engines": {
3-
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0"
3+
"composer": "^0.14.0"
44
},
55
"name": "carauction-network",
66
"version": "0.1.10",
@@ -33,10 +33,10 @@
3333
"devDependencies": {
3434
"browserfs": "^1.2.0",
3535
"chai": "^3.5.0",
36-
"composer-admin": "^0.11.0",
37-
"composer-cli": "^0.11.0",
38-
"composer-client": "^0.11.0",
39-
"composer-connector-embedded": "^0.11.0",
36+
"composer-admin": "^0.14.0-0",
37+
"composer-cli": "^0.14.0-0",
38+
"composer-client": "^0.14.0-0",
39+
"composer-connector-embedded": "^0.14.0-0",
4040
"eslint": "^3.6.1",
4141
"istanbul": "^0.4.5",
4242
"jsdoc": "^3.4.1",

‎packages/carauction-network/permissions.acl

+17-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,21 @@ rule SystemACL {
4040
participant: "org.hyperledger.composer.system.Participant"
4141
operation: ALL
4242
resource: "org.hyperledger.composer.system.**"
43-
action: ALLOW
43+
action: ALLOW
44+
}
45+
46+
rule NetworkAdminUser {
47+
description: "Grant business network administrators full access to user resources"
48+
participant: "org.hyperledger.composer.system.NetworkAdmin"
49+
operation: ALL
50+
resource: "**"
51+
action: ALLOW
52+
}
53+
54+
rule NetworkAdminSystem {
55+
description: "Grant business network administrators full access to system resources"
56+
participant: "org.hyperledger.composer.system.NetworkAdmin"
57+
operation: ALL
58+
resource: "org.hyperledger.composer.system.**"
59+
action: ALLOW
4460
}

‎packages/digitalproperty-network/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"engines": {
3-
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0"
3+
"composer": "^0.14.0"
44
},
55
"name": "digitalproperty-network",
66
"version": "0.1.10",
@@ -32,10 +32,10 @@
3232
"devDependencies": {
3333
"browserfs": "^1.2.0",
3434
"chai": "^3.5.0",
35-
"composer-admin": "^0.11.0",
36-
"composer-cli": "^0.11.0",
37-
"composer-client": "^0.11.0",
38-
"composer-connector-embedded": "^0.11.0",
35+
"composer-admin": "^0.14.0-0",
36+
"composer-cli": "^0.14.0-0",
37+
"composer-client": "^0.14.0-0",
38+
"composer-connector-embedded": "^0.14.0-0",
3939
"eslint": "^3.6.1",
4040
"istanbul": "^0.4.5",
4141
"jsdoc": "^3.4.1",

‎packages/digitalproperty-network/permissions.acl

+16
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,20 @@ rule SystemACL {
1515
operation: ALL
1616
resource: "org.hyperledger.composer.system.**"
1717
action: ALLOW
18+
}
19+
20+
rule NetworkAdminUser {
21+
description: "Grant business network administrators full access to user resources"
22+
participant: "org.hyperledger.composer.system.NetworkAdmin"
23+
operation: ALL
24+
resource: "**"
25+
action: ALLOW
26+
}
27+
28+
rule NetworkAdminSystem {
29+
description: "Grant business network administrators full access to system resources"
30+
participant: "org.hyperledger.composer.system.NetworkAdmin"
31+
operation: ALL
32+
resource: "org.hyperledger.composer.system.**"
33+
action: ALLOW
1834
}

‎packages/marbles-network/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"engines": {
3-
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0"
3+
"composer": "^0.14.0"
44
},
55
"name": "marbles-network",
66
"version": "0.1.10",
@@ -33,10 +33,10 @@
3333
"devDependencies": {
3434
"browserfs": "^1.2.0",
3535
"chai": "^3.5.0",
36-
"composer-admin": "^0.11.0",
37-
"composer-cli": "^0.11.0",
38-
"composer-client": "^0.11.0",
39-
"composer-connector-embedded": "^0.11.0",
36+
"composer-admin": "^0.14.0-0",
37+
"composer-cli": "^0.14.0-0",
38+
"composer-client": "^0.14.0-0",
39+
"composer-connector-embedded": "^0.14.0-0",
4040
"eslint": "^3.6.1",
4141
"istanbul": "^0.4.5",
4242
"jsdoc": "^3.4.1",

‎packages/marbles-network/permissions.acl

+16
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,20 @@ rule SystemACL {
1515
operation: ALL
1616
resource: "org.hyperledger.composer.system.**"
1717
action: ALLOW
18+
}
19+
20+
rule NetworkAdminUser {
21+
description: "Grant business network administrators full access to user resources"
22+
participant: "org.hyperledger.composer.system.NetworkAdmin"
23+
operation: ALL
24+
resource: "**"
25+
action: ALLOW
26+
}
27+
28+
rule NetworkAdminSystem {
29+
description: "Grant business network administrators full access to system resources"
30+
participant: "org.hyperledger.composer.system.NetworkAdmin"
31+
operation: ALL
32+
resource: "org.hyperledger.composer.system.**"
33+
action: ALLOW
1834
}

‎packages/perishable-network/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"engines": {
3-
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0 "
3+
"composer": "^0.14.0"
44
},
55
"name": "perishable-network",
66
"version": "0.1.10",
@@ -34,10 +34,10 @@
3434
"devDependencies": {
3535
"browserfs": "^1.2.0",
3636
"chai": "^3.5.0",
37-
"composer-admin": "^0.11.0",
38-
"composer-cli": "^0.11.0",
39-
"composer-client": "^0.11.0",
40-
"composer-connector-embedded": "^0.11.0",
37+
"composer-admin": "^0.14.0-0",
38+
"composer-cli": "^0.14.0-0",
39+
"composer-client": "^0.14.0-0",
40+
"composer-connector-embedded": "^0.14.0-0",
4141
"eslint": "^3.6.1",
4242
"istanbul": "^0.4.5",
4343
"jsdoc": "^3.4.1",

‎packages/perishable-network/permissions.acl

+16
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,20 @@ rule SystemACL {
1515
operation: ALL
1616
resource: "org.hyperledger.composer.system.**"
1717
action: ALLOW
18+
}
19+
20+
rule NetworkAdminUser {
21+
description: "Grant business network administrators full access to user resources"
22+
participant: "org.hyperledger.composer.system.NetworkAdmin"
23+
operation: ALL
24+
resource: "**"
25+
action: ALLOW
26+
}
27+
28+
rule NetworkAdminSystem {
29+
description: "Grant business network administrators full access to system resources"
30+
participant: "org.hyperledger.composer.system.NetworkAdmin"
31+
operation: ALL
32+
resource: "org.hyperledger.composer.system.**"
33+
action: ALLOW
1834
}

‎packages/pii-network/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"engines": {
3-
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0"
3+
"composer": "^0.14.0"
44
},
55
"name": "pii-network",
66
"version": "0.1.10",
@@ -33,10 +33,10 @@
3333
"devDependencies": {
3434
"browserfs": "^1.2.0",
3535
"chai": "^3.5.0",
36-
"composer-admin": "^0.11.0",
37-
"composer-cli": "^0.11.0",
38-
"composer-client": "^0.11.0",
39-
"composer-connector-embedded": "^0.11.0",
36+
"composer-admin": "^0.14.0-0",
37+
"composer-cli": "^0.14.0-0",
38+
"composer-client": "^0.14.0-0",
39+
"composer-connector-embedded": "^0.14.0-0",
4040
"eslint": "^3.6.1",
4141
"istanbul": "^0.4.5",
4242
"jsdoc": "^3.4.1",

‎packages/pii-network/permissions.acl

+16
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,20 @@ rule SystemACL {
4545
operation: ALL
4646
resource: "org.hyperledger.composer.system.**"
4747
action: ALLOW
48+
}
49+
50+
rule NetworkAdminUser {
51+
description: "Grant business network administrators full access to user resources"
52+
participant: "org.hyperledger.composer.system.NetworkAdmin"
53+
operation: ALL
54+
resource: "**"
55+
action: ALLOW
56+
}
57+
58+
rule NetworkAdminSystem {
59+
description: "Grant business network administrators full access to system resources"
60+
participant: "org.hyperledger.composer.system.NetworkAdmin"
61+
operation: ALL
62+
resource: "org.hyperledger.composer.system.**"
63+
action: ALLOW
4864
}

‎packages/trade-network/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"engines": {
3-
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0"
3+
"composer": "^0.14.0"
44
},
55
"name": "trade-network",
66
"version": "0.1.10",
@@ -33,10 +33,10 @@
3333
"devDependencies": {
3434
"browserfs": "^1.2.0",
3535
"chai": "^3.5.0",
36-
"composer-admin": "^0.11.0",
37-
"composer-cli": "^0.11.0",
38-
"composer-client": "^0.11.0",
39-
"composer-connector-embedded": "^0.11.0",
36+
"composer-admin": "^0.14.0-0",
37+
"composer-cli": "^0.14.0-0",
38+
"composer-client": "^0.14.0-0",
39+
"composer-connector-embedded": "^0.14.0-0",
4040
"eslint": "^3.6.1",
4141
"istanbul": "^0.4.5",
4242
"jsdoc": "^3.4.1",

0 commit comments

Comments
 (0)