commit 07ff3b173769f87c7c84b9b827f4a1f2dab63a91 · pyrox.dev/nixpkgs

+7 -4

nixos/tests/tracee.nix

···

       14
       14
        
                 patches = oa.patches or [] ++ [

     

       15
       15
        
                   # change the prefix from /usr/bin to /run to find nix processes

     

       16
       16
        
                   ../../pkgs/tools/security/tracee/test-EventFilters-prefix-nix-friendly.patch

     

       17
       17
       -
                   # skip magic_write test that currently fails

     

       18
       18
       -
                   ../../pkgs/tools/security/tracee/test-EventFilters-magic_write-skip.patch

     

       19
       17
        
                 ];

     

       20
       18
        
                 buildPhase = ''

     

       21
       19
        
                   runHook preBuild

     

       22
       20
        
                   # just build the static lib we need for the go test binary

     

       23
       23
       -
                   make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES} bpf-core ./dist/btfhub ./dist/libbpf/libbpf.a

     

       21
       21
       +
                   make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES} bpf-core ./dist/btfhub

     

       22
       22
       +
       

     

       23
       23
       +
                   # remove the /usr/bin prefix to work with the patch above

     

       24
       24
       +
                   substituteInPlace tests/integration/integration_test.go \

     

       25
       25
       +
                     --replace "/usr/bin/ls" "ls"

     

       26
       26
       +
       

     

       24
       27
        
                   # then compile the tests to be ran later

     

       25
       25
       -
                   CGO_CFLAGS="-I$PWD/dist/libbpf" CGO_LDFLAGS="-lelf -lz $PWD/dist/libbpf/libbpf.a" go test -tags core,ebpf,integration -p 1 -c -o $GOPATH/tracee-integration ./tests/integration/...

     

       28
       28
       +
                   CGO_LDFLAGS="$(pkg-config --libs libbpf)" go test -tags core,ebpf,integration -p 1 -c -o $GOPATH/tracee-integration ./tests/integration/...

     

       26
       29
        
                   runHook postBuild

     

       27
       30
        
                 '';

     

       28
       31
        
                 doCheck = false;

+9 -13

pkgs/tools/security/tracee/default.nix

···

       19
       19
        
       in

     

       20
       20
        
       buildGoModule rec {

     

       21
       21
        
         pname = "tracee";

     

       22
       22
       -
         version = "0.8.3";

     

       22
       22
       +
         version = "0.9.2";

     

       23
       23
        
       

     

       24
       24
        
         src = fetchFromGitHub {

     

       25
       25
        
           owner = "aquasecurity";

     

       26
       26
        
           repo = pname;

     

       27
       27
        
           rev = "v${version}";

     

       28
       28
       -
           sha256 = "sha256-VxTJcl7gHRZEXpFbxU4iMwqxuR1r0BNSseWQ5ijWHU4=";

     

       28
       28
       +
           sha256 = "sha256-w/x7KhopkADKvpDc5TE5Kf34pRY6HP3kX1Lqujnl0b8=";

     

       29
       29
        
         };

     

       30
       30
       -
         vendorSha256 = "sha256-szPoJUtzya3+8dOnkDxHEs3+a1LTVoMMLjUSrUlfiGg=";

     

       30
       30
       +
         vendorSha256 = "sha256-5RXNRNoMydFcemNGgyfqcUPtfMVgMYdiyWo/sZi8GQw=";

     

       31
       31
       +
       

     

       32
       32
       +
         patches = [

     

       33
       33
       +
           ./use-our-libbpf.patch

     

       34
       34
       +
         ];

     

       31
       35
        
       

     

       32
       36
        
         enableParallelBuilding = true;

     

       33
       37
        
         # needed to build bpf libs

     

       34
       38
        
         hardeningDisable = [ "stackprotector" ];

     

       35
       39
        
       

     

       36
       40
        
         nativeBuildInputs = [ pkg-config clang ];

     

       37
       37
       -
         # ensure libbpf version exactly matches the version added as a submodule

     

       38
       38
       -
         buildInputs = [ libbpf zlib elfutils ];

     

       41
       41
       +
         buildInputs = [ elfutils libbpf zlib ];

     

       39
       42
        
       

     

       40
       43
        
         makeFlags = [

     

       41
       44
        
           "VERSION=v${version}"

     
···

       44
       47
        
           "CMD_GIT=echo"

     

       45
       48
        
         ];

     

       46
       49
        
       

     

       47
       47
       -
         # TODO: patch tracee to take libbpf.a and headers via include path

     

       48
       48
       -
         preBuild = ''

     

       49
       49
       -
           mkdir -p 3rdparty/libbpf/src

     

       50
       50
       -
           mkdir -p ./dist

     

       51
       51
       -
           cp -r ${libbpf}/lib ./dist/libbpf

     

       52
       52
       -
           chmod +w ./dist/libbpf

     

       53
       53
       -
           cp -r ${libbpf}/include/bpf ./dist/libbpf/

     

       54
       54
       -
         '';

     

       55
       50
        
         buildPhase = ''

     

       56
       51
        
           runHook preBuild

     

       52
       52
       +
           mkdir -p ./dist

     

       57
       53
        
           make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES} bpf-core all

     

       58
       54
        
           runHook postBuild

     

       59
       55
        
         '';

