Skip to content

Commit

Permalink
keystore: use pre-configured client for {Gemalto,Fortanix} status che…
Browse files Browse the repository at this point in the history
…ck (#455)

This commit fixes an issue on the Gemalto and Fortanix status checks.
Before, the status check for both backends used the `http.DefaultClient`.
This can cause TLS verification issues when the backend uses certificate
not issued by one of the server's root CAs - e.g. with a custom root CA.

Now, the status check uses the HTTP client used for other API calls, like
creating a key, with a TLS configuration provided to the server.

Signed-off-by: Andreas Auernhammer <github@aead.dev>
  • Loading branch information
aead committed Mar 28, 2024
1 parent 332ae57 commit f7a894a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion internal/keystore/fortanix/keystore.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ func (s *Store) Status(ctx context.Context) (kes.KeyStoreState, error) {
}

start := time.Now()
resp, err := http.DefaultClient.Do(req)
resp, err := s.client.Do(req)
if err != nil {
return kes.KeyStoreState{}, &keystore.ErrUnreachable{Err: err}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/keystore/gemalto/key-secure.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func (s *Store) Status(ctx context.Context) (kes.KeyStoreState, error) {
}

start := time.Now()
resp, err := http.DefaultClient.Do(req)
resp, err := s.client.Do(req)
if err != nil {
return kes.KeyStoreState{}, &keystore.ErrUnreachable{Err: err}
}
Expand Down

0 comments on commit f7a894a

Please sign in to comment.