Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove wrong loop in matchData #785

Merged
merged 4 commits into from
May 9, 2023
Merged

remove wrong loop in matchData #785

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
971b561
remove wrong loop in matchData
Hayak3 May 4, 2023
8124c61
Merge branch 'v3/dev' into Violet-E-patch-1
Hayak3 May 8, 2023
33cf4c7
restructure matchData
Hayak3 May 8, 2023
52bc889
return if no operator
Hayak3 May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 21 additions & 19 deletions internal/corazarules/rule_match.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,25 +125,27 @@
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()
Hayak3 marked this conversation as resolved.
Show resolved Hide resolved
if len(value) > 200 {
value = value[:200]

Check warning on line 131 in internal/corazarules/rule_match.go

View check run for this annotation

Codecov / codecov/patch

internal/corazarules/rule_match.go#L128-L131 

Added lines #L128 - L131 were not covered by tests
}
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(".")

Check warning on line 148 in internal/corazarules/rule_match.go

View check run for this annotation

Codecov / codecov/patch

internal/corazarules/rule_match.go#L133-L148 

Added lines #L133 - L148 were not covered by tests
}

// AuditLog transforms the matched rule into an error log
Expand All @@ -157,7 +159,7 @@
} else {
log.WriteString("Coraza: Warning. ")
}
log.WriteString(mr.matchData(matchData))
mr.matchData(matchData, log)

Check warning on line 162 in internal/corazarules/rule_match.go

View check run for this annotation

Codecov / codecov/patch

internal/corazarules/rule_match.go#L162 

Added line #L162 was not covered by tests
mr.writeDetails(log, matchData)
log.WriteString("\n")
}
Expand Down