ClusterCockpit/cc-metric-collector
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-collector.git synced 2024-12-25 23:19:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not allow unknown fields in JSON configuration file

Browse Source
This commit is contained in:
Holger Obermaier 2022-12-08 14:15:56 +01:00
parent 56b41a9e57
commit b78e83b055
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
receivers/ipmiReceiver.go
View File

@ -352,8 +352,9 @@ func NewIPMIReceiver(name string, config json.RawMessage) (Receiver, error) {
// Read the IPMI receiver specific JSON config // Read the IPMI receiver specific JSON config
if len(config) > 0 { if len(config) > 0 {
err := json.Unmarshal(config, &configJSON) d := json.NewDecoder(bytes.NewReader(config))
if err != nil { d.DisallowUnknownFields()
if err := d.Decode(&configJSON); err != nil {
cclog.ComponentError(r.name, "Error reading config:", err.Error()) cclog.ComponentError(r.name, "Error reading config:", err.Error())
return nil, err return nil, err
} }

9
receivers/redfishReceiver.go
View File

@ -353,10 +353,10 @@ func (r *RedfishReceiver) readProcessorMetrics(
if err != nil { if err != nil {
return fmt.Errorf("unable to read JSON for processor metrics: %+w", err) return fmt.Errorf("unable to read JSON for processor metrics: %+w", err)
} }
err = json.NewDecoder(bytes.NewReader(body)).Decode(&processorMetrics) err = json.Unmarshal(body, &processorMetrics)
if err != nil { if err != nil {
return fmt.Errorf( return fmt.Errorf(
"unable to decode JSON='%s' for processor metrics: %+w", "unable to unmarshal JSON='%s' for processor metrics: %+w",
string(body), string(body),
err, err,
) )
@ -673,8 +673,9 @@ func NewRedfishReceiver(name string, config json.RawMessage) (Receiver, error) {
// Read the redfish receiver specific JSON config // Read the redfish receiver specific JSON config
if len(config) > 0 { if len(config) > 0 {
err := json.Unmarshal(config, &configJSON) d := json.NewDecoder(bytes.NewReader(config))
if err != nil { d.DisallowUnknownFields()
if err := d.Decode(&configJSON); err != nil {
cclog.ComponentError(r.name, "Error reading config:", err.Error()) cclog.ComponentError(r.name, "Error reading config:", err.Error())
return nil, err return nil, err
} }