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.

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

Reg event #25

Merged
merged 7 commits into from
Sep 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ Done. Output in ./testruns/harness-results-2773792211
- `M` : Module Load/Unload
- `N` : Netflow
- `P` : Process Event
- `R` : Windows Registry Event
- `S` : NetSniff Event
- `T` : PTrace Event
- `V` : Volume Activity Event
Expand Down
48 changes: 48 additions & 0 deletions cmd/harness/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,48 @@ func CheckAMSIEvent(testRun *SingleTestRun, evt *types.SimpleEvent, nativeJsonSt

}

func CheckRegEvent(testRun *SingleTestRun, evt *types.SimpleEvent, nativeJsonStr string) bool {
retval := false

for _, exp := range testRun.criteria.ExpectedEvents {
if exp.EventType != "REG" {
continue
}

numMatchingChecks := 0
for _, fc := range exp.FieldChecks {
isMatch := false
switch fc.FieldName {
case "event_type":
isMatch = CheckMatch(evt.RegFields.EventType, fc.Op, fc.Value)
case "key_name":
isMatch = CheckMatch(evt.RegFields.KeyName, fc.Op, fc.Value)
case "value_name":
isMatch = CheckMatch(evt.RegFields.ValueName, fc.Op, fc.Value)
case "value_data":
isMatch = CheckMatch(evt.RegFields.ValueData, fc.Op, fc.Value)
default:
fmt.Println("ERROR: unknown FieldName", fc)
}
if isMatch {
if gDebug {
fmt.Printf("Field Match '%s' '%s'\n", fc.FieldName, fc.Value)
}
numMatchingChecks += 1
}
}
if numMatchingChecks == len(exp.FieldChecks) {
AddMatchingEvent(testRun, exp, evt)
retval = true
} else if numMatchingChecks > 0 {
fmt.Printf("ONLY %d of %d FieldChecks satisfied\n%s\n", numMatchingChecks, len(exp.FieldChecks), nativeJsonStr)
}
}

return retval

}

func ValidateSimpleTelemetry(testRun *SingleTestRun, tool *TelemTool) {
gValidateState = ExtractState{}
gValidateState.StartTime = uint64(testRun.StartTime)
Expand Down Expand Up @@ -394,6 +436,8 @@ func ValidateSimpleTelemetry(testRun *SingleTestRun, tool *TelemTool) {
isMatch = CheckETWEvent(testRun, evt, rawEventStr)
case types.SimpleSchemaAMSI:
isMatch = CheckAMSIEvent(testRun, evt, rawEventStr)
case types.SimpleSchemaReg:
isMatch = CheckRegEvent(testRun, evt, rawEventStr)
default:
fmt.Println("missing handling of type", line)
}
Expand Down Expand Up @@ -508,6 +552,10 @@ func GetTelemChar(exp *types.ExpectedEvent) string {
return "V"
case "ETW":
return "E"
case "AMSI":
return "I"
case "REG":
return "R"
default:
break
}
Expand Down
10 changes: 10 additions & 0 deletions pkg/types/harness_simple_telemetry.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const (
SimpleSchemaDetection SimpleSchemaChar = "W"
SimpleSchemaETW SimpleSchemaChar = "E"
SimpleSchemaAMSI SimpleSchemaChar = "I"
SimpleSchemaReg SimpleSchemaChar = "R"
)

type SimpleProcessFields struct {
Expand Down Expand Up @@ -94,6 +95,14 @@ type SimpleAMSIFields struct {
AppName string `json:"app_name,omitempty"`
}

type SimpleRegFields struct {
EventType string `json:"event_type,omitempty"` // event_type: "SETVALUEKEY", "DELETEKEY", ...
Pid int64 `json:"pid,omitempty"`
KeyName string `json:"key_name,omitempty"`
ValueName string `json:"value_name,omitempty"` // if present, for SETVALUEKEY
ValueData string `json:"value_data,omitempty"` // if present, for SETVALUEKEY
}

type SimpleEvent struct {
EventType SimpleSchemaChar `json:"evt_type"`
Timestamp int64 `json:"ts,omitempty"`
Expand All @@ -106,4 +115,5 @@ type SimpleEvent struct {
NetflowFields *SimpleNetflowFields `json:"evt_netflow,omitempty"`
ETWFields *SimpleETWFields `json:"evt_etw,omitempty"`
AMSIFields *SimpleAMSIFields `json:"evt_amsi,omitempty"`
RegFields *SimpleRegFields `json:"evt_reg,omitempty"`
}