Skip to content

feat: add native container awareness and cgroup rule operands #1658

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

Open
adrian-lin-1-0-0 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add native container awareness and cgroup rule operands #1658

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
3 changes: 2 additions & 1 deletion daemon/conman/connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ func (c *Connection) String() string {
func (c *Connection) Serialize() *protocol.Connection {
c.Process.RLock()
defer c.Process.RUnlock()

return &protocol.Connection{
Protocol: c.Protocol,
SrcIp: c.SrcIP.String(),
Expand All @@ -334,7 +335,7 @@ func (c *Connection) Serialize() *protocol.Connection {
ProcessId: uint32(c.Process.ID),
ProcessPath: c.Process.Path,
ProcessArgs: c.Process.Args,
ProcessEnv: c.Process.Env,
ProcessEnv: c.Process.SerializeEnv(),
ProcessCwd: c.Process.CWD,
ProcessChecksums: c.Process.Checksums,
ProcessTree: c.Process.Tree,
Expand Down
35 changes: 35 additions & 0 deletions daemon/conman/connection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (
"net"
"testing"

"github.com/evilsocket/opensnitch/daemon/netstat"
"github.com/evilsocket/opensnitch/daemon/procmon"
"github.com/google/gopacket"
"github.com/google/gopacket/layers"

Expand Down Expand Up @@ -125,3 +127,36 @@ func TestParseUDPDirection(t *testing.T) {
t.Fail()
}
}

func TestConnectionSerializeIncludesContainerEnv(t *testing.T) {
conn := &Connection{
Protocol: "tcp",
DstHost: "example.org",
SrcIP: net.IP{192, 168, 1, 100},
DstIP: net.IP{1, 1, 1, 1},
SrcPort: 12345,
DstPort: 443,
Entry: &netstat.Entry{UserId: 1000},
Process: procmon.NewProcessEmpty(1234, "curl"),
}
conn.Process.Env = map[string]string{"PATH": "/usr/bin"}
conn.Process.Container = &procmon.ContainerContext{
IsContainer: true,
Runtime: "Docker",
CgroupPath: "/docker/0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
ContainerID: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
ContainerName: "web",
}

serialized := conn.Serialize()

if serialized.ProcessEnv["_OS_CONTAINER_RUNTIME"] != "Docker" {
t.Fatalf("ProcessEnv[_OS_CONTAINER_RUNTIME] = %q, want %q", serialized.ProcessEnv["_OS_CONTAINER_RUNTIME"], "Docker")
}
if serialized.ProcessEnv["_OS_CONTAINER_NAME"] != "web" {
t.Fatalf("ProcessEnv[_OS_CONTAINER_NAME] = %q, want %q", serialized.ProcessEnv["_OS_CONTAINER_NAME"], "web")
}
if serialized.ProcessEnv["PATH"] != "/usr/bin" {
t.Fatalf("ProcessEnv[PATH] = %q, want %q", serialized.ProcessEnv["PATH"], "/usr/bin")
}
}
36 changes: 35 additions & 1 deletion daemon/data/default-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,39 @@
"Internal": {
"GCPercent": 100,
"FlushConnsOnStart": true
}
},
"cgroup_monitors": [
{
"name": "docker",
"enabled": true,
"base_path": "docker",
"regex": "docker[/-](?P<id>[a-f0-9]{64})",
"display_name": "Docker",
"container_name_regex": "docker-(?P<name>[a-zA-Z0-9._-]+?)-[a-f0-9]{64}"
},
{
"name": "podman_rootless",
"enabled": true,
"base_path": "libpod",
"regex": "libpod-(?P<id>[a-f0-9]{64})\\.scope",
"display_name": "Podman (Rootless)",
"container_name_regex": "libpod-(?P<name>.+?)-[a-f0-9]{64}"
},
{
"name": "containerd",
"enabled": true,
"base_path": "containerd|crio",
"regex": "(?:containerd|crio)-(?P<id>[a-f0-9]{64})",
"display_name": "Containerd",
"container_name_regex": "(?:containerd|crio)-(?P<name>.+?)-[a-f0-9]{64}"
},
{
"name": "k8s",
"enabled": false,
"base_path": "/kubepods",
"regex": "kubepods.*pod(?P<pod_id>[a-f0-9_-]+)[./].*(?P<id>[a-f0-9]{64})",
"display_name": "Kubernetes",
"container_name_regex": "kubepods.*pod(?P<name>[a-f0-9_-]+)"
}
]
}
6 changes: 6 additions & 0 deletions daemon/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import (
"github.com/evilsocket/opensnitch/daemon/log/loggers"
"github.com/evilsocket/opensnitch/daemon/netfilter"
"github.com/evilsocket/opensnitch/daemon/netlink"
"github.com/evilsocket/opensnitch/daemon/procmon"
"github.com/evilsocket/opensnitch/daemon/procmon/ebpf"
"github.com/evilsocket/opensnitch/daemon/procmon/monitor"
"github.com/evilsocket/opensnitch/daemon/rule"
Expand Down Expand Up @@ -587,6 +588,11 @@ func main() {
if err != nil {
log.Fatal("%s", err)
}
if len(cfg.CgroupMonitors) == 0 {
cfg.CgroupMonitors = procmon.DefaultCgroupMonitors()
}

procmon.InitCgroupMonitors(cfg.CgroupMonitors)

if cfg.Rules.Path == "" {
cfg.Rules.Path = rule.DefaultPath
Expand Down
Loading