Merge pull request #1179 from prometheus/tlsconf

Add overflow check in TLS config
This commit is contained in:
Fabian Reinartz 2015-10-24 17:37:49 +02:00
commit 8d128685cf

View file

@ -314,6 +314,18 @@ type TLSConfig struct {
KeyFile string `yaml:"key_file,omitempty"`
// Disable target certificate validation.
InsecureSkipVerify bool `yaml:"insecure_skip_verify"`
// Catches all undefined fields and must be empty after parsing.
XXX map[string]interface{} `yaml:",inline"`
}
// UnmarshalYAML implements the yaml.Unmarshaler interface.
func (c *TLSConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
type plain TLSConfig
if err := unmarshal((*plain)(c)); err != nil {
return err
}
return checkOverflow(c.XXX, "TLS config")
}
// ScrapeConfig configures a scraping unit for Prometheus.