From 9447f2933a7851b857981c45a968d06d9fb4380d Mon Sep 17 00:00:00 2001 From: shm12 Date: Tue, 30 Aug 2022 11:33:19 +0300 Subject: [PATCH 1/2] Added fixed control input --- core/pkg/opaprocessor/processorhandler.go | 9 +++++++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/core/pkg/opaprocessor/processorhandler.go b/core/pkg/opaprocessor/processorhandler.go index f7fcbd01..7d9ddab4 100644 --- a/core/pkg/opaprocessor/processorhandler.go +++ b/core/pkg/opaprocessor/processorhandler.go @@ -122,7 +122,7 @@ func (opap *OPAProcessor) processControl(control *reporthandling.Control) (map[s // ruleResults := make(map[string][]resourcesresults.ResourceAssociatedRule) for i := range control.Rules { - resourceAssociatedRule, err := opap.processRule(&control.Rules[i]) + resourceAssociatedRule, err := opap.processRule(&control.Rules[i], control.FixedInput) if err != nil { logger.L().Error(err.Error()) continue @@ -150,10 +150,15 @@ func (opap *OPAProcessor) processControl(control *reporthandling.Control) (map[s return resourcesAssociatedControl, errs } -func (opap *OPAProcessor) processRule(rule *reporthandling.PolicyRule) (map[string]*resourcesresults.ResourceAssociatedRule, error) { +func (opap *OPAProcessor) processRule(rule *reporthandling.PolicyRule, fixedControlInputs map[string][]string) (map[string]*resourcesresults.ResourceAssociatedRule, error) { postureControlInputs := opap.regoDependenciesData.GetFilteredPostureControlInputs(rule.ConfigInputs) // get store + // Merge configurable control input and fixed control input + for k, v := range fixedControlInputs { + postureControlInputs[k] = v + } + inputResources, err := reporthandling.RegoResourcesAggregator(rule, getAllSupportedObjects(opap.K8SResources, opap.ArmoResource, opap.AllResources, rule)) if err != nil { return nil, fmt.Errorf("error getting aggregated k8sObjects: %s", err.Error()) diff --git a/go.mod b/go.mod index 3e8bb52c..4ecf3960 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/johnfercher/maroto v0.37.0 github.com/kubescape/go-logger v0.0.5 github.com/kubescape/k8s-interface v0.0.83 - github.com/kubescape/opa-utils v0.0.176 + github.com/kubescape/opa-utils v0.0.177 github.com/kubescape/rbac-utils v0.0.17 github.com/libgit2/git2go/v33 v33.0.9 github.com/mattn/go-isatty v0.0.14 diff --git a/go.sum b/go.sum index e270d7f4..f3207f59 100644 --- a/go.sum +++ b/go.sum @@ -839,8 +839,8 @@ github.com/kubescape/go-logger v0.0.5 h1:lA25XvI4LT4JqwnNkIDUtwdYS4KVmnbWrVB7SRt github.com/kubescape/go-logger v0.0.5/go.mod h1:DnVWEvC90LFY1nNMaNo6nBVOcqkLMK3S0qzXP1fzRvI= github.com/kubescape/k8s-interface v0.0.83 h1:yQ1kWNZmKfBim/+NmxpPI/j7L9ASDq2h3mCNdmYgzqY= github.com/kubescape/k8s-interface v0.0.83/go.mod h1:ihX96yqar+xogHl45mFE8zT9DLI06iy7XQPAP+j5KJE= -github.com/kubescape/opa-utils v0.0.176 h1:8i7fBpigWdIEN/0SLJr4YQP4Q3pwdyJnsQa3+WxcIa0= -github.com/kubescape/opa-utils v0.0.176/go.mod h1:t3Orz7lBAsjacXtBKB3mwxs6CCnM4+v92JiY74YiPoI= +github.com/kubescape/opa-utils v0.0.177 h1:6b7pTqD89b+VG7iQOZyCwCHlRyyQlfnhrojBbqZsfvw= +github.com/kubescape/opa-utils v0.0.177/go.mod h1:t3Orz7lBAsjacXtBKB3mwxs6CCnM4+v92JiY74YiPoI= github.com/kubescape/rbac-utils v0.0.17 h1:B78kjlTKqjYK/PXwmi4GPysHsFxIwVz1KFb4+IGT29w= github.com/kubescape/rbac-utils v0.0.17/go.mod h1:pBwjpcrVeuH/no+DiCZWvlhYtCDzd3U0o/hEZKi+eM8= github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo= From a76228c1e19690a704820b9433f518e53756bb78 Mon Sep 17 00:00:00 2001 From: shm12 Date: Tue, 30 Aug 2022 11:39:54 +0300 Subject: [PATCH 2/2] update go.mod --- httphandler/go.mod | 2 +- httphandler/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/httphandler/go.mod b/httphandler/go.mod index 6f821dae..9f001881 100644 --- a/httphandler/go.mod +++ b/httphandler/go.mod @@ -12,7 +12,7 @@ require ( github.com/gorilla/schema v1.2.0 github.com/kubescape/go-logger v0.0.5 github.com/kubescape/kubescape/v2 v2.0.0-00010101000000-000000000000 - github.com/kubescape/opa-utils v0.0.176 + github.com/kubescape/opa-utils v0.0.177 github.com/stretchr/testify v1.8.0 k8s.io/utils v0.0.0-20220706174534-f6158b442e7c ) diff --git a/httphandler/go.sum b/httphandler/go.sum index 78146926..f9c7c7ef 100644 --- a/httphandler/go.sum +++ b/httphandler/go.sum @@ -895,8 +895,8 @@ github.com/kubescape/go-logger v0.0.5 h1:lA25XvI4LT4JqwnNkIDUtwdYS4KVmnbWrVB7SRt github.com/kubescape/go-logger v0.0.5/go.mod h1:DnVWEvC90LFY1nNMaNo6nBVOcqkLMK3S0qzXP1fzRvI= github.com/kubescape/k8s-interface v0.0.83 h1:yQ1kWNZmKfBim/+NmxpPI/j7L9ASDq2h3mCNdmYgzqY= github.com/kubescape/k8s-interface v0.0.83/go.mod h1:ihX96yqar+xogHl45mFE8zT9DLI06iy7XQPAP+j5KJE= -github.com/kubescape/opa-utils v0.0.176 h1:8i7fBpigWdIEN/0SLJr4YQP4Q3pwdyJnsQa3+WxcIa0= -github.com/kubescape/opa-utils v0.0.176/go.mod h1:t3Orz7lBAsjacXtBKB3mwxs6CCnM4+v92JiY74YiPoI= +github.com/kubescape/opa-utils v0.0.177 h1:6b7pTqD89b+VG7iQOZyCwCHlRyyQlfnhrojBbqZsfvw= +github.com/kubescape/opa-utils v0.0.177/go.mod h1:t3Orz7lBAsjacXtBKB3mwxs6CCnM4+v92JiY74YiPoI= github.com/kubescape/rbac-utils v0.0.17 h1:B78kjlTKqjYK/PXwmi4GPysHsFxIwVz1KFb4+IGT29w= github.com/kubescape/rbac-utils v0.0.17/go.mod h1:pBwjpcrVeuH/no+DiCZWvlhYtCDzd3U0o/hEZKi+eM8= github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=