Skip to content

feat(tlsConfig): Add possiblity to trust provided CA and host at the same time #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davinkevin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(tlsConfig): Add possiblity to trust provided CA and host at the same time #247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions exthttp/tlsconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import (
type TLSConfig struct {
// The CA cert to use for the targets.
CAFile string `yaml:"ca_file"`
// Trust RootCAs provided by the host
TrustRootCA bool `yaml:"trust_root_ca"`
// The client cert file for the targets.
CertFile string `yaml:"cert_file"`
// The client key file for the targets.
Expand All @@ -34,7 +36,7 @@ func NewTLSConfig(cfg *TLSConfig) (*tls.Config, error) {
if err != nil {
return nil, err
}
if !updateRootCA(tlsConfig, b) {
if !updateRootCA(tlsConfig, b, cfg.TrustRootCA) {
return nil, fmt.Errorf("unable to use specified CA cert %s", cfg.CAFile)
}
}
Expand Down Expand Up @@ -68,8 +70,18 @@ func readCAFile(f string) ([]byte, error) {
}

// updateRootCA parses the given byte slice as a series of PEM encoded certificates and updates tls.Config.RootCAs.
func updateRootCA(cfg *tls.Config, b []byte) bool {
caCertPool := x509.NewCertPool()
func updateRootCA(cfg *tls.Config, b []byte, trustRootCA bool) bool {
var caCertPool *x509.CertPool
var err error
if trustRootCA {
caCertPool, err = x509.SystemCertPool()
if err != nil {
caCertPool = x509.NewCertPool()
}
} else {
caCertPool = x509.NewCertPool()
}

if !caCertPool.AppendCertsFromPEM(b) {
return false
}
Expand Down
Loading