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

[DRAFT] chore!: concrete type arguments #4353

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

[DRAFT] chore!: concrete type arguments #4353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a30a56
chore: move argtype and reduce type variance
NDStrahilevitz Oct 9, 2024
ebe9be2
chore(bufferdecoder): readability refactors
NDStrahilevitz Oct 10, 2024
22d5ea7
wip: standardize strarr buffer submit
NDStrahilevitz Oct 10, 2024
114f9a8
decode strategies
NDStrahilevitz Oct 16, 2024
d48f44c
debug
NDStrahilevitz Oct 22, 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
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,5 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
kernel.org/pub/linux/libs/security/libcap/psx v1.2.70 // indirect
)

replace github.com/aquasecurity/tracee/types => ./types
93 changes: 88 additions & 5 deletions pkg/bufferdecoder/decoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ package bufferdecoder
import (
"encoding/binary"
"errors"
"fmt"
"runtime"

"github.com/aquasecurity/tracee/pkg/errfmt"
"github.com/aquasecurity/tracee/pkg/events"
Expand Down Expand Up @@ -39,8 +41,17 @@ func (decoder *EbpfDecoder) BuffLen() int {
return len(decoder.buffer)
}

// ReadAmountBytes returns the total amount of bytes that decoder has read from its buffer up until now.
func (decoder *EbpfDecoder) ReadAmountBytes() int {
// BytesRead returns the total amount of bytes that decoder has read from its buffer up until now.
func (decoder *EbpfDecoder) BytesRead() int {
return decoder.cursor
}

// MoveCursor moves the buffer cursor over n bytes. Returns the new cursor position.
func (decoder *EbpfDecoder) MoveCursor(n int) int {

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += n
return decoder.cursor
}

Expand Down Expand Up @@ -82,6 +93,8 @@ func (decoder *EbpfDecoder) DecodeContext(eCtx *EventContext) error {
eCtx.MatchedPolicies = binary.LittleEndian.Uint64(decoder.buffer[offset+136 : offset+144])
// event_context end

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += eCtx.GetSizeBytes()
return nil
}
Expand All @@ -107,7 +120,7 @@ func (decoder *EbpfDecoder) DecodeArguments(args []trace.Argument, argnum int, e
args[idx] = arg
}

// Fill missing arguments metadata
// Fill missing arguments
for i := 0; i < len(evtParams); i++ {
if args[i].Value == nil {
args[i].ArgMeta = evtParams[i]
Expand All @@ -125,6 +138,9 @@ func (decoder *EbpfDecoder) DecodeUint8(msg *uint8) error {
return ErrBufferTooShort
}
*msg = decoder.buffer[decoder.cursor]

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += readAmount
return nil
}
Expand All @@ -137,6 +153,9 @@ func (decoder *EbpfDecoder) DecodeInt8(msg *int8) error {
return ErrBufferTooShort
}
*msg = int8(decoder.buffer[offset])

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += readAmount
return nil
}
Expand All @@ -149,6 +168,9 @@ func (decoder *EbpfDecoder) DecodeUint16(msg *uint16) error {
return ErrBufferTooShort
}
*msg = binary.LittleEndian.Uint16(decoder.buffer[offset : offset+readAmount])

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += readAmount
return nil
}
Expand All @@ -161,6 +183,9 @@ func (decoder *EbpfDecoder) DecodeUint16BigEndian(msg *uint16) error {
return ErrBufferTooShort
}
*msg = binary.BigEndian.Uint16(decoder.buffer[offset : offset+readAmount])

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += readAmount
return nil
}
Expand All @@ -173,6 +198,9 @@ func (decoder *EbpfDecoder) DecodeInt16(msg *int16) error {
return ErrBufferTooShort
}
*msg = int16(binary.LittleEndian.Uint16(decoder.buffer[offset : offset+readAmount]))

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += readAmount
return nil
}
Expand All @@ -185,6 +213,9 @@ func (decoder *EbpfDecoder) DecodeUint32(msg *uint32) error {
return ErrBufferTooShort
}
*msg = binary.LittleEndian.Uint32(decoder.buffer[offset : offset+readAmount])

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += readAmount
return nil
}
Expand All @@ -197,6 +228,9 @@ func (decoder *EbpfDecoder) DecodeUint32BigEndian(msg *uint32) error {
return ErrBufferTooShort
}
*msg = binary.BigEndian.Uint32(decoder.buffer[offset : offset+readAmount])

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += readAmount
return nil
}
Expand All @@ -209,6 +243,9 @@ func (decoder *EbpfDecoder) DecodeInt32(msg *int32) error {
return ErrBufferTooShort
}
*msg = int32(binary.LittleEndian.Uint32(decoder.buffer[offset : offset+readAmount]))

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += readAmount
return nil
}
Expand All @@ -221,6 +258,9 @@ func (decoder *EbpfDecoder) DecodeUint64(msg *uint64) error {
return ErrBufferTooShort
}
*msg = binary.LittleEndian.Uint64(decoder.buffer[offset : offset+readAmount])

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += readAmount
return nil
}
Expand All @@ -233,6 +273,9 @@ func (decoder *EbpfDecoder) DecodeInt64(msg *int64) error {
return ErrBufferTooShort
}
*msg = int64(binary.LittleEndian.Uint64(decoder.buffer[decoder.cursor : decoder.cursor+readAmount]))

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += readAmount
return nil
}
Expand All @@ -244,6 +287,8 @@ func (decoder *EbpfDecoder) DecodeBool(msg *bool) error {
return ErrBufferTooShort
}
*msg = (decoder.buffer[offset] != 0)
pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor++
return nil
}
Expand All @@ -256,18 +301,39 @@ func (decoder *EbpfDecoder) DecodeBytes(msg []byte, size int) error {
return ErrBufferTooShort
}
_ = copy(msg[:], decoder.buffer[offset:offset+size])

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += size
return nil
}

