CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(inputs.x509_cert): fix linter warning (#12577)

This commit is contained in:
Sven Rebhan 2023-01-31 20:05:05 +01:00 committed by GitHub
parent e6655d534e
commit 6f33711c38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,11 +96,8 @@ func (c *X509Cert) Gather(acc telegraf.Accumulator) error {
if err != nil { if err != nil {
acc.AddError(fmt.Errorf("cannot get SSL cert '%s': %s", location, err.Error())) acc.AddError(fmt.Errorf("cannot get SSL cert '%s': %s", location, err.Error()))
} }
dnsName, err := c.serverName(location)
if err != nil { dnsName := c.serverName(location)
acc.AddError(fmt.Errorf("resolving name of %q failed: %w", location, err))
continue
}
for i, cert := range certs { for i, cert := range certs {
fields := getFields(cert, now) fields := getFields(cert, now)
tags := getTags(cert, location.String()) tags := getTags(cert, location.String())
@ -179,11 +176,11 @@ func (c *X509Cert) sourcesToURLs() error {
return nil return nil
} }
func (c *X509Cert) serverName(u *url.URL) (string, error) { func (c *X509Cert) serverName(u *url.URL) string {
if c.tlsCfg.ServerName != "" { if c.tlsCfg.ServerName != "" {
return c.tlsCfg.ServerName, nil return c.tlsCfg.ServerName
} }
return u.Hostname(), nil return u.Hostname()
} }
func (c *X509Cert) getCert(u *url.URL, timeout time.Duration) ([]*x509.Certificate, error) { func (c *X509Cert) getCert(u *url.URL, timeout time.Duration) ([]*x509.Certificate, error) {
@ -196,16 +193,11 @@ func (c *X509Cert) getCert(u *url.URL, timeout time.Duration) ([]*x509.Certifica
} }
defer ipConn.Close() defer ipConn.Close()
serverName, err := c.serverName(u)
if err != nil {
return nil, err
}
dtlsCfg := &dtls.Config{ dtlsCfg := &dtls.Config{
InsecureSkipVerify: true, InsecureSkipVerify: true,
Certificates: c.tlsCfg.Certificates, Certificates: c.tlsCfg.Certificates,
RootCAs: c.tlsCfg.RootCAs, RootCAs: c.tlsCfg.RootCAs,
ServerName: serverName, ServerName: c.serverName(u),
} }
conn, err := dtls.Client(ipConn, dtlsCfg) conn, err := dtls.Client(ipConn, dtlsCfg)
if err != nil { if err != nil {
@ -244,13 +236,8 @@ func (c *X509Cert) getCert(u *url.URL, timeout time.Duration) ([]*x509.Certifica
} }
defer ipConn.Close() defer ipConn.Close()
serverName, err := c.serverName(u)
if err != nil {
return nil, err
}
downloadTLSCfg := c.tlsCfg.Clone() downloadTLSCfg := c.tlsCfg.Clone()
downloadTLSCfg.ServerName = serverName downloadTLSCfg.ServerName = c.serverName(u)
downloadTLSCfg.InsecureSkipVerify = true downloadTLSCfg.InsecureSkipVerify = true
conn := tls.Client(ipConn, downloadTLSCfg) conn := tls.Client(ipConn, downloadTLSCfg)
@ -296,13 +283,8 @@ func (c *X509Cert) getCert(u *url.URL, timeout time.Duration) ([]*x509.Certifica
} }
defer ipConn.Close() defer ipConn.Close()
serverName, err := c.serverName(u)
if err != nil {
return nil, err
}
downloadTLSCfg := c.tlsCfg.Clone() downloadTLSCfg := c.tlsCfg.Clone()
downloadTLSCfg.ServerName = serverName downloadTLSCfg.ServerName = c.serverName(u)
downloadTLSCfg.InsecureSkipVerify = true downloadTLSCfg.InsecureSkipVerify = true
smtpConn, err := smtp.NewClient(ipConn, u.Host) smtpConn, err := smtp.NewClient(ipConn, u.Host)

4
plugins/inputs/x509_cert/x509_cert_test.go
View File

@ -431,9 +431,7 @@ func TestServerName(t *testing.T) {
} }
u, err := url.Parse(test.url) u, err := url.Parse(test.url)
require.NoError(t, err) require.NoError(t, err)
actual, err := sc.serverName(u) require.Equal(t, test.expected, sc.serverName(u))
require.NoError(t, err)
require.Equal(t, test.expected, actual)
}) })
} }
} }