add IsAny method for matchers package

kitabisa · Dec 3, 2022 · 6c76619 · 6c76619
1 parent 667c814
commit 6c76619
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 23 deletions.
diff --git a/internal/runner/validator.go b/internal/runner/validator.go
@@ -103,7 +103,7 @@ func customs(options *common.Options) {
 			matchers.IsBlank(rules[j].Element, "Custom threat rules element")
 			elm := fmt.Sprint("$", rules[j].Element)
 
-			if !matchers.IsMatch(fmt.Sprint(`\`, elm), cfg.Logformat) {
+			if !matchers.IsAny(elm, cfg.Logformat) {
 				err = strings.Replace(errors.ErrNoElement, ":element", elm, -1)
 				err = strings.Replace(err, ":category", custom[i].Name, -1)
 

diff --git a/pkg/matchers/fuzz.go b/pkg/matchers/fuzz.go
diff --git a/pkg/matchers/matchers.go b/pkg/matchers/matchers.go
@@ -0,0 +1,31 @@
+package matchers
+
+import (
+	"regexp"
+	"strings"
+
+	"github.com/sahilm/fuzzy"
+)
+
+func IsAny(substr string, s string) bool {
+	if strings.Index(s, substr) > 0 {
+		return false
+	}
+
+	return true
+}
+
+func IsMatch(pattern string, s string) bool {
+	defer func() {
+		_ = recover()
+	}()
+
+	re := regexp.MustCompile(pattern)
+	return re.FindString(s) != ""
+}
+
+func IsMatchFuzz(pattern string, s []string) bool {
+	matches := fuzzy.Find(pattern, s)
+
+	return len(matches) > 0
+}
diff --git a/pkg/matchers/regex.go b/pkg/matchers/regex.go
diff --git a/pkg/teler/teler.go b/pkg/teler/teler.go
@@ -229,7 +229,7 @@ func Analyze(options *common.Options, logs *gonx.Entry) (bool, map[string]string
 					cont = strings.ReplaceAll(cont, `.%EXT%`, ext)
 				}
 
-				match = matchers.IsMatch(trimFirst(req.Path), cont)
+				match = matchers.IsAny(trimFirst(req.Path), cont)
 			}
 		}