// DecodeIntArray translate from the decoder buffer, starting from the decoder cursor, to msg, size * 4 bytes (in order to get int32).
func (decoder *EbpfDecoder) DecodeIntArray(msg []int32, size int) error {
// ReadBytesLen is a helper which allocates a known size bytes buffer and decodes
// the bytes from the buffer into it.
func (decoder *EbpfDecoder) ReadBytesLen(len int) ([]byte, error) {
var err error
res := make([]byte, len)
err = decoder.DecodeBytes(res[:], len)
if err != nil {
return nil, errfmt.Errorf("error reading byte array: %v", err)
}
return res, nil
}

// DecodeInt32Array translate from the decoder buffer, starting from the decoder cursor, to msg, size * 4 bytes (in order to get int32).
func (decoder *EbpfDecoder) DecodeInt32Array(msg []int32, size int) error {
offset := decoder.cursor
if len(decoder.buffer[offset:]) < size*4 {
fmt.Println("buffer size from offset:", decoder.cursor)
fmt.Printf("buffer from offset: %08b\n", decoder.buffer[offset:])
return ErrBufferTooShort
}
for i := 0; i < size; i++ {
fmt.Println("ayy lmao", i)
msg[i] = int32(binary.LittleEndian.Uint32(decoder.buffer[decoder.cursor : decoder.cursor+4]))

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += 4
}
return nil
Expand Down Expand Up @@ -312,6 +378,9 @@ func (decoder *EbpfDecoder) DecodeSlimCred(slimCred *SlimCred) error {
slimCred.CapEffective = binary.LittleEndian.Uint64(decoder.buffer[offset+56 : offset+64])
slimCred.CapBounding = binary.LittleEndian.Uint64(decoder.buffer[offset+64 : offset+72])
slimCred.CapAmbient = binary.LittleEndian.Uint64(decoder.buffer[offset+72 : offset+80])

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += int(slimCred.GetSizeBytes())
return nil
}
Expand All @@ -327,6 +396,9 @@ func (decoder *EbpfDecoder) DecodeChunkMeta(chunkMeta *ChunkMeta) error {
_ = copy(chunkMeta.Metadata[:], decoder.buffer[offset+9:offset+37])
chunkMeta.Size = int32(binary.LittleEndian.Uint32(decoder.buffer[offset+37 : offset+41]))
chunkMeta.Off = binary.LittleEndian.Uint64(decoder.buffer[offset+41 : offset+49])

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += int(chunkMeta.GetSizeBytes())
return nil
}
Expand All @@ -341,6 +413,9 @@ func (decoder *EbpfDecoder) DecodeVfsFileMeta(vfsFileMeta *VfsFileMeta) error {
vfsFileMeta.Inode = binary.LittleEndian.Uint64(decoder.buffer[offset+4 : offset+12])
vfsFileMeta.Mode = binary.LittleEndian.Uint32(decoder.buffer[offset+12 : offset+16])
vfsFileMeta.Pid = binary.LittleEndian.Uint32(decoder.buffer[offset+16 : offset+20])

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += int(vfsFileMeta.GetSizeBytes())
return nil
}
Expand All @@ -355,6 +430,9 @@ func (decoder *EbpfDecoder) DecodeKernelModuleMeta(kernelModuleMeta *KernelModul
kernelModuleMeta.Inode = binary.LittleEndian.Uint64(decoder.buffer[offset+4 : offset+12])
kernelModuleMeta.Pid = binary.LittleEndian.Uint32(decoder.buffer[offset+12 : offset+16])
kernelModuleMeta.Size = binary.LittleEndian.Uint32(decoder.buffer[offset+16 : offset+20])

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += int(kernelModuleMeta.GetSizeBytes())
return nil
}
Expand All @@ -369,6 +447,9 @@ func (decoder *EbpfDecoder) DecodeBpfObjectMeta(bpfObjectMeta *BpfObjectMeta) er
bpfObjectMeta.Rand = binary.LittleEndian.Uint32(decoder.buffer[offset+16 : offset+20])
bpfObjectMeta.Pid = binary.LittleEndian.Uint32(decoder.buffer[offset+20 : offset+24])
bpfObjectMeta.Size = binary.LittleEndian.Uint32(decoder.buffer[offset+24 : offset+28])

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += int(bpfObjectMeta.GetSizeBytes())
return nil
}
Expand All @@ -382,6 +463,8 @@ func (decoder *EbpfDecoder) DecodeMprotectWriteMeta(mprotectWriteMeta *MprotectW
mprotectWriteMeta.Ts = binary.LittleEndian.Uint64(decoder.buffer[offset : offset+8])
mprotectWriteMeta.Pid = binary.LittleEndian.Uint32(decoder.buffer[offset+8 : offset+12])

pc, _, _, _ := runtime.Caller(0)
fmt.Println("increased cursor in line", runtime.FuncForPC(pc).Name())
decoder.cursor += int(mprotectWriteMeta.GetSizeBytes())
return nil
}
2 changes: 1 addition & 1 deletion pkg/bufferdecoder/decoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ func TestDecodeIntArray(t *testing.T) {
raw = append(raw, 1, 2, 3, 4, 5, 6, 7, 8)
decoder := New(raw)
var obtained [2]int32
err := decoder.DecodeIntArray(obtained[:], 2)
err := decoder.DecodeInt32Array(obtained[:], 2)
assert.Equal(t, nil, err)
rawcp := append(raw, 1, 2, 3, 4, 5, 6, 7, 8)
dataBuff := bytes.NewBuffer(rawcp)
Expand Down
Loading
Loading