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.

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

Add basic SSH detection #336

Merged
merged 1 commit into from
Aug 28, 2024
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
4 changes: 2 additions & 2 deletions api/v1/kube/kube_api.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 16 additions & 6 deletions api/v1/kube/kube_api_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

320 changes: 203 additions & 117 deletions api/v1/runtime/common.pb.go

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions api/v1/runtime/common.proto
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,11 @@ message SOCKS5DetectedFinding {
uint32 port = 6;
}

message SSHData {
FlowDirection flow_direction = 1;
string version = 2;
string comments = 3;
}

enum NetflowProtocol {
NETFLOW_PROTOCOL_UNKNOWN = 0;
Expand Down
833 changes: 429 additions & 404 deletions api/v1/runtime/runtime_agent_api.pb.go

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions api/v1/runtime/runtime_agent_api.proto
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ enum EventType {
EVENT_SIGNATURE = 9;
EVENT_TTY_WRITE = 10;
EVENT_STDIO_VIA_SOCKET = 11;
EVENT_SSH = 12;

EVENT_ANY = 999;
}
Expand Down Expand Up @@ -81,6 +82,7 @@ message Event {
v1.SignatureEvent signature = 25;
v1.Any any = 26;
v1.StdioViaSocketFinding stdio_via_socket = 27;
v1.SSHData ssh = 28;
}
}

Expand Down
58 changes: 39 additions & 19 deletions api/v1/runtime/runtime_agent_api_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions cmd/agent/daemon/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ func NewRunCommand(version string) *cobra.Command {
events.ProcessOomKilled,
events.StdioViaSocket,
events.TtyWrite,
events.NetPacketSSHBase,
},
}
ebpfEventsStdioExporterEnabled = pflag.Bool("ebpf-events-stdio-exporter-enabled", false, "Export ebpf event to stdio")
Expand Down
7 changes: 7 additions & 0 deletions cmd/agent/daemon/state/events_pipeline.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,13 @@ func (c *Controller) toProtoEvent(e *ebpftypes.Event) *castpb.Event {
event.Data = &castpb.Event_File{
File: &castpb.File{Path: args.Path},
}
case ebpftypes.NetPacketSSHBaseArgs:
event.EventType = castpb.EventType_EVENT_SSH
sshEvent := args.Payload
sshEvent.FlowDirection = convertFlowDirection(e.Context.GetFlowDirection())
event.Data = &castpb.Event_Ssh{
Ssh: sshEvent,
}
}

if event.EventType == 0 {
Expand Down
3 changes: 3 additions & 0 deletions e2e/e2e.go
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,9 @@ func (t *testCASTAIServer) validateEvents(ctx context.Context, timeout time.Dura
}
return nil
},
castaipb.EventType_EVENT_SSH: func(e *castaipb.Event) error {
return nil
},
}
expectedTypes := lo.KeyBy(lo.Keys(eventsValidators), func(item castaipb.EventType) castaipb.EventType {
return item
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ require (
github.com/spf13/viper v1.18.2
github.com/stretchr/testify v1.9.0
github.com/testcontainers/testcontainers-go v0.30.0
github.com/tklauser/go-sysconf v0.3.12
github.com/vishvananda/netns v0.0.4
go.uber.org/atomic v1.11.0
go.uber.org/goleak v1.3.0
Expand Down Expand Up @@ -175,7 +176,6 @@ require (
github.com/skeema/knownhosts v1.2.1 // indirect
github.com/spdx/tools-golang v0.5.4-0.20231108154018-0c0f394b5e1a // indirect
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/vishvananda/netlink v1.2.1-beta.2.0.20231127184239-0ced8385386a // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
Expand Down
5 changes: 4 additions & 1 deletion pkg/ebpftracer/c/headers/common/network.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ typedef enum net_packet {
SUB_NET_PACKET_DNS = 1 << 6,
SUB_NET_PACKET_HTTP = 1 << 7,
SUB_NET_PACKET_SOCKS5 = 1 << 8,
SUB_NET_PACKET_SSH = 1 << 9,
} net_packet_t;

typedef struct net_event_contextmd {
Expand Down Expand Up @@ -244,13 +245,15 @@ struct {
#define HEADERS 0 // no payload

// when guessing by src/dst ports, declare at network.h
#define TCP_PORT_SSH 22
#define UDP_PORT_DNS 53
#define TCP_PORT_DNS 53
#define TCP_PORT_SOCKS5 1080

// layer 7 parsing related constants
#define http_min_len 7 // longest http command is "DELETE "
#define socks5_min_len 4 // we try to match the socks5 request. this should
#define socks5_min_len 4
#define ssh_min_len 4 // the initial SSH messages always send `SSH-`

// PROTOTYPES

Expand Down
1 change: 1 addition & 0 deletions pkg/ebpftracer/c/headers/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ enum event_id_e {
NET_PACKET_DNS,
NET_PACKET_HTTP,
NET_PACKET_SOCKS5,
NET_PACKET_SSH,
NET_PACKET_CAP_BASE,
NET_CAPTURE_BASE,
NET_FLOW_BASE,
Expand Down
Loading
Loading