filters: add error files

Author: NDStrahilevitz

cmd/tracee-ebpf/flags/errors.go

@@ -0,0 +1,21 @@
+package flags
+
+import (
+	"fmt"
+)
+
+func InvalidSetError(set string) error {
+	return fmt.Errorf("invalid set to trace: %s", set)
+}
+
+func InvalidEventError(event string) error {
+	return fmt.Errorf("invalid event to trace: %s", event)
+}
+
+func InvalidEventExcludeError(event string) error {
+	return fmt.Errorf("invalid event to exclude: %s", event)
+}
+
+func InvalidFilterOptionError(expr string) error {
+	return fmt.Errorf("invalid filter option specified (%s), use '--trace help' for more info", expr)
+}

cmd/tracee-ebpf/flags/filter.go

@@ -1,7 +1,6 @@
 package flags
 
 import (
-	"fmt"
 	"strings"
 
 	tracee "github.com/aquasecurity/tracee/pkg/ebpf"
@@ -121,6 +120,10 @@ func PrepareFilter(filtersArr []string) (tracee.Filter, error) {
 			operatorAndValues = f[operatorIndex:]
 		}
 
+		if len(operatorAndValues) == 1 || operatorAndValues == "!=" || operatorAndValues == "<=" || operatorAndValues == ">=" {
+			return tracee.Filter{}, filters.InvalidExpression(f)
+		}
+
 		if strings.Contains(f, ".retval") {
 			err := filter.RetFilter.Parse(filterName, operatorAndValues, eventsNameToID)
 			if err != nil {
@@ -262,7 +265,7 @@ func PrepareFilter(filtersArr []string) (tracee.Filter, error) {
 			filter.Follow = true
 			continue
 		}
-		return tracee.Filter{}, fmt.Errorf("invalid filter option specified, use '--trace help' for more info")
+		return tracee.Filter{}, InvalidFilterOptionError(f)
 	}
 
 	var err error
@@ -300,12 +303,12 @@ func prepareEventsToTrace(eventFilter *filters.StringFilter, setFilter *filters.
 				}
 			}
 			if !found {
-				return nil, fmt.Errorf("invalid event to exclude: %s", name)
+				return nil, InvalidEventExcludeError(name)
 			}
 		} else {
 			id, ok := eventsNameToID[name]
 			if !ok {
-				return nil, fmt.Errorf("invalid event to exclude: %s", name)
+				return nil, InvalidEventExcludeError(name)
 			}
 			isExcluded[id] = true
 		}
@@ -328,21 +331,21 @@ func prepareEventsToTrace(eventFilter *filters.StringFilter, setFilter *filters.
 				}
 			}
 			if !found {
-				return nil, fmt.Errorf("invalid event to trace: %s", name)
+				return nil, InvalidEventError(name)
 			}
 			res = append(res, ids...)
 		} else {
 			id, ok := eventsNameToID[name]
 			if !ok {
-				return nil, fmt.Errorf("invalid event to trace: %s", name)
+				return nil, InvalidEventError(name)
 			}
 			res = append(res, id)
 		}
 	}
 	for _, set := range setsToTrace {
 		setEvents, ok := setsToEvents[set]
 		if !ok {
-			return nil, fmt.Errorf("invalid set to trace: %s", set)
+			return nil, InvalidSetError(set)
 		}
 		for _, id := range setEvents {
 			if !isExcluded[id] {

pkg/filters/errors.go

@@ -0,0 +1,23 @@
+package filters
+
+import "fmt"
+
+func UnsupportedOperator(op Operator) error {
+	return fmt.Errorf("failed to add filter: unsupported operator %s", op.String())
+}
+
+func InvalidExpression(expression string) error {
+	return fmt.Errorf("invalid filter expression: %s", expression)
+}
+
+func InvalidValue(value string) error {
+	return fmt.Errorf("invalid filter value %s", value)
+}
+
+func InvalidEventName(event string) error {
+	return fmt.Errorf("invalid event name in filter: %s", event)
+}
+
+func InvalidEventArgument(argument string) error {
+	return fmt.Errorf("invalid filter event argument: %s", argument)
+}