Skip to content

Commit

Permalink
[FAB-8226] Include consortia TLS CAs
Browse files Browse the repository at this point in the history
The orderer updateTrustRoots currently ignores organizations defined in
consortia for the orderer system channel.  This CR simply includes them
in the update path.

Change-Id: I56c590248a4a6e71db1ae32e9f95e44066bea5f9
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
  • Loading branch information
Jason Yellick committed Feb 12, 2018
1 parent ad5d0f7 commit fadd1f6
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions orderer/common/server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,15 @@ func updateTrustedRoots(srv comm.GRPCServer, rootCASupport *comm.CASupport,
}
}

if cc, ok := cm.ConsortiumsConfig(); ok {
for _, consortium := range cc.Consortiums() {
//loop through consortium orgs and build map of MSPIDs
for _, consortiumOrg := range consortium.Organizations() {
appOrgMSPs[consortiumOrg.MSPID()] = struct{}{}
}
}
}

cid := cm.ConfigtxValidator().ChainID()
logger.Debugf("updating root CAs for channel [%s]", cid)
msps, err := cm.MSPManager().GetMSPs()
Expand Down

0 comments on commit fadd1f6

Please sign in to comment.