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

Commit

Permalink
Add network admin ACL rules, bump Composer version to 0.14.0 (#100)
Browse files Browse the repository at this point in the history 
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
  • Loading branch information
Simon Stone committed Oct 9, 2017
1 parent f3a4fff commit 457875b
Show file tree
Hide file tree
Showing 20 changed files with 211 additions and 51 deletions.
6 changes: 3 additions & 3 deletions packages/animaltracking-network/package.json
View file
@@ -1,6 +1,6 @@
{
"engines": {
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0"
"composer": "^0.14.0"
},
"name": "animaltracking-network",
"version": "0.1.10",
Expand Down Expand Up @@ -36,8 +36,8 @@
"devDependencies": {
"browserfs": "^1.2.0",
"chai": "^3.5.0",
"composer-cli": "^0.11.0",
"composer-connector-embedded": "^0.11.0",
"composer-cli": "^0.14.0-0",
"composer-connector-embedded": "^0.14.0-0",
"eslint": "^3.6.1",
"jsdoc": "^3.4.1",
"license-check": "^1.1.5",
Expand Down
16 changes: 16 additions & 0 deletions packages/animaltracking-network/permissions.acl
View file
Expand Up @@ -15,4 +15,20 @@ rule SystemACL {
operation: ALL
resource: "org.hyperledger.composer.system.**"
action: ALLOW
}

rule NetworkAdminUser {
description: "Grant business network administrators full access to user resources"
participant: "org.hyperledger.composer.system.NetworkAdmin"
operation: ALL
resource: "**"
action: ALLOW
}

rule NetworkAdminSystem {
description: "Grant business network administrators full access to system resources"
participant: "org.hyperledger.composer.system.NetworkAdmin"
operation: ALL
resource: "org.hyperledger.composer.system.**"
action: ALLOW
}
12 changes: 6 additions & 6 deletions packages/basic-sample-network/package.json
View file
@@ -1,6 +1,6 @@
{
"engines": {
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0"
"composer": "^0.14.0"
},
"name": "basic-sample-network",
"version": "0.1.10",
Expand Down Expand Up @@ -34,11 +34,11 @@
"browserfs": "^1.2.0",
"chai": "^3.5.0",
"chai-as-promised": "^6.0.0",
"composer-admin": "^0.11.0",
"composer-cli": "^0.11.0",
"composer-client": "^0.11.0",
"composer-connector-embedded": "^0.11.0",
"composer-cucumber-steps": "^0.11.0",
"composer-admin": "^0.14.0-0",
"composer-cli": "^0.14.0-0",
"composer-client": "^0.14.0-0",
"composer-connector-embedded": "^0.14.0-0",
"composer-cucumber-steps": "^0.14.0-0",
"cucumber": "^2.2.0",
"eslint": "^3.6.1",
"istanbul": "^0.4.5",
Expand Down
16 changes: 16 additions & 0 deletions packages/basic-sample-network/permissions.acl
View file
Expand Up @@ -32,4 +32,20 @@ rule SystemACL {
operation: ALL
resource: "org.hyperledger.composer.system.**"
action: ALLOW
}

rule NetworkAdminUser {
description: "Grant business network administrators full access to user resources"
participant: "org.hyperledger.composer.system.NetworkAdmin"
operation: ALL
resource: "**"
action: ALLOW
}

rule NetworkAdminSystem {
description: "Grant business network administrators full access to system resources"
participant: "org.hyperledger.composer.system.NetworkAdmin"
operation: ALL
resource: "org.hyperledger.composer.system.**"
action: ALLOW
}
10 changes: 5 additions & 5 deletions packages/bond-network/package.json
View file
@@ -1,6 +1,6 @@
{
"engines": {
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0"
"composer": "^0.14.0"
},
"name": "bond-network",
"version": "0.1.10",
Expand Down Expand Up @@ -34,10 +34,10 @@
"devDependencies": {
"browserfs": "^1.2.0",
"chai": "^3.5.0",
"composer-admin": "^0.11.0",
"composer-cli": "^0.11.0",
"composer-client": "^0.11.0",
"composer-connector-embedded": "^0.11.0",
"composer-admin": "^0.14.0-0",
"composer-cli": "^0.14.0-0",
"composer-client": "^0.14.0-0",
"composer-connector-embedded": "^0.14.0-0",
"eslint": "^3.6.1",
"istanbul": "^0.4.5",
"jsdoc": "^3.4.1",
Expand Down
18 changes: 17 additions & 1 deletion packages/bond-network/permissions.acl
View file
Expand Up @@ -6,7 +6,7 @@ rule Issuer {
participant(i): "org.acme.bond.Issuer"
operation: ALL
resource(a): "org.acme.bond.BondAsset"
condition: (a.bond.issuer.memberId === i.memberId)
condition: (a.bond.issuer.memberId === i.memberId)
action: ALLOW
}

Expand All @@ -24,4 +24,20 @@ rule SystemACL {
operation: ALL
resource: "org.hyperledger.composer.system.**"
action: ALLOW
}

rule NetworkAdminUser {
description: "Grant business network administrators full access to user resources"
participant: "org.hyperledger.composer.system.NetworkAdmin"
operation: ALL
resource: "**"
action: ALLOW
}

rule NetworkAdminSystem {
description: "Grant business network administrators full access to system resources"
participant: "org.hyperledger.composer.system.NetworkAdmin"
operation: ALL
resource: "org.hyperledger.composer.system.**"
action: ALLOW
}
10 changes: 5 additions & 5 deletions packages/carauction-network/package.json
View file
@@ -1,6 +1,6 @@
{
"engines": {
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0"
"composer": "^0.14.0"
},
"name": "carauction-network",
"version": "0.1.10",
Expand Down Expand Up @@ -33,10 +33,10 @@
"devDependencies": {
"browserfs": "^1.2.0",
"chai": "^3.5.0",
"composer-admin": "^0.11.0",
"composer-cli": "^0.11.0",
"composer-client": "^0.11.0",
"composer-connector-embedded": "^0.11.0",
"composer-admin": "^0.14.0-0",
"composer-cli": "^0.14.0-0",
"composer-client": "^0.14.0-0",
"composer-connector-embedded": "^0.14.0-0",
"eslint": "^3.6.1",
"istanbul": "^0.4.5",
"jsdoc": "^3.4.1",
Expand Down
18 changes: 17 additions & 1 deletion packages/carauction-network/permissions.acl
View file
Expand Up @@ -40,5 +40,21 @@ rule SystemACL {
participant: "org.hyperledger.composer.system.Participant"
operation: ALL
resource: "org.hyperledger.composer.system.**"
action: ALLOW
action: ALLOW
}

rule NetworkAdminUser {
description: "Grant business network administrators full access to user resources"
participant: "org.hyperledger.composer.system.NetworkAdmin"
operation: ALL
resource: "**"
action: ALLOW
}

rule NetworkAdminSystem {
description: "Grant business network administrators full access to system resources"
participant: "org.hyperledger.composer.system.NetworkAdmin"
operation: ALL
resource: "org.hyperledger.composer.system.**"
action: ALLOW
}
10 changes: 5 additions & 5 deletions packages/digitalproperty-network/package.json
View file
@@ -1,6 +1,6 @@
{
"engines": {
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0"
"composer": "^0.14.0"
},
"name": "digitalproperty-network",
"version": "0.1.10",
Expand Down Expand Up @@ -32,10 +32,10 @@
"devDependencies": {
"browserfs": "^1.2.0",
"chai": "^3.5.0",
"composer-admin": "^0.11.0",
"composer-cli": "^0.11.0",
"composer-client": "^0.11.0",
"composer-connector-embedded": "^0.11.0",
"composer-admin": "^0.14.0-0",
"composer-cli": "^0.14.0-0",
"composer-client": "^0.14.0-0",
"composer-connector-embedded": "^0.14.0-0",
"eslint": "^3.6.1",
"istanbul": "^0.4.5",
"jsdoc": "^3.4.1",
Expand Down
16 changes: 16 additions & 0 deletions packages/digitalproperty-network/permissions.acl
View file
Expand Up @@ -15,4 +15,20 @@ rule SystemACL {
operation: ALL
resource: "org.hyperledger.composer.system.**"
action: ALLOW
}

rule NetworkAdminUser {
description: "Grant business network administrators full access to user resources"
participant: "org.hyperledger.composer.system.NetworkAdmin"
operation: ALL
resource: "**"
action: ALLOW
}

rule NetworkAdminSystem {
description: "Grant business network administrators full access to system resources"
participant: "org.hyperledger.composer.system.NetworkAdmin"
operation: ALL
resource: "org.hyperledger.composer.system.**"
action: ALLOW
}
10 changes: 5 additions & 5 deletions packages/marbles-network/package.json
View file
@@ -1,6 +1,6 @@
{
"engines": {
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0"
"composer": "^0.14.0"
},
"name": "marbles-network",
"version": "0.1.10",
Expand Down Expand Up @@ -33,10 +33,10 @@
"devDependencies": {
"browserfs": "^1.2.0",
"chai": "^3.5.0",
"composer-admin": "^0.11.0",
"composer-cli": "^0.11.0",
"composer-client": "^0.11.0",
"composer-connector-embedded": "^0.11.0",
"composer-admin": "^0.14.0-0",
"composer-cli": "^0.14.0-0",
"composer-client": "^0.14.0-0",
"composer-connector-embedded": "^0.14.0-0",
"eslint": "^3.6.1",
"istanbul": "^0.4.5",
"jsdoc": "^3.4.1",
Expand Down
16 changes: 16 additions & 0 deletions packages/marbles-network/permissions.acl
View file
Expand Up @@ -15,4 +15,20 @@ rule SystemACL {
operation: ALL
resource: "org.hyperledger.composer.system.**"
action: ALLOW
}

rule NetworkAdminUser {
description: "Grant business network administrators full access to user resources"
participant: "org.hyperledger.composer.system.NetworkAdmin"
operation: ALL
resource: "**"
action: ALLOW
}

rule NetworkAdminSystem {
description: "Grant business network administrators full access to system resources"
participant: "org.hyperledger.composer.system.NetworkAdmin"
operation: ALL
resource: "org.hyperledger.composer.system.**"
action: ALLOW
}
10 changes: 5 additions & 5 deletions packages/perishable-network/package.json
View file
@@ -1,6 +1,6 @@
{
"engines": {
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0 "
"composer": "^0.14.0"
},
"name": "perishable-network",
"version": "0.1.10",
Expand Down Expand Up @@ -34,10 +34,10 @@
"devDependencies": {
"browserfs": "^1.2.0",
"chai": "^3.5.0",
"composer-admin": "^0.11.0",
"composer-cli": "^0.11.0",
"composer-client": "^0.11.0",
"composer-connector-embedded": "^0.11.0",
"composer-admin": "^0.14.0-0",
"composer-cli": "^0.14.0-0",
"composer-client": "^0.14.0-0",
"composer-connector-embedded": "^0.14.0-0",
"eslint": "^3.6.1",
"istanbul": "^0.4.5",
"jsdoc": "^3.4.1",
Expand Down
16 changes: 16 additions & 0 deletions packages/perishable-network/permissions.acl
View file
Expand Up @@ -15,4 +15,20 @@ rule SystemACL {
operation: ALL
resource: "org.hyperledger.composer.system.**"
action: ALLOW
}

rule NetworkAdminUser {
description: "Grant business network administrators full access to user resources"
participant: "org.hyperledger.composer.system.NetworkAdmin"
operation: ALL
resource: "**"
action: ALLOW
}

rule NetworkAdminSystem {
description: "Grant business network administrators full access to system resources"
participant: "org.hyperledger.composer.system.NetworkAdmin"
operation: ALL
resource: "org.hyperledger.composer.system.**"
action: ALLOW
}
10 changes: 5 additions & 5 deletions packages/pii-network/package.json
View file
@@ -1,6 +1,6 @@
{
"engines": {
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0"
"composer": "^0.14.0"
},
"name": "pii-network",
"version": "0.1.10",
Expand Down Expand Up @@ -33,10 +33,10 @@
"devDependencies": {
"browserfs": "^1.2.0",
"chai": "^3.5.0",
"composer-admin": "^0.11.0",
"composer-cli": "^0.11.0",
"composer-client": "^0.11.0",
"composer-connector-embedded": "^0.11.0",
"composer-admin": "^0.14.0-0",
"composer-cli": "^0.14.0-0",
"composer-client": "^0.14.0-0",
"composer-connector-embedded": "^0.14.0-0",
"eslint": "^3.6.1",
"istanbul": "^0.4.5",
"jsdoc": "^3.4.1",
Expand Down
16 changes: 16 additions & 0 deletions packages/pii-network/permissions.acl
View file
Expand Up @@ -45,4 +45,20 @@ rule SystemACL {
operation: ALL
resource: "org.hyperledger.composer.system.**"
action: ALLOW
}

rule NetworkAdminUser {
description: "Grant business network administrators full access to user resources"
participant: "org.hyperledger.composer.system.NetworkAdmin"
operation: ALL
resource: "**"
action: ALLOW
}

rule NetworkAdminSystem {
description: "Grant business network administrators full access to system resources"
participant: "org.hyperledger.composer.system.NetworkAdmin"
operation: ALL
resource: "org.hyperledger.composer.system.**"
action: ALLOW
}
10 changes: 5 additions & 5 deletions packages/trade-network/package.json
View file
@@ -1,6 +1,6 @@
{
"engines": {
"composer": "^0.11.0 || ^0.12.0 || ^0.13.0"
"composer": "^0.14.0"
},
"name": "trade-network",
"version": "0.1.10",
Expand Down Expand Up @@ -33,10 +33,10 @@
"devDependencies": {
"browserfs": "^1.2.0",
"chai": "^3.5.0",
"composer-admin": "^0.11.0",
"composer-cli": "^0.11.0",
"composer-client": "^0.11.0",
"composer-connector-embedded": "^0.11.0",
"composer-admin": "^0.14.0-0",
"composer-cli": "^0.14.0-0",
"composer-client": "^0.14.0-0",
"composer-connector-embedded": "^0.14.0-0",
"eslint": "^3.6.1",
"istanbul": "^0.4.5",
"jsdoc": "^3.4.1",
Expand Down

0 comments on commit 457875b

Please sign in to comment.