-
Notifications
You must be signed in to change notification settings - Fork 321
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into kics-issue-6936
- Loading branch information
Showing
12 changed files
with
381 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,184 @@ | ||
| package kics | ||
|
|
||
| import ( | ||
| "context" | ||
| "github.com/Checkmarx/kics/assets" | ||
| "github.com/Checkmarx/kics/internal/storage" | ||
| "github.com/Checkmarx/kics/internal/tracker" | ||
| "github.com/Checkmarx/kics/pkg/engine" | ||
| "github.com/Checkmarx/kics/pkg/engine/provider" | ||
| "github.com/Checkmarx/kics/pkg/engine/secrets" | ||
| "github.com/Checkmarx/kics/pkg/engine/source" | ||
| "github.com/Checkmarx/kics/pkg/parser" | ||
| yamlParser "github.com/Checkmarx/kics/pkg/parser/yaml" | ||
| "github.com/Checkmarx/kics/pkg/resolver" | ||
| "github.com/Checkmarx/kics/pkg/resolver/helm" | ||
| "github.com/rs/zerolog/log" | ||
| "github.com/stretchr/testify/require" | ||
| "testing" | ||
| ) | ||
|
|
||
| func Test_ResolverSink(t *testing.T) { | ||
| ctx := context.Background() | ||
| tests := []struct { | ||
| name string | ||
| path string | ||
| service Service | ||
| expectedExcludedCount int | ||
| }{ | ||
| { | ||
| name: "test resolver sink", | ||
| path: "./../../test/fixtures/helm_ignore/test", | ||
| service: MockService( | ||
| []string{"./../../test/fixtures/helm_ignore/test"}, | ||
| []string{"Kubernetes"}, | ||
| []string{}, | ||
| 10, | ||
| 60, | ||
| 100, | ||
| ctx), | ||
| expectedExcludedCount: 11, | ||
| }, | ||
| { | ||
| name: "test resolver sink no helm", | ||
| path: "./../../test/fixtures/test_scan_cloudfront_logging_disabled", | ||
| service: MockService( | ||
| []string{"./../../test/fixtures/test_scan_cloudfront_logging_disabled"}, | ||
| []string{"CloudFormation"}, | ||
| []string{"aws"}, | ||
| 10, | ||
| 60, | ||
| 100, | ||
| ctx), | ||
| expectedExcludedCount: 0, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| s := tt.service | ||
|
|
||
| excluded, err := s.resolverSink(ctx, tt.path, "", false) | ||
| if err != nil { | ||
| t.Fatalf(`ResolverSink failed for path %s with error: %v`, tt.path, err) | ||
| } | ||
|
|
||
| require.Equal(t, tt.expectedExcludedCount, len(excluded)) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func Test_ResolverSink_ParseError(t *testing.T) { | ||
| ctx := context.Background() | ||
| tests := []struct { | ||
| name string | ||
| path string | ||
| service Service | ||
| expectedErrorString string | ||
| }{ | ||
| { | ||
| name: "test resolver sink", | ||
| path: "./../../test/fixtures/helm_template_parser_error/test", | ||
| service: MockService( | ||
| []string{"./../../test/fixtures/helm_template_parser_error/test"}, | ||
| []string{"Kubernetes"}, | ||
| []string{}, | ||
| 10, | ||
| 60, | ||
| 100, | ||
| ctx), | ||
| expectedErrorString: "failed to render helm chart", | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| s := tt.service | ||
| _, err := s.resolverSink(ctx, tt.path, "", false) | ||
| require.EqualError(t, err, tt.expectedErrorString) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func MockService(paths []string, | ||
| platforms []string, | ||
| cloudProviders []string, | ||
| previewLines int, | ||
| queryExecTimeout int, | ||
| maxFileSizeFlag int, | ||
| ctx context.Context) Service { | ||
|
|
||
| path := paths[0] | ||
|
|
||
| filesSource, err := provider.NewFileSystemSourceProvider(paths, []string{}) | ||
| if err != nil { | ||
| log.Error().Msgf(`Failed to get File Sources for path %s with error: %v`, path, err) | ||
| } | ||
|
|
||
| querySource := source.NewFilesystemSource( | ||
| []string{}, | ||
| platforms, | ||
| cloudProviders, | ||
| "", | ||
| false) | ||
|
|
||
| combinedParser, err := parser.NewBuilder(). | ||
| Add(&yamlParser.Parser{}). | ||
| Build(querySource.Types, querySource.CloudProviders) | ||
| if err != nil { | ||
| log.Error().Msgf(`Failed to build parser for path %s with error: %v`, path, err) | ||
| } | ||
|
|
||
| mockTracker, err := tracker.NewTracker(previewLines) | ||
| if err != nil { | ||
| log.Error().Msgf(`Failed to build tracker for path %s with error: %v`, path, err) | ||
| } | ||
|
|
||
| queryFilter := source.QueryInspectorParameters{} | ||
|
|
||
| inspector, err := engine.NewInspector(ctx, | ||
| querySource, | ||
| engine.DefaultVulnerabilityBuilder, | ||
| mockTracker, | ||
| &queryFilter, | ||
| map[string]bool{}, | ||
| queryExecTimeout, | ||
| true, | ||
| 1, | ||
| ) | ||
| if err != nil { | ||
| log.Error().Msgf(`Failed to build inspector for path %s with error: %v`, path, err) | ||
| } | ||
|
|
||
| regexRulesContent := assets.SecretsQueryRegexRulesJSON | ||
|
|
||
| secretsInspector, err := secrets.NewInspector( | ||
| ctx, | ||
| map[string]bool{}, | ||
| mockTracker, | ||
| &queryFilter, | ||
| false, | ||
| queryExecTimeout, | ||
| regexRulesContent, | ||
| false, | ||
| ) | ||
| if err != nil { | ||
| log.Error().Msgf(`Failed to build secretsInspector with error: %v`, err) | ||
| } | ||
|
|
||
| mockResolver, err := resolver.NewBuilder().Add(&helm.Resolver{}).Build() | ||
| if err != nil { | ||
| log.Error().Msgf(`Failed to build mockResolver with error: %v`, err) | ||
| } | ||
|
|
||
| return Service{ | ||
| SourceProvider: filesSource, | ||
| Storage: storage.NewMemoryStorage(), | ||
| Parser: combinedParser[0], | ||
| Inspector: inspector, | ||
| SecretsInspector: secretsInspector, | ||
| Tracker: mockTracker, | ||
| MaxFileSize: maxFileSizeFlag, | ||
| Resolver: mockResolver, | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # Patterns to ignore when building packages. | ||
| # This supports shell glob matching, relative path matching, and | ||
| # negation (prefixed with !). Only one pattern per line. | ||
| .DS_Store | ||
| # Common VCS dirs | ||
| .git/ | ||
| .gitignore | ||
| .bzr/ | ||
| .bzrignore | ||
| .hg/ | ||
| .hgignore | ||
| .svn/ | ||
| # Common backup files | ||
| *.swp | ||
| *.bak | ||
| *.tmp | ||
| *.orig | ||
| *~ | ||
| # Various IDEs | ||
| .project | ||
| .idea/ | ||
| *.tmproj | ||
| .vscode/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| apiVersion: v2 | ||
| name: test | ||
| description: A Helm chart for Kubernetes | ||
|
|
||
| # A chart can be either an 'application' or a 'library' chart. | ||
| # | ||
| # Application charts are a collection of templates that can be packaged into versioned archives | ||
| # to be deployed. | ||
| # | ||
| # Library charts provide useful utilities or functions for the chart developer. They're included as | ||
| # a dependency of application charts to inject those utilities and functions into the rendering | ||
| # pipeline. Library charts do not define any templates and therefore cannot be deployed. | ||
| type: application | ||
|
|
||
| # This is the chart version. This version number should be incremented each time you make changes | ||
| # to the chart and its templates, including the app version. | ||
| # Versions are expected to follow Semantic Versioning (https://semver.org/) | ||
| version: 0.1.0 | ||
|
|
||
| # This is the version number of the application being deployed. This version number should be | ||
| # incremented each time you make changes to the application. Versions are not expected to | ||
| # follow Semantic Versioning. They should reflect the version the application is using. | ||
| # It is recommended to use it with quotes. | ||
| appVersion: "1.16.0" |
Oops, something went wrong.