Skip to content

refactor(filter, field): Refactor image.* fields #573

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 2 commits into from
Jan 28, 2026
Merged

refactor(filter, field): Refactor image.* fields #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96141d2
refactor(filter,field): Rename image.* fields
rabbitstack Jan 27, 2026
56d2c77
refactor(rules): Adapt rules and macros to use new module/dll fields
rabbitstack Jan 28, 2026
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
12 changes: 6 additions & 6 deletions pkg/filter/accessor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func (f *filter) narrowAccessors() {
removeEvtAccessor = true
removePsAccessor = true
removeThreadAccessor = true
removeImageAccessor = true
removeModuleAccessor = true
removeFileAccessor = true
removeRegistryAccessor = true
removeNetworkAccessor = true
Expand All @@ -169,16 +169,16 @@ func (f *filter) narrowAccessors() {

for _, field := range f.fields {
switch {
case field.Name.IsKevtField(), field.Name.IsEvtField():
case field.Name.IsEvtField() || field.Name.IsKevtField():
removeEvtAccessor = false
case field.Name.IsPeField():
removePEAccessor = false
case field.Name.IsPsField():
removePsAccessor = false
case field.Name.IsThreadField():
removeThreadAccessor = false
case field.Name.IsImageField():
removeImageAccessor = false
case field.Name.IsImageField() || field.Name.IsModuleField():
removeModuleAccessor = false
case field.Name.IsFileField():
removeFileAccessor = false
case field.Name.IsRegistryField():
Expand All @@ -205,8 +205,8 @@ func (f *filter) narrowAccessors() {
if removeThreadAccessor {
f.removeAccessor(&threadAccessor{})
}
if removeImageAccessor {
f.removeAccessor(&imageAccessor{})
if removeModuleAccessor {
f.removeAccessor(&moduleAccessor{})
}
if removeFileAccessor {
f.removeAccessor(&fileAccessor{})
Expand Down
77 changes: 42 additions & 35 deletions pkg/filter/accessor_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func GetAccessors() []Accessor {
newDNSAccessor(),
newFileAccessor(),
newEventAccessor(),
newImageAccessor(),
newModuleAccessor(),
newThreadAccessor(),
newHandleAccessor(),
newNetworkAccessor(),
Expand Down Expand Up @@ -616,7 +616,7 @@ func (t *threadAccessor) Get(f Field, e *event.Event) (params.Value, error) {
return frame.Symbol, nil
}
return nil, nil
case fields.ThreadCallstackFinalUserModuleSignatureIsSigned, fields.ThreadCallstackFinalUserModuleSignatureIsTrusted:
case fields.ThreadCallstackFinalUserModuleSignatureExists, fields.ThreadCallstackFinalUserModuleSignatureTrusted:
frame := e.Callstack.FinalUserFrame()
if frame == nil || (frame != nil && frame.ModuleAddress.IsZero()) {
return nil, nil
Expand All @@ -627,12 +627,12 @@ func (t *threadAccessor) Get(f Field, e *event.Event) (params.Value, error) {
return nil, nil
}

if f.Name == fields.ThreadCallstackFinalUserModuleSignatureIsSigned {
if f.Name == fields.ThreadCallstackFinalUserModuleSignatureExists {
return sign.IsSigned(), nil
}

return sign.IsTrusted(), nil
case fields.ThreadCallstackFinalUserModuleSignatureCertIssuer, fields.ThreadCallstackFinalUserModuleSignatureCertSubject:
case fields.ThreadCallstackFinalUserModuleSignatureIssuer, fields.ThreadCallstackFinalUserModuleSignatureSubject:
frame := e.Callstack.FinalUserFrame()
if frame == nil || (frame != nil && frame.ModuleAddress.IsZero()) {
return nil, nil
Expand All @@ -643,7 +643,7 @@ func (t *threadAccessor) Get(f Field, e *event.Event) (params.Value, error) {
return nil, nil
}

if sign.HasCertificate() && f.Name == fields.ThreadCallstackFinalUserModuleSignatureCertIssuer {
if sign.HasCertificate() && f.Name == fields.ThreadCallstackFinalUserModuleSignatureIssuer {
return sign.Cert.Issuer, nil
}

Expand Down Expand Up @@ -737,24 +737,24 @@ func (l *fileAccessor) Get(f Field, e *event.Event) (params.Value, error) {
return nil, nil
}

// imageAccessor extracts image (DLL, executable, driver) event values.
type imageAccessor struct{}
// moduleAccessor extracts module (DLL, executable, driver) event values.
type moduleAccessor struct{}

func (imageAccessor) SetFields(fields []Field) {
func (moduleAccessor) SetFields(fields []Field) {
initLOLDriversClient(fields)
}
func (imageAccessor) SetSegments([]fields.Segment) {}
func (moduleAccessor) SetSegments([]fields.Segment) {}

func (imageAccessor) IsFieldAccessible(e *event.Event) bool {
func (moduleAccessor) IsFieldAccessible(e *event.Event) bool {
return e.Category == event.Image
}

func newImageAccessor() Accessor {
return &imageAccessor{}
func newModuleAccessor() Accessor {
return &moduleAccessor{}
}

func (i *imageAccessor) Get(f Field, e *event.Event) (params.Value, error) {
if e.IsLoadImage() && (f.Name == fields.ImageSignatureType || f.Name == fields.ImageSignatureLevel || f.Name.IsImageCert()) {
func (*moduleAccessor) Get(f Field, e *event.Event) (params.Value, error) {
if e.IsLoadImage() && (f.Name.IsModuleSignature() || f.Name == fields.ImageSignatureType || f.Name == fields.ImageSignatureLevel || f.Name.IsImageCert()) {
filename := e.GetParamAsString(params.ImagePath)
addr := e.Params.MustGetUint64(params.ImageBase)
typ := e.Params.MustGetUint32(params.ImageSignatureType)
Expand All @@ -771,7 +771,7 @@ func (i *imageAccessor) Get(f Field, e *event.Event) (params.Value, error) {
Filename: filename,
}
}
if f.Name.IsImageCert() {
if f.Name.IsImageCert() || f.Name.IsModuleCert() {
err := sign.ParseCertificate()
if err != nil {
certErrors.Add(1)
Expand All @@ -795,7 +795,7 @@ func (i *imageAccessor) Get(f Field, e *event.Event) (params.Value, error) {
if sign.IsSigned() {
sign.Verify()
}
if f.Name.IsImageCert() {
if f.Name.IsImageCert() || f.Name.IsModuleCert() {
err := sign.ParseCertificate()
if err != nil {
certErrors.Add(1)
Expand All @@ -816,49 +816,56 @@ func (i *imageAccessor) Get(f Field, e *event.Event) (params.Value, error) {
e.AppendParam(params.ImageCertNotAfter, params.Time, sign.Cert.NotAfter)
e.AppendParam(params.ImageCertNotBefore, params.Time, sign.Cert.NotBefore)
}

switch f.Name {
case fields.ModuleSignatureExists, fields.DllSignatureExists:
return sign != nil && sign.IsSigned(), nil
case fields.ModuleSignatureTrusted, fields.DllSignatureTrusted:
return sign != nil && sign.IsTrusted(), nil
}
}

switch f.Name {
case fields.ImagePath:
case fields.ImagePath, fields.ModulePath, fields.DllPath:
return e.GetParamAsString(params.ImagePath), nil
case fields.ImageName:
case fields.ImageName, fields.ModuleName, fields.DllName:
return filepath.Base(e.GetParamAsString(params.ImagePath)), nil
case fields.ImageDefaultAddress:
case fields.ImageDefaultAddress, fields.ModuleDefaultAddress:
return e.GetParamAsString(params.ImageDefaultBase), nil
case fields.ImageBase:
case fields.ImageBase, fields.ModuleBase, fields.DllBase:
return e.GetParamAsString(params.ImageBase), nil
case fields.ImageSize:
case fields.ImageSize, fields.ModuleSize, fields.DllSize:
return e.Params.GetUint64(params.ImageSize)
case fields.ImageChecksum:
case fields.ImageChecksum, fields.ModuleChecksum:
return e.Params.GetUint32(params.ImageCheckSum)
case fields.ImagePID:
case fields.ImagePID, fields.ModulePID, fields.DllPID:
return e.Params.GetPid()
case fields.ImageSignatureType:
case fields.ImageSignatureType, fields.ModuleSignatureType, fields.DllSignatureType:
return e.GetParamAsString(params.ImageSignatureType), nil
case fields.ImageSignatureLevel:
case fields.ImageSignatureLevel, fields.ModuleSignatureLevel, fields.DllSignatureLevel:
return e.GetParamAsString(params.ImageSignatureLevel), nil
case fields.ImageCertSubject:
case fields.ImageCertSubject, fields.ModuleSignatureSubject, fields.DllSignatureSubject:
return e.GetParamAsString(params.ImageCertSubject), nil
case fields.ImageCertIssuer:
case fields.ImageCertIssuer, fields.ModuleSignatureIssuer, fields.DllSignatureIssuer:
return e.GetParamAsString(params.ImageCertIssuer), nil
case fields.ImageCertSerial:
case fields.ImageCertSerial, fields.ModuleSignatureSerial, fields.DllSignatureSerial:
return e.GetParamAsString(params.ImageCertSerial), nil
case fields.ImageCertBefore:
case fields.ImageCertBefore, fields.ModuleSignatureBefore, fields.DllSignatureBefore:
return e.Params.GetTime(params.ImageCertNotBefore)
case fields.ImageCertAfter:
case fields.ImageCertAfter, fields.ModuleSignatureAfter, fields.DllSignatureAfter:
return e.Params.GetTime(params.ImageCertNotAfter)
case fields.ImageIsDriverVulnerable, fields.ImageIsDriverMalicious:
case fields.ImageIsDriverVulnerable, fields.ImageIsDriverMalicious, fields.ModuleIsDriverVulnerable, fields.ModuleIsDriverMalicious:
if e.IsLoadImage() {
return isLOLDriver(f.Name, e)
}
return false, nil
case fields.ImageIsDLL:
case fields.ImageIsDLL, fields.ModuleIsDLL:
return e.Params.GetBool(params.FileIsDLL)
case fields.ImageIsDriver:
case fields.ImageIsDriver, fields.ModuleIsDriver:
return e.Params.GetBool(params.FileIsDriver)
case fields.ImageIsExecutable:
case fields.ImageIsExecutable, fields.ModuleIsExecutable:
return e.Params.GetBool(params.FileIsExecutable)
case fields.ImageIsDotnet:
case fields.ImageIsDotnet, fields.ModuleIsDotnet, fields.DllIsDotnet:
return e.Params.GetBool(params.FileIsDotnet)
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/filter/accessor_windows_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func TestIsFieldAccessible(t *testing.T) {
true,
},
{
newImageAccessor(),
newModuleAccessor(),
&event.Event{Type: event.LoadImage, Category: event.Image},
true,
},
Expand Down
Loading
Loading