Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
beea64a3
Unverified
Commit
beea64a3
authored
Feb 16, 2023
by
Mark Tyneway
Committed by
GitHub
Feb 16, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4902 from conduit-xyz/develop
Make tlsconfig optional for op-signer client
parents
039cc67f
7c44efeb
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
32 additions
and
24 deletions
+32
-24
client.go
op-signer/client/client.go
+32
-24
No files found.
op-signer/client/client.go
View file @
beea64a3
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment