dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add server_name override for x509_cert plugin (#6917)

This commit is contained in:
James Beckett 2020-01-22 01:06:58 +00:00 committed by Daniel Nelson
parent 6a982da8b0
commit 916f39d285
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/inputs/x509_cert/README.md
View File

@ -19,6 +19,8 @@ file or network connection.
# tls_ca = "/etc/telegraf/ca.pem" # tls_ca = "/etc/telegraf/ca.pem"
# tls_cert = "/etc/telegraf/cert.pem" # tls_cert = "/etc/telegraf/cert.pem"
# tls_key = "/etc/telegraf/key.pem" # tls_key = "/etc/telegraf/key.pem"
## Pass a different name into the TLS request (Server Name Indication)
# server_name = "myhost.example.org"
``` ```

22
plugins/inputs/x509_cert/x509_cert.go
View File

@ -30,14 +30,17 @@ const sampleConfig = `
# tls_ca = "/etc/telegraf/ca.pem" # tls_ca = "/etc/telegraf/ca.pem"
# tls_cert = "/etc/telegraf/cert.pem" # tls_cert = "/etc/telegraf/cert.pem"
# tls_key = "/etc/telegraf/key.pem" # tls_key = "/etc/telegraf/key.pem"
## Pass a different name into the TLS request (Server Name Indication)
# server_name = "myhost.example.org"
` `
const description = "Reads metrics from a SSL certificate" const description = "Reads metrics from a SSL certificate"
// X509Cert holds the configuration of the plugin. // X509Cert holds the configuration of the plugin.
type X509Cert struct { type X509Cert struct {
Sources []string `toml:"sources"` Sources []string `toml:"sources"`
Timeout internal.Duration `toml:"timeout"` Timeout internal.Duration `toml:"timeout"`
tlsCfg *tls.Config ServerName string `toml:"server_name"`
tlsCfg *tls.Config
_tls.ClientConfig _tls.ClientConfig
} }
@ -78,7 +81,12 @@ func (c *X509Cert) getCert(u *url.URL, timeout time.Duration) ([]*x509.Certifica
} }
defer ipConn.Close() defer ipConn.Close()
c.tlsCfg.ServerName = u.Hostname() if c.ServerName == "" {
c.tlsCfg.ServerName = u.Hostname()
} else {
c.tlsCfg.ServerName = c.ServerName
}
c.tlsCfg.InsecureSkipVerify = true c.tlsCfg.InsecureSkipVerify = true
conn := tls.Client(ipConn, c.tlsCfg) conn := tls.Client(ipConn, c.tlsCfg)
defer conn.Close() defer conn.Close()
@ -203,7 +211,11 @@ func (c *X509Cert) Gather(acc telegraf.Accumulator) error {
Intermediates: x509.NewCertPool(), Intermediates: x509.NewCertPool(),
} }
if i == 0 { if i == 0 {
opts.DNSName = u.Hostname() if c.ServerName == "" {
opts.DNSName = u.Hostname()
} else {
opts.DNSName = c.ServerName
}
for j, cert := range certs { for j, cert := range certs {
if j != 0 { if j != 0 {
opts.Intermediates.AddCert(cert) opts.Intermediates.AddCert(cert)