-16

pkgs/tools/security/tracee/test-EventFilters-magic_write-skip.patch

···

       1
       1
       -
       diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go

     

       2
       2
       -
       index afbc5330..3b38a1b8 100644

     

       3
       3
       -
       --- a/tests/integration/integration_test.go

     

       4
       4
       -
       +++ b/tests/integration/integration_test.go

     

       5
       5
       -
       @@ -205,11 +205,6 @@ func Test_EventFilters(t *testing.T) {

     

       6
       6
       -
        		filterArgs []string

     

       7
       7
       -
        		eventFunc  func(*testing.T, *[]trace.Event)

     

       8
       8
       -
        	}{

     

       9
       9
       -
       -		{

     

       10
       10
       -
       -			name:       "do a file write",

     

       11
       11
       -
       -			filterArgs: []string{"event=magic_write"},

     

       12
       12
       -
       -			eventFunc:  checkMagicwrite,

     

       13
       13
       -
       -		},

     

       14
       14
       -
        		{

     

       15
       15
       -
        			name:       "execute a command",

     

       16
       16
       -
        			filterArgs: []string{"comm=ls"},

+129

pkgs/tools/security/tracee/use-our-libbpf.patch

···

       1
       1
       +
       diff --git a/Makefile b/Makefile

     

       2
       2
       +
       index c72cf63d..e96b7eed 100644

     

       3
       3
       +
       --- a/Makefile

     

       4
       4
       +
       +++ b/Makefile

     

       5
       5
       +
       @@ -50,6 +50,7 @@ CMD_STATICCHECK ?= staticcheck

     

       6
       6
       +
        # libs

     

       7
       7
       +
        #

     

       8
       8
       +
        

     

       9
       9
       +
       +LIB_BPF ?= libbpf

     

       10
       10
       +
        LIB_ELF ?= libelf

     

       11
       11
       +
        LIB_ZLIB ?= zlib

     

       12
       12
       +
        

     

       13
       13
       +
       @@ -172,10 +173,6 @@ env:

     

       14
       14
       +
        	@echo "KERN_BUILD_PATH          $(KERN_BUILD_PATH)"

     

       15
       15
       +
        	@echo "KERN_SRC_PATH            $(KERN_SRC_PATH)"

     

       16
       16
       +
        	@echo ---------------------------------------

     

       17
       17
       +
       -	@echo "LIBBPF_CFLAGS            $(LIBBPF_CFLAGS)"

     

       18
       18
       +
       -	@echo "LIBBPF_LDLAGS            $(LIBBPF_LDFLAGS)"

     

       19
       19
       +
       -	@echo "LIBBPF_SRC               $(LIBBPF_SRC)"

     

       20
       20
       +
       -	@echo ---------------------------------------

     

       21
       21
       +
        	@echo "STATIC                   $(STATIC)"

     

       22
       22
       +
        	@echo ---------------------------------------

     

       23
       23
       +
        	@echo "BPF_VCPU                 $(BPF_VCPU)"

     

       24
       24
       +
       @@ -274,8 +271,6 @@ OUTPUT_DIR = ./dist

     

       25
       25
       +
        $(OUTPUT_DIR):

     

       26
       26
       +
        #

     

       27
       27
       +
        	@$(CMD_MKDIR) -p $@

     

       28
       28
       +
       -	@$(CMD_MKDIR) -p $@/libbpf

     

       29
       29
       +
       -	@$(CMD_MKDIR) -p $@/libbpf/obj

     

       30
       30
       +
        

     

       31
       31
       +
        #

     

       32
       32
       +
        # embedded btfhub

     

       33
       33
       +
       @@ -286,37 +281,6 @@ $(OUTPUT_DIR)/btfhub:

     

       34
       34
       +
        	@$(CMD_MKDIR) -p $@

     

       35
       35
       +
        	@$(CMD_TOUCH) $@/.place-holder # needed for embed.FS

     

       36
       36
       +
        

     

       37
       37
       +
       -#

     

       38
       38
       +
       -# libbpf

     

       39
       39
       +
       -#

     

       40
       40
       +
       -

     

       41
       41
       +
       -LIBBPF_CFLAGS = "-fPIC"

     

       42
       42
       +
       -LIBBPF_LDLAGS =

     

       43
       43
       +
       -LIBBPF_SRC = ./3rdparty/libbpf/src

     

       44
       44
       +
       -

     

       45
       45
       +
       -$(OUTPUT_DIR)/libbpf/libbpf.a: \

     

       46
       46
       +
       -	$(LIBBPF_SRC) \

     

       47
       47
       +
       -	$(wildcard $(LIBBPF_SRC)/*.[ch]) \

     

       48
       48
       +
       -	| .checkver_$(CMD_CLANG) $(OUTPUT_DIR)

     

       49
       49
       +
       -#

     

       50
       50
       +
       -	CC="$(CMD_CLANG)" \

     

       51
       51
       +
       -		CFLAGS="$(LIBBPF_CFLAGS)" \

     

       52
       52
       +
       -		LD_FLAGS="$(LIBBPF_LDFLAGS)" \

     

       53
       53
       +
       -		$(MAKE) \

     

       54
       54
       +
       -		-C $(LIBBPF_SRC) \

     

       55
       55
       +
       -		BUILD_STATIC_ONLY=1 \

     

       56
       56
       +
       -		DESTDIR=$(abspath ./$(OUTPUT_DIR)/libbpf/) \

     

       57
       57
       +
       -		OBJDIR=$(abspath ./$(OUTPUT_DIR)/libbpf/obj) \

     

       58
       58
       +
       -		INCLUDEDIR= LIBDIR= UAPIDIR= prefix= libdir= \

     

       59
       59
       +
       -		install install_uapi_headers

     

       60
       60
       +
       -

     

       61
       61
       +
       -$(LIBBPF_SRC): \

     

       62
       62
       +
       -	| .check_$(CMD_GIT)

     

       63
       63
       +
       -#

     

       64
       64
       +
       -ifeq ($(wildcard $@), )

     

       65
       65
       +
       -	@$(CMD_GIT) submodule update --init --recursive

     

       66
       66
       +
       -endif

     

       67
       67
       +
       -

     

       68
       68
       +
        #

     

       69
       69
       +
        # non co-re ebpf

     

       70
       70
       +
        #

     

       71
       71
       +
       @@ -333,7 +297,6 @@ BPF_NOCORE_TAG = $(subst .,_,$(KERN_RELEASE)).$(subst .,_,$(VERSION))

     

       72
       72
       +
        bpf-nocore: $(OUTPUT_DIR)/tracee.bpf.$(BPF_NOCORE_TAG).o

     

       73
       73
       +
        

     

       74
       74
       +
        $(OUTPUT_DIR)/tracee.bpf.$(BPF_NOCORE_TAG).o: \

     

       75
       75
       +
       -	$(OUTPUT_DIR)/libbpf/libbpf.a \

     

       76
       76
       +
        	$(TRACEE_EBPF_OBJ_SRC)

     

       77
       77
       +
        #

     

       78
       78
       +
        	MAKEFLAGS="--no-print-directory"

     

       79
       79
       +
       @@ -351,7 +314,6 @@ $(OUTPUT_DIR)/tracee.bpf.$(BPF_NOCORE_TAG).o: \

     

       80
       80
       +
        		-I $(KERN_SRC_PATH)/include/uapi \

     

       81
       81
       +
        		-I $(KERN_BUILD_PATH)/include/generated \

     

       82
       82
       +
        		-I $(KERN_BUILD_PATH)/include/generated/uapi \

     

       83
       83
       +
       -		-I $(OUTPUT_DIR)/libbpf \

     

       84
       84
       +
        		-I ./3rdparty/include \

     

       85
       85
       +
        		-Wunused \

     

       86
       86
       +
        		-Wall \

     

       87
       87
       +
       @@ -412,7 +374,6 @@ TRACEE_EBPF_OBJ_CORE_HEADERS = $(shell find pkg/ebpf/c -name *.h)

     

       88
       88
       +
        bpf-core: $(OUTPUT_DIR)/tracee.bpf.core.o

     

       89
       89
       +
        

     

       90
       90
       +
        $(OUTPUT_DIR)/tracee.bpf.core.o: \

     

       91
       91
       +
       -	$(OUTPUT_DIR)/libbpf/libbpf.a \

     

       92
       92
       +
        	$(TRACEE_EBPF_OBJ_SRC) \

     

       93
       93
       +
        	$(TRACEE_EBPF_OBJ_CORE_HEADERS)

     

       94
       94
       +
        #

     

       95
       95
       +
       @@ -421,7 +382,6 @@ $(OUTPUT_DIR)/tracee.bpf.core.o: \

     

       96
       96
       +
        		-D__BPF_TRACING__ \

     

       97
       97
       +
        		-DCORE \

     

       98
       98
       +
        		-I./pkg/ebpf/c/ \

     

       99
       99
       +
       -		-I$(OUTPUT_DIR)/libbpf/ \

     

       100
       100
       +
        		-I ./3rdparty/include \

     

       101
       101
       +
        		-target bpf \

     

       102
       102
       +
        		-O2 -g \

     

       103
       103
       +
       @@ -447,8 +407,8 @@ ifeq ($(STATIC), 1)

     

       104
       104
       +
            GO_TAGS_EBPF := $(GO_TAGS_EBPF),netgo

     

       105
       105
       +
        endif

     

       106
       106
       +
        

     

       107
       107
       +
       -CUSTOM_CGO_CFLAGS = "-I$(abspath $(OUTPUT_DIR)/libbpf)"

     

       108
       108
       +
       -CUSTOM_CGO_LDFLAGS = "$(shell $(call pkg_config, $(LIB_ELF))) $(shell $(call pkg_config, $(LIB_ZLIB))) $(abspath $(OUTPUT_DIR)/libbpf/libbpf.a)"

     

       109
       109
       +
       +CUSTOM_CGO_CFLAGS = ""

     

       110
       110
       +
       +CUSTOM_CGO_LDFLAGS = "$(shell $(call pkg_config, $(LIB_BPF))) $(shell $(call pkg_config, $(LIB_ELF))) $(shell $(call pkg_config, $(LIB_ZLIB)))"

     

       111
       111
       +
        

     

       112
       112
       +
        GO_ENV_EBPF =

     

       113
       113
       +
        GO_ENV_EBPF += GOOS=linux

     

       114
       114
       +
       @@ -468,6 +428,7 @@ $(OUTPUT_DIR)/tracee-ebpf: \

     

       115
       115
       +
        	$(TRACEE_EBPF_SRC) \

     

       116
       116
       +
        	./embedded-ebpf.go \

     

       117
       117
       +
        	| .checkver_$(CMD_GO) \

     

       118
       118
       +
       +	.checklib_$(LIB_BPF) \

     

       119
       119
       +
        	.checklib_$(LIB_ELF) \

     

       120
       120
       +
        	.checklib_$(LIB_ZLIB) \

     

       121
       121
       +
        	btfhub

     

       122
       122
       +
       @@ -658,7 +619,6 @@ test-rules: \

     

       123
       123
       +
        .PHONY: test-upstream-libbpfgo

     

       124
       124
       +
        test-upstream-libbpfgo: \

     

       125
       125
       +
        	.checkver_$(CMD_GO) \

     

       126
       126
       +
       -	$(OUTPUT_DIR)/libbpf/libbpf.a

     

       127
       127
       +
        #

     

       128
       128
       +
        	./tests/libbpfgo.sh $(GO_ENV_EBPF)

     

       129
       129
       +

+1 -1

pkgs/top-level/all-packages.nix

···

       12074
       12074
        
         tracebox = callPackage ../tools/networking/tracebox { stdenv = gcc10StdenvCompat; };

     

       12075
       12075
        
       

     

       12076
       12076
        
         tracee = callPackage ../tools/security/tracee {

     

       12077
       12077
       -
           buildGoModule = buildGo118Module; # tests fail with 1.19

     

       12077
       12077
       +
           libbpf = libbpf_1; # keep inline with their submodule

     

       12078
       12078
        
         };

     

       12079
       12079
        
       

     

       12080
       12080
        
         tracefilegen = callPackage ../development/tools/analysis/garcosim/tracefilegen { };