fix(inputs.snmp): Fix crash when trying to format fields from unknown OIDs (#16155)

Hipska · web-flow · commit 58b4126f0b66 · 2024-11-07T15:18:39.000+01:00
diff --git a/internal/snmp/translator_gosmi.go b/internal/snmp/translator_gosmi.go
@@ -12,6 +12,8 @@ import (
 	"github.com/influxdata/telegraf"
 )
 
+var errCannotFormatUnkownType = errors.New("cannot format value, unknown type")
+
 type gosmiTranslator struct {
 }
 
@@ -64,14 +66,18 @@ func (g *gosmiTranslator) SnmpFormatEnum(oid string, value interface{}, full boo
 		return "", err
 	}
 
+	if node.Type == nil {
+		return "", errCannotFormatUnkownType
+	}
+
 	var v models.Value
 	if full {
 		v = node.FormatValue(value, models.FormatEnumName, models.FormatEnumValue)
 	} else {
 		v = node.FormatValue(value, models.FormatEnumName)
 	}
 
-	return v.Formatted, nil
+	return v.String(), nil
 }
 
 func (g *gosmiTranslator) SnmpFormatDisplayHint(oid string, value interface{}) (string, error) {
@@ -85,9 +91,11 @@ func (g *gosmiTranslator) SnmpFormatDisplayHint(oid string, value interface{}) (
 		return "", err
 	}
 
-	v := node.FormatValue(value)
+	if node.Type == nil {
+		return "", errCannotFormatUnkownType
+	}
 
-	return v.Formatted, nil
+	return node.FormatValue(value).String(), nil
 }
 
 func getIndex(mibPrefix string, node gosmi.SmiNode) (col []string, tagOids map[string]struct{}) {

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ import (`
`12`	`12`	`"github.com/influxdata/telegraf"`
`13`	`13`	`)`
`14`	`14`
	`15`	`+var errCannotFormatUnkownType = errors.New("cannot format value, unknown type")`
	`16`	`+`
`15`	`17`	`type gosmiTranslator struct {`
`16`	`18`	`}`
`17`	`19`
`@@ -64,14 +66,18 @@ func (g *gosmiTranslator) SnmpFormatEnum(oid string, value interface{}, full boo`
`64`	`66`	`return "", err`
`65`	`67`	`}`
`66`	`68`
	`69`	`+ if node.Type == nil {`
	`70`	`+ return "", errCannotFormatUnkownType`
	`71`	`+ }`
	`72`	`+`
`67`	`73`	`var v models.Value`
`68`	`74`	`if full {`
`69`	`75`	`v = node.FormatValue(value, models.FormatEnumName, models.FormatEnumValue)`
`70`	`76`	`} else {`
`71`	`77`	`v = node.FormatValue(value, models.FormatEnumName)`
`72`	`78`	`}`
`73`	`79`
`74`		`- return v.Formatted, nil`
	`80`	`+ return v.String(), nil`
`75`	`81`	`}`
`76`	`82`
`77`	`83`	`func (g *gosmiTranslator) SnmpFormatDisplayHint(oid string, value interface{}) (string, error) {`
`@@ -85,9 +91,11 @@ func (g *gosmiTranslator) SnmpFormatDisplayHint(oid string, value interface{}) (`
`85`	`91`	`return "", err`
`86`	`92`	`}`
`87`	`93`
`88`		`- v := node.FormatValue(value)`
	`94`	`+ if node.Type == nil {`
	`95`	`+ return "", errCannotFormatUnkownType`
	`96`	`+ }`
`89`	`97`
`90`		`- return v.Formatted, nil`
	`98`	`+ return node.FormatValue(value).String(), nil`
`91`	`99`	`}`
`92`	`100`
`93`	`101`	`func getIndex(mibPrefix string, node gosmi.SmiNode) (col []string, tagOids map[string]struct{}) {`