public_git
/
unpoller_unpoller
mirror of https://github.com/unpoller/unpoller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

turn booleans into ptrs so we can fill defaults.

This commit is contained in:
davidnewhall2 2020-06-15 02:05:39 -07:00
parent 7f8f523d12
commit 150a37b302
2 changed files with 65 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
integrations/inputunifi/collector.go
View File

@ -35,10 +35,9 @@ func (u *InputUnifi) newDynamicCntrlr(url string) (bool, *Controller) {
} }
ccopy := u.Default // copy defaults into new controller ccopy := u.Default // copy defaults into new controller
c = &ccopy u.dynamic[url] = &ccopy
u.dynamic[url] = c u.dynamic[url].Role = url
c.Role = url u.dynamic[url].URL = url
c.URL = url
return true, c return true, c
} }
@ -95,7 +94,7 @@ func (u *InputUnifi) pollController(c *Controller) (*poller.Metrics, error) {
return nil, errors.Wrap(err, "unifi.GetSites()") return nil, errors.Wrap(err, "unifi.GetSites()")
} }
if c.SaveDPI { if c.SaveDPI != nil && *c.SaveDPI {
if m.SitesDPI, err = c.Unifi.GetSiteDPI(m.Sites); err != nil { if m.SitesDPI, err = c.Unifi.GetSiteDPI(m.Sites); err != nil {
return nil, errors.Wrapf(err, "unifi.GetSiteDPI(%s)", c.URL) return nil, errors.Wrapf(err, "unifi.GetSiteDPI(%s)", c.URL)
} }
@ -105,7 +104,7 @@ func (u *InputUnifi) pollController(c *Controller) (*poller.Metrics, error) {
} }
} }
if c.SaveIDS { if c.SaveIDS != nil && *c.SaveIDS {
m.IDSList, err = c.Unifi.GetIDS(m.Sites, time.Now().Add(time.Minute), time.Now()) m.IDSList, err = c.Unifi.GetIDS(m.Sites, time.Now().Add(time.Minute), time.Now())
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "unifi.GetIDS(%s)", c.URL) return nil, errors.Wrapf(err, "unifi.GetIDS(%s)", c.URL)
@ -161,9 +160,9 @@ func (u *InputUnifi) augmentMetrics(c *Controller, metrics *poller.Metrics) *pol
devices[client.Mac] = client.Hostname devices[client.Mac] = client.Hostname
} }
metrics.Clients[i].Mac = c.redactMacPII(metrics.Clients[i].Mac) metrics.Clients[i].Mac = RedactMacPII(metrics.Clients[i].Mac, c.HashPII)
metrics.Clients[i].Name = c.redactNamePII(metrics.Clients[i].Name) metrics.Clients[i].Name = RedactNamePII(metrics.Clients[i].Name, c.HashPII)
metrics.Clients[i].Hostname = c.redactNamePII(metrics.Clients[i].Hostname) metrics.Clients[i].Hostname = RedactNamePII(metrics.Clients[i].Hostname, c.HashPII)
metrics.Clients[i].SwName = devices[client.SwMac] metrics.Clients[i].SwName = devices[client.SwMac]
metrics.Clients[i].ApName = devices[client.ApMac] metrics.Clients[i].ApName = devices[client.ApMac]
metrics.Clients[i].GwName = devices[client.GwMac] metrics.Clients[i].GwName = devices[client.GwMac]
@ -177,8 +176,8 @@ func (u *InputUnifi) augmentMetrics(c *Controller, metrics *poller.Metrics) *pol
metrics.ClientsDPI[i].Name = metrics.ClientsDPI[i].MAC metrics.ClientsDPI[i].Name = metrics.ClientsDPI[i].MAC
} }
metrics.ClientsDPI[i].Name = c.redactNamePII(metrics.ClientsDPI[i].Name) metrics.ClientsDPI[i].Name = RedactNamePII(metrics.ClientsDPI[i].Name, c.HashPII)
metrics.ClientsDPI[i].MAC = c.redactMacPII(metrics.ClientsDPI[i].MAC) metrics.ClientsDPI[i].MAC = RedactMacPII(metrics.ClientsDPI[i].MAC, c.HashPII)
} }
if !*c.SaveSites { if !*c.SaveSites {
@ -188,32 +187,28 @@ func (u *InputUnifi) augmentMetrics(c *Controller, metrics *poller.Metrics) *pol
return metrics return metrics
} }
// redactNamePII converts a name string to an md5 hash. // RedactNamePII converts a name string to an md5 hash (first 24 chars only).
// Useful for maskiing out personally identifying information. // Useful for maskiing out personally identifying information.
func (c *Controller) redactNamePII(pii string) string { func RedactNamePII(pii string, hash *bool) string {
if !c.HashPII { if hash == nil || !*hash {
return pii
}
return fmt.Sprintf("%x", md5.Sum([]byte(pii))) // nolint: gosec
}
// redactMacPII converts a MAC address to an md5 hashed version of a MAC.
// Useful for maskiing out personally identifying information.
func (c *Controller) redactMacPII(pii string) (output string) {
if !c.HashPII {
return pii return pii
} }
s := fmt.Sprintf("%x", md5.Sum([]byte(pii))) // nolint: gosec s := fmt.Sprintf("%x", md5.Sum([]byte(pii))) // nolint: gosec
// This fancy code formats a "fake" mac address looking string. // instead of 32 characters, only use 24.
for i, r := range s[0:14] { return s[:24]
if output += string(r); i != 13 && i%2 == 1 { }
output += ":"
} // RedactMacPII converts a MAC address to an md5 hashed version (first 14 chars only).
// Useful for maskiing out personally identifying information.
func RedactMacPII(pii string, hash *bool) (output string) {
if hash == nil || !*hash {
return pii
} }
return output s := fmt.Sprintf("%x", md5.Sum([]byte(pii))) // nolint: gosec
// This formats a "fake" mac address looking string.
return fmt.Sprintf("%s:%s:%s:%s:%s:%s:%s", s[:2], s[2:4], s[4:6], s[6:8], s[8:10], s[10:12], s[12:14])
} }
// getFilteredSites returns a list of sites to fetch data for. // getFilteredSites returns a list of sites to fetch data for.

