Skip to content

fix(risk): improve reprocess deployment risk #16987

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

Closed
janisz wants to merge 1 commit into from
Closed

fix(risk): improve reprocess deployment risk #16987

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
24 changes: 13 additions & 11 deletions central/processbaseline/evaluator/evaluator_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,30 +86,32 @@ func (e *evaluator) EvaluateBaselinesAndPersistResult(deployment *storage.Deploy
}
}

var processes []*storage.ProcessIndicator
if hasAtLeastOneLockedBaseline {
processes, err = e.indicators.SearchRawProcessIndicators(evaluatorCtx, search.NewQueryBuilder().AddExactMatches(search.DeploymentID, deployment.GetId()).ProtoQuery())
if err != nil {
return nil, errors.Wrapf(err, "searching process indicators for deployment %s/%s/%s", deployment.GetClusterName(), deployment.GetNamespace(), deployment.GetName())
}
}
for _, process := range processes {
fn := func(process *storage.ProcessIndicator) error {
processSet, exists := containerNameToBaselinedProcesses[process.GetContainerName()]
// If no explicit baseline, then all processes are valid.
if !exists {
continue
return nil
}
baselineItem := processBaselinePkg.BaselineItemFromProcess(process)
if baselineItem == "" {
continue
return nil
}
if processbaseline.IsStartupProcess(process) {
continue
return nil
}
if !processSet.Contains(processBaselinePkg.BaselineItemFromProcess(process)) {
violatingProcesses = append(violatingProcesses, process)
containerNameToBaselineResults[process.GetContainerName()].AnomalousProcessesExecuted = true
}
return nil
}

if hasAtLeastOneLockedBaseline {
query := search.NewQueryBuilder().AddExactMatches(search.DeploymentID, deployment.GetId()).ProtoQuery()
err := e.indicators.GetByQueryFn(evaluatorCtx, query, fn)
if err != nil {
return nil, errors.Wrapf(err, "searching process indicators for deployment %s/%s/%s", deployment.GetClusterName(), deployment.GetNamespace(), deployment.GetName())
}
}

baselineResults, err := e.baselineResults.GetBaselineResults(evaluatorCtx, deployment.GetId())
Expand Down
10 changes: 9 additions & 1 deletion central/processbaseline/evaluator/evaluator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package evaluator

import (
"context"
"strings"
"testing"
"time"

processBaselineMocks "github.com/stackrox/rox/central/processbaseline/datastore/mocks"
processBaselineResultMocks "github.com/stackrox/rox/central/processbaselineresults/datastore/mocks"
processIndicatorMocks "github.com/stackrox/rox/central/processindicator/datastore/mocks"
v1 "github.com/stackrox/rox/generated/api/v1"
"github.com/stackrox/rox/generated/storage"
"github.com/stackrox/rox/pkg/fixtures"
"github.com/stackrox/rox/pkg/protoassert"
Expand Down Expand Up @@ -269,7 +271,13 @@ func TestProcessBaselineEvaluator(t *testing.T) {

mockBaselines.EXPECT().GetProcessBaseline(gomock.Any(), gomock.Any()).MaxTimes(len(deployment.GetContainers())).Return(c.baseline, c.baseline != nil, c.baselineErr)
if c.indicators != nil {
mockIndicators.EXPECT().SearchRawProcessIndicators(gomock.Any(), gomock.Any()).Return(c.indicators, c.indicatorErr)
mockIndicators.EXPECT().GetByQueryFn(gomock.Any(), gomock.Any(), gomock.Any()).Do(
func(_ context.Context, _ *v1.Query, fn func(indicator *storage.ProcessIndicator) error) {
for _, i := range c.indicators {
err := fn(i)
require.NoError(t, err)
}
}).Return(c.indicatorErr)
}

expectedBaselineResult := &storage.ProcessBaselineResults{
Expand Down
1 change: 1 addition & 0 deletions central/processindicator/datastore/datastore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ type DataStore interface {

Search(ctx context.Context, q *v1.Query) ([]pkgSearch.Result, error)
SearchRawProcessIndicators(ctx context.Context, q *v1.Query) ([]*storage.ProcessIndicator, error)
GetByQueryFn(ctx context.Context, query *v1.Query, fn func(obj *storage.ProcessIndicator) error) error

GetProcessIndicator(ctx context.Context, id string) (*storage.ProcessIndicator, bool, error)
GetProcessIndicators(ctx context.Context, ids []string) ([]*storage.ProcessIndicator, bool, error)
Expand Down
4 changes: 4 additions & 0 deletions central/processindicator/datastore/datastore_impl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ func (ds *datastoreImpl) SearchRawProcessIndicators(ctx context.Context, q *v1.Q
return ds.storage.GetByQuery(ctx, q)
}

func (ds *datastoreImpl) GetByQueryFn(ctx context.Context, query *v1.Query, fn func(obj *storage.ProcessIndicator) error) error {
return ds.storage.GetByQueryFn(ctx, query, fn)
}

func (ds *datastoreImpl) GetProcessIndicator(ctx context.Context, id string) (*storage.ProcessIndicator, bool, error) {
indicator, exists, err := ds.storage.Get(ctx, id)
if err != nil || !exists {
Expand Down
14 changes: 14 additions & 0 deletions central/processindicator/datastore/mocks/datastore.go
View file
Open in desktop

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

14 changes: 14 additions & 0 deletions central/processindicator/store/mocks/store.go
View file
Open in desktop

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

1 change: 1 addition & 0 deletions central/processindicator/store/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ type Store interface {

Get(ctx context.Context, id string) (*storage.ProcessIndicator, bool, error)
GetByQuery(ctx context.Context, q *v1.Query) ([]*storage.ProcessIndicator, error)
GetByQueryFn(ctx context.Context, query *v1.Query, fn func(obj *storage.ProcessIndicator) error) error
GetMany(ctx context.Context, ids []string) ([]*storage.ProcessIndicator, []int, error)

UpsertMany(context.Context, []*storage.ProcessIndicator) error
Expand Down
Loading