Recover jmespath panics

CHANGELOG.md

@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+## 0.17.0 - 2018-07-17
+
 ### Changed
 
 - Renamed `content` condition type to `text` in order to clarify its purpose.

lib/processor/condition/jmespath.go

@@ -123,6 +123,15 @@ func NewJMESPath(
 
 //------------------------------------------------------------------------------
 
+func safeSearch(part interface{}, j *jmespath.JMESPath) (res interface{}, err error) {
+	defer func() {
+		if r := recover(); r != nil {
+			err = fmt.Errorf("jmespath panic: %v", r)
+		}
+	}()
+	return j.Search(part)
+}
+
 // Check attempts to check a message part against a configured condition.
 func (c *JMESPath) Check(msg types.Message) bool {
 	index := c.part
@@ -144,7 +153,7 @@ func (c *JMESPath) Check(msg types.Message) bool {
 	}
 
 	var result interface{}
-	if result, err = c.query.Search(jsonPart); err != nil {
+	if result, err = safeSearch(jsonPart, c.query); err != nil {
 		c.mErrJMES.Incr(1)
 		c.mDropped.Incr(1)
 		c.log.Debugf("Failed to search json: %v\n", err)

lib/processor/jmespath.go

@@ -142,6 +142,15 @@ func NewJMESPath(
 
 //------------------------------------------------------------------------------
 
+func safeSearch(part interface{}, j *jmespath.JMESPath) (res interface{}, err error) {
+	defer func() {
+		if r := recover(); r != nil {
+			err = fmt.Errorf("jmespath panic: %v", r)
+		}
+	}()
+	return j.Search(part)
+}
+
 // ProcessMessage prepends a new message part to the message.
 func (p *JMESPath) ProcessMessage(msg types.Message) ([]types.Message, types.Response) {
 	p.mCount.Incr(1)
@@ -165,7 +174,7 @@ func (p *JMESPath) ProcessMessage(msg types.Message) ([]types.Message, types.Res
 		}
 
 		var result interface{}
-		if result, err = p.query.Search(jsonPart); err != nil {
+		if result, err = safeSearch(jsonPart, p.query); err != nil {
 			p.mErrJMES.Incr(1)
 			p.log.Debugf("Failed to search json: %v\n", err)
 			continue