remove wrong loop in matchData (#785)

* remove wrong loop in matchData * restructure matchData * return if no operator
corazawaf · May 9, 2023 · dac4d8a · dac4d8a
1 parent 75478a3
commit dac4d8a
Showing 1 changed file with 21 additions and 19 deletions.
diff --git a/internal/corazarules/rule_match.go b/internal/corazarules/rule_match.go
@@ -125,25 +125,27 @@ func (mr MatchedRule) writeDetails(log *strings.Builder, matchData types.MatchDa
 		mr.ServerIPAddress_, mr.URI_, mr.TransactionID_))
 }
 
-func (mr MatchedRule) matchData(matchData types.MatchData) string {
-	log := &strings.Builder{}
-	for _, matchData := range mr.MatchedDatas_ {
-		v := matchData.Variable().Name()
-		if matchData.Key() != "" {
-			v += fmt.Sprintf(":%s", matchData.Key())
-		}
-		value := matchData.Value()
-		if len(value) > 200 {
-			value = value[:200]
-		}
-		if mr.Rule_.Operator() != "" {
-			log.WriteString(fmt.Sprintf("Matched \"Operator %s matched %s at %s.",
-				"", value, v))
-		} else {
-			log.WriteString("Matched.\"")
-		}
+func (mr MatchedRule) matchData(matchData types.MatchData, log *strings.Builder) {
+	value := matchData.Value()
+	if len(value) > 200 {
+		value = value[:200]
 	}
-	return log.String()
+	op := mr.Rule_.Operator()
+	if op == "" {
+		log.WriteString("Matched.")
+		return
+	}
+	log.WriteString("Matched Operator ")
+	log.WriteString(op)
+	log.WriteString(" matched ")
+	log.WriteString(value)
+	log.WriteString(" at ")
+	log.WriteString(matchData.Variable().Name())
+	if matchData.Key() != "" {
+		log.WriteString(":")
+		log.WriteString(matchData.Key())
+	}
+	log.WriteString(".")
 }
 
 // AuditLog transforms the matched rule into an error log
@@ -157,7 +159,7 @@ func (mr MatchedRule) AuditLog(code int) string {
 		} else {
 			log.WriteString("Coraza: Warning. ")
 		}
-		log.WriteString(mr.matchData(matchData))
+		mr.matchData(matchData, log)
 		mr.writeDetails(log, matchData)
 		log.WriteString("\n")
 	}