48
integrations/inputunifi/input.go
View File

@ -33,11 +33,10 @@ type InputUnifi struct {
// Controller represents the configuration for a UniFi Controller. // Controller represents the configuration for a UniFi Controller.
// Each polled controller may have its own configuration. // Each polled controller may have its own configuration.
type Controller struct { type Controller struct {
VerifySSL bool `json:"verify_ssl" toml:"verify_ssl" xml:"verify_ssl" yaml:"verify_ssl"` VerifySSL *bool `json:"verify_ssl" toml:"verify_ssl" xml:"verify_ssl" yaml:"verify_ssl"`
SaveIDS bool `json:"save_ids" toml:"save_ids" xml:"save_ids" yaml:"save_ids"` SaveIDS *bool `json:"save_ids" toml:"save_ids" xml:"save_ids" yaml:"save_ids"`
SaveDPI bool `json:"save_dpi" toml:"save_dpi" xml:"save_dpi" yaml:"save_dpi"` SaveDPI *bool `json:"save_dpi" toml:"save_dpi" xml:"save_dpi" yaml:"save_dpi"`
New bool `json:"new" toml:"new" xml:"new" yaml:"new"` HashPII *bool `json:"hash_pii" toml:"hash_pii" xml:"hash_pii" yaml:"hash_pii"`
HashPII bool `json:"hash_pii" toml:"hash_pii" xml:"hash_pii" yaml:"hash_pii"`
SaveSites *bool `json:"save_sites" toml:"save_sites" xml:"save_sites" yaml:"save_sites"` SaveSites *bool `json:"save_sites" toml:"save_sites" xml:"save_sites" yaml:"save_sites"`
Role string `json:"role" toml:"role" xml:"role,attr" yaml:"role"` Role string `json:"role" toml:"role" xml:"role,attr" yaml:"role"`
User string `json:"user" toml:"user" xml:"user" yaml:"user"` User string `json:"user" toml:"user" xml:"user" yaml:"user"`
@ -82,8 +81,7 @@ func (u *InputUnifi) getUnifi(c *Controller) error {
User: c.User, User: c.User,
Pass: c.Pass, Pass: c.Pass,
URL: c.URL, URL: c.URL,
New: c.New, VerifySSL: *c.VerifySSL,
VerifySSL: c.VerifySSL,
ErrorLog: u.LogErrorf, // Log all errors. ErrorLog: u.LogErrorf, // Log all errors.
DebugLog: u.LogDebugf, // Log debug messages. DebugLog: u.LogDebugf, // Log debug messages.
}) })
@ -175,12 +173,30 @@ func (u *InputUnifi) getPassFromFile(filename string) string {
// setDefaults sets the default defaults. // setDefaults sets the default defaults.
func (u *InputUnifi) setDefaults(c *Controller) { func (u *InputUnifi) setDefaults(c *Controller) {
t := true
f := false
// Default defaults. // Default defaults.
if c.SaveSites == nil { if c.SaveSites == nil {
t := true
c.SaveSites = &t c.SaveSites = &t
} }
if c.VerifySSL == nil {
c.VerifySSL = &f
}
if c.HashPII == nil {
c.HashPII = &f
}
if c.SaveDPI == nil {
c.SaveDPI = &f
}
if c.SaveIDS == nil {
c.SaveIDS = &f
}
if c.URL == "" { if c.URL == "" {
c.URL = defaultURL c.URL = defaultURL
} }
@ -214,6 +230,22 @@ func (u *InputUnifi) setControllerDefaults(c *Controller) *Controller {
c.SaveSites = u.Default.SaveSites c.SaveSites = u.Default.SaveSites
} }
if c.VerifySSL == nil {
c.VerifySSL = u.Default.VerifySSL
}
if c.HashPII == nil {
c.HashPII = u.Default.HashPII
}
if c.SaveDPI == nil {
c.SaveDPI = u.Default.SaveDPI
}
if c.SaveIDS == nil {
c.SaveIDS = u.Default.SaveIDS
}
if c.URL == "" { if c.URL == "" {
c.URL = u.Default.URL c.URL = u.Default.URL
} }