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
7c44efeb
Commit
7c44efeb
authored
Feb 15, 2023
by
Andrew Huang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make tlsconfig optional for op-signer client
parent
fd29e1c7
Changes
1
Hide 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 @
7c44efeb
...
...
@@ -25,35 +25,43 @@ type SignerClient struct {
}
func
NewSignerClient
(
logger
log
.
Logger
,
endpoint
string
,
tlsConfig
optls
.
CLIConfig
)
(
*
SignerClient
,
error
)
{
caCert
,
err
:=
os
.
ReadFile
(
tlsConfig
.
TLSCaCert
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"failed to read tls.ca: %w"
,
err
)
}
caCertPool
:=
x509
.
NewCertPool
()
caCertPool
.
AppendCertsFromPEM
(
caCert
)
var
httpClient
*
http
.
Client
if
tlsConfig
.
TLSCaCert
!=
""
{
logger
.
Info
(
"tlsConfig specified, loading tls config"
)
caCert
,
err
:=
os
.
ReadFile
(
tlsConfig
.
TLSCaCert
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"failed to read tls.ca: %w"
,
err
)
}
caCertPool
:=
x509
.
NewCertPool
()
caCertPool
.
AppendCertsFromPEM
(
caCert
)
// certman watches for newer client certifictes and automatically reloads them
cm
,
err
:=
certman
.
New
(
logger
,
tlsConfig
.
TLSCert
,
tlsConfig
.
TLSKey
)
if
err
!=
nil
{
logger
.
Error
(
"failed to read tls cert or key"
,
"err"
,
err
)
return
nil
,
err
}
if
err
:=
cm
.
Watch
();
err
!=
nil
{
logger
.
Error
(
"failed to start certman watcher"
,
"err"
,
err
)
return
nil
,
err
}
// certman watches for newer client certifictes and automatically reloads them
cm
,
err
:=
certman
.
New
(
logger
,
tlsConfig
.
TLSCert
,
tlsConfig
.
TLSKey
)
if
err
!=
nil
{
logger
.
Error
(
"failed to read tls cert or key"
,
"err"
,
err
)
return
nil
,
err
}
if
err
:=
cm
.
Watch
();
err
!=
nil
{
logger
.
Error
(
"failed to start certman watcher"
,
"err"
,
err
)
return
nil
,
err
}
httpClient
:=
&
http
.
Client
{
Transport
:
&
http
.
Transport
{
TLSClientConfig
:
&
tls
.
Config
{
MinVersion
:
tls
.
VersionTLS13
,
RootCAs
:
caCertPool
,
GetClientCertificate
:
func
(
_
*
tls
.
CertificateRequestInfo
)
(
*
tls
.
Certificate
,
error
)
{
return
cm
.
GetCertificate
(
nil
)
httpClient
=
&
http
.
Client
{
Transport
:
&
http
.
Transport
{
TLSClientConfig
:
&
tls
.
Config
{
MinVersion
:
tls
.
VersionTLS13
,
RootCAs
:
caCertPool
,
GetClientCertificate
:
func
(
_
*
tls
.
CertificateRequestInfo
)
(
*
tls
.
Certificate
,
error
)
{
return
cm
.
GetCertificate
(
nil
)
},
},
},
},
}
}
else
{
logger
.
Info
(
"no tlsConfig specified, using default http client"
)
httpClient
=
http
.
DefaultClient
}
rpcClient
,
err
:=
rpc
.
DialOptions
(
context
.
Background
(),
endpoint
,
rpc
.
WithHTTPClient
(
httpClient
))
if
err
!=
nil
{
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