Skip to content
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 comp/core/workloadfilter/baseimpl/filter_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ func (pf *filterSelection) computeKubeEndpointAutodiscoveryFilters(_ config.Comp
// computeContainerComplianceFilters computes container compliance filters
func (pf *filterSelection) computeContainerComplianceFilters(cfg config.Component) [][]workloadfilter.ContainerFilter {
flist := []workloadfilter.ContainerFilter{workloadfilter.ContainerLegacyCompliance}
if cfg.GetBool("compliance_config.exclude_pause_containers") {
if cfg.GetBool("compliance_config.exclude_pause_container") {
flist = append(flist, workloadfilter.ContainerPaused)
}
return [][]workloadfilter.ContainerFilter{flist}
Expand All @@ -245,7 +245,7 @@ func (pf *filterSelection) computeContainerComplianceFilters(cfg config.Componen
// computeContainerRuntimeSecurityFilters computes container runtime security filters
func (pf *filterSelection) computeContainerRuntimeSecurityFilters(cfg config.Component) [][]workloadfilter.ContainerFilter {
flist := []workloadfilter.ContainerFilter{workloadfilter.ContainerLegacyRuntimeSecurity}
if cfg.GetBool("runtime_security_config.exclude_pause_containers") {
if cfg.GetBool("runtime_security_config.exclude_pause_container") {
flist = append(flist, workloadfilter.ContainerPaused)
}
return [][]workloadfilter.ContainerFilter{flist}
Expand Down
5 changes: 5 additions & 0 deletions comp/core/workloadfilter/impl/filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1345,6 +1345,7 @@ func TestContainerRuntimeSecurityAndComplianceFilters(t *testing.T) {
// Setup Compliance Config
mockConfig.SetWithoutSource("compliance_config.container_include", []string{"image:compliance-agent"})
mockConfig.SetWithoutSource("compliance_config.container_exclude", []string{"image:malicious"})
mockConfig.SetWithoutSource("compliance_config.exclude_pause_container", false)

// Setup Runtime Security Config
mockSystemProbe.SetWithoutSource("runtime_security_config.container_include", []string{"image:security-agent"})
Expand All @@ -1357,25 +1358,29 @@ func TestContainerRuntimeSecurityAndComplianceFilters(t *testing.T) {
includedContainer := workloadfilter.CreateContainerImage("compliance-agent")
excludedContainer := workloadfilter.CreateContainerImage("malicious")
unknownContainer := workloadfilter.CreateContainerImage("security-agent")
pauseContainer := workloadfilter.CreateContainerImage("kubernetes/pause")

filterBundle := filterStore.GetContainerComplianceFilters()

assert.Equal(t, workloadfilter.Included, filterBundle.GetResult(includedContainer))
assert.Equal(t, workloadfilter.Excluded, filterBundle.GetResult(excludedContainer))
assert.Equal(t, workloadfilter.Unknown, filterBundle.GetResult(unknownContainer))
assert.Equal(t, workloadfilter.Unknown, filterBundle.GetResult(pauseContainer))
})

// Test Runtime Security Filter
t.Run("Runtime Security Filter", func(t *testing.T) {
includedContainer := workloadfilter.CreateContainerImage("security-agent")
excludedContainer := workloadfilter.CreateContainerImage("suspicious")
unknownContainer := workloadfilter.CreateContainerImage("malicious")
pauseContainer := workloadfilter.CreateContainerImage("kubernetes/pause")

filterBundle := filterStore.GetContainerRuntimeSecurityFilters()

assert.Equal(t, workloadfilter.Included, filterBundle.GetResult(includedContainer))
assert.Equal(t, workloadfilter.Excluded, filterBundle.GetResult(excludedContainer))
assert.Equal(t, workloadfilter.Unknown, filterBundle.GetResult(unknownContainer))
assert.Equal(t, workloadfilter.Excluded, filterBundle.GetResult(pauseContainer))
})

}
Loading