Skip to content

Commit

Permalink
feat: Export functions for trivy plugin (#3204)
Browse files Browse the repository at this point in the history
  • Loading branch information
tamirkiviti13 committed Nov 22, 2022
1 parent 7594b1f commit 604a73d
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 6 deletions.
5 changes: 3 additions & 2 deletions pkg/fanal/analyzer/language/nodejs/yarn/yarn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ package yarn

import (
"context"
"os"
"testing"

"github.com/aquasecurity/trivy/pkg/fanal/analyzer"
"github.com/aquasecurity/trivy/pkg/fanal/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"os"
"testing"
)

func Test_yarnLibraryAnalyzer_Analyze(t *testing.T) {
Expand Down
5 changes: 3 additions & 2 deletions pkg/fanal/handler/misconf/misconf.go
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ func (h misconfPostHandler) Handle(ctx context.Context, result *analyzer.Analysi
return xerrors.Errorf("scan config error: %w", err)
}

misconfs = append(misconfs, resultsToMisconf(t, scanner.Name(), results)...)
misconfs = append(misconfs, ResultsToMisconf(t, scanner.Name(), results)...)
}

// Add misconfigurations
Expand Down Expand Up @@ -335,7 +335,8 @@ func (h misconfPostHandler) Priority() int {
return types.MisconfPostHandlerPriority
}

func resultsToMisconf(configType string, scannerName string, results scan.Results) []types.Misconfiguration {
// This function is exported for trivy-plugin-aqua purposes only
func ResultsToMisconf(configType string, scannerName string, results scan.Results) []types.Misconfiguration {
misconfs := map[string]types.Misconfiguration{}

for _, result := range results {
Expand Down
13 changes: 13 additions & 0 deletions pkg/fanal/secret/builtin-rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ package secret
import (
"fmt"

"github.com/samber/lo"

defsecRules "github.com/aquasecurity/defsec/pkg/rules"
"github.com/aquasecurity/trivy/pkg/fanal/types"
)

Expand Down Expand Up @@ -76,6 +79,16 @@ const (
aws = `(aws)?_?`
)

// This function is exported for trivy-plugin-aqua purposes only
func GetSecretRulesMetadata() []defsecRules.Check {
return lo.Map(builtinRules, func(rule Rule, i int) defsecRules.Check {
return defsecRules.Check{
Name: rule.ID,
Description: rule.Title,
}
})
}

var builtinRules = []Rule{
{
ID: "aws-access-key-id",
Expand Down
5 changes: 3 additions & 2 deletions pkg/scanner/local/scan.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func (s Scanner) Scan(ctx context.Context, target, artifactKey string, blobKeys

// Scan IaC config files
if ShouldScanMisconfigOrRbac(options.SecurityChecks) {
configResults := s.misconfsToResults(artifactDetail.Misconfigurations)
configResults := s.MisconfsToResults(artifactDetail.Misconfigurations)
results = append(results, configResults...)
}

Expand Down Expand Up @@ -334,7 +334,8 @@ func (s Scanner) fillPkgsInVulns(pkgResults, vulnResults types.Results) types.Re
return results
}

func (s Scanner) misconfsToResults(misconfs []ftypes.Misconfiguration) types.Results {
// This function is exported for trivy-plugin-aqua purposes only
func (s Scanner) MisconfsToResults(misconfs []ftypes.Misconfiguration) types.Results {
log.Logger.Infof("Detected config files: %d", len(misconfs))
var results types.Results
for _, misconf := range misconfs {
Expand Down

0 comments on commit 604a73d

Please sign in to comment.