Skip to content

Commit bdf81d0

Browse files
adecaroadecaro
authored
bug fix and enhancements (#442)
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
1 parent 7415b02 commit bdf81d0

File tree

87 files changed

+871
-700
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+871
-700
lines changed

‎docs/core-fabric.md‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,16 @@ fsc:
2424
key:
2525
file: /path/to/key.pwm
2626

27-
# TBD
27+
# This is used to list the authorized clients of this FSC node.
28+
# At least one client certificate must be specified
29+
# The GRPC service uses this list to filter the connecting clients
2830
client:
2931
certs:
3032
- path/to/client-cert.pem
3133

32-
# TBD
33-
admin:
34-
certs:
35-
- path/to/admin-cert.pem
36-
3734
# ------------------- GRPC Server Configuration -------------------------
3835
grpc:
36+
enabled: true
3937
# The listen address of this server
4038
address: 0.0.0.0:20000
4139
# ConnectionTimeout specifies the timeout for connection establishment for all new connections
@@ -115,7 +113,13 @@ fsc:
115113
file: /path/to/tls/server.crt
116114
key:
117115
file: /path/to/tls/server.key
118-
# root CAs for all clients that will connect to the web server
116+
# Whether clients are required to provide their TLS certificates for verification
117+
# Require client certificates / mutual TLS for inbound connections.
118+
# Note that clients that are not configured to use a certificate will
119+
# fail to connect to the node.
120+
clientAuthRequired: false
121+
# If mutual TLS is enabled, clientRootCAs.files contains a list of additional root certificates
122+
# used for verifying certificates of client connections.
119123
clientRootCAs:
120124
files:
121125
- path/to/client/tls/ca.crt

‎integration/fsc/pingpong/Dockerfile‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎integration/fsc/pingpong/pingpong_test.go‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,19 @@ var _ = Describe("EndToEnd", func() {
6363
res, err := initiatorWebClient.CallView("init", bytes.NewBuffer([]byte("hi")).Bytes())
6464
Expect(err).NotTo(HaveOccurred())
6565
Expect(common.JSONUnmarshalString(res)).To(BeEquivalentTo("OK"))
66+
version, err := initiatorWebClient.ServerVersion()
67+
Expect(err).NotTo(HaveOccurred())
68+
Expect(version).To(BeEquivalentTo("{\"CommitSHA\":\"development build\",\"Version\":\"latest\"}"))
69+
70+
webClientConfig.TLSCert = ""
71+
initiatorWebClient, err = web.NewClient(webClientConfig)
72+
Expect(err).NotTo(HaveOccurred())
73+
_, err = initiatorWebClient.CallView("init", bytes.NewBuffer([]byte("hi")).Bytes())
74+
Expect(err).To(HaveOccurred())
75+
Expect(err.Error()).To(ContainSubstring("status code [401], status [401 Unauthorized]"))
76+
version, err = initiatorWebClient.ServerVersion()
77+
Expect(err).NotTo(HaveOccurred())
78+
Expect(version).To(BeEquivalentTo("{\"CommitSHA\":\"development build\",\"Version\":\"latest\"}"))
6679
})
6780

6881
It("successful pingpong", func() {
@@ -99,6 +112,7 @@ var _ = Describe("EndToEnd", func() {
99112

100113
AfterEach(func() {
101114
// Stop the ii
115+
ii.DeleteOnStop = false
102116
ii.Stop()
103117
})
104118

@@ -118,22 +132,6 @@ var _ = Describe("EndToEnd", func() {
118132
Expect(common.JSONUnmarshalString(res)).To(BeEquivalentTo("OK"))
119133
})
120134

121-
It("generate artifacts & successful pingpong with Admin", func() {
122-
var err error
123-
// Create the integration ii
124-
ii, err = integration.Generate(StartPortWithAdmin(), true, pingpong.Topology()...)
125-
Expect(err).NotTo(HaveOccurred())
126-
// Start the integration ii
127-
ii.Start()
128-
time.Sleep(3 * time.Second)
129-
// Get an admin client for the fsc node labelled initiator
130-
initiatorAdmin := ii.Admin("initiator")
131-
// Initiate a view and check the output
132-
res, err := initiatorAdmin.CallView("init", nil)
133-
Expect(err).NotTo(HaveOccurred())
134-
Expect(common.JSONUnmarshalString(res)).To(BeEquivalentTo("OK"))
135-
})
136-
137135
It("load artifact & successful pingpong", func() {
138136
var err error
139137
// Create the integration ii

‎integration/fsc/pingpong/testdata/conf.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"StartPort":21000}

‎integration/fsc/pingpong/testdata/fsc/crypto-config.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ PeerOrgs:
55
EnableNodeOUs: false
66
Users:
77
Count: 4
8-
Names:
9-
- initiator
10-
- responder
11-
- User1
12-
- User2
8+
Specs:
9+
- Name: initiator
10+
- Name: responder
11+
- Name: User1
12+
- Name: User2
1313

1414
Specs:
1515
- Hostname: initiator

‎integration/fsc/pingpong/testdata/fsc/crypto/ca-certs.pem‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
-----BEGIN CERTIFICATE-----
2-
MIICVDCCAfqgAwIBAgIRAKv75S/aCbb1xnTg15SlsjswCgYIKoZIzj0EAwIwdDEL
2+
MIICVDCCAfqgAwIBAgIRALD+lkEx8PCM7gyPjfzr704wCgYIKoZIzj0EAwIwdDEL
33
MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
44
cmFuY2lzY28xGDAWBgNVBAoTD2ZzYy5leGFtcGxlLmNvbTEeMBwGA1UEAxMVdGxz
5-
Y2EuZnNjLmV4YW1wbGUuY29tMB4XDTIxMDYwNjA4MzQwMFoXDTMxMDYwNDA4MzQw
5+
Y2EuZnNjLmV4YW1wbGUuY29tMB4XDTIyMTIwNzA4NTQwMFoXDTMyMTIwNDA4NTQw
66
MFowdDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcT
77
DVNhbiBGcmFuY2lzY28xGDAWBgNVBAoTD2ZzYy5leGFtcGxlLmNvbTEeMBwGA1UE
88
AxMVdGxzY2EuZnNjLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
9-
QgAEA8LqfXK+uB4UfIAZIA28sPGgRFjNfUk6gxZ8a2YNHFOgzhCJMjxpEkIyeXNV
10-
YNZlD1JMlNdKyLAUMDZAUem0s6NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQW
9+
QgAEShJ2PcYTFuUHPlKXnc9nM9GaMTlJdDN0cJYobJL2HzQoV9PLOuix6EOavH2f
10+
79hJ5lYi1GnWURl/OuETcNcTj6NtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQW
1111
MBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQi
12-
BCDG0I9y7rOHqagyeDoYc/AOusXGH1Ydp6E6nEZiOfSzDjAKBggqhkjOPQQDAgNI
13-
ADBFAiBZckarX739sHkMkzYcMdOBIZdW+dbQ+BAybtR57gH1dAIhAIjVGvypVnwz
14-
U2TXhzXsVCqg3H++Jnbvfl9QFZOkJodC
12+
BCBEUlLb2flqWAgCgxPa3fMTg3yKt9d9i7J9jk1OtyWjhDAKBggqhkjOPQQDAgNI
13+
ADBFAiEAh07ctSlXrq1BhkLF99Jrb2E7122zLN4E9R6rEws7BcACID9ItU8I8A5f
14+
auEAbgjrpKfvgVw7jG5e0XQMOoJwY98c
1515
-----END CERTIFICATE-----

‎integration/fsc/pingpong/testdata/fsc/crypto/peerOrganizations/fsc.example.com/ca/ca.fsc.example.com-cert.pem‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
-----BEGIN CERTIFICATE-----
2-
MIICTTCCAfOgAwIBAgIQUKgkWioSmBDgo3RmIypoGzAKBggqhkjOPQQDAjBxMQsw
2+
MIICTjCCAfOgAwIBAgIQHEJTceDZQGPProZc38ArijAKBggqhkjOPQQDAjBxMQsw
33
CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
44
YW5jaXNjbzEYMBYGA1UEChMPZnNjLmV4YW1wbGUuY29tMRswGQYDVQQDExJjYS5m
5-
c2MuZXhhbXBsZS5jb20wHhcNMjEwNjA2MDgzNDAwWhcNMzEwNjA0MDgzNDAwWjBx
5+
c2MuZXhhbXBsZS5jb20wHhcNMjIxMjA3MDg1NDAwWhcNMzIxMjA0MDg1NDAwWjBx
66
MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu
77
IEZyYW5jaXNjbzEYMBYGA1UEChMPZnNjLmV4YW1wbGUuY29tMRswGQYDVQQDExJj
8-
YS5mc2MuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATcNPL6
9-
lzSxT4BFqOlyjUFEm8V4dFWVR+lIWAhlb6O5q3tG8mrQUtPKRGfa3Jrjkjk915hz
10-
xEEH/pU8123vYmbso20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYB
11-
BQUHAwIGCCsGAQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEICfIJ+8c
12-
pyOkxc/XQUHdA/sTD1coJO0vgPd98bmTtgHrMAoGCCqGSM49BAMCA0gAMEUCIHf6
13-
Ta18DrDulr5DPhGtKifoGmzvgxD+vJ34hrJJ3mMXAiEA8miZXsZrePCmqgPsyp68
14-
n6IEwTgOAccc5zYlJZ+p+8w=
8+
YS5mc2MuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASW9lkn
9+
7MGIUusTmsKZq+XhY2US8mNbBo1mEBg28JD1Zdjaoc5/sprEVbwZogcGoylfZJXO
10+
NVcxaRmk9D7G0anxo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYB
11+
BQUHAwIGCCsGAQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEICGeSeub
12+
dW4I1VfdyROkPKeGCA7IhKVsrG/W7qmopMSKMAoGCCqGSM49BAMCA0kAMEYCIQDe
13+
UooteANSPqcwGQlxXbD/hEFvEhBC9WJ1ER9YzAaDsgIhAIlgWVdxt11QL7CH/dc0
14+
bVP5RbAOaHJ3HxS9FRb2sx0M
1515
-----END CERTIFICATE-----

‎integration/fsc/pingpong/testdata/fsc/crypto/peerOrganizations/fsc.example.com/ca/priv_sk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-----BEGIN PRIVATE KEY-----
2-
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgTOBSs0JaVEEMxtPT
3-
gpKyBnyUTpS+BM1l9Hn2jUP1EBKhRANCAATcNPL6lzSxT4BFqOlyjUFEm8V4dFWV
4-
R+lIWAhlb6O5q3tG8mrQUtPKRGfa3Jrjkjk915hzxEEH/pU8123vYmbs
2+
MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg/3aiyhzHptobMiW4
3+
sxwvhB99lhDtgMbYB+Rzo+occfuhRANCAASW9lkn7MGIUusTmsKZq+XhY2US8mNb
4+
Bo1mEBg28JD1Zdjaoc5/sprEVbwZogcGoylfZJXONVcxaRmk9D7G0anx
55
-----END PRIVATE KEY-----

‎integration/fsc/pingpong/testdata/fsc/crypto/peerOrganizations/fsc.example.com/msp/admincerts/Admin@fsc.example.com-cert.pem‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
-----BEGIN CERTIFICATE-----
2-
MIICFjCCAb2gAwIBAgIRAJ4A4LoqJkeJDeQM2vlTRJ8wCgYIKoZIzj0EAwIwcTEL
3-
MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
4-
cmFuY2lzY28xGDAWBgNVBAoTD2ZzYy5leGFtcGxlLmNvbTEbMBkGA1UEAxMSY2Eu
5-
ZnNjLmV4YW1wbGUuY29tMB4XDTIxMDYwNjA4MzQwMFoXDTMxMDYwNDA4MzQwMFow
6-
WjELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh
7-
biBGcmFuY2lzY28xHjAcBgNVBAMMFUFkbWluQGZzYy5leGFtcGxlLmNvbTBZMBMG
8-
ByqGSM49AgEGCCqGSM49AwEHA0IABD/gVINk8ODmvwXSve7nN/A8swB2Ly3Ip2gP
9-
HzbSsJrMtLCZHE8CuRZYY/PmPLlq5Q/9UnAPTghDqWWSGc8xhEOjTTBLMA4GA1Ud
10-
DwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAICfIJ+8cpyOkxc/X
11-
QUHdA/sTD1coJO0vgPd98bmTtgHrMAoGCCqGSM49BAMCA0cAMEQCIFmcwHG9vYR+
12-
kSvV8QREgQKuBvdidBqfHyOA126T9SG6AiAr+kWgo1JtWXVwca19syhTik6TcPNe
13-
uuwJ5DilZ/Yk4w==
2+
MIICkjCCAjigAwIBAgIQUnQiPRwKX9eSNxbV45rA8zAKBggqhkjOPQQDAjBxMQsw
3+
CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
4+
YW5jaXNjbzEYMBYGA1UEChMPZnNjLmV4YW1wbGUuY29tMRswGQYDVQQDExJjYS5m
5+
c2MuZXhhbXBsZS5jb20wHhcNMjIxMjA3MDg1NDAwWhcNMzIxMjA0MDg1NDAwWjBa
6+
MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu
7+
IEZyYW5jaXNjbzEeMBwGA1UEAwwVQWRtaW5AZnNjLmV4YW1wbGUuY29tMFkwEwYH
8+
KoZIzj0CAQYIKoZIzj0DAQcDQgAEoIORcZ+Rleqag9Qf/ilxE2RycPil/PgA8+5d
9+
mHdSCrCRKar/wR3xsDMiRdUf8k8XKCnCoIFhBdZSWtQXQlJMx6OByDCBxTAOBgNV
10+
HQ8BAf8EBAMCB4AwDAYDVR0TAQH/BAIwADArBgNVHSMEJDAigCAhnknrm3VuCNVX
11+
3ckTpDynhggOyISlbKxv1u6pqKTEijB4BggqAwQFBgcIAQRseyJhdHRycyI6eyJo
12+
Zi5BZmZpbGlhdGlvbiI6IiIsImhmLkVucm9sbG1lbnRJRCI6IkFkbWluQGZzYy5l
13+
eGFtcGxlLmNvbSIsImhmLlR5cGUiOiJjbGllbnQiLCJyZWxheSI6ImZhbHNlIn19
14+
MAoGCCqGSM49BAMCA0gAMEUCIQCwrX5BFfGrf7kqrTcPZuHJ/xDqsDooReTBErtv
15+
OyRL2gIgT9hqdY5fYy+IvjatG7nARFgsI3Q1EP+QR0IAw5zk4ew=
1416
-----END CERTIFICATE-----

‎integration/fsc/pingpong/testdata/fsc/crypto/peerOrganizations/fsc.example.com/msp/cacerts/ca.fsc.example.com-cert.pem‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
-----BEGIN CERTIFICATE-----
2-
MIICTTCCAfOgAwIBAgIQUKgkWioSmBDgo3RmIypoGzAKBggqhkjOPQQDAjBxMQsw
2+
MIICTjCCAfOgAwIBAgIQHEJTceDZQGPProZc38ArijAKBggqhkjOPQQDAjBxMQsw
33
CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
44
YW5jaXNjbzEYMBYGA1UEChMPZnNjLmV4YW1wbGUuY29tMRswGQYDVQQDExJjYS5m
5-
c2MuZXhhbXBsZS5jb20wHhcNMjEwNjA2MDgzNDAwWhcNMzEwNjA0MDgzNDAwWjBx
5+
c2MuZXhhbXBsZS5jb20wHhcNMjIxMjA3MDg1NDAwWhcNMzIxMjA0MDg1NDAwWjBx
66
MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu
77
IEZyYW5jaXNjbzEYMBYGA1UEChMPZnNjLmV4YW1wbGUuY29tMRswGQYDVQQDExJj
8-
YS5mc2MuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATcNPL6
9-
lzSxT4BFqOlyjUFEm8V4dFWVR+lIWAhlb6O5q3tG8mrQUtPKRGfa3Jrjkjk915hz
10-
xEEH/pU8123vYmbso20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYB
11-
BQUHAwIGCCsGAQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEICfIJ+8c
12-
pyOkxc/XQUHdA/sTD1coJO0vgPd98bmTtgHrMAoGCCqGSM49BAMCA0gAMEUCIHf6
13-
Ta18DrDulr5DPhGtKifoGmzvgxD+vJ34hrJJ3mMXAiEA8miZXsZrePCmqgPsyp68
14-
n6IEwTgOAccc5zYlJZ+p+8w=
8+
YS5mc2MuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASW9lkn
9+
7MGIUusTmsKZq+XhY2US8mNbBo1mEBg28JD1Zdjaoc5/sprEVbwZogcGoylfZJXO
10+
NVcxaRmk9D7G0anxo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYB
11+
BQUHAwIGCCsGAQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEICGeSeub
12+
dW4I1VfdyROkPKeGCA7IhKVsrG/W7qmopMSKMAoGCCqGSM49BAMCA0kAMEYCIQDe
13+
UooteANSPqcwGQlxXbD/hEFvEhBC9WJ1ER9YzAaDsgIhAIlgWVdxt11QL7CH/dc0
14+
bVP5RbAOaHJ3HxS9FRb2sx0M
1515
-----END CERTIFICATE-----

0 commit comments

Comments
 (0)