Skip to content

Commit 3f9d2c9

Browse files
committed
[FAB-9836] Glossary
To avoid scope creep, please only comment on the following entries in the glossary: - Added ACL - Updated Policy, Anchor Peer Leading Peer Change-Id: I14cc55b180120522900914b4193095fbc6be8f50 Signed-off-by: pama-ibm <pama@ibm.com>
1 parent 4db37aa commit 3f9d2c9

File tree

1 file changed

+40
-7
lines changed

1 file changed

+40
-7
lines changed

docs/source/glossary.rst

+40-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,24 @@ Each organization added to a channel should identify at least one of its
2020
peers as an anchor peer. The anchor peer address is stored in the
2121
configuration block of the channel. Each organization that has a peer
2222
should have at least one (there can be more than one) of its peers
23-
defined as an anchor peer.
23+
defined as an anchor peer. Thus, the anchor peer is used as the entry point
24+
from another organization's peer on the same channel to get the message
25+
delivered to each of the peers in the anchor peer's org.
26+
27+
.. _glossary_ACL:
28+
29+
ACL
30+
---
31+
32+
Access Control List. Used to associate policies with specific resources.
33+
Access control lists are defined in the ``configtx.yaml`` file, used by
34+
configtxgen to build channel configurations. An ACL is formatted as a key-value
35+
pair consisting of a resource function name followed by the name of the group
36+
with access to the resource. A set of default ACLs are provided in the
37+
``configtx.yaml`` file and can be overridden by editing the configtx.yaml
38+
for the orderer system channel (new channels copy the configuration of the
39+
orderer system channel by default) or the ``configtx.yaml`` for a specific
40+
channel.
2441

2542
.. _Block:
2643

@@ -227,11 +244,11 @@ invoke, and an array of arguments.
227244
Leading Peer
228245
------------
229246

230-
Each Member_ can own multiple peers on each channel that
231-
it subscribes to. One of these peers is serves as the leading peer for the channel,
247+
Each Organization_ can own multiple peers on each channel that
248+
it subscribes to. One of these peers serves as the leading peer for the channel,
232249
in order to communicate with the network ordering service on behalf of the
233-
member. The ordering service "delivers" blocks to the leading peer(s) on a
234-
channel, who then distribute them to other peers within the same member cluster.
250+
organization. The ordering service "delivers" blocks to the leading peer(s) on a
251+
channel, who then distribute them to other peers within the same org cluster.
235252

236253
.. _Ledger:
237254

@@ -327,8 +344,24 @@ read/write operations to the ledger. Peers are owned and maintained by members.
327344
Policy
328345
------
329346

330-
There are policies for endorsement, validation, chaincode
331-
management and network/channel management.
347+
How members come to agreement on accepting or rejecting changes to the network
348+
or a channel. Policies include criteria for adding or removing members or peers
349+
from the network. They also include the requirements needed to update a channel
350+
or endorsements required to instantiate chaincode and have a transaction
351+
validated by a channel.
352+
353+
Policies are fundamental to the way Fabric works because they allow the identity
354+
associated with a request to be checked against the policy associated with the
355+
resource (such as a chaincode API) needed to fulfill the request. There are two
356+
types of policies -- ``Signature`` and ``ImplicitMeta``. ``Signature`` policies
357+
define specific users who must sign in order for a policy to be satisfied such
358+
as ``Org1.Peer OR Org2.Peer``. ``ImplicitMeta`` policies are only valid in the
359+
context of configuration and aggregate the result of policies deeper in the
360+
configuration hierarchy which are ultimately defined by Signature policies.
361+
They use a different syntax, for example ``"MAJORITY Admins``. Policies can be
362+
defined globally for the entire network in the ``configtx.yaml`` file under
363+
``Application: Policies``, but channel specific policies may also be defined in
364+
the channel profile section as well.
332365

333366
.. _Proposal:
334367

0 commit comments

Comments
 (0)