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

backports:v1.0: clone ns fixes #2700

Merged
merged 3 commits into from
Jul 19, 2024
Merged

backports:v1.0: clone ns fixes #2700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
350d8e6
bpf: store thread leader namespaces/caps at fork and reduce false pos…
tixxdz Jul 19, 2024
e87fb7e
test:clone: more namespace checks
tixxdz Jul 19, 2024
2aaf287
tests:process_exec: more tests for get caps and ns
tixxdz Jul 19, 2024
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
11 changes: 11 additions & 0 deletions bpf/process/bpf_fork.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@ BPF_KPROBE(event_wake_up_new_task, struct task_struct *task)
curr->binary = parent->binary;
curr->pkey = parent->key;

/* Store the thread leader capabilities so we can check later
* before the execve hook point if they changed or not.
* This needs to be converted later to credentials.
*/
get_current_subj_caps(&curr->caps, task);

/* Store the thread leader namespaces so we can check later
* before the execve hook point if they changed or not.
*/
get_namespaces(&curr->ns, task);

u64 size = sizeof(struct msg_clone_event);
struct msg_clone_event msg = {
.common.op = MSG_OP_CLONE,
Expand Down
19 changes: 16 additions & 3 deletions pkg/sensors/exec/exec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"github.com/cilium/tetragon/pkg/observer/observertesthelper"
"github.com/cilium/tetragon/pkg/option"
proc "github.com/cilium/tetragon/pkg/process"
"github.com/cilium/tetragon/pkg/reader/caps"
"github.com/cilium/tetragon/pkg/reader/namespace"
"github.com/cilium/tetragon/pkg/sensors"
"github.com/cilium/tetragon/pkg/sensors/base"
Expand Down Expand Up @@ -257,9 +258,14 @@ func TestEventExecve(t *testing.T) {

testNop := testutils.RepoRootPath("contrib/tester-progs/nop")

myCaps := ec.NewCapabilitiesChecker().FromCapabilities(caps.GetCurrentCapabilities())
myNs := ec.NewNamespacesChecker().FromNamespaces(namespace.GetCurrentNamespace())

procChecker := ec.NewProcessChecker().
WithBinary(sm.Full(testNop)).
WithArguments(sm.Full("arg1 arg2 arg3"))
WithArguments(sm.Full("arg1 arg2 arg3")).
WithCap(myCaps).
WithNs(myNs)

execChecker := ec.NewProcessExecChecker("").WithProcess(procChecker)
checker := ec.NewUnorderedEventChecker(execChecker)
Expand Down Expand Up @@ -873,6 +879,9 @@ func TestExecProcessCredentials(t *testing.T) {

testNop := testutils.RepoRootPath("contrib/tester-progs/nop")

myCaps := ec.NewCapabilitiesChecker().FromCapabilities(caps.GetCurrentCapabilities())
myNs := ec.NewNamespacesChecker().FromNamespaces(namespace.GetCurrentNamespace())

if err := exec.Command(testNop).Run(); err != nil {
t.Fatalf("Failed to execute test binary: %s\n", err)
}
Expand All @@ -895,10 +904,14 @@ func TestExecProcessCredentials(t *testing.T) {
WithGid(0).WithEgid(gid).WithSgid(gid).WithFsgid(gid)

procExecChecker := ec.NewProcessChecker().
WithBinary(sm.Full(testNop)).WithProcessCredentials(creds).WithBinaryProperties(nil)
WithBinary(sm.Full(testNop)).WithProcessCredentials(creds).WithBinaryProperties(nil).
WithCap(myCaps).
WithNs(myNs)

procGidExecChecker := ec.NewProcessChecker().
WithBinary(sm.Full(testNop)).WithProcessCredentials(gidCreds).WithBinaryProperties(nil)
WithBinary(sm.Full(testNop)).WithProcessCredentials(gidCreds).WithBinaryProperties(nil).
WithCap(myCaps).
WithNs(myNs)

execChecker := ec.NewProcessExecChecker("exec").WithProcess(procExecChecker)
execGidChecker := ec.NewProcessExecChecker("exec").WithProcess(procGidExecChecker)
Expand Down
17 changes: 14 additions & 3 deletions pkg/sensors/tracing/kprobe_threads_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import (
"github.com/cilium/tetragon/pkg/logger"
sm "github.com/cilium/tetragon/pkg/matchers/stringmatcher"
"github.com/cilium/tetragon/pkg/observer/observertesthelper"
"github.com/cilium/tetragon/pkg/reader/caps"
"github.com/cilium/tetragon/pkg/reader/namespace"
"github.com/cilium/tetragon/pkg/testutils"
tus "github.com/cilium/tetragon/pkg/testutils/sensors"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -90,10 +92,15 @@ spec:

cti.AssertPidsTids(t)

myCaps := ec.NewCapabilitiesChecker().FromCapabilities(caps.GetCurrentCapabilities())
myNs := ec.NewNamespacesChecker().FromNamespaces(namespace.GetCurrentNamespace())

parentCheck := ec.NewProcessChecker().
WithBinary(sm.Suffix("threads-tester")).
WithPid(cti.ParentPid).
WithTid(cti.ParentTid)
WithTid(cti.ParentTid).
WithCap(myCaps).
WithNs(myNs)

execCheck := ec.NewProcessExecChecker("").
WithProcess(parentCheck)
Expand All @@ -104,15 +111,19 @@ spec:
child1Checker := ec.NewProcessChecker().
WithBinary(sm.Suffix("threads-tester")).
WithPid(cti.Child1Pid).
WithTid(cti.Child1Tid)
WithTid(cti.Child1Tid).
WithCap(myCaps).
WithNs(myNs)

child1KpChecker := ec.NewProcessKprobeChecker("").
WithProcess(child1Checker).WithParent(parentCheck)

thread1Checker := ec.NewProcessChecker().
WithBinary(sm.Suffix("threads-tester")).
WithPid(cti.Thread1Pid).
WithTid(cti.Thread1Tid)
WithTid(cti.Thread1Tid).
WithCap(myCaps).
WithNs(myNs)

thread1KpChecker := ec.NewProcessKprobeChecker("").
WithProcess(thread1Checker).WithParent(parentCheck)
Expand Down
Loading