Commit graph

14 commits

Author SHA1 Message Date
Gari Singh
5d7ac01c81 Merge "[FAB-8496] allow modification of affiliations" 2018-03-07 23:01:33 +00:00
rennman
823fb6b9c5 [ FAB-8679 ] Permit samples to use RootCAs
Fix USE_INTERMEDIATE_CA variable to allow
exclusive use of RootCA for sample tests.

Change-Id: If10f9a768ba17943f03b416f5a68edb9eb65a27a
Signed-off-by: rennman <eabailey@us.ibm.com>
2018-03-06 13:42:48 -05:00
Keith Smith
9f9fc7e5ac [FAB-8633] Correct revoked error check
The returned error message was changed to "access denied" when
a certificate has been revoked.  This simply changes the sample
to look for the correct error message.

Change-Id: Id107d4e1813099e2f21ba9eaffa0bd0b9912a97b
Signed-off-by: Keith Smith <bksmith@us.ibm.com>
2018-03-01 23:47:07 -05:00
Saad Karim
77e74b7cd7 [FAB-8497] Download images required for fabric-ca
Added a script for fabric-ca sample that downloads
all the required docker images.

Vendored dependencies for the fabric-ca sample chaincode.
It can now be run without having a local fabric repository.

Change-Id: I7e0f3d7950201e42fdf82bbef2fc855d33c78676
Signed-off-by: Saad Karim <skarim@us.ibm.com>
2018-02-27 20:35:34 +00:00
luomin
7b7fc09804 [FAB-8496] allow modification of affiliations
As pointed out in [FAB-8496], updating the orgs for the fabric-ca
sample does not have an effect currently.

This RC added the affiliation settings in env.sh script into the
default config file.

Change-Id: I3eaa601fc572f6880b15dec48a4be8a69d01eb4e
Signed-off-by: Min Luo <luomin_tokyotech@hotmail.com>
2018-02-27 09:58:16 +09:00
Saad Karim
ca8016385e [FAB-8387] Add gencrl to revoke command
Add --gencrl flag to revoke command to illustrate
the ability to generate a CRL while performing
a revocation.

Change-Id: I7521cfee54f8704675236d7afb2876b87eb339bf
Signed-off-by: Saad Karim <skarim@us.ibm.com>
2018-02-22 11:22:05 -05:00
Anil Ambati
e379ac5581 [FAB-8407] Fix TLS bad cert error
Fabric CA sample fails with TLS error when
running against latest 1.1 code because orderer
was expecting client certificate but was not receiving
on during TLS handshake. This change set fixes the
problem by specifying --clientauth, --keyfile and
--certfile command line arguments to the peer commands
that need to communicate with orderer, like 'peer channel
create'.

Change-Id: I34ad39c919c0121916116c3711c7429009db7fc8
Signed-off-by: Anil Ambati <aambati@us.ibm.com>
2018-02-21 17:25:41 -05:00
luomin
305d6f47f8 [FAB-8238]wrong orderer/peer type in fabric-ca sam
The fabric-samples/fabric-ca/scripts/setup-fabric.sh script needs 
two small changes so that orderers and peers are registered with 
the correct type. They are currently defaulting to type 'client'.

Change-Id: Ibd813cd68ae1669bc39423826ca1d39ac57d16c1
Signed-off-by: luomin <luomin_tokyotech@hotmail.com>
2018-02-14 03:01:31 +00:00
Anil Ambati
652f0744cd [FAB-7342] Enable client auth in fabric-ca sample
Currently client authentication is not enabled on
any peers and orderer in the fabric-ca sample. This
change set will enable client authentication on all
the peers and orderer.

Change-Id: If3c6a5dc6d1dc3a38096608617971945bde359c0
Signed-off-by: Anil Ambati <aambati@us.ibm.com>
2018-02-02 14:30:41 -05:00
Anil Ambati
bbee1b283b [FAB-7908] Change hf.admin attr to admin
Recently, Fabric CA was changed to restrict custom attributes
from starting with "hf." prefix. But fabric-ca sample was
using hf.admin custom attribute. Hence it was failing. This
change set changes custom attribute "hf.admin" to "admin".

Change-Id: I6c9324e62717c26aab3c2d308d9fb098ecd2fb65
Signed-off-by: Anil Ambati <aambati@us.ibm.com>
2018-01-25 10:34:46 -05:00
Anil Ambati
038c496f4c [FAB-7592] Give hf.Registrar attrs to admins
The admin identity needs hf.Registrar.Roles attribute so
it can register other identities. This attribute was
introduced recently in fabric-ca v1.1.0-alpha.

Change-Id: Ie2a0ef705f07a35580c6bc8a85a34b9b9d937623
Signed-off-by: Anil Ambati <aambati@us.ibm.com>
2018-01-03 15:21:10 -05:00
Anil Ambati
2474704d33 [FAB-6967] Added steps to query by a revoked user
Steps include: revoking a user, generating a CRL,
updating the CRL in the configuration block of the
channel, and finally querying the chaincode using
the revoked user credentials. The query will fail as
it is invoked by a revoked user.

Change-Id: I3b0f26d9b5a78475b6f42543b0e17458e9ce2a73
Signed-off-by: Anil Ambati <aambati@us.ibm.com>
2017-11-10 21:26:19 -05:00
Keith Smith
fd795d2923 [FAB-6745] Fix timing issue in sample
When a CA starts, it creates its signing cert and then
starts listening on its listening port.  The fix is to
wait for the server to start listening on the port rather
than waiting for the signing cert file to be created.

See the waitPort function in env.sh, and places where this
is called.  I also had to increase the max time we wait before
failing.

WARNING: This change set is dependent upon the following
fabric-ca change set and should not be merged until it
has been merged:
   https://gerrit.hyperledger.org/r/#/c/15089/

Change-Id: I781e3653bf6846e22f401fe64855fa155ffeb7cb
Signed-off-by: Keith Smith <bksmith@us.ibm.com>
2017-11-07 11:35:57 -05:00
Keith Smith
caf5c33db2 [FAB-6050] Adding fabric-ca sample
This sample uses fabric-ca to run an end-to-end test similar
to the BYFN sample. However, instead of using cryptogen, it
uses fabric-ca. All private keys are generated dynamically in
the container in which they are used.

This sample also demonstrates how to use abac
(Attribute-Based Access Control) to make access decisions.
See chaincode/abac/abac.go.

Change-Id: I5eddc9e35908e409ac07266c3183ce89a5a6cd82
Signed-off-by: Keith Smith <bksmith@us.ibm.com>
2017-10-17 16:38:33 -04:00