@@ -16,16 +16,19 @@ import (
1616 "github.com/rs/zerolog/log"
1717)
1818
19+ const maxRuleIdsEstimate = 15
20+
21+ var ruleIdsSet = make (map [uint ]bool , maxRuleIdsEstimate )
22+
1923// TriggeredRules returns the IDs of all the rules found in the log for the current test
2024func (ll * FTWLogLines ) TriggeredRules () []uint {
21- if ll .triggeredRules != nil {
25+ if ll .triggeredRulesInitialized {
2226 return ll .triggeredRules
2327 }
28+ ll .triggeredRulesInitialized = true
2429
2530 lines := ll .getMarkedLines ()
26-
2731 regex := regexp .MustCompile (`\[id "(\d+)"\]|"id":\s*"?(\d+)"?` )
28- ruleIds := []uint {}
2932 for _ , line := range lines {
3033 log .Trace ().Msgf ("ftw/waflog: Looking for any rule in %s" , line )
3134 match := regex .FindAllSubmatch (line , - 1 )
@@ -42,13 +45,21 @@ func (ll *FTWLogLines) TriggeredRules() []uint {
4245 log .Error ().Caller ().Msgf ("Failed to parse uint from %s" , submatch )
4346 continue
4447 }
45- ruleIds = append ( ruleIds , uint (ruleId ))
48+ ruleIdsSet [ uint (ruleId )] = true
4649 }
4750 }
4851 }
4952 }
53+ ruleIds := make ([]uint , 0 , len (ruleIdsSet ))
54+ for ruleId := range ruleIdsSet {
55+ ruleIds = append (ruleIds , ruleId )
56+ }
5057 ll .triggeredRules = ruleIds
51- return ruleIds
58+ // Reset map for next use
59+ for key := range ruleIdsSet {
60+ delete (ruleIdsSet , key )
61+ }
62+ return ll .triggeredRules
5263}
5364
5465// ContainsAllIds returns true if all of the specified rule IDs appear in the log for the current test.
@@ -106,20 +117,19 @@ func (ll *FTWLogLines) MatchesRegex(pattern string) bool {
106117}
107118
108119func (ll * FTWLogLines ) getMarkedLines () [][]byte {
109- if ll .markedLines != nil {
120+ if ll .markedLinesInitialized {
110121 return ll .markedLines
111122 }
123+ ll .markedLinesInitialized = true
112124
113125 if ll .startMarker == nil || ll .endMarker == nil {
114126 log .Fatal ().Msg ("Both start and end marker must be set before the log can be inspected" )
115127 }
116128
117- var found [][]byte
118-
119129 fi , err := ll .logFile .Stat ()
120130 if err != nil {
121131 log .Error ().Caller ().Msgf ("cannot read file's size" )
122- return found
132+ return ll . markedLines
123133 }
124134
125135 // Lines in modsec logging can be quite large
@@ -149,11 +159,10 @@ func (ll *FTWLogLines) getMarkedLines() [][]byte {
149159
150160 saneCopy := make ([]byte , len (line ))
151161 copy (saneCopy , line )
152- found = append (found , saneCopy )
162+ ll . markedLines = append (ll . markedLines , saneCopy )
153163 }
154164
155- ll .markedLines = found
156- return found
165+ return ll .markedLines
157166}
158167
159168// CheckLogForMarker reads the log file and searches for a marker line.
0 commit comments