Add Intermediate CA certs to dial options #3225
Merged
+15
−6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yacovm
reviewed
Feb 11, 2022
internal/pkg/gateway/registry.go
Outdated
| @@ -353,7 +353,7 @@ func (reg *registry) connectChannelPeers(channel string, force bool) error { | |||
| for mspid, infoset := range reg.discovery.IdentityInfo().ByOrg() { | |||
| var tlsRootCerts [][]byte | |||
| if mspInfo, ok := config.GetMsps()[mspid]; ok { | |||
| tlsRootCerts = mspInfo.GetTlsRootCerts() | |||
| tlsRootCerts = append(mspInfo.GetTlsRootCerts(), mspInfo.GetTlsIntermediateCerts()...) | |||
There was a problem hiding this comment.
concatenating slices in this way may alter the root cert slice.
Let's do it in the right way by having the left most slice a nil slice.
yacovm
reviewed
Feb 11, 2022
| @@ -121,6 +121,8 @@ func TestStaleMultiChannelOrdererConnections(t *testing.T) { | |||
| func buildConfig(t *testing.T, orderers []string) *dp.ConfigResult { | |||
| ca, err := tlsgen.NewCA() | |||
| require.NoError(t, err) | |||
| ica, err := ca.NewIntermediateCA() | |||
There was a problem hiding this comment.
this doesn't test the change in line 424
The gateway was omitting to include TLS intermediate certificates in the dial options when connecting to other nodes. This commit appends them to the splice of root certs in the endpoint config. Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>
andrew-coleman
force-pushed
the
issue3224
branch
from
74d1309
to
b17fd03
Compare
yacovm
approved these changes
Feb 11, 2022
|
@Mergifyio backport release-2.4 |
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Feb 11, 2022
The gateway was omitting to include TLS intermediate certificates in the dial options when connecting to other nodes. This commit appends them to the splice of root certs in the endpoint config. Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com> (cherry picked from commit 7b7b6e9)
yacovm
pushed a commit
that referenced
this pull request
Feb 11, 2022
The gateway was omitting to include TLS intermediate certificates in the dial options when connecting to other nodes. This commit appends them to the splice of root certs in the endpoint config. Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com> (cherry picked from commit 7b7b6e9) Co-authored-by: Andrew Coleman <andrew_coleman@uk.ibm.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The gateway was omitting to include TLS intermediate certificates in the dial options when connecting to other nodes.
This commit appends them to the splice of root certs in the endpoint config.
Resolves #3224
Signed-off-by: andrew-coleman andrew_coleman@uk.ibm.com