Skip to content

fix(ps): Use start time from event timestamp #405

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
Jan 15, 2025
Merged

fix(ps): Use start time from event timestamp #405

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
12 changes: 8 additions & 4 deletions internal/etw/processors/ps_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ func (p psProcessor) ProcessEvent(e *kevent.Kevent) (*kevent.Kevent, bool, error
p.regionProber.Remove(evt.Kparams.MustGetPid())
return evt, false, multierror.Wrap(err, p.psnap.Remove(evt))
}

return evt, false, multierror.Wrap(err, p.psnap.Write(evt))
case ktypes.CreateThread, ktypes.TerminateThread, ktypes.ThreadRundown:
pid, err := e.Kparams.GetPid()
Expand All @@ -65,6 +66,7 @@ func (p psProcessor) ProcessEvent(e *kevent.Kevent) (*kevent.Kevent, bool, error
if err != nil {
return e, false, err
}

return e, false, p.psnap.RemoveThread(pid, tid)
case ktypes.OpenProcess, ktypes.OpenThread:
pid, err := e.Kparams.GetPid()
Expand All @@ -76,8 +78,10 @@ func (p psProcessor) ProcessEvent(e *kevent.Kevent) (*kevent.Kevent, bool, error
e.AppendParam(kparams.Exe, kparams.FilePath, proc.Exe)
e.AppendParam(kparams.ProcessName, kparams.AnsiString, proc.Name)
}

return e, false, nil
}

return e, true, nil
}

Expand Down Expand Up @@ -105,7 +109,7 @@ func (p psProcessor) processEvent(e *kevent.Kevent) (*kevent.Kevent, error) {

// query process start time
pid := e.Kparams.MustGetPid()
started, err := getStartTime(pid)
started, err := getStartTime(pid, e)
if err != nil {
started = e.Timestamp
}
Expand All @@ -117,10 +121,10 @@ func (p psProcessor) processEvent(e *kevent.Kevent) (*kevent.Kevent, error) {
func (psProcessor) Name() ProcessorType { return Ps }
func (p psProcessor) Close() {}

func getStartTime(pid uint32) (time.Time, error) {
func getStartTime(pid uint32, e *kevent.Kevent) (time.Time, error) {
proc, err := windows.OpenProcess(windows.PROCESS_QUERY_LIMITED_INFORMATION, false, pid)
if err != nil {
return time.Now(), err
return e.Timestamp, err
}
//nolint:errcheck
defer windows.CloseHandle(proc)
Expand All @@ -132,7 +136,7 @@ func getStartTime(pid uint32) (time.Time, error) {
)
err = windows.GetProcessTimes(proc, &ct, &xt, &kt, &ut)
if err != nil {
return time.Now(), err
return e.Timestamp, err
}
return time.Unix(0, ct.Nanoseconds()), nil
}
Loading