-
Notifications
You must be signed in to change notification settings - Fork 8.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Peer CLI communicate with orderers with expired TLS certs (#1863)
Implement a TLS handshake timeshift for the "peer channel fetch" and "peer channel update" comands to allow fetching config blocks and updating the config for orderers with expired TLS certificates. FAB-18205 #done Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
- Loading branch information
Showing
10 changed files
with
232 additions
and
65 deletions.
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/* | ||
Copyright IBM Corp All Rights Reserved. | ||
SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
package configtx | ||
|
||
import ( | ||
"net" | ||
"strconv" | ||
|
||
"github.com/hyperledger/fabric/integration/nwo" | ||
. "github.com/onsi/gomega" | ||
) | ||
|
||
// PeerHostPort returns the host name and port number for the specified peer. | ||
func PeerHostPort(n *nwo.Network, p *nwo.Peer) (string, int) { | ||
return splitHostPort(n.PeerAddress(p, nwo.ListenPort)) | ||
} | ||
|
||
// OrdererHostPort returns the host name and port number for the specified | ||
// orderer. | ||
func OrdererHostPort(n *nwo.Network, o *nwo.Orderer) (string, int) { | ||
return splitHostPort(n.OrdererAddress(o, nwo.ListenPort)) | ||
} | ||
|
||
// OrdererClusterHostPort returns the host name and cluster port number for the | ||
// specified orderer. | ||
func OrdererClusterHostPort(n *nwo.Network, o *nwo.Orderer) (string, int) { | ||
return splitHostPort(n.OrdererAddress(o, nwo.ClusterPort)) | ||
} | ||
|
||
func splitHostPort(address string) (string, int) { | ||
host, port, err := net.SplitHostPort(address) | ||
Expect(err).NotTo(HaveOccurred()) | ||
portInt, err := strconv.Atoi(port) | ||
Expect(err).NotTo(HaveOccurred()) | ||
return host, portInt | ||
} |
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
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
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
Oops, something went wrong.