Skip to content
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
34 changes: 34 additions & 0 deletions internal/etw/source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1162,6 +1162,40 @@ func testCallstackEnrichment(t *testing.T, hsnap handle.Snapshotter, psnap ps.Sn
},
false,
},
{
"open process callstack",
func() error {
_, err := windows.OpenProcess(windows.PROCESS_VM_READ, false, uint32(os.Getpid()))
return err
},
func(e *kevent.Kevent) bool {
if e.CurrentPid() && e.Type == ktypes.OpenProcess {
callstack := e.Callstack.String()
log.Infof("open process event %s: %s", e.String(), callstack)
return callstackContainsTestExe(callstack) &&
strings.Contains(strings.ToLower(callstack), strings.ToLower("\\WINDOWS\\System32\\KERNELBASE.dll!OpenProcess"))
}
return false
},
false,
},
{
"open thread callstack",
func() error {
_, err := windows.OpenThread(windows.THREAD_IMPERSONATE, false, windows.GetCurrentThreadId())
return err
},
func(e *kevent.Kevent) bool {
if e.CurrentPid() && e.Type == ktypes.OpenThread {
callstack := e.Callstack.String()
log.Infof("open thread event %s: %s", e.String(), callstack)
return callstackContainsTestExe(callstack) &&
strings.Contains(strings.ToLower(callstack), strings.ToLower("\\WINDOWS\\System32\\KERNELBASE.dll!OpenThread"))
}
return false
},
false,
},
}

kstreamConfig := config.KstreamConfig{
Expand Down
7 changes: 5 additions & 2 deletions pkg/kevent/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,12 @@ var PsCreationFlags = []ParamFlag{
{"PACKAGED", PsPackaged},
}

// AllAccess represents the maximum process/thread access right
const AllAccess = windows.STANDARD_RIGHTS_REQUIRED | windows.SYNCHRONIZE | 0xFFFF

// PsAccessRightFlags describes flags for the process access rights.
var PsAccessRightFlags = []ParamFlag{
{"ALL_ACCESS", windows.STANDARD_RIGHTS_REQUIRED | windows.SYNCHRONIZE | 0xFFFF},
{"ALL_ACCESS", AllAccess},
{"DELETE", windows.DELETE},
{"READ_CONTROL", windows.READ_CONTROL},
{"SYNCHRONIZE", windows.SYNCHRONIZE},
Expand All @@ -102,7 +105,7 @@ var PsAccessRightFlags = []ParamFlag{

// ThreadAccessRightFlags describes flags for the thread access rights.
var ThreadAccessRightFlags = []ParamFlag{
{"ALL_ACCESS", windows.STANDARD_RIGHTS_REQUIRED | windows.SYNCHRONIZE | 0xFFFF},
{"ALL_ACCESS", AllAccess},
{"DELETE", windows.DELETE},
{"READ_CONTROL", windows.READ_CONTROL},
{"SYNCHRONIZE", windows.SYNCHRONIZE},
Expand Down
16 changes: 16 additions & 0 deletions pkg/kevent/kparam_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,14 @@ func (e *Kevent) produceParams(evt *etw.EventRecord) {
e.AppendParam(kparams.ProcessID, kparams.PID, processID)
e.AppendParam(kparams.DesiredAccess, kparams.Flags, desiredAccess, WithFlags(PsAccessRightFlags))
e.AppendParam(kparams.NTStatus, kparams.Status, status)

// append callstack for interested flags
if desiredAccess == AllAccess || ((desiredAccess & windows.PROCESS_VM_READ) != 0) || ((desiredAccess & windows.PROCESS_VM_WRITE) != 0) ||
((desiredAccess & windows.PROCESS_VM_OPERATION) != 0) || ((desiredAccess & windows.PROCESS_DUP_HANDLE) != 0) ||
((desiredAccess & windows.PROCESS_TERMINATE) != 0) || ((desiredAccess & windows.PROCESS_CREATE_PROCESS) != 0) ||
((desiredAccess & windows.PROCESS_CREATE_THREAD) != 0) || ((desiredAccess & windows.PROCESS_SET_INFORMATION) != 0) {
e.AppendParam(kparams.Callstack, kparams.Slice, evt.Callstack())
}
case ktypes.CreateThread,
ktypes.TerminateThread,
ktypes.ThreadRundown:
Expand Down Expand Up @@ -323,6 +331,14 @@ func (e *Kevent) produceParams(evt *etw.EventRecord) {
e.AppendParam(kparams.ThreadID, kparams.TID, threadID)
e.AppendParam(kparams.DesiredAccess, kparams.Flags, desiredAccess, WithFlags(ThreadAccessRightFlags))
e.AppendParam(kparams.NTStatus, kparams.Status, status)

// append callstack for interested flags
if desiredAccess == AllAccess || ((desiredAccess & windows.THREAD_SET_CONTEXT) != 0) || ((desiredAccess & windows.THREAD_SET_THREAD_TOKEN) != 0) ||
((desiredAccess & windows.THREAD_IMPERSONATE) != 0) || ((desiredAccess & windows.THREAD_DIRECT_IMPERSONATION) != 0) ||
((desiredAccess & windows.THREAD_SUSPEND_RESUME) != 0) || ((desiredAccess & windows.THREAD_TERMINATE) != 0) ||
((desiredAccess & windows.THREAD_SET_INFORMATION) != 0) {
e.AppendParam(kparams.Callstack, kparams.Slice, evt.Callstack())
}
case ktypes.SetThreadContext:
status := evt.ReadUint32(0)
e.AppendParam(kparams.NTStatus, kparams.Status, status)
Expand Down
Loading