Merge branch 'development'

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project should be documented in this file.
 
+### v1.2.2
+
+- Add utility for get datasets
+- Remove debug print
+
+### v1.2.1
+
+- Fix exclude threats logic to set datasets
+- Fix linter
+
 ### v1.1.1
 
 - Add interrupt handler

pkg/teler/teler.go

@@ -1,7 +1,6 @@
 package teler
 
 import (
-	"fmt"
 	"net/url"
 	"reflect"
 	"regexp"
@@ -13,7 +12,6 @@ import (
 	"ktbs.dev/teler/common"
 	"ktbs.dev/teler/pkg/matchers"
 	"ktbs.dev/teler/pkg/metrics"
-	"ktbs.dev/teler/resource"
 )
 
 // Analyze logs from threat resources
@@ -28,20 +26,7 @@ func Analyze(options *common.Options, logs *gonx.Entry) (bool, map[string]string
 	}
 
 	if len(datasets) == 0 {
-		datasets = make(map[string]map[string]string)
-		rsc := resource.Get()
-		for i := 0; i < len(rsc.Threat); i++ {
-			threat := reflect.ValueOf(&rsc.Threat[i]).Elem()
-			cat := threat.FieldByName("Category").String()
-			con := threat.FieldByName("Content").String()
-
-			if threat.FieldByName("Exclude").Bool() {
-				continue
-			}
-
-			datasets[cat] = map[string]string{}
-			datasets[cat]["content"] = con
-		}
+		getDatasets()
 	}
 
 	for cat, data := range datasets {
@@ -217,7 +202,6 @@ func Analyze(options *common.Options, logs *gonx.Entry) (bool, map[string]string
 			refs := strings.Split(data["content"], "\n")
 
 			match = matchers.IsMatchFuzz(req.Host, refs)
-			fmt.Println(match)
 			if match {
 				metrics.GetBadReferrer.WithLabelValues(log["http_referer"]).Inc()
 			}

pkg/teler/utils.go

@@ -0,0 +1,24 @@
+package teler
+
+import (
+	"reflect"
+
+	"ktbs.dev/teler/resource"
+)
+
+func getDatasets() {
+	datasets = make(map[string]map[string]string)
+	rsc := resource.Get()
+	for i := 0; i < len(rsc.Threat); i++ {
+		threat := reflect.ValueOf(&rsc.Threat[i]).Elem()
+		cat := threat.FieldByName("Category").String()
+		con := threat.FieldByName("Content").String()
+
+		if threat.FieldByName("Exclude").Bool() {
+			continue
+		}
+
+		datasets[cat] = map[string]string{}
+		datasets[cat]["content"] = con
+	}
+}