Commit beea64a3 authored by Mark Tyneway's avatar Mark Tyneway Committed by GitHub

Merge pull request #4902 from conduit-xyz/develop

Make tlsconfig optional for op-signer client
parents 039cc67f 7c44efeb
...@@ -25,6 +25,9 @@ type SignerClient struct { ...@@ -25,6 +25,9 @@ type SignerClient struct {
} }
func NewSignerClient(logger log.Logger, endpoint string, tlsConfig optls.CLIConfig) (*SignerClient, error) { func NewSignerClient(logger log.Logger, endpoint string, tlsConfig optls.CLIConfig) (*SignerClient, error) {
var httpClient *http.Client
if tlsConfig.TLSCaCert != "" {
logger.Info("tlsConfig specified, loading tls config")
caCert, err := os.ReadFile(tlsConfig.TLSCaCert) caCert, err := os.ReadFile(tlsConfig.TLSCaCert)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to read tls.ca: %w", err) return nil, fmt.Errorf("failed to read tls.ca: %w", err)
...@@ -43,7 +46,7 @@ func NewSignerClient(logger log.Logger, endpoint string, tlsConfig optls.CLIConf ...@@ -43,7 +46,7 @@ func NewSignerClient(logger log.Logger, endpoint string, tlsConfig optls.CLIConf
return nil, err return nil, err
} }
httpClient := &http.Client{ httpClient = &http.Client{
Transport: &http.Transport{ Transport: &http.Transport{
TLSClientConfig: &tls.Config{ TLSClientConfig: &tls.Config{
MinVersion: tls.VersionTLS13, MinVersion: tls.VersionTLS13,
...@@ -54,6 +57,11 @@ func NewSignerClient(logger log.Logger, endpoint string, tlsConfig optls.CLIConf ...@@ -54,6 +57,11 @@ func NewSignerClient(logger log.Logger, endpoint string, tlsConfig optls.CLIConf
}, },
}, },
} }
} else {
logger.Info("no tlsConfig specified, using default http client")
httpClient = http.DefaultClient
}
rpcClient, err := rpc.DialOptions(context.Background(), endpoint, rpc.WithHTTPClient(httpClient)) rpcClient, err := rpc.DialOptions(context.Background(), endpoint, rpc.WithHTTPClient(httpClient))
if err != nil { if err != nil {
return nil, err return nil, err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment