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.

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

Jump to bottom

grpc: refactor event structure #4118

Merged
merged 1 commit into from
Jun 13, 2024
Merged

grpc: refactor event structure #4118

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 go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/IBM/fluent-forward-go v0.2.2
github.com/Masterminds/sprig/v3 v3.2.3
github.com/aquasecurity/libbpfgo v0.7.0-libbpf-1.4
github.com/aquasecurity/tracee/api v0.0.0-20240607205742-90c301111aee
github.com/aquasecurity/tracee/api v0.0.0-20240613134034-89d2d4fc7689
github.com/aquasecurity/tracee/signatures/helpers v0.0.0-20240607205742-90c301111aee
github.com/aquasecurity/tracee/types v0.0.0-20240607205742-90c301111aee
github.com/containerd/containerd v1.7.17
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,8 +406,8 @@ github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVb
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/aquasecurity/libbpfgo v0.7.0-libbpf-1.4 h1:rQ94U12Xlz2tncE8Rxnw3vpp/9hgUIEu3/Lv0/XQM0Q=
github.com/aquasecurity/libbpfgo v0.7.0-libbpf-1.4/go.mod h1:iI7QCIZ3kXG0MR+FHsDZck6cYs1y1HyZP3sMObBg0sk=
github.com/aquasecurity/tracee/api v0.0.0-20240607205742-90c301111aee h1:HmrzEVS2gfUUlB/S1fLB7vvqEnf2Vk7DraAETX6PGMk=
github.com/aquasecurity/tracee/api v0.0.0-20240607205742-90c301111aee/go.mod h1:km0QNkaoOVxU/IYF/Pw/ju/2SO1mYn+HJOIyMDtnfkE=
github.com/aquasecurity/tracee/api v0.0.0-20240613134034-89d2d4fc7689 h1:mAOehSHrqAZ4lvn3AYgDxn+aDTKrv81ghNnGlteDB00=
github.com/aquasecurity/tracee/api v0.0.0-20240613134034-89d2d4fc7689/go.mod h1:km0QNkaoOVxU/IYF/Pw/ju/2SO1mYn+HJOIyMDtnfkE=
github.com/aquasecurity/tracee/signatures/helpers v0.0.0-20240607205742-90c301111aee h1:1KJy6Z2bSpmKQVPShU7hhbXgGVOgMwvzf9rjoWMTYEg=
github.com/aquasecurity/tracee/signatures/helpers v0.0.0-20240607205742-90c301111aee/go.mod h1:SX08YRCsPFh8CvCvzkV8FSn1sqWAarNVEJq9RSZoF/8=
github.com/aquasecurity/tracee/types v0.0.0-20240607205742-90c301111aee h1:PDQn0NcQnF/O8wX2zDak0TteAR89IMUTcCm1IwVmo0M=
Expand Down
36 changes: 23 additions & 13 deletions pkg/server/grpc/tracee.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,30 +778,40 @@ func getProcess(e trace.Event) *pb.Process {
executable = &pb.Executable{Path: e.Executable.Path}
}

ancestors := getAncestors(e)

return &pb.Process{
Executable: executable,
EntityId: wrapperspb.UInt32(e.ProcessEntityId),
Pid: wrapperspb.UInt32(uint32(e.HostProcessID)),
NamespacedPid: wrapperspb.UInt32(uint32(e.ProcessID)),
Executable: executable,
UniqueId: wrapperspb.UInt32(e.ProcessEntityId),
HostPid: wrapperspb.UInt32(uint32(e.HostProcessID)),
Pid: wrapperspb.UInt32(uint32(e.ProcessID)),
RealUser: &pb.User{
Id: wrapperspb.UInt32(uint32(e.UserID)),
},
Thread: &pb.Thread{
Start: threadStartTime,
StartTime: threadStartTime,
Name: e.ProcessName,
EntityId: wrapperspb.UInt32(e.ThreadEntityId),
Tid: wrapperspb.UInt32(uint32(e.HostThreadID)),
NamespacedTid: wrapperspb.UInt32(uint32(e.ThreadID)),
UniqueId: wrapperspb.UInt32(e.ThreadEntityId),
HostTid: wrapperspb.UInt32(uint32(e.HostThreadID)),
Tid: wrapperspb.UInt32(uint32(e.ThreadID)),
Syscall: e.Syscall,
Compat: e.ContextFlags.ContainerStarted,
UserStackTrace: userStackTrace,
},
Parent: &pb.Process{
EntityId: wrapperspb.UInt32(e.ParentEntityId),
Pid: wrapperspb.UInt32(uint32(e.HostParentProcessID)),
NamespacedPid: wrapperspb.UInt32(uint32(e.ParentProcessID)),
},
Ancestors: ancestors,
}
}

func getAncestors(e trace.Event) []*pb.Process {
var ancestors []*pb.Process
if e.ParentEntityId != 0 {
ancestors = append(ancestors, &pb.Process{
UniqueId: wrapperspb.UInt32(e.ParentEntityId),
HostPid: wrapperspb.UInt32(uint32(e.HostParentProcessID)),
Pid: wrapperspb.UInt32(uint32(e.ParentProcessID)),
})
}
return ancestors
}

func getContainer(e trace.Event) *pb.Container {
Expand Down
18 changes: 9 additions & 9 deletions pkg/server/grpc/tracee_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ func Test_convertEventWithProcessContext(t *testing.T) {
protoEvent, err := convertTraceeEventToProto(traceEvent)
assert.NoError(t, err)

assert.Equal(t, uint32(1), protoEvent.Context.Process.NamespacedPid.Value)
assert.Equal(t, uint32(2), protoEvent.Context.Process.Thread.NamespacedTid.Value)
assert.Equal(t, uint32(3), protoEvent.Context.Process.Pid.Value)
assert.Equal(t, uint32(4), protoEvent.Context.Process.Thread.Tid.Value)
assert.Equal(t, uint32(5), protoEvent.Context.Process.Parent.NamespacedPid.Value)
assert.Equal(t, uint32(6), protoEvent.Context.Process.Parent.Pid.Value)
assert.Equal(t, uint32(1), protoEvent.Context.Process.Pid.Value)
assert.Equal(t, uint32(2), protoEvent.Context.Process.Thread.Tid.Value)
assert.Equal(t, uint32(3), protoEvent.Context.Process.HostPid.Value)
assert.Equal(t, uint32(4), protoEvent.Context.Process.Thread.HostTid.Value)
assert.Equal(t, uint32(5), protoEvent.Context.Process.Ancestors[0].Pid.Value)
assert.Equal(t, uint32(6), protoEvent.Context.Process.Ancestors[0].HostPid.Value)
assert.Equal(t, uint32(7), protoEvent.Context.Process.RealUser.Id.Value)
assert.Equal(t, pb.EventId_execve, protoEvent.Id)
assert.Equal(t, uint32(9), protoEvent.Context.Process.Thread.EntityId.Value)
assert.Equal(t, uint32(10), protoEvent.Context.Process.EntityId.Value)
assert.Equal(t, uint32(11), protoEvent.Context.Process.Parent.EntityId.Value)
assert.Equal(t, uint32(9), protoEvent.Context.Process.Thread.UniqueId.Value)
assert.Equal(t, uint32(10), protoEvent.Context.Process.UniqueId.Value)
assert.Equal(t, uint32(11), protoEvent.Context.Process.Ancestors[0].UniqueId.Value)
assert.Equal(t, "eventTest", protoEvent.Name)
assert.Equal(t, []string{"policyTest"}, protoEvent.Policies.Matched)
assert.Equal(t, "processTest", protoEvent.Context.Process.Thread.Name)
Expand Down
Loading