Skip to content

fix(filter): Allow interpolation for fields with underscore characters #480

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

Merged
rabbitstack merged 1 commit into from
Apr 2, 2025
Merged

fix(filter): Allow interpolation for fields with underscore characters #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/filter/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ func (f *filter) GetSequence() *ql.Sequence { return f.seq }
// which refers to the event in particular sequence stage. Otherwise, the modifier is
// a well-known field name prepended with the `%` symbol.
func InterpolateFields(s string, evts []*kevent.Kevent) string {
var fieldsReplRegexp = regexp.MustCompile(`%([1-9]?)\.?([a-z0-9A-Z\[\].]+)`)
var fieldsReplRegexp = regexp.MustCompile(`%([1-9]?)\.?([a-z0-9A-Z\[\]._]+)`)
matches := fieldsReplRegexp.FindAllStringSubmatch(s, -1)
r := s
if len(matches) == 0 {
Expand Down
15 changes: 15 additions & 0 deletions pkg/filter/filter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,6 +1325,21 @@ func TestInterpolateFields(t *testing.T) {
},
},
},
{
original: "Suspicious thread start module %thread.start_address.module",
interpolated: "Suspicious thread start module C:\\Windows\\System32\\vault.dll",
evts: []*kevent.Kevent{
{
Type: ktypes.CreateThread,
Category: ktypes.Thread,
Name: "CreateThread",
PID: 1023,
Kparams: kevent.Kparams{
kparams.StartAddressModule: {Name: kparams.StartAddressModule, Type: kparams.UnicodeString, Value: "C:\\Windows\\System32\\vault.dll"},
},
},
},
},
{
original: `Detected an attempt by <code>%1.ps.name</code> process to access
and read the memory of the <b>Local Security And Authority Subsystem Service</b>
Expand Down