Skip to content
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

fix(misconf): skip broken scans #2396

Merged
merged 6 commits into from
Jun 29, 2022
Merged

fix(misconf): skip broken scans #2396

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1cfbf18
fix(misconf): skip broken scans
afdesk Jun 23, 2022
568413f
improve a log message
afdesk Jun 23, 2022
3f39aba
Merge branch 'main' of github.com:aquasecurity/trivy into skip-scanne…
afdesk Jun 27, 2022
d658d17
Merge branch 'main' of github.com:aquasecurity/trivy into skip-scanne…
afdesk Jun 27, 2022
8d0e971
handle only invalid content
afdesk Jun 27, 2022
0e318f5
fix a package name
afdesk Jun 27, 2022
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
Prev Previous commit
Next Next commit
handle only invalid content
  • Loading branch information
@afdesk
afdesk committed Jun 27, 2022
commit 8d0e9716028b4e8e969837e9d635301d31a08fb6
13 changes: 8 additions & 5 deletions pkg/fanal/handler/misconf/misconf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ import (
"path/filepath"
"strings"

"github.com/aquasecurity/defsec/pkg/scanners/rbac"
"github.com/aquasecurity/trivy/pkg/log"

"github.com/liamg/memoryfs"
"github.com/samber/lo"
"golang.org/x/xerrors"
Expand All @@ -21,15 +18,18 @@ import (
"github.com/aquasecurity/defsec/pkg/scan"
"github.com/aquasecurity/defsec/pkg/scanners"
cfscanner "github.com/aquasecurity/defsec/pkg/scanners/cloudformation"
cfparse "github.com/aquasecurity/defsec/pkg/scanners/cloudformation/parser"
dfscanner "github.com/aquasecurity/defsec/pkg/scanners/dockerfile"
"github.com/aquasecurity/defsec/pkg/scanners/helm"
k8sscanner "github.com/aquasecurity/defsec/pkg/scanners/kubernetes"
"github.com/aquasecurity/defsec/pkg/scanners/options"
"github.com/aquasecurity/defsec/pkg/scanners/rbac"
tfscanner "github.com/aquasecurity/defsec/pkg/scanners/terraform"
"github.com/aquasecurity/trivy/pkg/fanal/analyzer"
"github.com/aquasecurity/trivy/pkg/fanal/artifact"
"github.com/aquasecurity/trivy/pkg/fanal/handler"
"github.com/aquasecurity/trivy/pkg/fanal/types"
"github.com/aquasecurity/trivy/pkg/log"
)

func init() {
Expand Down Expand Up @@ -237,8 +237,11 @@ func (h misconfPostHandler) Handle(ctx context.Context, result *analyzer.Analysi
for t, scanner := range h.scanners {
results, err := scanner.ScanFS(ctx, mapMemoryFS[t], ".")
if err != nil {
log.Logger.Errorf("scan %q was broken with error: %v", scanner.Name(), err)
continue
if _, ok := err.(*cfparse.InvalidContentError); ok {
log.Logger.Errorf("scan %q was broken with InvalidContentError: %v", scanner.Name(), err)
continue
}
return xerrors.Errorf("scan config error: %w", err)
}

misconfs = append(misconfs, resultsToMisconf(t, scanner.Name(), results)...)
Expand Down