feat(image): scan misconfigurations in image config (#3437)

integration/fs_test.go

@@ -17,7 +17,7 @@ import (
 
 func TestFilesystem(t *testing.T) {
 	type args struct {
-		scanners       string
+		scanner        types.Scanner
 		severity       []string
 		ignoreIDs      []string
 		policyPaths    []string
@@ -41,15 +41,15 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "gomod",
 			args: args{
-				scanners: types.VulnerabilityScanner,
+				scanner: types.VulnerabilityScanner,
-				input:    "testdata/fixtures/fs/gomod",
+				input:   "testdata/fixtures/fs/gomod",
 			},
 			golden: "testdata/gomod.json.golden",
 		},
 		{
 			name: "gomod with skip files",
 			args: args{
-				scanners:  types.VulnerabilityScanner,
+				scanner:   types.VulnerabilityScanner,
 				input:     "testdata/fixtures/fs/gomod",
 				skipFiles: []string{"testdata/fixtures/fs/gomod/submod2/go.mod"},
 			},
@@ -58,7 +58,7 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "gomod with skip dirs",
 			args: args{
-				scanners: types.VulnerabilityScanner,
+				scanner:  types.VulnerabilityScanner,
 				input:    "testdata/fixtures/fs/gomod",
 				skipDirs: []string{"testdata/fixtures/fs/gomod/submod2"},
 			},
@@ -67,7 +67,7 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "nodejs",
 			args: args{
-				scanners:    types.VulnerabilityScanner,
+				scanner:     types.VulnerabilityScanner,
 				input:       "testdata/fixtures/fs/nodejs",
 				listAllPkgs: true,
 			},
@@ -76,7 +76,7 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "yarn",
 			args: args{
-				scanners:    types.VulnerabilityScanner,
+				scanner:     types.VulnerabilityScanner,
 				input:       "testdata/fixtures/fs/yarn",
 				listAllPkgs: true,
 			},
@@ -85,15 +85,15 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "pnpm",
 			args: args{
-				scanners: types.VulnerabilityScanner,
+				scanner: types.VulnerabilityScanner,
-				input:    "testdata/fixtures/fs/pnpm",
+				input:   "testdata/fixtures/fs/pnpm",
 			},
 			golden: "testdata/pnpm.json.golden",
 		},
 		{
 			name: "pip",
 			args: args{
-				scanners:    types.VulnerabilityScanner,
+				scanner:     types.VulnerabilityScanner,
 				listAllPkgs: true,
 				input:       "testdata/fixtures/fs/pip",
 			},
@@ -102,23 +102,23 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "pom",
 			args: args{
-				scanners: types.VulnerabilityScanner,
+				scanner: types.VulnerabilityScanner,
-				input:    "testdata/fixtures/fs/pom",
+				input:   "testdata/fixtures/fs/pom",
 			},
 			golden: "testdata/pom.json.golden",
 		},
 		{
 			name: "gradle",
 			args: args{
-				scanners: types.VulnerabilityScanner,
+				scanner: types.VulnerabilityScanner,
-				input:    "testdata/fixtures/fs/gradle",
+				input:   "testdata/fixtures/fs/gradle",
 			},
 			golden: "testdata/gradle.json.golden",
 		},
 		{
 			name: "conan",
 			args: args{
-				scanners:    types.VulnerabilityScanner,
+				scanner:     types.VulnerabilityScanner,
 				listAllPkgs: true,
 				input:       "testdata/fixtures/fs/conan",
 			},
@@ -127,7 +127,7 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "nuget",
 			args: args{
-				scanners:    types.VulnerabilityScanner,
+				scanner:     types.VulnerabilityScanner,
 				listAllPkgs: true,
 				input:       "testdata/fixtures/fs/nuget",
 			},
@@ -136,7 +136,7 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "dotnet",
 			args: args{
-				scanners:    types.VulnerabilityScanner,
+				scanner:     types.VulnerabilityScanner,
 				listAllPkgs: true,
 				input:       "testdata/fixtures/fs/dotnet",
 			},
@@ -145,7 +145,7 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "cocoapods",
 			args: args{
-				scanners:    types.VulnerabilityScanner,
+				scanner:     types.VulnerabilityScanner,
 				listAllPkgs: true,
 				input:       "testdata/fixtures/fs/cocoapods",
 			},
@@ -154,7 +154,7 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "pubspec.lock",
 			args: args{
-				scanners:    types.VulnerabilityScanner,
+				scanner:     types.VulnerabilityScanner,
 				listAllPkgs: true,
 				input:       "testdata/fixtures/fs/pubspec",
 			},
@@ -163,7 +163,7 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "mix.lock",
 			args: args{
-				scanners:    types.VulnerabilityScanner,
+				scanner:     types.VulnerabilityScanner,
 				listAllPkgs: true,
 				input:       "testdata/fixtures/fs/mixlock",
 			},
@@ -172,7 +172,7 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "dockerfile",
 			args: args{
-				scanners:   types.MisconfigScanner,
+				scanner:    types.MisconfigScanner,
 				input:      "testdata/fixtures/fs/dockerfile",
 				namespaces: []string{"testing"},
 			},
@@ -181,7 +181,7 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "dockerfile with custom file pattern",
 			args: args{
-				scanners:     types.MisconfigScanner,
+				scanner:      types.MisconfigScanner,
 				input:        "testdata/fixtures/fs/dockerfile_file_pattern",
 				namespaces:   []string{"testing"},
 				filePatterns: []string{"dockerfile:Customfile"},
@@ -191,7 +191,7 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "dockerfile with rule exception",
 			args: args{
-				scanners:    types.MisconfigScanner,
+				scanner:     types.MisconfigScanner,
 				policyPaths: []string{"testdata/fixtures/fs/rule-exception/policy"},
 				input:       "testdata/fixtures/fs/rule-exception",
 			},
@@ -200,7 +200,7 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "dockerfile with namespace exception",
 			args: args{
-				scanners:    types.MisconfigScanner,
+				scanner:     types.MisconfigScanner,
 				policyPaths: []string{"testdata/fixtures/fs/namespace-exception/policy"},
 				input:       "testdata/fixtures/fs/namespace-exception",
 			},
@@ -209,7 +209,7 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "dockerfile with custom policies",
 			args: args{
-				scanners:    types.MisconfigScanner,
+				scanner:     types.MisconfigScanner,
 				policyPaths: []string{"testdata/fixtures/fs/custom-policy/policy"},
 				namespaces:  []string{"user"},
 				input:       "testdata/fixtures/fs/custom-policy",
@@ -219,32 +219,32 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "tarball helm chart scanning with builtin policies",
 			args: args{
-				scanners: types.MisconfigScanner,
+				scanner: types.MisconfigScanner,
-				input:    "testdata/fixtures/fs/helm",
+				input:   "testdata/fixtures/fs/helm",
 			},
 			golden: "testdata/helm.json.golden",
 		},
 		{
 			name: "helm chart directory scanning with builtin policies",
 			args: args{
-				scanners: types.MisconfigScanner,
+				scanner: types.MisconfigScanner,
-				input:    "testdata/fixtures/fs/helm_testchart",
+				input:   "testdata/fixtures/fs/helm_testchart",
 			},
 			golden: "testdata/helm_testchart.json.golden",
 		},
 		{
 			name: "helm chart directory scanning with value overrides using set",
 			args: args{
-				scanners: types.MisconfigScanner,
+				scanner: types.MisconfigScanner,
-				input:    "testdata/fixtures/fs/helm_testchart",
+				input:   "testdata/fixtures/fs/helm_testchart",
-				helmSet:  []string{"securityContext.runAsUser=0"},
+				helmSet: []string{"securityContext.runAsUser=0"},
 			},
 			golden: "testdata/helm_testchart.overridden.json.golden",
 		},
 		{
 			name: "helm chart directory scanning with value overrides using value file",
 			args: args{
-				scanners:       types.MisconfigScanner,
+				scanner:        types.MisconfigScanner,
 				input:          "testdata/fixtures/fs/helm_testchart",
 				helmValuesFile: []string{"testdata/fixtures/fs/helm_values/values.yaml"},
 			},
@@ -253,15 +253,15 @@ func TestFilesystem(t *testing.T) {
 		{
 			name: "helm chart directory scanning with builtin policies and non string Chart name",
 			args: args{
-				scanners: types.MisconfigScanner,
+				scanner: types.MisconfigScanner,
-				input:    "testdata/fixtures/fs/helm_badname",
+				input:   "testdata/fixtures/fs/helm_badname",
 			},
 			golden: "testdata/helm_badname.json.golden",
 		},
 		{
 			name: "secrets",
 			args: args{
-				scanners:     "vuln,secret",
+				scanner:      "vuln,secret",
 				input:        "testdata/fixtures/fs/secrets",
 				secretConfig: "testdata/fixtures/fs/secrets/trivy-secret.yaml",
 			},
@@ -318,8 +318,8 @@ func TestFilesystem(t *testing.T) {
 				"--offline-scan",
 			}
 
-			if tt.args.scanners != "" {
+			if tt.args.scanner != "" {
-				osArgs = append(osArgs, "--scanners", tt.args.scanners)
+				osArgs = append(osArgs, "--scanners", string(tt.args.scanner))
 			}
 
 			if len(tt.args.policyPaths) != 0 {

pkg/commands/app.go

@@ -581,7 +581,7 @@ func NewConfigCommand(globalFlags *flag.GlobalFlagGroup) *cobra.Command {
 			options.DisabledAnalyzers = append(analyzer.TypeOSes, analyzer.TypeLanguages...)
 
 			// Scan only for misconfigurations
-			options.Scanners = []string{types.MisconfigScanner}
+			options.Scanners = types.Scanners{types.MisconfigScanner}
 
 			return artifact.Run(cmd.Context(), options, artifact.TargetFilesystem)
 		},
@@ -989,7 +989,7 @@ func NewSBOMCommand(globalFlags *flag.GlobalFlagGroup) *cobra.Command {
 			}
 
 			// Scan vulnerabilities
-			options.Scanners = []string{types.VulnerabilityScanner}
+			options.Scanners = types.Scanners{types.VulnerabilityScanner}
 
 			return artifact.Run(cmd.Context(), options, artifact.TargetSBOM)
 		},

pkg/commands/artifact/run.go

@@ -297,7 +297,7 @@ func (r *runner) Report(opts flag.Options, report types.Report) error {
 
 func (r *runner) initDB(opts flag.Options) error {
 	// When scanning config files or running as client mode, it doesn't need to download the vulnerability database.
-	if opts.ServerAddr != "" || !slices.Contains(opts.Scanners, types.VulnerabilityScanner) {
+	if opts.ServerAddr != "" || !opts.Scanners.Enabled(types.VulnerabilityScanner) {
 		return nil
 	}
 
@@ -359,16 +359,6 @@ func (r *runner) initCache(opts flag.Options) error {
 	return nil
 }
 
-// Run performs artifact scanning
-//func Run(cliCtx *cli.Context, targetKind TargetKind) error {
-//	opt, err := InitOption(cliCtx)
-//	if err != nil {
-//		return xerrors.Errorf("InitOption: %w", err)
-//	}
-//
-//	return run(cliCtx.Context, opt, targetKind)
-//}
-
 // Run performs artifact scanning
 func Run(ctx context.Context, opts flag.Options, targetKind TargetKind) (err error) {
 	ctx, cancel := context.WithTimeout(ctx, opts.Timeout)
@@ -452,22 +442,27 @@ func disabledAnalyzers(opts flag.Options) []analyzer.Type {
 	}
 
 	// Do not perform secret scanning when it is not specified.
-	if !slices.Contains(opts.Scanners, types.SecretScanner) {
+	if !opts.Scanners.Enabled(types.SecretScanner) {
 		analyzers = append(analyzers, analyzer.TypeSecret)
 	}
 
 	// Do not perform misconfiguration scanning when it is not specified.
-	if !slices.Contains(opts.Scanners, types.MisconfigScanner) &&
+	if !opts.Scanners.AnyEnabled(types.MisconfigScanner, types.RBACScanner) {
-		!slices.Contains(opts.Scanners, types.RBACScanner) {
 		analyzers = append(analyzers, analyzer.TypeConfigFiles...)
 	}
 
 	// Scanning file headers and license files is expensive.
-	// It is performed only when '--scanners license' and '--license-full' are specified.
+	// It is performed only when '--scanners license' and '--license-full' are specified together.
-	if !slices.Contains(opts.Scanners, types.LicenseScanner) || !opts.LicenseFull {
+	if !opts.Scanners.Enabled(types.LicenseScanner) || !opts.LicenseFull {
 		analyzers = append(analyzers, analyzer.TypeLicenseFile)
 	}
 
+	// Do not perform misconfiguration scanning on container image config
+	// when it is not specified.
+	if !opts.ImageConfigScanners.Enabled(types.MisconfigScanner) {
+		analyzers = append(analyzers, analyzer.TypeHistoryDockerfile)
+	}
+
 	if len(opts.SBOMSources) == 0 {
 		analyzers = append(analyzers, analyzer.TypeExecutable)
 	}
@@ -484,34 +479,40 @@ func initScannerConfig(opts flag.Options, cacheClient cache.Cache) (ScannerConfi
 	scanOptions := types.ScanOptions{
 		VulnType:            opts.VulnType,
 		Scanners:            opts.Scanners,
-		ScanRemovedPackages: opts.ScanRemovedPkgs, // this is valid only for 'image' subcommand
+		ImageConfigScanners: opts.ImageConfigScanners, // this is valid only for 'image' subcommand
-		Platform:            opts.Platform,        // this is valid only for 'image' subcommand
+		ScanRemovedPackages: opts.ScanRemovedPkgs,     // this is valid only for 'image' subcommand
+		Platform:            opts.Platform,            // this is valid only for 'image' subcommand
 		ListAllPackages:     opts.ListAllPkgs,
 		LicenseCategories:   opts.LicenseCategories,
 		FilePatterns:        opts.FilePatterns,
 	}
 
-	if slices.Contains(opts.Scanners, types.VulnerabilityScanner) {
+	if len(opts.ImageConfigScanners) != 0 {
+		log.Logger.Infof("Container image config scanners: %q", opts.ImageConfigScanners)
+	}
+
+	if opts.Scanners.Enabled(types.VulnerabilityScanner) {
 		log.Logger.Info("Vulnerability scanning is enabled")
 		log.Logger.Debugf("Vulnerability type:  %s", scanOptions.VulnType)
 	}
 
-	var downloadedPolicyPaths []string
-	var disableEmbedded bool
-	downloadedPolicyPaths, err := operation.InitBuiltinPolicies(context.Background(), opts.CacheDir, opts.Quiet, opts.SkipPolicyUpdate)
-	if err != nil {
-		if !opts.SkipPolicyUpdate {
-			log.Logger.Errorf("Falling back to embedded policies: %s", err)
-		}
-	} else {
-		log.Logger.Debug("Policies successfully loaded from disk")
-		disableEmbedded = true
-	}
-
 	// ScannerOption is filled only when config scanning is enabled.
 	var configScannerOptions config.ScannerOption
-	if slices.Contains(opts.Scanners, types.MisconfigScanner) {
+	if opts.Scanners.Enabled(types.MisconfigScanner) || opts.ImageConfigScanners.Enabled(types.MisconfigScanner) {
 		log.Logger.Info("Misconfiguration scanning is enabled")
+
+		var downloadedPolicyPaths []string
+		var disableEmbedded bool
+		downloadedPolicyPaths, err := operation.InitBuiltinPolicies(context.Background(), opts.CacheDir, opts.Quiet, opts.SkipPolicyUpdate)
+		if err != nil {
+			if !opts.SkipPolicyUpdate {
+				log.Logger.Errorf("Falling back to embedded policies: %s", err)
+			}
+		} else {
+			log.Logger.Debug("Policies successfully loaded from disk")
+			disableEmbedded = true
+		}
+
 		configScannerOptions = config.ScannerOption{
 			Trace:                   opts.Trace,
 			Namespaces:              append(opts.PolicyNamespaces, defaultPolicyNamespaces...),
@@ -527,7 +528,7 @@ func initScannerConfig(opts flag.Options, cacheClient cache.Cache) (ScannerConfi
 	}
 
 	// Do not load config file for secret scanning
-	if slices.Contains(opts.Scanners, types.SecretScanner) {
+	if opts.Scanners.Enabled(types.SecretScanner) {
 		ver := canonicalVersion(opts.AppVersion)
 		log.Logger.Info("Secret scanning is enabled")
 		log.Logger.Info("If your scanning is slow, please try '--scanners vuln' to disable secret scanning")
@@ -536,7 +537,7 @@ func initScannerConfig(opts flag.Options, cacheClient cache.Cache) (ScannerConfi
 		opts.SecretConfigPath = ""
 	}
 
-	if slices.Contains(opts.Scanners, types.LicenseScanner) {
+	if opts.Scanners.Enabled(types.LicenseScanner) {
 		if opts.LicenseFull {
 			log.Logger.Info("Full license scanning is enabled")
 		} else {

pkg/compliance/spec/compliance.go

@@ -62,12 +62,12 @@ const (
 )
 
 // Scanners reads spec control and determines the scanners by check ID prefix
-func (cs *ComplianceSpec) Scanners() ([]types.Scanner, error) {
+func (cs *ComplianceSpec) Scanners() (types.Scanners, error) {
 	scannerTypes := map[types.Scanner]struct{}{}
 	for _, control := range cs.Spec.Controls {
 		for _, check := range control.Checks {
 			scannerType := scannerByCheckID(check.ID)
-			if scannerType == types.ScannerUnknown {
+			if scannerType == types.UnknownScanner {
 				return nil, xerrors.Errorf("unsupported check ID: %s", check.ID)
 			}
 			scannerTypes[scannerType] = struct{}{}
@@ -96,11 +96,11 @@ func scannerByCheckID(checkID string) types.Scanner {
 	case strings.HasPrefix(checkID, "avd-"):
 		return types.MisconfigScanner
 	default:
-		return types.ScannerUnknown
+		return types.UnknownScanner
 	}
 }
 
-// GetComlianceSpec accepct compliance flag name/path and return builtin or file system loaded spec
+// GetComplianceSpec accepct compliance flag name/path and return builtin or file system loaded spec
 func GetComplianceSpec(specNameOrPath string) ([]byte, error) {
 	if strings.HasPrefix(specNameOrPath, "@") {
 		buf, err := os.ReadFile(strings.TrimPrefix(specNameOrPath, "@"))

pkg/compliance/spec/compliance_test.go

@@ -15,7 +15,7 @@ func TestComplianceSpec_Scanners(t *testing.T) {
 	tests := []struct {
 		name    string
 		spec    spec.Spec
-		want    []types.Scanner
+		want    types.Scanners
 		wantErr assert.ErrorAssertionFunc
 	}{
 		{
@@ -127,7 +127,9 @@ func TestComplianceSpec_Scanners(t *testing.T) {
 			if !tt.wantErr(t, err, fmt.Sprintf("Scanners()")) {
 				return
 			}
-			sort.Strings(got) // for consistency
+			sort.Slice(got, func(i, j int) bool {
+				return got[i] < got[j]
+			}) // for consistency
 			assert.Equalf(t, tt.want, got, "Scanners()")
 		})
 	}

pkg/fanal/analyzer/all/import.go

@@ -2,9 +2,10 @@ package all
 
 import (
 	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/buildinfo"
-	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/command/apk"
 	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/config/all"
 	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/executable"
+	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/imgconf/apk"
+	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/imgconf/dockerfile"
 	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/c/conan"
 	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/conda/meta"
 	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/dart/pub"

pkg/fanal/analyzer/analyzer.go

@@ -10,7 +10,6 @@ import (
 	"strings"
 	"sync"
 
-	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/samber/lo"
 	"golang.org/x/exp/slices"
 	"golang.org/x/sync/semaphore"
@@ -23,8 +22,7 @@ import (
 )
 
 var (
-	analyzers       = map[Type]analyzer{}
+	analyzers = map[Type]analyzer{}
-	configAnalyzers = map[Type]configAnalyzer{}
 
 	// ErrUnknownOS occurs when unknown OS is analyzed.
 	ErrUnknownOS = xerrors.New("unknown OS")
@@ -72,14 +70,6 @@ type analyzer interface {
 	Required(filePath string, info os.FileInfo) bool
 }
 
-// configAnalyzer defines an interface for container image config analyzer
-type configAnalyzer interface {
-	Type() Type
-	Version() int
-	Analyze(input ConfigAnalysisInput) (*AnalysisResult, error)
-	Required(osFound types.OS) bool
-}
-
 ////////////////////
 // Analyzer group //
 ////////////////////
@@ -97,15 +87,6 @@ func DeregisterAnalyzer(t Type) {
 	delete(analyzers, t)
 }
 
-func RegisterConfigAnalyzer(analyzer configAnalyzer) {
-	configAnalyzers[analyzer.Type()] = analyzer
-}
-
-// DeregisterConfigAnalyzer is mainly for testing
-func DeregisterConfigAnalyzer(t Type) {
-	delete(configAnalyzers, t)
-}
-
 // CustomGroup returns a group name for custom analyzers
 // This is mainly intended to be used in Aqua products.
 type CustomGroup interface {
@@ -115,9 +96,8 @@ type CustomGroup interface {
 type Opener func() (dio.ReadSeekCloserAt, error)
 
 type AnalyzerGroup struct {
-	analyzers       []analyzer
+	analyzers    []analyzer
-	configAnalyzers []configAnalyzer
+	filePatterns map[Type][]*regexp.Regexp
-	filePatterns    map[Type][]*regexp.Regexp
 }
 
 ///////////////////////////
@@ -162,11 +142,6 @@ type AnalysisResult struct {
 	CustomResources []types.CustomResource
 }
 
-type ConfigAnalysisInput struct {
-	OS     types.OS
-	Config *v1.ConfigFile
-}
-
 func NewAnalysisResult() *AnalysisResult {
 	result := new(AnalysisResult)
 	result.Files = map[types.HandlerType][]types.File{}
@@ -360,13 +335,6 @@ func NewAnalyzerGroup(opt AnalyzerOptions) (AnalyzerGroup, error) {
 		group.analyzers = append(group.analyzers, a)
 	}
 
-	for analyzerType, a := range configAnalyzers {
-		if slices.Contains(opt.DisabledAnalyzers, analyzerType) {
-			continue
-		}
-		group.configAnalyzers = append(group.configAnalyzers, a)
-	}
-
 	return group, nil
 }
 
@@ -379,15 +347,6 @@ func (ag AnalyzerGroup) AnalyzerVersions() map[string]int {
 	return versions
 }
 
-// ImageConfigAnalyzerVersions returns analyzer version identifier used for cache keys.
-func (ag AnalyzerGroup) ImageConfigAnalyzerVersions() map[string]int {
-	versions := map[string]int{}
-	for _, ca := range ag.configAnalyzers {
-		versions[string(ca.Type())] = ca.Version()
-	}
-	return versions
-}
-
 func (ag AnalyzerGroup) AnalyzeFile(ctx context.Context, wg *sync.WaitGroup, limit *semaphore.Weighted, result *AnalysisResult,
 	dir, filePath string, info os.FileInfo, opener Opener, disabled []Type, opts AnalysisOptions) error {
 	if info.IsDir() {
@@ -444,28 +403,6 @@ func (ag AnalyzerGroup) AnalyzeFile(ctx context.Context, wg *sync.WaitGroup, lim
 	return nil
 }
 
-func (ag AnalyzerGroup) AnalyzeImageConfig(targetOS types.OS, config *v1.ConfigFile) *AnalysisResult {
-	input := ConfigAnalysisInput{
-		OS:     targetOS,
-		Config: config,
-	}
-	result := NewAnalysisResult()
-	for _, a := range ag.configAnalyzers {
-		if !a.Required(targetOS) {
-			continue
-		}
-
-		r, err := a.Analyze(input)
-		if err != nil {
-			log.Logger.Debugf("Image config analysis error: %s", err)
-			continue
-		}
-
-		result.Merge(r)
-	}
-	return result
-}
-
 func (ag AnalyzerGroup) filePatternMatch(analyzerType Type, filePath string) bool {
 	for _, pattern := range ag.filePatterns[analyzerType] {
 		if pattern.MatchString(filePath) {

pkg/fanal/analyzer/analyzer_test.go

@@ -2,13 +2,11 @@ package analyzer_test
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"os"
 	"sync"
 	"testing"
 
-	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/semaphore"
@@ -19,7 +17,7 @@ import (
 	aos "github.com/aquasecurity/trivy/pkg/fanal/analyzer/os"
 	"github.com/aquasecurity/trivy/pkg/fanal/types"
 
-	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/command/apk"
+	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/imgconf/apk"
 	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/ruby/bundler"
 	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/os/alpine"
 	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/os/ubuntu"
@@ -28,45 +26,6 @@ import (
 	_ "github.com/aquasecurity/trivy/pkg/fanal/handler/all"
 )
 
-type mockConfigAnalyzer struct{}
-
-func (mockConfigAnalyzer) Required(targetOS types.OS) bool {
-	return targetOS.Family == "alpine"
-}
-
-func (mockConfigAnalyzer) Analyze(input analyzer.ConfigAnalysisInput) (*analyzer.AnalysisResult, error) {
-	if input.Config == nil {
-		return nil, errors.New("error")
-	}
-	return &analyzer.AnalysisResult{
-		PackageInfos: []types.PackageInfo{
-			{
-				Packages: types.Packages{
-					{
-						Name:    "musl",
-						Version: "1.1.24-r2",
-					},
-				},
-			},
-		},
-	}, nil
-}
-
-func (mockConfigAnalyzer) Type() analyzer.Type {
-	return analyzer.Type("test")
-}
-
-func (mockConfigAnalyzer) Version() int {
-	return 1
-}
-
-func TestMain(m *testing.M) {
-	mock := mockConfigAnalyzer{}
-	analyzer.RegisterConfigAnalyzer(mock)
-	defer analyzer.DeregisterConfigAnalyzer(mock.Type())
-	os.Exit(m.Run())
-}
-
 func TestAnalysisResult_Merge(t *testing.T) {
 	type fields struct {
 		m            sync.Mutex
@@ -325,7 +284,7 @@ func TestAnalysisResult_Merge(t *testing.T) {
 	}
 }
 
-func TestAnalyzeFile(t *testing.T) {
+func TestAnalyzerGroup_AnalyzeFile(t *testing.T) {
 	type args struct {
 		filePath          string
 		testFilePath      string
@@ -540,81 +499,7 @@ func TestAnalyzeFile(t *testing.T) {
 	}
 }
 
-func TestAnalyzeConfig(t *testing.T) {
+func TestAnalyzerGroup_AnalyzerVersions(t *testing.T) {
-	type args struct {
-		targetOS          types.OS
-		config            *v1.ConfigFile
-		disabledAnalyzers []analyzer.Type
-		filePatterns      []string
-	}
-	tests := []struct {
-		name string
-		args args
-		want *analyzer.AnalysisResult
-	}{
-		{
-			name: "happy path",
-			args: args{
-				targetOS: types.OS{
-					Family: "alpine",
-					Name:   "3.11.6",
-				},
-				config: &v1.ConfigFile{
-					OS: "linux",
-				},
-			},
-			want: &analyzer.AnalysisResult{
-				Files: map[types.HandlerType][]types.File{},
-				PackageInfos: []types.PackageInfo{
-					{
-						Packages: []types.Package{
-							{
-								Name:    "musl",
-								Version: "1.1.24-r2",
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			name: "non-target OS",
-			args: args{
-				targetOS: types.OS{
-					Family: "debian",
-					Name:   "9.2",
-				},
-				config: &v1.ConfigFile{
-					OS: "linux",
-				},
-			},
-			want: analyzer.NewAnalysisResult(),
-		},
-		{
-			name: "Analyze returns an error",
-			args: args{
-				targetOS: types.OS{
-					Family: "alpine",
-					Name:   "3.11.6",
-				},
-			},
-			want: analyzer.NewAnalysisResult(),
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			a, err := analyzer.NewAnalyzerGroup(analyzer.AnalyzerOptions{
-				FilePatterns:      tt.args.filePatterns,
-				DisabledAnalyzers: tt.args.disabledAnalyzers,
-			})
-			require.NoError(t, err)
-			got := a.AnalyzeImageConfig(tt.args.targetOS, tt.args.config)
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
-func TestAnalyzer_AnalyzerVersions(t *testing.T) {
 	tests := []struct {
 		name     string
 		disabled []analyzer.Type
@@ -656,40 +541,3 @@ func TestAnalyzer_AnalyzerVersions(t *testing.T) {
 		})
 	}
 }
-
-func TestAnalyzer_ImageConfigAnalyzerVersions(t *testing.T) {
-	tests := []struct {
-		name     string
-		disabled []analyzer.Type
-		want     map[string]int
-	}{
-		{
-			name:     "happy path",
-			disabled: []analyzer.Type{},
-			want: map[string]int{
-				"apk-command": 1,
-				"test":        1,
-			},
-		},
-		{
-			name: "disable analyzers",
-			disabled: []analyzer.Type{
-				analyzer.TypeAlpine,
-				analyzer.TypeApkCommand,
-			},
-			want: map[string]int{
-				"test": 1,
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			a, err := analyzer.NewAnalyzerGroup(analyzer.AnalyzerOptions{
-				DisabledAnalyzers: tt.disabled,
-			})
-			require.NoError(t, err)
-			got := a.ImageConfigAnalyzerVersions()
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}

pkg/fanal/analyzer/config_analyzer.go

@@ -0,0 +1,117 @@
+package analyzer
+
+import (
+	"context"
+
+	v1 "github.com/google/go-containerregistry/pkg/v1"
+	"golang.org/x/exp/slices"
+	"golang.org/x/xerrors"
+
+	misconf "github.com/aquasecurity/trivy/pkg/fanal/analyzer/config"
+	"github.com/aquasecurity/trivy/pkg/fanal/types"
+	"github.com/aquasecurity/trivy/pkg/log"
+)
+
+var configAnalyzerConstructors = map[Type]configAnalyzerConstructor{}
+
+type configAnalyzerConstructor func(ConfigAnalyzerOptions) (ConfigAnalyzer, error)
+
+// RegisterConfigAnalyzer adds a constructor of config analyzer
+func RegisterConfigAnalyzer(t Type, init configAnalyzerConstructor) {
+	configAnalyzerConstructors[t] = init
+}
+
+// DeregisterConfigAnalyzer is mainly for testing
+func DeregisterConfigAnalyzer(t Type) {
+	delete(configAnalyzerConstructors, t)
+}
+
+// ConfigAnalyzer defines an interface for analyzer of container image config
+type ConfigAnalyzer interface {
+	Type() Type
+	Version() int
+	Analyze(ctx context.Context, input ConfigAnalysisInput) (*ConfigAnalysisResult, error)
+	Required(osFound types.OS) bool
+}
+
+// ConfigAnalyzerOptions is used to initialize config analyzers
+type ConfigAnalyzerOptions struct {
+	FilePatterns         []string
+	DisabledAnalyzers    []Type
+	MisconfScannerOption misconf.ScannerOption
+}
+
+type ConfigAnalysisInput struct {
+	OS     types.OS
+	Config *v1.ConfigFile
+}
+
+type ConfigAnalysisResult struct {
+	Misconfiguration *types.Misconfiguration
+	HistoryPackages  types.Packages
+}
+
+func (r *ConfigAnalysisResult) Merge(new *ConfigAnalysisResult) {
+	if new == nil {
+		return
+	}
+	if new.Misconfiguration != nil {
+		r.Misconfiguration = new.Misconfiguration
+	}
+	if new.HistoryPackages != nil {
+		r.HistoryPackages = new.HistoryPackages
+	}
+}
+
+type ConfigAnalyzerGroup struct {
+	configAnalyzers []ConfigAnalyzer
+}
+
+func NewConfigAnalyzerGroup(opts ConfigAnalyzerOptions) (ConfigAnalyzerGroup, error) {
+	var g ConfigAnalyzerGroup
+	for t, newConfigAnalyzer := range configAnalyzerConstructors {
+		// Skip the handler if it is disabled
+		if slices.Contains(opts.DisabledAnalyzers, t) {
+			continue
+		}
+		a, err := newConfigAnalyzer(opts)
+		if err != nil {
+			return ConfigAnalyzerGroup{}, xerrors.Errorf("config analyzer %s initialize error: %w", t, err)
+		}
+
+		g.configAnalyzers = append(g.configAnalyzers, a)
+	}
+
+	return g, nil
+}
+
+// AnalyzerVersions returns analyzer version identifier used for cache keys.
+func (ag *ConfigAnalyzerGroup) AnalyzerVersions() map[string]int {
+	versions := map[string]int{}
+	for _, ca := range ag.configAnalyzers {
+		versions[string(ca.Type())] = ca.Version()
+	}
+	return versions
+}
+
+func (ag *ConfigAnalyzerGroup) AnalyzeImageConfig(ctx context.Context, targetOS types.OS, config *v1.ConfigFile) *ConfigAnalysisResult {
+	input := ConfigAnalysisInput{
+		OS:     targetOS,
+		Config: config,
+	}
+	result := new(ConfigAnalysisResult)
+	for _, a := range ag.configAnalyzers {
+		if !a.Required(targetOS) {
+			continue
+		}
+
+		r, err := a.Analyze(ctx, input)
+		if err != nil {
+			log.Logger.Debugf("Image config analysis error: %s", err)
+			continue
+		}
+
+		result.Merge(r)
+	}
+	return result
+}

pkg/fanal/analyzer/config_analyzer_test.go

@@ -0,0 +1,160 @@
+package analyzer_test
+
+import (
+	"context"
+	"errors"
+	"os"
+	"testing"
+
+	v1 "github.com/google/go-containerregistry/pkg/v1"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/aquasecurity/trivy/pkg/fanal/analyzer"
+	"github.com/aquasecurity/trivy/pkg/fanal/types"
+)
+
+type mockConfigAnalyzer struct{}
+
+func newMockConfigAnalyzer(_ analyzer.ConfigAnalyzerOptions) (analyzer.ConfigAnalyzer, error) {
+	return mockConfigAnalyzer{}, nil
+}
+
+func (mockConfigAnalyzer) Required(targetOS types.OS) bool {
+	return targetOS.Family == "alpine"
+}
+
+func (mockConfigAnalyzer) Analyze(_ context.Context, input analyzer.ConfigAnalysisInput) (*analyzer.ConfigAnalysisResult, error) {
+	if input.Config == nil {
+		return nil, errors.New("error")
+	}
+	return &analyzer.ConfigAnalysisResult{
+		HistoryPackages: types.Packages{
+			{
+				Name:    "musl",
+				Version: "1.1.24-r2",
+			},
+		},
+	}, nil
+}
+
+func (mockConfigAnalyzer) Type() analyzer.Type {
+	return analyzer.Type("test")
+}
+
+func (mockConfigAnalyzer) Version() int {
+	return 1
+}
+
+func TestMain(m *testing.M) {
+	mock := mockConfigAnalyzer{}
+	analyzer.RegisterConfigAnalyzer(mock.Type(), newMockConfigAnalyzer)
+	defer analyzer.DeregisterConfigAnalyzer(mock.Type())
+	os.Exit(m.Run())
+}
+
+func TestAnalyzeConfig(t *testing.T) {
+	type args struct {
+		targetOS          types.OS
+		config            *v1.ConfigFile
+		disabledAnalyzers []analyzer.Type
+		filePatterns      []string
+	}
+	tests := []struct {
+		name string
+		args args
+		want *analyzer.ConfigAnalysisResult
+	}{
+		{
+			name: "happy path",
+			args: args{
+				targetOS: types.OS{
+					Family: "alpine",
+					Name:   "3.11.6",
+				},
+				config: &v1.ConfigFile{
+					OS: "linux",
+				},
+			},
+			want: &analyzer.ConfigAnalysisResult{
+				HistoryPackages: []types.Package{
+					{
+						Name:    "musl",
+						Version: "1.1.24-r2",
+					},
+				},
+			},
+		},
+		{
+			name: "non-target OS",
+			args: args{
+				targetOS: types.OS{
+					Family: "debian",
+					Name:   "9.2",
+				},
+				config: &v1.ConfigFile{
+					OS: "linux",
+				},
+			},
+			want: &analyzer.ConfigAnalysisResult{},
+		},
+		{
+			name: "Analyze returns an error",
+			args: args{
+				targetOS: types.OS{
+					Family: "alpine",
+					Name:   "3.11.6",
+				},
+			},
+			want: &analyzer.ConfigAnalysisResult{},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			a, err := analyzer.NewConfigAnalyzerGroup(analyzer.ConfigAnalyzerOptions{
+				FilePatterns:      tt.args.filePatterns,
+				DisabledAnalyzers: tt.args.disabledAnalyzers,
+			})
+			require.NoError(t, err)
+			got := a.AnalyzeImageConfig(context.Background(), tt.args.targetOS, tt.args.config)
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}
+
+func TestConfigAnalyzerGroup_AnalyzerVersions(t *testing.T) {
+	tests := []struct {
+		name     string
+		disabled []analyzer.Type
+		want     map[string]int
+	}{
+		{
+			name:     "happy path",
+			disabled: []analyzer.Type{},
+			want: map[string]int{
+				"apk-command": 1,
+				"test":        1,
+			},
+		},
+		{
+			name: "disable analyzers",
+			disabled: []analyzer.Type{
+				analyzer.TypeAlpine,
+				analyzer.TypeApkCommand,
+			},
+			want: map[string]int{
+				"test": 1,
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			a, err := analyzer.NewConfigAnalyzerGroup(analyzer.ConfigAnalyzerOptions{
+				DisabledAnalyzers: tt.disabled,
+			})
+			require.NoError(t, err)
+			got := a.AnalyzerVersions()
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}

pkg/fanal/analyzer/const.go

@@ -94,7 +94,8 @@ const (
 	// ============
 	// Image Config
 	// ============
-	TypeApkCommand Type = "apk-command"
+	TypeApkCommand        Type = "apk-command"
+	TypeHistoryDockerfile Type = "history-dockerfile"
 
 	// =================
 	// Structured Config

pkg/fanal/analyzer/imgconf/apk/apk.go

@@ -1,6 +1,7 @@
 package apk
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -24,17 +25,25 @@ const (
 	analyzerVersion       = 1
 )
 
-var apkIndexArchiveURL = "https://raw.githubusercontent.com/knqyf263/apkIndex-archive/master/alpine/v%s/main/x86_64/history.json"
+var defaultApkIndexArchiveURL = "https://raw.githubusercontent." +
+	"com/knqyf263/apkIndex-archive/master/alpine/v%s/main/x86_64/history.json"
 
 func init() {
+	analyzer.RegisterConfigAnalyzer(analyzer.TypeApkCommand, newAlpineCmdAnalyzer)
+}
+
+type alpineCmdAnalyzer struct {
+	apkIndexArchiveURL string
+}
+
+func newAlpineCmdAnalyzer(_ analyzer.ConfigAnalyzerOptions) (analyzer.ConfigAnalyzer, error) {
+	apkIndexArchiveURL := defaultApkIndexArchiveURL
 	if builtinos.Getenv(envApkIndexArchiveURL) != "" {
 		apkIndexArchiveURL = builtinos.Getenv(envApkIndexArchiveURL)
 	}
-	analyzer.RegisterConfigAnalyzer(&alpineCmdAnalyzer{})
+	return alpineCmdAnalyzer{apkIndexArchiveURL: apkIndexArchiveURL}, nil
 }
 
-type alpineCmdAnalyzer struct{}
-
 type apkIndex struct {
 	Package map[string]archive
 	Provide provide
@@ -59,7 +68,7 @@ type pkg struct {
 
 type version map[string]int
 
-func (a alpineCmdAnalyzer) Analyze(input analyzer.ConfigAnalysisInput) (*analyzer.AnalysisResult, error) {
+func (a alpineCmdAnalyzer) Analyze(_ context.Context, input analyzer.ConfigAnalysisInput) (*analyzer.ConfigAnalysisResult, error) {
 	if input.Config == nil {
 		return nil, nil
 	}
@@ -75,13 +84,8 @@ func (a alpineCmdAnalyzer) Analyze(input analyzer.ConfigAnalysisInput) (*analyze
 		return nil, nil
 	}
 
-	return &analyzer.AnalysisResult{
+	return &analyzer.ConfigAnalysisResult{
-		PackageInfos: []types.PackageInfo{
+		HistoryPackages: pkgs,
-			{
-				FilePath: types.HistoryPkgs,
-				Packages: pkgs,
-			},
-		},
 	}, nil
 }
 func (a alpineCmdAnalyzer) fetchApkIndexArchive(targetOS types.OS) (*apkIndex, error) {
@@ -91,7 +95,7 @@ func (a alpineCmdAnalyzer) fetchApkIndexArchive(targetOS types.OS) (*apkIndex, e
 		osVer = osVer[:strings.LastIndex(osVer, ".")]
 	}
 
-	url := fmt.Sprintf(apkIndexArchiveURL, osVer)
+	url := fmt.Sprintf(a.apkIndexArchiveURL, osVer)
 	var reader io.Reader
 	if strings.HasPrefix(url, "file://") {
 		var err error
@@ -193,7 +197,8 @@ func (a alpineCmdAnalyzer) resolveDependencies(apkIndexArchive *apkIndex, origin
 	return pkgs
 }
 
-func (a alpineCmdAnalyzer) resolveDependency(apkIndexArchive *apkIndex, pkgName string, seenPkgs map[string]struct{}) (pkgNames []string) {
+func (a alpineCmdAnalyzer) resolveDependency(apkIndexArchive *apkIndex, pkgName string,
+	seenPkgs map[string]struct{}) (pkgNames []string) {
 	pkg, ok := apkIndexArchive.Package[pkgName]
 	if !ok {
 		return nil
@@ -232,7 +237,8 @@ type historyVersion struct {
 	BuiltAt int
 }
 
-func (a alpineCmdAnalyzer) guessVersion(apkIndexArchive *apkIndex, originalPkgs []string, createdAt time.Time) (pkgs []types.Package) {
+func (a alpineCmdAnalyzer) guessVersion(apkIndexArchive *apkIndex, originalPkgs []string,
+	createdAt time.Time) (pkgs []types.Package) {
 	for _, pkg := range originalPkgs {
 		archive, ok := apkIndexArchive.Package[pkg]
 		if !ok {

pkg/fanal/analyzer/imgconf/apk/apk_test.go

@@ -1,6 +1,7 @@
 package apk
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 	"net/http/httptest"
@@ -10,13 +11,14 @@ import (
 	"testing"
 	"time"
 
-	v1 "github.com/google/go-containerregistry/pkg/v1"
+	"github.com/samber/lo"
-	"github.com/kylelemons/godebug/pretty"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/aquasecurity/trivy/pkg/fanal/analyzer"
 	"github.com/aquasecurity/trivy/pkg/fanal/types"
+	v1 "github.com/google/go-containerregistry/pkg/v1"
+	"github.com/kylelemons/godebug/pretty"
+	"github.com/stretchr/testify/assert"
 )
 
 var (
@@ -564,465 +566,458 @@ var (
 		},
 	}
 
-	wantPkgs = &analyzer.AnalysisResult{
+	wantPkgs = []types.Package{
-		PackageInfos: []types.PackageInfo{
+		{
-			{
+			Name:    "acl",
-				FilePath: "pkgs-from-history",
+			Version: "2.2.52-r5",
-				Packages: []types.Package{
+		},
-					{
+		{
-						Name:    "acl",
+			Name:    "apr",
-						Version: "2.2.52-r5",
+			Version: "1.6.5-r0",
-					},
+		},
-					{
+		{
-						Name:    "apr",
+			Name:    "apr-util",
-						Version: "1.6.5-r0",
+			Version: "1.6.1-r5",
-					},
+		},
-					{
+		{
-						Name:    "apr-util",
+			Name:    "argon2",
-						Version: "1.6.1-r5",
+			Version: "20171227-r1",
-					},
+		},
-					{
+		{
-						Name:    "argon2",
+			Name:    "argon2-dev",
-						Version: "20171227-r1",
+			Version: "20171227-r1",
-					},
+		},
-					{
+		{
-						Name:    "argon2-dev",
+			Name:    "argon2-libs",
-						Version: "20171227-r1",
+			Version: "20171227-r1",
-					},
+		},
-					{
+		{
-						Name:    "argon2-libs",
+			Name:    "attr",
-						Version: "20171227-r1",
+			Version: "2.4.47-r7",
-					},
+		},
-					{
+		{
-						Name:    "attr",
+			Name:    "autoconf",
-						Version: "2.4.47-r7",
+			Version: "2.69-r2",
-					},
+		},
-					{
+		{
-						Name:    "autoconf",
+			Name:    "bash",
-						Version: "2.69-r2",
+			Version: "4.4.19-r1",
-					},
+		},
-					{
+		{
-						Name:    "bash",
+			Name:    "binutils",
-						Version: "4.4.19-r1",
+			Version: "2.31.1-r2",
-					},
+		},
-					{
+		{
-						Name:    "binutils",
+			Name:    "busybox",
-						Version: "2.31.1-r2",
+			Version: "1.29.3-r10",
-					},
+		},
-					{
+		{
-						Name:    "busybox",
+			Name:    "bzip2",
-						Version: "1.29.3-r10",
+			Version: "1.0.6-r6",
-					},
+		},
-					{
+		{
-						Name:    "bzip2",
+			Name:    "ca-certificates",
-						Version: "1.0.6-r6",
+			Version: "20190108-r0",
-					},
+		},
-					{
+		{
-						Name:    "ca-certificates",
+			Name:    "coreutils",
-						Version: "20190108-r0",
+			Version: "8.30-r0",
-					},
+		},
-					{
+		{
-						Name:    "coreutils",
+			Name:    "curl",
-						Version: "8.30-r0",
+			Version: "7.64.0-r1",
-					},
+		},
-					{
+		{
-						Name:    "curl",
+			Name:    "curl-dev",
-						Version: "7.64.0-r1",
+			Version: "7.64.0-r1",
-					},
+		},
-					{
+		{
-						Name:    "curl-dev",
+			Name:    "cyrus-sasl",
-						Version: "7.64.0-r1",
+			Version: "2.1.27-r1",
-					},
+		},
-					{
+		{
-						Name:    "cyrus-sasl",
+			Name:    "db",
-						Version: "2.1.27-r1",
+			Version: "5.3.28-r1",
-					},
+		},
-					{
+		{
-						Name:    "db",
+			Name:    "dpkg",
-						Version: "5.3.28-r1",
+			Version: "1.19.2-r0",
-					},
+		},
-					{
+		{
-						Name:    "dpkg",
+			Name:    "dpkg-dev",
-						Version: "1.19.2-r0",
+			Version: "1.19.2-r0",
-					},
+		},
-					{
+		{
-						Name:    "dpkg-dev",
+			Name:    "expat",
-						Version: "1.19.2-r0",
+			Version: "2.2.6-r0",
-					},
+		},
-					{
+		{
-						Name:    "expat",
+			Name:    "file",
-						Version: "2.2.6-r0",
+			Version: "5.36-r0",
-					},
+		},
-					{
+		{
-						Name:    "file",
+			Name:    "g++",
-						Version: "5.36-r0",
+			Version: "8.3.0-r0",
-					},
+		},
-					{
+		{
-						Name:    "g++",
+			Name:    "gcc",
-						Version: "8.3.0-r0",
+			Version: "8.3.0-r0",
-					},
+		},
-					{
+		{
-						Name:    "gcc",
+			Name:    "gdbm",
-						Version: "8.3.0-r0",
+			Version: "1.13-r1",
-					},
+		},
-					{
+		{
-						Name:    "gdbm",
+			Name:    "git",
-						Version: "1.13-r1",
+			Version: "2.20.1-r0",
-					},
+		},
-					{
+		{
-						Name:    "git",
+			Name:    "gmp",
-						Version: "2.20.1-r0",
+			Version: "6.1.2-r1",
-					},
+		},
-					{
+		{
-						Name:    "gmp",
+			Name:    "gnupg",
-						Version: "6.1.2-r1",
+			Version: "2.2.12-r0",
-					},
+		},
-					{
+		{
-						Name:    "gnupg",
+			Name:    "gnutls",
-						Version: "2.2.12-r0",
+			Version: "3.6.7-r0",
-					},
+		},
-					{
+		{
-						Name:    "gnutls",
+			Name:    "isl",
-						Version: "3.6.7-r0",
+			Version: "0.18-r0",
-					},
+		},
-					{
+		{
-						Name:    "isl",
+			Name:    "libacl",
-						Version: "0.18-r0",
+			Version: "2.2.52-r5",
-					},
+		},
-					{
+		{
-						Name:    "libacl",
+			Name:    "libassuan",
-						Version: "2.2.52-r5",
+			Version: "2.5.1-r0",
-					},
+		},
-					{
+		{
-						Name:    "libassuan",
+			Name:    "libatomic",
-						Version: "2.5.1-r0",
+			Version: "8.3.0-r0",
-					},
+		},
-					{
+		{
-						Name:    "libatomic",
+			Name:    "libattr",
-						Version: "8.3.0-r0",
+			Version: "2.4.47-r7",
-					},
+		},
-					{
+		{
-						Name:    "libattr",
+			Name:    "libbz2",
-						Version: "2.4.47-r7",
+			Version: "1.0.6-r6",
-					},
+		},
-					{
+		{
-						Name:    "libbz2",
+			Name:    "libc-dev",
-						Version: "1.0.6-r6",
+			Version: "0.7.1-r0",
-					},
+		},
-					{
+		{
-						Name:    "libc-dev",
+			Name:    "libcap",
-						Version: "0.7.1-r0",
+			Version: "2.26-r0",
-					},
+		},
-					{
+		{
-						Name:    "libcap",
+			Name:    "libcrypto1.1",
-						Version: "2.26-r0",
+			Version: "1.1.1b-r1",
-					},
+		},
-					{
+		{
-						Name:    "libcrypto1.1",
+			Name:    "libcurl",
-						Version: "1.1.1b-r1",
+			Version: "7.64.0-r1",
-					},
+		},
-					{
+		{
-						Name:    "libcurl",
+			Name:    "libedit",
-						Version: "7.64.0-r1",
+			Version: "20181209.3.1-r0",
-					},
+		},
-					{
+		{
-						Name:    "libedit",
+			Name:    "libedit-dev",
-						Version: "20181209.3.1-r0",
+			Version: "20181209.3.1-r0",
-					},
+		},
-					{
+		{
-						Name:    "libedit-dev",
+			Name:    "libffi",
-						Version: "20181209.3.1-r0",
+			Version: "3.2.1-r6",
-					},
+		},
-					{
+		{
-						Name:    "libffi",
+			Name:    "libgcc",
-						Version: "3.2.1-r6",
+			Version: "8.3.0-r0",
-					},
+		},
-					{
+		{
-						Name:    "libgcc",
+			Name:    "libgcrypt",
-						Version: "8.3.0-r0",
+			Version: "1.8.4-r0",
-					},
+		},
-					{
+		{
-						Name:    "libgcrypt",
+			Name:    "libgomp",
-						Version: "1.8.4-r0",
+			Version: "8.3.0-r0",
-					},
+		},
-					{
+		{
-						Name:    "libgomp",
+			Name:    "libgpg-error",
-						Version: "8.3.0-r0",
+			Version: "1.33-r0",
-					},
+		},
-					{
+		{
-						Name:    "libgpg-error",
+			Name:    "libksba",
-						Version: "1.33-r0",
+			Version: "1.3.5-r0",
-					},
+		},
-					{
+		{
-						Name:    "libksba",
+			Name:    "libldap",
-						Version: "1.3.5-r0",
+			Version: "2.4.47-r2",
-					},
+		},
-					{
+		{
-						Name:    "libldap",
+			Name:    "libmagic",
-						Version: "2.4.47-r2",
+			Version: "5.36-r0",
-					},
+		},
-					{
+		{
-						Name:    "libmagic",
+			Name:    "libsasl",
-						Version: "5.36-r0",
+			Version: "2.1.27-r1",
-					},
+		},
-					{
+		{
-						Name:    "libsasl",
+			Name:    "libsodium",
-						Version: "2.1.27-r1",
+			Version: "1.0.16-r0",
-					},
+		},
-					{
+		{
-						Name:    "libsodium",
+			Name:    "libsodium-dev",
-						Version: "1.0.16-r0",
+			Version: "1.0.16-r0",
-					},
+		},
-					{
+		{
-						Name:    "libsodium-dev",
+			Name:    "libssh2",
-						Version: "1.0.16-r0",
+			Version: "1.8.2-r0",
-					},
+		},
-					{
+		{
-						Name:    "libssh2",
+			Name:    "libssh2-dev",
-						Version: "1.8.2-r0",
+			Version: "1.8.2-r0",
-					},
+		},
-					{
+		{
-						Name:    "libssh2-dev",
+			Name:    "libssl1.1",
-						Version: "1.8.2-r0",
+			Version: "1.1.1b-r1",
-					},
+		},
-					{
+		{
-						Name:    "libssl1.1",
+			Name:    "libstdc++",
-						Version: "1.1.1b-r1",
+			Version: "8.3.0-r0",
-					},
+		},
-					{
+		{
-						Name:    "libstdc++",
+			Name:    "libtasn1",
-						Version: "8.3.0-r0",
+			Version: "4.13-r0",
-					},
+		},
-					{
+		{
-						Name:    "libtasn1",
+			Name:    "libunistring",
-						Version: "4.13-r0",
+			Version: "0.9.10-r0",
-					},
+		},
-					{
+		{
-						Name:    "libunistring",
+			Name:    "libuuid",
-						Version: "0.9.10-r0",
+			Version: "2.33-r0",
-					},
+		},
-					{
+		{
-						Name:    "libuuid",
+			Name:    "libxml2",
-						Version: "2.33-r0",
+			Version: "2.9.9-r1",
-					},
+		},
-					{
+		{
-						Name:    "libxml2",
+			Name:    "libxml2-dev",
-						Version: "2.9.9-r1",
+			Version: "2.9.9-r1",
-					},
+		},
-					{
+		{
-						Name:    "libxml2-dev",
+			Name:    "lz4",
-						Version: "2.9.9-r1",
+			Version: "1.8.3-r2",
-					},
+		},
-					{
+		{
-						Name:    "lz4",
+			Name:    "lz4-libs",
-						Version: "1.8.3-r2",
+			Version: "1.8.3-r2",
-					},
+		},
-					{
+		{
-						Name:    "lz4-libs",
+			Name:    "m4",
-						Version: "1.8.3-r2",
+			Version: "1.4.18-r1",
-					},
+		},
-					{
+		{
-						Name:    "m4",
+			Name:    "make",
-						Version: "1.4.18-r1",
+			Version: "4.2.1-r2",
-					},
+		},
-					{
+		{
-						Name:    "make",
+			Name:    "mercurial",
-						Version: "4.2.1-r2",
+			Version: "4.9.1-r0",
-					},
+		},
-					{
+		{
-						Name:    "mercurial",
+			Name:    "mpc1",
-						Version: "4.9.1-r0",
+			Version: "1.0.3-r1",
-					},
+		},
-					{
+		{
-						Name:    "mpc1",
+			Name:    "mpfr3",
-						Version: "1.0.3-r1",
+			Version: "3.1.5-r1",
-					},
+		},
-					{
+		{
-						Name:    "mpfr3",
+			Name:    "musl",
-						Version: "3.1.5-r1",
+			Version: "1.1.20-r4",
-					},
+		},
-					{
+		{
-						Name:    "musl",
+			Name:    "musl-dev",
-						Version: "1.1.20-r4",
+			Version: "1.1.20-r4",
-					},
+		},
-					{
+		{
-						Name:    "musl-dev",
+			Name:    "ncurses",
-						Version: "1.1.20-r4",
+			Version: "6.1_p20190105-r0",
-					},
+		},
-					{
+		{
-						Name:    "ncurses",
+			Name:    "ncurses-dev",
-						Version: "6.1_p20190105-r0",
+			Version: "6.1_p20190105-r0",
-					},
+		},
-					{
+		{
-						Name:    "ncurses-dev",
+			Name:    "ncurses-libs",
-						Version: "6.1_p20190105-r0",
+			Version: "6.1_p20190105-r0",
-					},
+		},
-					{
+		{
-						Name:    "ncurses-libs",
+			Name:    "ncurses-terminfo",
-						Version: "6.1_p20190105-r0",
+			Version: "6.1_p20190105-r0",
-					},
+		},
-					{
+		{
-						Name:    "ncurses-terminfo",
+			Name:    "ncurses-terminfo-base",
-						Version: "6.1_p20190105-r0",
+			Version: "6.1_p20190105-r0",
-					},
+		},
-					{
+		{
-						Name:    "ncurses-terminfo-base",
+			Name:    "nettle",
-						Version: "6.1_p20190105-r0",
+			Version: "3.4.1-r0",
-					},
+		},
-					{
+		{
-						Name:    "nettle",
+			Name:    "nghttp2",
-						Version: "3.4.1-r0",
+			Version: "1.35.1-r0",
-					},
+		},
-					{
+		{
-						Name:    "nghttp2",
+			Name:    "nghttp2-dev",
-						Version: "1.35.1-r0",
+			Version: "1.35.1-r0",
-					},
+		},
-					{
+		{
-						Name:    "nghttp2-dev",
+			Name:    "nghttp2-libs",
-						Version: "1.35.1-r0",
+			Version: "1.35.1-r0",
-					},
+		},
-					{
+		{
-						Name:    "nghttp2-libs",
+			Name:    "npth",
-						Version: "1.35.1-r0",
+			Version: "1.6-r0",
-					},
+		},
-					{
+		{
-						Name:    "npth",
+			Name:    "openldap",
-						Version: "1.6-r0",
+			Version: "2.4.47-r2",
-					},
+		},
-					{
+		{
-						Name:    "openldap",
+			Name:    "openssh",
-						Version: "2.4.47-r2",
+			Version: "7.9_p1-r5",
-					},
+		},
-					{
+		{
-						Name:    "openssh",
+			Name:    "openssh-client",
-						Version: "7.9_p1-r5",
+			Version: "7.9_p1-r5",
-					},
+		},
-					{
+		{
-						Name:    "openssh-client",
+			Name:    "openssh-keygen",
-						Version: "7.9_p1-r5",
+			Version: "7.9_p1-r5",
-					},
+		},
-					{
+		{
-						Name:    "openssh-keygen",
+			Name:    "openssh-server",
-						Version: "7.9_p1-r5",
+			Version: "7.9_p1-r5",
-					},
+		},
-					{
+		{
-						Name:    "openssh-server",
+			Name:    "openssh-server-common",
-						Version: "7.9_p1-r5",
+			Version: "7.9_p1-r5",
-					},
+		},
-					{
+		{
-						Name:    "openssh-server-common",
+			Name:    "openssh-sftp-server",
-						Version: "7.9_p1-r5",
+			Version: "7.9_p1-r5",
-					},
+		},
-					{
+		{
-						Name:    "openssh-sftp-server",
+			Name:    "openssl",
-						Version: "7.9_p1-r5",
+			Version: "1.1.1b-r1",
-					},
+		},
-					{
+		{
-						Name:    "openssl",
+			Name:    "openssl-dev",
-						Version: "1.1.1b-r1",
+			Version: "1.1.1b-r1",
-					},
+		},
-					{
+		{
-						Name:    "openssl-dev",
+			Name:    "p11-kit",
-						Version: "1.1.1b-r1",
+			Version: "0.23.14-r0",
-					},
+		},
-					{
+		{
-						Name:    "p11-kit",
+			Name:    "patch",
-						Version: "0.23.14-r0",
+			Version: "2.7.6-r4",
-					},
+		},
-					{
+		{
-						Name:    "patch",
+			Name:    "pcre2",
-						Version: "2.7.6-r4",
+			Version: "10.32-r1",
-					},
+		},
-					{
+		{
-						Name:    "pcre2",
+			Name:    "perl",
-						Version: "10.32-r1",
+			Version: "5.26.3-r0",
-					},
+		},
-					{
+		{
-						Name:    "perl",
+			Name:    "pinentry",
-						Version: "5.26.3-r0",
+			Version: "1.1.0-r0",
-					},
+		},
-					{
+		{
-						Name:    "pinentry",
+			Name:    "pkgconf",
-						Version: "1.1.0-r0",
+			Version: "1.6.0-r0",
-					},
+		},
-					{
+		{
-						Name:    "pkgconf",
+			Name:    "python2",
-						Version: "1.6.0-r0",
+			Version: "2.7.16-r1",
-					},
+		},
-					{
+		{
-						Name:    "python2",
+			Name:    "re2c",
-						Version: "2.7.16-r1",
+			Version: "1.1.1-r0",
-					},
+		},
-					{
+		{
-						Name:    "re2c",
+			Name:    "readline",
-						Version: "1.1.1-r0",
+			Version: "7.0.003-r1",
-					},
+		},
-					{
+		{
-						Name:    "readline",
+			Name:    "serf",
-						Version: "7.0.003-r1",
+			Version: "1.3.9-r5",
-					},
+		},
-					{
+		{
-						Name:    "serf",
+			Name:    "sqlite",
-						Version: "1.3.9-r5",
+			Version: "3.26.0-r3",
-					},
+		},
-					{
+		{
-						Name:    "sqlite",
+			Name:    "sqlite-dev",
-						Version: "3.26.0-r3",
+			Version: "3.26.0-r3",
-					},
+		},
-					{
+		{
-						Name:    "sqlite-dev",
+			Name:    "sqlite-libs",
-						Version: "3.26.0-r3",
+			Version: "3.26.0-r3",
-					},
+		},
-					{
+		{
-						Name:    "sqlite-libs",
+			Name:    "subversion",
-						Version: "3.26.0-r3",
+			Version: "1.11.1-r0",
-					},
+		},
-					{
+		{
-						Name:    "subversion",
+			Name:    "subversion-libs",
-						Version: "1.11.1-r0",
+			Version: "1.11.1-r0",
-					},
+		},
-					{
+		{
-						Name:    "subversion-libs",
+			Name:    "tar",
-						Version: "1.11.1-r0",
+			Version: "1.32-r0",
-					},
+		},
-					{
+		{
-						Name:    "tar",
+			Name:    "unzip",
-						Version: "1.32-r0",
+			Version: "6.0-r4",
-					},
+		},
-					{
+		{
-						Name:    "unzip",
+			Name:    "util-linux",
-						Version: "6.0-r4",
+			Version: "2.33-r0",
-					},
+		},
-					{
+		{
-						Name:    "util-linux",
+			Name:    "wget",
-						Version: "2.33-r0",
+			Version: "1.20.3-r0",
-					},
+		},
-					{
+		{
-						Name:    "wget",
+			Name:    "xz",
-						Version: "1.20.3-r0",
+			Version: "5.2.4-r0",
-					},
+		},
-					{
+		{
-						Name:    "xz",
+			Name:    "xz-libs",
-						Version: "5.2.4-r0",
+			Version: "5.2.4-r0",
-					},
+		},
-					{
+		{
-						Name:    "xz-libs",
+			Name:    "zip",
-						Version: "5.2.4-r0",
+			Version: "3.0-r7",
-					},
+		},
-					{
+		{
-						Name:    "zip",
+			Name:    "zlib",
-						Version: "3.0-r7",
+			Version: "1.2.11-r1",
-					},
+		},
-					{
+		{
-						Name:    "zlib",
+			Name:    "zlib-dev",
-						Version: "1.2.11-r1",
+			Version: "1.2.11-r1",
-					},
-					{
-						Name:    "zlib-dev",
-						Version: "1.2.11-r1",
-					},
-				},
-			},
 		},
 	}
 )
@@ -1047,7 +1042,7 @@ func TestAnalyze(t *testing.T) {
 	var tests = map[string]struct {
 		args                args
 		apkIndexArchivePath string
-		want                *analyzer.AnalysisResult
+		want                types.Packages
 	}{
 		"old": {
 			args: args{
@@ -1085,17 +1080,18 @@ func TestAnalyze(t *testing.T) {
 	}
 	for testName, v := range tests {
 		t.Run(testName, func(t *testing.T) {
-			apkIndexArchiveURL = v.apkIndexArchivePath
+			t.Setenv(envApkIndexArchiveURL, v.apkIndexArchivePath)
-			a := alpineCmdAnalyzer{}
+			a, err := newAlpineCmdAnalyzer(analyzer.ConfigAnalyzerOptions{})
-			actual, _ := a.Analyze(analyzer.ConfigAnalysisInput{
+			require.NoError(t, err)
+			result, err := a.Analyze(context.Background(), analyzer.ConfigAnalysisInput{
 				OS:     v.args.targetOS,
 				Config: v.args.config,
 			})
-			if actual != nil {
+			require.NoError(t, err)
-				require.Equal(t, 1, len(actual.PackageInfos))
+
-				sort.Sort(actual.PackageInfos[0].Packages)
+			got := lo.FromPtr(result)
-			}
+			sort.Sort(got.HistoryPackages)
-			assert.Equal(t, v.want, actual)
+			assert.Equal(t, v.want, got.HistoryPackages)
 		})
 	}
 }

pkg/fanal/analyzer/imgconf/dockerfile/dockerfile.go

@@ -0,0 +1,86 @@
+package dockerfile
+
+import (
+	"bytes"
+	"context"
+	"strings"
+
+	"golang.org/x/xerrors"
+
+	"github.com/aquasecurity/trivy/pkg/fanal/analyzer"
+	"github.com/aquasecurity/trivy/pkg/fanal/types"
+	"github.com/aquasecurity/trivy/pkg/misconf"
+)
+
+const analyzerVersion = 1
+
+func init() {
+	analyzer.RegisterConfigAnalyzer(analyzer.TypeHistoryDockerfile, newHistoryAnalyzer)
+}
+
+type historyAnalyzer struct {
+	scanner misconf.Scanner
+}
+
+func newHistoryAnalyzer(opts analyzer.ConfigAnalyzerOptions) (analyzer.ConfigAnalyzer, error) {
+	s, err := misconf.NewScanner(opts.FilePatterns, opts.MisconfScannerOption)
+	if err != nil {
+		return nil, xerrors.Errorf("misconfiguration scanner error: %w", err)
+	}
+	return &historyAnalyzer{
+		scanner: s,
+	}, nil
+}
+
+func (a *historyAnalyzer) Analyze(ctx context.Context, input analyzer.ConfigAnalysisInput) (*analyzer.
+	ConfigAnalysisResult, error) {
+	if input.Config == nil {
+		return nil, nil
+	}
+	dockerfile := new(bytes.Buffer)
+	for _, h := range input.Config.History {
+		var createdBy string
+		switch {
+		case strings.HasPrefix(h.CreatedBy, "/bin/sh -c #(nop)"):
+			// Instruction other than RUN
+			createdBy = strings.TrimPrefix(h.CreatedBy, "/bin/sh -c #(nop)")
+		case strings.HasPrefix(h.CreatedBy, "/bin/sh -c"):
+			// RUN instruction
+			createdBy = strings.ReplaceAll(h.CreatedBy, "/bin/sh -c", "RUN")
+		}
+		dockerfile.WriteString(strings.TrimSpace(createdBy) + "\n")
+	}
+
+	files := []types.File{
+		{
+			Type:    types.Dockerfile,
+			Path:    "Dockerfile",
+			Content: dockerfile.Bytes(),
+		},
+	}
+
+	misconfs, err := a.scanner.Scan(ctx, files)
+	if err != nil {
+		return nil, xerrors.Errorf("history scan error: %w", err)
+	}
+	// The result should be a single element as it passes one Dockerfile.
+	if len(misconfs) != 1 {
+		return nil, nil
+	}
+
+	return &analyzer.ConfigAnalysisResult{
+		Misconfiguration: &misconfs[0],
+	}, nil
+}
+
+func (a *historyAnalyzer) Required(_ types.OS) bool {
+	return true
+}
+
+func (a *historyAnalyzer) Type() analyzer.Type {
+	return analyzer.TypeHistoryDockerfile
+}
+
+func (a *historyAnalyzer) Version() int {
+	return analyzerVersion
+}

pkg/fanal/analyzer/imgconf/dockerfile/dockerfile_test.go

@@ -0,0 +1,125 @@
+package dockerfile
+
+import (
+	"context"
+	"testing"
+
+	v1 "github.com/google/go-containerregistry/pkg/v1"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/aquasecurity/trivy/pkg/fanal/analyzer"
+	"github.com/aquasecurity/trivy/pkg/fanal/types"
+)
+
+func Test_historyAnalyzer_Analyze(t *testing.T) {
+	tests := []struct {
+		name    string
+		input   analyzer.ConfigAnalysisInput
+		want    *analyzer.ConfigAnalysisResult
+		wantErr bool
+	}{
+		{
+			name: "happy",
+			input: analyzer.ConfigAnalysisInput{
+				Config: &v1.ConfigFile{
+					History: []v1.History{
+						{
+							CreatedBy:  "/bin/sh -c #(nop) ADD file:e4d600fc4c9c293efe360be7b30ee96579925d1b4634c94332e2ec73f7d8eca1 in /",
+							EmptyLayer: false,
+						},
+						{
+							CreatedBy:  `/bin/sh -c #(nop)  CMD [\"/bin/sh\"]`,
+							EmptyLayer: true,
+						},
+					},
+				},
+			},
+			want: &analyzer.ConfigAnalysisResult{
+				Misconfiguration: &types.Misconfiguration{
+					FileType: "dockerfile",
+					FilePath: "Dockerfile",
+					Failures: types.MisconfResults{
+						types.MisconfResult{
+							Namespace: "builtin.dockerfile.DS002",
+							Query:     "data.builtin.dockerfile.DS002.deny",
+							Message:   "Specify at least 1 USER command in Dockerfile with non-root user as argument",
+							PolicyMetadata: types.PolicyMetadata{
+								ID:                 "DS002",
+								AVDID:              "AVD-DS-0002",
+								Type:               "Dockerfile Security Check",
+								Title:              "Image user should not be 'root'",
+								Description:        "Running containers with 'root' user can lead to a container escape situation. It is a best practice to run containers as non-root users, which can be done by adding a 'USER' statement to the Dockerfile.",
+								Severity:           "HIGH",
+								RecommendedActions: "Add 'USER <non root user name>' line to the Dockerfile",
+								References: []string{
+									"https://docs.docker." +
+										"com/develop/develop-images/dockerfile_best-practices/",
+								},
+							},
+							CauseMetadata: types.CauseMetadata{
+								Provider: "Dockerfile",
+								Service:  "general",
+							},
+						},
+						types.MisconfResult{
+							Namespace: "builtin.dockerfile.DS005",
+							Query:     "data.builtin.dockerfile.DS005.deny",
+							Message:   "Consider using 'COPY file:e4d600fc4c9c293efe360be7b30ee96579925d1b4634c94332e2ec73f7d8eca1 in /' command instead of 'ADD file:e4d600fc4c9c293efe360be7b30ee96579925d1b4634c94332e2ec73f7d8eca1 in /'",
+							PolicyMetadata: types.PolicyMetadata{
+								ID:                 "DS005",
+								AVDID:              "AVD-DS-0005",
+								Type:               "Dockerfile Security Check",
+								Title:              "ADD instead of COPY",
+								Description:        "You should use COPY instead of ADD unless you want to extract a tar file. Note that an ADD command will extract a tar file, which adds the risk of Zip-based vulnerabilities. Accordingly, it is advised to use a COPY command, which does not extract tar files.",
+								Severity:           "LOW",
+								RecommendedActions: "Use COPY instead of ADD",
+								References:         []string{"https://docs.docker.com/engine/reference/builder/#add"},
+							},
+							CauseMetadata: types.CauseMetadata{
+								Provider:  "Dockerfile",
+								Service:   "general",
+								StartLine: 1,
+								EndLine:   1,
+								Code: types.Code{
+									Lines: []types.Line{
+										{
+											Number:      1,
+											Content:     "ADD file:e4d600fc4c9c293efe360be7b30ee96579925d1b4634c94332e2ec73f7d8eca1 in /",
+											IsCause:     true,
+											Truncated:   false,
+											Highlighted: "\x1b[38;5;64mADD\x1b[0m file:e4d600fc4c9c293efe360be7b30ee96579925d1b4634c94332e2ec73f7d8eca1 in /",
+											FirstCause:  true,
+											LastCause:   true,
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "nil config",
+			input: analyzer.ConfigAnalysisInput{
+				Config: nil,
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			a, err := newHistoryAnalyzer(analyzer.ConfigAnalyzerOptions{})
+			require.NoError(t, err)
+			got, err := a.Analyze(context.Background(), tt.input)
+			if tt.wantErr {
+				assert.Error(t, err)
+				return
+			}
+			if got != nil && got.Misconfiguration != nil {
+				got.Misconfiguration.Successes = nil // Not compare successes in this test
+			}
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}

pkg/fanal/applier/applier.go

@@ -27,14 +27,16 @@ func (a Applier) ApplyLayers(imageID string, layerKeys []string) (types.Artifact
 	}
 
 	mergedLayer := ApplyLayers(layers)
+
+	imageInfo, _ := a.cache.GetArtifact(imageID) // nolint
+	mergedLayer.HistoryPackages = imageInfo.HistoryPackages
+	mergedLayer.ImageMisconfiguration = imageInfo.Misconfiguration
+
 	if !mergedLayer.OS.Detected() {
 		return mergedLayer, analyzer.ErrUnknownOS // send back package and apps info regardless
 	} else if mergedLayer.Packages == nil {
 		return mergedLayer, analyzer.ErrNoPkgsDetected // send back package and apps info regardless
 	}
 
-	imageInfo, _ := a.cache.GetArtifact(imageID) // nolint
-	mergedLayer.HistoryPackages = imageInfo.HistoryPackages
-
 	return mergedLayer, nil
 }

pkg/fanal/applier/applier_test.go

@@ -22,12 +22,12 @@ func TestApplier_ApplyLayers(t *testing.T) {
 		layerIDs []string
 	}
 	tests := []struct {
-		name                 string
+		name                    string
-		args                 args
+		args                    args
-		getLayerExpectations []cache.LocalArtifactCacheGetBlobExpectation
+		getLayerExpectations    []cache.LocalArtifactCacheGetBlobExpectation
-		getImageExpectations []cache.LocalArtifactCacheGetArtifactExpectation
+		getArtifactExpectations []cache.LocalArtifactCacheGetArtifactExpectation
-		want                 types.ArtifactDetail
+		want                    types.ArtifactDetail
-		wantErr              string
+		wantErr                 string
 	}{
 		{
 			name: "happy path",
@@ -126,7 +126,7 @@ func TestApplier_ApplyLayers(t *testing.T) {
 					},
 				},
 			},
-			getImageExpectations: []cache.LocalArtifactCacheGetArtifactExpectation{
+			getArtifactExpectations: []cache.LocalArtifactCacheGetArtifactExpectation{
 				{
 					Args: cache.LocalArtifactCacheGetArtifactArgs{
 						ArtifactID: "sha256:4791503518dff090d6a82f7a5c1fd71c41146920e2562fb64308e17ab6834b7e",
@@ -145,14 +145,20 @@ func TestApplier_ApplyLayers(t *testing.T) {
 				},
 				Packages: []types.Package{
 					{
-						Name: "libc6", Version: "2.24-11+deb9u4", SrcName: "glibc", SrcVersion: "2.24-11+deb9u4",
+						Name:       "libc6",
+						Version:    "2.24-11+deb9u4",
+						SrcName:    "glibc",
+						SrcVersion: "2.24-11+deb9u4",
 						Layer: types.Layer{
 							Digest: "sha256:dffd9992ca398466a663c87c92cfea2a2db0ae0cf33fcb99da60eec52addbfc5",
 							DiffID: "sha256:aad63a9339440e7c3e1fff2b988991b9bfb81280042fa7f39a5e327023056819",
 						},
 					},
 					{
-						Name: "tzdata", Version: "2019a-0+deb9u1", SrcName: "tzdata", SrcVersion: "2019a-0+deb9u1",
+						Name:       "tzdata",
+						Version:    "2019a-0+deb9u1",
+						SrcName:    "tzdata",
+						SrcVersion: "2019a-0+deb9u1",
 						Layer: types.Layer{
 							Digest: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
 							DiffID: "sha256:a187dde48cd289ac374ad8539930628314bc581a481cdb41409c9289419ddb72",
@@ -211,11 +217,26 @@ func TestApplier_ApplyLayers(t *testing.T) {
 								{
 									FilePath: "lib/apk/db/installed",
 									Packages: []types.Package{
-										{Name: "musl", Version: "1.1.22-r3"},
+										{
-										{Name: "busybox", Version: "1.30.1-r3"},
+											Name:    "musl",
-										{Name: "openssl", Version: "1.1.1d-r2"},
+											Version: "1.1.22-r3",
-										{Name: "libcrypto1.1", Version: "1.1.1d-r2"},
+										},
-										{Name: "libssl1.1", Version: "1.1.1d-r2"},
+										{
+											Name:    "busybox",
+											Version: "1.30.1-r3",
+										},
+										{
+											Name:    "openssl",
+											Version: "1.1.1d-r2",
+										},
+										{
+											Name:    "libcrypto1.1",
+											Version: "1.1.1d-r2",
+										},
+										{
+											Name:    "libssl1.1",
+											Version: "1.1.1d-r2",
+										},
 									},
 								},
 							},
@@ -223,7 +244,7 @@ func TestApplier_ApplyLayers(t *testing.T) {
 					},
 				},
 			},
-			getImageExpectations: []cache.LocalArtifactCacheGetArtifactExpectation{
+			getArtifactExpectations: []cache.LocalArtifactCacheGetArtifactExpectation{
 				{
 					Args: cache.LocalArtifactCacheGetArtifactArgs{
 						ArtifactID: "sha256:3bb70bd5fb37e05b8ecaaace5d6a6b5ec7834037c07ecb5907355c23ab70352d",
@@ -232,14 +253,38 @@ func TestApplier_ApplyLayers(t *testing.T) {
 						ArtifactInfo: types.ArtifactInfo{
 							SchemaVersion: 1,
 							HistoryPackages: []types.Package{
-								{Name: "musl", Version: "1.1.23"},
+								{
-								{Name: "busybox", Version: "1.31"},
+									Name:    "musl",
-								{Name: "ncurses-libs", Version: "6.1_p20190518-r0"},
+									Version: "1.1.23",
-								{Name: "ncurses-terminfo-base", Version: "6.1_p20190518-r0"},
+								},
-								{Name: "ncurses", Version: "6.1_p20190518-r0"},
+								{
-								{Name: "ncurses-terminfo", Version: "6.1_p20190518-r0"},
+									Name:    "busybox",
-								{Name: "bash", Version: "5.0.0-r0"},
+									Version: "1.31",
-								{Name: "readline", Version: "8.0.0-r0"},
+								},
+								{
+									Name:    "ncurses-libs",
+									Version: "6.1_p20190518-r0",
+								},
+								{
+									Name:    "ncurses-terminfo-base",
+									Version: "6.1_p20190518-r0",
+								},
+								{
+									Name:    "ncurses",
+									Version: "6.1_p20190518-r0",
+								},
+								{
+									Name:    "ncurses-terminfo",
+									Version: "6.1_p20190518-r0",
+								},
+								{
+									Name:    "bash",
+									Version: "5.0.0-r0",
+								},
+								{
+									Name:    "readline",
+									Version: "8.0.0-r0",
+								},
 							},
 						},
 					},
@@ -293,14 +338,38 @@ func TestApplier_ApplyLayers(t *testing.T) {
 					},
 				},
 				HistoryPackages: []types.Package{
-					{Name: "musl", Version: "1.1.23"},
+					{
-					{Name: "busybox", Version: "1.31"},
+						Name:    "musl",
-					{Name: "ncurses-libs", Version: "6.1_p20190518-r0"},
+						Version: "1.1.23",
-					{Name: "ncurses-terminfo-base", Version: "6.1_p20190518-r0"},
+					},
-					{Name: "ncurses", Version: "6.1_p20190518-r0"},
+					{
-					{Name: "ncurses-terminfo", Version: "6.1_p20190518-r0"},
+						Name:    "busybox",
-					{Name: "bash", Version: "5.0.0-r0"},
+						Version: "1.31",
-					{Name: "readline", Version: "8.0.0-r0"},
+					},
+					{
+						Name:    "ncurses-libs",
+						Version: "6.1_p20190518-r0",
+					},
+					{
+						Name:    "ncurses-terminfo-base",
+						Version: "6.1_p20190518-r0",
+					},
+					{
+						Name:    "ncurses",
+						Version: "6.1_p20190518-r0",
+					},
+					{
+						Name:    "ncurses-terminfo",
+						Version: "6.1_p20190518-r0",
+					},
+					{
+						Name:    "bash",
+						Version: "5.0.0-r0",
+					},
+					{
+						Name:    "readline",
+						Version: "8.0.0-r0",
+					},
 				},
 			},
 		},
@@ -348,6 +417,18 @@ func TestApplier_ApplyLayers(t *testing.T) {
 					"sha256:24df0d4e20c0f42d3703bf1f1db2bdd77346c7956f74f423603d651e8e5ae8a7",
 				},
 			},
+			getArtifactExpectations: []cache.LocalArtifactCacheGetArtifactExpectation{
+				{
+					Args: cache.LocalArtifactCacheGetArtifactArgs{
+						ArtifactID: "sha256:4791503518dff090d6a82f7a5c1fd71c41146920e2562fb64308e17ab6834b7e",
+					},
+					Returns: cache.LocalArtifactCacheGetArtifactReturns{
+						ArtifactInfo: types.ArtifactInfo{
+							SchemaVersion: 1,
+						},
+					},
+				},
+			},
 			getLayerExpectations: []cache.LocalArtifactCacheGetBlobExpectation{
 				{
 					Args: cache.LocalArtifactCacheGetBlobArgs{
@@ -434,14 +515,20 @@ func TestApplier_ApplyLayers(t *testing.T) {
 			want: types.ArtifactDetail{
 				Packages: []types.Package{
 					{
-						Name: "libc6", Version: "2.24-11+deb9u4", SrcName: "glibc", SrcVersion: "2.24-11+deb9u4",
+						Name:       "libc6",
+						Version:    "2.24-11+deb9u4",
+						SrcName:    "glibc",
+						SrcVersion: "2.24-11+deb9u4",
 						Layer: types.Layer{
 							Digest: "sha256:dffd9992ca398466a663c87c92cfea2a2db0ae0cf33fcb99da60eec52addbfc5",
 							DiffID: "sha256:aad63a9339440e7c3e1fff2b988991b9bfb81280042fa7f39a5e327023056819",
 						},
 					},
 					{
-						Name: "tzdata", Version: "2019a-0+deb9u1", SrcName: "tzdata", SrcVersion: "2019a-0+deb9u1",
+						Name:       "tzdata",
+						Version:    "2019a-0+deb9u1",
+						SrcName:    "tzdata",
+						SrcVersion: "2019a-0+deb9u1",
 						Layer: types.Layer{
 							Digest: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
 							DiffID: "sha256:a187dde48cd289ac374ad8539930628314bc581a481cdb41409c9289419ddb72",
@@ -478,10 +565,23 @@ func TestApplier_ApplyLayers(t *testing.T) {
 		{
 			name: "sad path no package detected",
 			args: args{
+				imageID: "sha256:4791503518dff090d6a82f7a5c1fd71c41146920e2562fb64308e17ab6834b7e",
 				layerIDs: []string{
 					"sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
 				},
 			},
+			getArtifactExpectations: []cache.LocalArtifactCacheGetArtifactExpectation{
+				{
+					Args: cache.LocalArtifactCacheGetArtifactArgs{
+						ArtifactID: "sha256:4791503518dff090d6a82f7a5c1fd71c41146920e2562fb64308e17ab6834b7e",
+					},
+					Returns: cache.LocalArtifactCacheGetArtifactReturns{
+						ArtifactInfo: types.ArtifactInfo{
+							SchemaVersion: 1,
+						},
+					},
+				},
+			},
 			getLayerExpectations: []cache.LocalArtifactCacheGetBlobExpectation{
 				{
 					Args: cache.LocalArtifactCacheGetBlobArgs{
@@ -515,6 +615,18 @@ func TestApplier_ApplyLayers(t *testing.T) {
 					"sha256:dffd9992ca398466a663c87c92cfea2a2db0ae0cf33fcb99da60eec52addbfc5",
 				},
 			},
+			getArtifactExpectations: []cache.LocalArtifactCacheGetArtifactExpectation{
+				{
+					Args: cache.LocalArtifactCacheGetArtifactArgs{
+						ArtifactID: "sha256:4791503518dff090d6a82f7a5c1fd71c41146920e2562fb64308e17ab6834b7e",
+					},
+					Returns: cache.LocalArtifactCacheGetArtifactReturns{
+						ArtifactInfo: types.ArtifactInfo{
+							SchemaVersion: 1,
+						},
+					},
+				},
+			},
 			getLayerExpectations: []cache.LocalArtifactCacheGetBlobExpectation{
 				{
 					Args: cache.LocalArtifactCacheGetBlobArgs{
@@ -605,7 +717,10 @@ func TestApplier_ApplyLayers(t *testing.T) {
 			want: types.ArtifactDetail{
 				Packages: []types.Package{
 					{
-						Name: "tzdata", Version: "2019a-0+deb9u1", SrcName: "tzdata", SrcVersion: "2019a-0+deb9u1",
+						Name:       "tzdata",
+						Version:    "2019a-0+deb9u1",
+						SrcName:    "tzdata",
+						SrcVersion: "2019a-0+deb9u1",
 						Layer: types.Layer{
 							Digest: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
 							DiffID: "sha256:a187dde48cd289ac374ad8539930628314bc581a481cdb41409c9289419ddb72",
@@ -679,7 +794,7 @@ func TestApplier_ApplyLayers(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			c := new(cache.MockLocalArtifactCache)
 			c.ApplyGetBlobExpectations(tt.getLayerExpectations)
-			c.ApplyGetArtifactExpectations(tt.getImageExpectations)
+			c.ApplyGetArtifactExpectations(tt.getArtifactExpectations)
 
 			a := applier.NewApplier(c)
 

pkg/fanal/artifact/image/image.go

@@ -28,7 +28,8 @@ type Artifact struct {
 	image          types.Image
 	cache          cache.ArtifactCache
 	walker         walker.LayerTar
-	analyzer       analyzer.AnalyzerGroup
+	analyzer       analyzer.AnalyzerGroup       // analyzer for files in container image
+	configAnalyzer analyzer.ConfigAnalyzerGroup // analyzer for container image config
 	handlerManager handler.Manager
 
 	artifactOption artifact.Option
@@ -57,11 +58,21 @@ func NewArtifact(img types.Image, c cache.ArtifactCache, opt artifact.Option) (a
 		return nil, xerrors.Errorf("analyzer group error: %w", err)
 	}
 
+	ca, err := analyzer.NewConfigAnalyzerGroup(analyzer.ConfigAnalyzerOptions{
+		FilePatterns:         opt.FilePatterns,
+		DisabledAnalyzers:    opt.DisabledAnalyzers,
+		MisconfScannerOption: opt.MisconfScannerOption,
+	})
+	if err != nil {
+		return nil, xerrors.Errorf("config analyzer group error: %w", err)
+	}
+
 	return Artifact{
 		image:          img,
 		cache:          c,
 		walker:         walker.NewLayerTar(opt.SkipFiles, opt.SkipDirs, opt.Slow),
 		analyzer:       a,
+		configAnalyzer: ca,
 		handlerManager: handlerManager,
 
 		artifactOption: opt,
@@ -119,7 +130,7 @@ func (a Artifact) Inspect(ctx context.Context) (types.ArtifactReference, error)
 		missingImageKey = ""
 	}
 
-	if err = a.inspect(ctx, missingImageKey, missingLayers, baseDiffIDs, layerKeyMap); err != nil {
+	if err = a.inspect(ctx, missingImageKey, missingLayers, baseDiffIDs, layerKeyMap, configFile); err != nil {
 		return types.ArtifactReference{}, xerrors.Errorf("analyze error: %w", err)
 	}
 
@@ -144,7 +155,7 @@ func (Artifact) Clean(_ types.ArtifactReference) error {
 
 func (a Artifact) calcCacheKeys(imageID string, diffIDs []string) (string, []string, error) {
 	// Pass an empty config scanner option so that the cache key can be the same, even when policies are updated.
-	imageKey, err := cache.CalcKey(imageID, a.analyzer.ImageConfigAnalyzerVersions(), nil, artifact.Option{})
+	imageKey, err := cache.CalcKey(imageID, a.configAnalyzer.AnalyzerVersions(), nil, artifact.Option{})
 	if err != nil {
 		return "", nil, err
 	}
@@ -195,7 +206,8 @@ func (a Artifact) consolidateCreatedBy(diffIDs, layerKeys []string, configFile *
 	return layerKeyMap
 }
 
-func (a Artifact) inspect(ctx context.Context, missingImage string, layerKeys, baseDiffIDs []string, layerKeyMap map[string]LayerInfo) error {
+func (a Artifact) inspect(ctx context.Context, missingImage string, layerKeys, baseDiffIDs []string,
+	layerKeyMap map[string]LayerInfo, configFile *v1.ConfigFile) error {
 	done := make(chan struct{})
 	errCh := make(chan error)
 	limit := semaphore.New(a.artifactOption.Slow)
@@ -246,7 +258,7 @@ func (a Artifact) inspect(ctx context.Context, missingImage string, layerKeys, b
 	}
 
 	if missingImage != "" {
-		if err := a.inspectConfig(missingImage, osFound); err != nil {
+		if err := a.inspectConfig(ctx, missingImage, osFound, configFile); err != nil {
 			return xerrors.Errorf("unable to analyze config: %w", err)
 		}
 	}
@@ -357,33 +369,20 @@ func (a Artifact) isCompressed(l v1.Layer) bool {
 	return !uncompressed
 }
 
-func (a Artifact) inspectConfig(imageID string, osFound types.OS) error {
+func (a Artifact) inspectConfig(ctx context.Context, imageID string, osFound types.OS, config *v1.ConfigFile) error {
-	config, err := a.image.ConfigFile()
+	result := lo.FromPtr(a.configAnalyzer.AnalyzeImageConfig(ctx, osFound, config))
-	if err != nil {
-		return xerrors.Errorf("unable to get config blob: %w", err)
-	}
-
-	result := lo.FromPtr(a.analyzer.AnalyzeImageConfig(osFound, config))
-
-	// Identify packages from history.
-	var historyPkgs types.Packages
-	for _, pi := range result.PackageInfos {
-		if pi.FilePath == types.HistoryPkgs {
-			historyPkgs = pi.Packages
-			break
-		}
-	}
 
 	info := types.ArtifactInfo{
-		SchemaVersion:   types.ArtifactJSONSchemaVersion,
+		SchemaVersion:    types.ArtifactJSONSchemaVersion,
-		Architecture:    config.Architecture,
+		Architecture:     config.Architecture,
-		Created:         config.Created.Time,
+		Created:          config.Created.Time,
-		DockerVersion:   config.DockerVersion,
+		DockerVersion:    config.DockerVersion,
-		OS:              config.OS,
+		OS:               config.OS,
-		HistoryPackages: historyPkgs,
+		Misconfiguration: result.Misconfiguration,
+		HistoryPackages:  result.HistoryPackages,
 	}
 
-	if err = a.cache.PutArtifact(imageID, info); err != nil {
+	if err := a.cache.PutArtifact(imageID, info); err != nil {
 		return xerrors.Errorf("failed to put image info into the cache: %w", err)
 	}
 

pkg/fanal/artifact/image/image_test.go

@@ -12,8 +12,8 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/aquasecurity/trivy/pkg/fanal/analyzer"
-	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/command/apk"
 	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/config/all"
+	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/imgconf/apk"
 	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/php/composer"
 	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/ruby/bundler"
 	_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/licensing"

pkg/fanal/handler/misconf/misconf.go

@@ -1,40 +1,16 @@
 package misconf
 
 import (
-	"bytes"
 	"context"
 	_ "embed"
-	"fmt"
-	"io/fs"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
 
-	"github.com/samber/lo"
 	"golang.org/x/xerrors"
 
-	"github.com/aquasecurity/memoryfs"
-
-	"github.com/aquasecurity/defsec/pkg/scanners/azure/arm"
-
-	"github.com/aquasecurity/defsec/pkg/detection"
-	"github.com/aquasecurity/defsec/pkg/scan"
-	"github.com/aquasecurity/defsec/pkg/scanners"
-	cfscanner "github.com/aquasecurity/defsec/pkg/scanners/cloudformation"
-	cfparser "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"
-	tfscanner "github.com/aquasecurity/defsec/pkg/scanners/terraform"
-
 	"github.com/aquasecurity/trivy/pkg/fanal/analyzer"
-	"github.com/aquasecurity/trivy/pkg/fanal/analyzer/config"
 	"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"
+	"github.com/aquasecurity/trivy/pkg/misconf"
 )
 
 func init() {
@@ -44,205 +20,19 @@ func init() {
 const version = 1
 
 type misconfPostHandler struct {
-	filePatterns []string
+	scanner misconf.Scanner
-	scanners     map[string]scanners.FSScanner
-}
-
-// for a given set of paths, find the most specific filesystem path that contains all the descendants
-// the function also returns a filtered version of the input paths that are compatible with a fs.FS
-// using the resultant target path. This means they will always use "/" as a separator
-func findFSTarget(paths []string) (string, []string, error) {
-	if len(paths) == 0 {
-		return "", nil, xerrors.New("must specify at least one path")
-	}
-
-	var absPaths []string
-	var minSegmentCount int
-	for _, relPath := range paths {
-		abs, err := filepath.Abs(relPath)
-		if err != nil {
-			return "", nil, xerrors.Errorf("failed to derive absolute path from '%s': %w", relPath, err)
-		}
-		count := len(strings.Split(filepath.ToSlash(abs), "/"))
-		if count < minSegmentCount || minSegmentCount == 0 {
-			minSegmentCount = count
-		}
-		absPaths = append(absPaths, abs)
-	}
-
-	var outputSegments []string
-	for i := 0; i < minSegmentCount; i++ {
-		required := strings.Split(absPaths[0], string(filepath.Separator))[i]
-		match := true
-		for _, path := range absPaths[1:] {
-			actual := strings.Split(path, string(filepath.Separator))[i]
-			if required != actual {
-				match = false
-				break
-			}
-		}
-		if !match {
-			break
-		}
-		outputSegments = append(outputSegments, required)
-	}
-
-	slashTarget := strings.Join(outputSegments, "/")
-	if slashTarget == "" {
-		slashTarget = string(filepath.Separator)
-	}
-
-	var cleanPaths []string
-	for _, path := range absPaths {
-		path := filepath.ToSlash(path)
-		path = strings.TrimPrefix(path, slashTarget)
-		path = strings.TrimPrefix(path, "/")
-		if path == "" {
-			path = "."
-		}
-		cleanPaths = append(cleanPaths, path)
-	}
-
-	// we don't use filepath.Join here as we need to maintain the root "/"
-	target := strings.Join(outputSegments, string(filepath.Separator))
-	if target == "" || filepath.VolumeName(target) == target {
-		target += string(filepath.Separator)
-	}
-	return target, cleanPaths, nil
-}
-
-func createPolicyFS(policyPaths []string) (fs.FS, []string, error) {
-	if len(policyPaths) == 0 {
-		return nil, nil, nil
-	}
-	var outsideCWD bool
-	for _, path := range policyPaths {
-		if strings.Contains(path, "..") || strings.HasPrefix(path, "/") || (len(path) > 1 && path[1] == ':') {
-			outsideCWD = true
-			break
-		}
-	}
-	// all policy paths are inside the CWD, so create a filesystem from CWD to load from
-	if !outsideCWD {
-		cwd, err := os.Getwd()
-		if err != nil {
-			return nil, nil, err
-		}
-		var cleanPaths []string
-		for _, path := range policyPaths {
-			path = strings.TrimPrefix(path, ".")
-			path = strings.TrimPrefix(path, "/")
-			cleanPaths = append(cleanPaths, path)
-		}
-		return os.DirFS(cwd), cleanPaths, nil
-	}
-
-	target, cleanPaths, err := findFSTarget(policyPaths)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return os.DirFS(target), cleanPaths, nil
 }
 
 func newMisconfPostHandler(artifactOpt artifact.Option) (handler.PostHandler, error) {
-	opt := artifactOpt.MisconfScannerOption
+	s, err := misconf.NewScanner(artifactOpt.FilePatterns, artifactOpt.MisconfScannerOption)
-
-	opts := []options.ScannerOption{
-		options.ScannerWithSkipRequiredCheck(true),
-		options.ScannerWithEmbeddedPolicies(!artifactOpt.MisconfScannerOption.DisableEmbeddedPolicies),
-	}
-
-	policyFS, policyPaths, err := createPolicyFS(opt.PolicyPaths)
 	if err != nil {
-		return nil, err
+		return nil, xerrors.Errorf("scanner init error: %w", err)
 	}
-	if policyFS != nil {
-		opts = append(opts, options.ScannerWithPolicyFilesystem(policyFS))
-	}
-
-	if opt.Trace {
-		opts = append(opts, options.ScannerWithPerResultTracing(true))
-	}
-
-	if opt.RegoOnly {
-		opts = append(opts, options.ScannerWithRegoOnly(true))
-	}
-
-	if len(policyPaths) > 0 {
-		opts = append(opts, options.ScannerWithPolicyDirs(policyPaths...))
-	}
-
-	if len(opt.DataPaths) > 0 {
-		opts = append(opts, options.ScannerWithDataDirs(opt.DataPaths...))
-	}
-
-	if len(opt.Namespaces) > 0 {
-		opts = append(opts, options.ScannerWithPolicyNamespaces(opt.Namespaces...))
-	}
-
-	helmOpts := addHelmOpts(opts, artifactOpt.MisconfScannerOption)
-	tfOpts := addTFOpts(opts, artifactOpt.MisconfScannerOption)
-
 	return misconfPostHandler{
-		filePatterns: artifactOpt.FilePatterns,
+		scanner: s,
-		scanners: map[string]scanners.FSScanner{
-			types.AzureARM:       arm.New(opts...),
-			types.Terraform:      tfscanner.New(tfOpts...),
-			types.CloudFormation: cfscanner.New(opts...),
-			types.Dockerfile:     dfscanner.NewScanner(opts...),
-			types.Kubernetes:     k8sscanner.NewScanner(opts...),
-			types.Helm:           helm.New(helmOpts...),
-		},
 	}, nil
 }
 
-func addTFOpts(opts []options.ScannerOption, scannerOption config.ScannerOption) []options.ScannerOption {
-	if len(scannerOption.TerraformTFVars) > 0 {
-		opts = append(opts, tfscanner.ScannerWithTFVarsPaths(scannerOption.TerraformTFVars...))
-	}
-
-	return opts
-}
-
-func addHelmOpts(opts []options.ScannerOption, scannerOption config.ScannerOption) []options.ScannerOption {
-	if len(scannerOption.HelmValueFiles) > 0 {
-		opts = append(opts, helm.ScannerWithValuesFile(scannerOption.HelmValueFiles...))
-	}
-
-	if len(scannerOption.HelmValues) > 0 {
-		opts = append(opts, helm.ScannerWithValues(scannerOption.HelmValues...))
-	}
-
-	if len(scannerOption.HelmFileValues) > 0 {
-		opts = append(opts, helm.ScannerWithFileValues(scannerOption.HelmFileValues...))
-	}
-
-	if len(scannerOption.HelmStringValues) > 0 {
-		opts = append(opts, helm.ScannerWithStringValues(scannerOption.HelmStringValues...))
-	}
-
-	return opts
-}
-
-var enabledDefsecTypes = map[detection.FileType]string{
-	detection.FileTypeAzureARM:       types.AzureARM,
-	detection.FileTypeCloudFormation: types.CloudFormation,
-	detection.FileTypeTerraform:      types.Terraform,
-	detection.FileTypeDockerfile:     types.Dockerfile,
-	detection.FileTypeKubernetes:     types.Kubernetes,
-	detection.FileTypeHelm:           types.Helm,
-}
-
-func (h misconfPostHandler) hasCustomPatternForType(t string) bool {
-	for _, pattern := range h.filePatterns {
-		if strings.HasPrefix(pattern, t+":") {
-			return true
-		}
-	}
-	return false
-}
-
 // Handle detects misconfigurations.
 func (h misconfPostHandler) Handle(ctx context.Context, result *analyzer.AnalysisResult, blob *types.BlobInfo) error {
 	files, ok := result.Files[h.Type()]
@@ -250,69 +40,9 @@ func (h misconfPostHandler) Handle(ctx context.Context, result *analyzer.Analysi
 		return nil
 	}
 
-	mapMemoryFS := make(map[string]*memoryfs.FS)
+	misconfs, err := h.scanner.Scan(ctx, files)
-	for t := range h.scanners {
+	if err != nil {
-		mapMemoryFS[t] = memoryfs.New()
+		return xerrors.Errorf("misconfiguration scan error: %w", err)
-	}
-
-	for _, file := range files {
-
-		for defsecType, localType := range enabledDefsecTypes {
-
-			buffer := bytes.NewReader(file.Content)
-			if !h.hasCustomPatternForType(localType) && !detection.IsType(file.Path, buffer, defsecType) {
-				continue
-			}
-			// Replace with more detailed config type
-			file.Type = localType
-
-			if memfs, ok := mapMemoryFS[file.Type]; ok {
-				if filepath.Dir(file.Path) != "." {
-					if err := memfs.MkdirAll(filepath.Dir(file.Path), os.ModePerm); err != nil {
-						return xerrors.Errorf("memoryfs mkdir error: %w", err)
-					}
-				}
-				if err := memfs.WriteFile(file.Path, file.Content, os.ModePerm); err != nil {
-					return xerrors.Errorf("memoryfs write error: %w", err)
-				}
-			}
-		}
-	}
-
-	var misconfs []types.Misconfiguration
-	for t, scanner := range h.scanners {
-		results, err := scanner.ScanFS(ctx, mapMemoryFS[t], ".")
-		if err != nil {
-			if _, ok := err.(*cfparser.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)...)
-	}
-
-	// Add misconfigurations
-	for _, misconf := range misconfs {
-		sort.Slice(misconf.Successes, func(i, j int) bool {
-			if misconf.Successes[i].AVDID == misconf.Successes[j].AVDID {
-				return misconf.Successes[i].StartLine < misconf.Successes[j].StartLine
-			}
-			return misconf.Successes[i].AVDID < misconf.Successes[j].AVDID
-		})
-		sort.Slice(misconf.Warnings, func(i, j int) bool {
-			if misconf.Warnings[i].AVDID == misconf.Warnings[j].AVDID {
-				return misconf.Warnings[i].StartLine < misconf.Warnings[j].StartLine
-			}
-			return misconf.Warnings[i].AVDID < misconf.Warnings[j].AVDID
-		})
-		sort.Slice(misconf.Failures, func(i, j int) bool {
-			if misconf.Failures[i].AVDID == misconf.Failures[j].AVDID {
-				return misconf.Failures[i].StartLine < misconf.Failures[j].StartLine
-			}
-			return misconf.Failures[i].AVDID < misconf.Failures[j].AVDID
-		})
 	}
 
 	blob.Misconfigurations = misconfs
@@ -331,92 +61,3 @@ func (h misconfPostHandler) Type() types.HandlerType {
 func (h misconfPostHandler) Priority() int {
 	return types.MisconfPostHandlerPriority
 }
-
-// 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 {
-		flattened := result.Flatten()
-
-		query := fmt.Sprintf("data.%s.%s", result.RegoNamespace(), result.RegoRule())
-
-		ruleID := result.Rule().AVDID
-		if result.RegoNamespace() != "" && len(result.Rule().Aliases) > 0 {
-			ruleID = result.Rule().Aliases[0]
-		}
-
-		cause := NewCauseWithCode(result)
-
-		misconfResult := types.MisconfResult{
-			Namespace: result.RegoNamespace(),
-			Query:     query,
-			Message:   flattened.Description,
-			PolicyMetadata: types.PolicyMetadata{
-				ID:                 ruleID,
-				AVDID:              result.Rule().AVDID,
-				Type:               fmt.Sprintf("%s Security Check", scannerName),
-				Title:              result.Rule().Summary,
-				Description:        result.Rule().Explanation,
-				Severity:           string(flattened.Severity),
-				RecommendedActions: flattened.Resolution,
-				References:         flattened.Links,
-			},
-			CauseMetadata: cause,
-			Traces:        result.Traces(),
-		}
-
-		filePath := flattened.Location.Filename
-		misconf, ok := misconfs[filePath]
-		if !ok {
-			misconf = types.Misconfiguration{
-				FileType: configType,
-				FilePath: filePath,
-			}
-		}
-
-		if flattened.Warning {
-			misconf.Warnings = append(misconf.Warnings, misconfResult)
-		} else {
-			switch flattened.Status {
-			case scan.StatusPassed:
-				misconf.Successes = append(misconf.Successes, misconfResult)
-			case scan.StatusIgnored:
-				misconf.Exceptions = append(misconf.Exceptions, misconfResult)
-			case scan.StatusFailed:
-				misconf.Failures = append(misconf.Failures, misconfResult)
-			}
-		}
-		misconfs[filePath] = misconf
-	}
-
-	return types.ToMisconfigurations(misconfs)
-}
-
-func NewCauseWithCode(underlying scan.Result) types.CauseMetadata {
-	flat := underlying.Flatten()
-	cause := types.CauseMetadata{
-		Resource:  flat.Resource,
-		Provider:  flat.RuleProvider.DisplayName(),
-		Service:   flat.RuleService,
-		StartLine: flat.Location.StartLine,
-		EndLine:   flat.Location.EndLine,
-	}
-	if code, err := underlying.GetCode(); err == nil {
-		cause.Code = types.Code{
-			Lines: lo.Map(code.Lines, func(l scan.Line, i int) types.Line {
-				return types.Line{
-					Number:      l.Number,
-					Content:     l.Content,
-					IsCause:     l.IsCause,
-					Annotation:  l.Annotation,
-					Truncated:   l.Truncated,
-					Highlighted: l.Highlighted,
-					FirstCause:  l.FirstCause,
-					LastCause:   l.LastCause,
-				}
-			}),
-		}
-	}
-	return cause
-}

pkg/fanal/types/artifact.go

@@ -199,6 +199,9 @@ type ArtifactInfo struct {
 	DockerVersion string
 	OS            string
 
+	// Misconfiguration holds misconfiguration in container image config
+	Misconfiguration *Misconfiguration `json:",omitempty"`
+
 	// HistoryPackages are packages extracted from RUN instructions
 	HistoryPackages Packages `json:",omitempty"`
 }
@@ -243,6 +246,9 @@ type ArtifactDetail struct {
 	Secrets           []Secret           `json:",omitempty"`
 	Licenses          []LicenseFile      `json:",omitempty"`
 
+	// ImageMisconfiguration holds misconfigurations in container image config
+	ImageMisconfiguration *Misconfiguration `json:",omitempty"`
+
 	// HistoryPackages are packages extracted from RUN instructions
 	HistoryPackages []Package `json:",omitempty"`
 

pkg/fanal/types/const.go

@@ -79,7 +79,4 @@ const (
 	PubSpecLock = "pubspec.lock"
 
 	MixLock = "mix.lock"
-
-	// Container image config
-	HistoryPkgs = "pkgs-from-history"
 )

pkg/flag/image_flags.go

@@ -1,11 +1,23 @@
 package flag
 
+import (
+	"golang.org/x/xerrors"
+
+	"github.com/aquasecurity/trivy/pkg/types"
+)
+
 // e.g. config yaml
 // image:
 //   removed-pkgs: true
 //   input: "/path/to/alpine"
 
 var (
+	ImageConfigScannersFlag = Flag{
+		Name:       "image-config-scanners",
+		ConfigName: "image.image-config-scanners",
+		Value:      "",
+		Usage:      "comma-separated list of what security issues to detect on container image configurations (config,secret)",
+	}
 	ScanRemovedPkgsFlag = Flag{
 		Name:       "removed-pkgs",
 		ConfigName: "image.removed-pkgs",
@@ -18,7 +30,6 @@ var (
 		Value:      "",
 		Usage:      "input file path instead of image name",
 	}
-
 	PlatformFlag = Flag{
 		Name:       "platform",
 		ConfigName: "image.platform",
@@ -28,22 +39,25 @@ var (
 )
 
 type ImageFlagGroup struct {
-	Input           *Flag // local image archive
+	Input               *Flag // local image archive
-	ScanRemovedPkgs *Flag
+	ImageConfigScanners *Flag
-	Platform        *Flag
+	ScanRemovedPkgs     *Flag
+	Platform            *Flag
 }
 
 type ImageOptions struct {
-	Input           string
+	Input               string
-	ScanRemovedPkgs bool
+	ImageConfigScanners types.Scanners
-	Platform        string
+	ScanRemovedPkgs     bool
+	Platform            string
 }
 
 func NewImageFlagGroup() *ImageFlagGroup {
 	return &ImageFlagGroup{
-		Input:           &InputFlag,
+		Input:               &InputFlag,
-		ScanRemovedPkgs: &ScanRemovedPkgsFlag,
+		ImageConfigScanners: &ImageConfigScannersFlag,
-		Platform:        &PlatformFlag,
+		ScanRemovedPkgs:     &ScanRemovedPkgsFlag,
+		Platform:            &PlatformFlag,
 	}
 }
 
@@ -52,13 +66,18 @@ func (f *ImageFlagGroup) Name() string {
 }
 
 func (f *ImageFlagGroup) Flags() []*Flag {
-	return []*Flag{f.Input, f.ScanRemovedPkgs, f.Platform}
+	return []*Flag{f.Input, f.ImageConfigScanners, f.ScanRemovedPkgs, f.Platform}
 }
 
-func (f *ImageFlagGroup) ToOptions() ImageOptions {
+func (f *ImageFlagGroup) ToOptions() (ImageOptions, error) {
-	return ImageOptions{
+	scanners, err := parseScanners(getStringSlice(f.ImageConfigScanners), types.AllImageConfigScanners)
-		Input:           getString(f.Input),
+	if err != nil {
-		ScanRemovedPkgs: getBool(f.ScanRemovedPkgs),
+		return ImageOptions{}, xerrors.Errorf("unable to parse image config scanners: %w", err)
-		Platform:        getString(f.Platform),
 	}
+	return ImageOptions{
+		Input:               getString(f.Input),
+		ImageConfigScanners: scanners,
+		ScanRemovedPkgs:     getBool(f.ScanRemovedPkgs),
+		Platform:            getString(f.Platform),
+	}, nil
 }

pkg/flag/options.go

@@ -383,7 +383,10 @@ func (f *Flags) ToOptions(appVersion string, args []string, globalFlags *GlobalF
 	}
 
 	if f.ImageFlagGroup != nil {
-		opts.ImageOptions = f.ImageFlagGroup.ToOptions()
+		opts.ImageOptions, err = f.ImageFlagGroup.ToOptions()
+		if err != nil {
+			return Options{}, xerrors.Errorf("image flag error: %w", err)
+		}
 	}
 
 	if f.K8sFlagGroup != nil {

pkg/flag/options_test.go

@@ -1,7 +1,6 @@
 package flag
 
 import (
-	"os"
 	"testing"
 
 	"github.com/spf13/viper"
@@ -33,8 +32,8 @@ func Test_getStringSlice(t *testing.T) {
 			flag:      &ScannersFlag,
 			flagValue: "license,vuln",
 			want: []string{
-				types.LicenseScanner,
+				string(types.LicenseScanner),
-				types.VulnerabilityScanner,
+				string(types.VulnerabilityScanner),
 			},
 		},
 		{
@@ -45,8 +44,8 @@ func Test_getStringSlice(t *testing.T) {
 				"secret",
 			},
 			want: []string{
-				types.LicenseScanner,
+				string(types.LicenseScanner),
-				types.SecretScanner,
+				string(types.SecretScanner),
 			},
 		},
 		{
@@ -57,8 +56,8 @@ func Test_getStringSlice(t *testing.T) {
 				value: "rbac,config",
 			},
 			want: []string{
-				types.RBACScanner,
+				string(types.RBACScanner),
-				types.MisconfigScanner,
+				string(types.MisconfigScanner),
 			},
 		},
 	}
@@ -71,10 +70,7 @@ func Test_getStringSlice(t *testing.T) {
 				err := viper.BindEnv(tt.flag.ConfigName, tt.env.key)
 				assert.NoError(t, err)
 
-				savedEnvValue := os.Getenv(tt.env.key)
+				t.Setenv(tt.env.key, tt.env.value)
-				err = os.Setenv(tt.env.key, tt.env.value)
-				assert.NoError(t, err)
-				defer os.Setenv(tt.env.key, savedEnvValue)
 			}
 
 			sl := getStringSlice(tt.flag)

pkg/flag/scan_flags.go

@@ -29,10 +29,10 @@ var (
 	ScannersFlag = Flag{
 		Name:       "scanners",
 		ConfigName: "scan.scanners",
-		Value: []string{
+		Value: types.Scanners{
 			types.VulnerabilityScanner,
 			types.SecretScanner,
-		},
+		}.StringSlice(),
 		Aliases: []Alias{
 			{
 				Name:       "security-checks",
@@ -84,7 +84,7 @@ type ScanOptions struct {
 	SkipDirs     []string
 	SkipFiles    []string
 	OfflineScan  bool
-	Scanners     []string
+	Scanners     types.Scanners
 	FilePatterns []string
 	Slow         bool
 	SBOMSources  []string
@@ -126,7 +126,7 @@ func (f *ScanFlagGroup) ToOptions(args []string) (ScanOptions, error) {
 	if len(args) == 1 {
 		target = args[0]
 	}
-	scanners, err := parseScanners(getStringSlice(f.Scanners))
+	scanners, err := parseScanners(getStringSlice(f.Scanners), types.AllScanners)
 	if err != nil {
 		return ScanOptions{}, xerrors.Errorf("unable to parse scanners: %w", err)
 	}
@@ -149,13 +149,14 @@ func (f *ScanFlagGroup) ToOptions(args []string) (ScanOptions, error) {
 	}, nil
 }
 
-func parseScanners(scanner []string) ([]string, error) {
+func parseScanners(scanner []string, allowedScanners []types.Scanner) (types.Scanners, error) {
-	var scanners []string
+	var scanners types.Scanners
 	for _, v := range scanner {
-		if !slices.Contains(types.Scanners, v) {
+		s := types.Scanner(v)
+		if !slices.Contains(allowedScanners, s) {
 			return nil, xerrors.Errorf("unknown scanner: %s", v)
 		}
-		scanners = append(scanners, v)
+		scanners = append(scanners, s)
 	}
 	return scanners, nil
 }

pkg/flag/scan_flags_test.go

@@ -42,7 +42,7 @@ func TestScanFlagGroup_ToOptions(t *testing.T) {
 			},
 			want: flag.ScanOptions{
 				Target:   "alpine:latest",
-				Scanners: []string{types.MisconfigScanner},
+				Scanners: types.Scanners{types.MisconfigScanner},
 			},
 			assertion: require.NoError,
 		},

pkg/k8s/report/report.go

@@ -34,7 +34,7 @@ type Option struct {
 	Output        io.Writer
 	Severities    []dbTypes.Severity
 	ColumnHeading []string
-	Scanners      []string
+	Scanners      types.Scanners
 	Components    []string
 }
 
@@ -176,7 +176,7 @@ type reports struct {
 // - misconfiguration report
 // - rbac report
 // - infra checks report
-func separateMisconfigReports(k8sReport Report, scanners, components []string) []reports {
+func separateMisconfigReports(k8sReport Report, scanners types.Scanners, components []string) []reports {
 
 	workloadMisconfig := make([]Resource, 0)
 	infraMisconfig := make([]Resource, 0)
@@ -184,7 +184,7 @@ func separateMisconfigReports(k8sReport Report, scanners, components []string) [
 
 	for _, misConfig := range k8sReport.Misconfigurations {
 		switch {
-		case slices.Contains(scanners, types.RBACScanner) && rbacResource(misConfig):
+		case scanners.Enabled(types.RBACScanner) && rbacResource(misConfig):
 			rbacAssessment = append(rbacAssessment, misConfig)
 		case infraResource(misConfig):
 			workload, infra := splitInfraAndWorkloadResources(misConfig)
@@ -197,7 +197,7 @@ func separateMisconfigReports(k8sReport Report, scanners, components []string) [
 				workloadMisconfig = append(workloadMisconfig, workload)
 			}
 
-		case slices.Contains(scanners, types.MisconfigScanner) && !rbacResource(misConfig):
+		case scanners.Enabled(types.MisconfigScanner) && !rbacResource(misConfig):
 			if slices.Contains(components, workloadComponent) {
 				workloadMisconfig = append(workloadMisconfig, misConfig)
 			}
@@ -225,7 +225,7 @@ func separateMisconfigReports(k8sReport Report, scanners, components []string) [
 		}
 	}
 
-	if slices.Contains(scanners, types.RBACScanner) && len(rbacAssessment) > 0 {
+	if scanners.Enabled(types.RBACScanner) && len(rbacAssessment) > 0 {
 		r = append(r, reports{
 			report: Report{
 				SchemaVersion:     0,
@@ -237,7 +237,7 @@ func separateMisconfigReports(k8sReport Report, scanners, components []string) [
 		})
 	}
 
-	if slices.Contains(scanners, types.MisconfigScanner) &&
+	if scanners.Enabled(types.MisconfigScanner) &&
 		slices.Contains(components, infraComponent) &&
 		len(infraMisconfig) > 0 {
 
@@ -363,8 +363,6 @@ func copyResult(r types.Result, misconfigs []types.DetectedMisconfiguration) typ
 	}
 }
 
-func shouldAddWorkloadReport(scanners []string) bool {
+func shouldAddWorkloadReport(scanners types.Scanners) bool {
-	return slices.Contains(scanners, types.MisconfigScanner) ||
+	return scanners.AnyEnabled(types.MisconfigScanner, types.VulnerabilityScanner, types.SecretScanner)
-		slices.Contains(scanners, types.VulnerabilityScanner) ||
-		slices.Contains(scanners, types.SecretScanner)
 }

pkg/k8s/report/report_test.go

@@ -482,14 +482,14 @@ func Test_separateMisconfigReports(t *testing.T) {
 	tests := []struct {
 		name            string
 		k8sReport       Report
-		scanners        []string
+		scanners        types.Scanners
 		components      []string
 		expectedReports []Report
 	}{
 		{
 			name:      "Config, Rbac, and Infra Reports",
 			k8sReport: k8sReport,
-			scanners: []string{
+			scanners: types.Scanners{
 				types.MisconfigScanner,
 				types.RBACScanner,
 			},
@@ -513,7 +513,7 @@ func Test_separateMisconfigReports(t *testing.T) {
 		{
 			name:      "Config and Infra for the same resource",
 			k8sReport: k8sReport,
-			scanners:  []string{types.MisconfigScanner},
+			scanners:  types.Scanners{types.MisconfigScanner},
 			components: []string{
 				workloadComponent,
 				infraComponent,
@@ -533,7 +533,7 @@ func Test_separateMisconfigReports(t *testing.T) {
 		{
 			name:      "Role Report Only",
 			k8sReport: k8sReport,
-			scanners:  []string{types.RBACScanner},
+			scanners:  types.Scanners{types.RBACScanner},
 			expectedReports: []Report{
 				{Misconfigurations: []Resource{{Kind: "Role"}}},
 			},
@@ -541,7 +541,7 @@ func Test_separateMisconfigReports(t *testing.T) {
 		{
 			name:       "Config Report Only",
 			k8sReport:  k8sReport,
-			scanners:   []string{types.MisconfigScanner},
+			scanners:   types.Scanners{types.MisconfigScanner},
 			components: []string{workloadComponent},
 			expectedReports: []Report{
 				{
@@ -556,7 +556,7 @@ func Test_separateMisconfigReports(t *testing.T) {
 		{
 			name:       "Infra Report Only",
 			k8sReport:  k8sReport,
-			scanners:   []string{types.MisconfigScanner},
+			scanners:   types.Scanners{types.MisconfigScanner},
 			components: []string{infraComponent},
 			expectedReports: []Report{
 				{Misconfigurations: []Resource{{Kind: "Pod"}}},
@@ -594,7 +594,7 @@ func TestReportWrite_Summary(t *testing.T) {
 		name           string
 		report         Report
 		opt            Option
-		scanners       []string
+		scanners       types.Scanners
 		components     []string
 		severities     []dbTypes.Severity
 		expectedOutput string
@@ -605,7 +605,7 @@ func TestReportWrite_Summary(t *testing.T) {
 				ClusterName:       "test",
 				Misconfigurations: []Resource{deployOrionWithMisconfigs},
 			},
-			scanners:   []string{types.MisconfigScanner},
+			scanners:   types.Scanners{types.MisconfigScanner},
 			components: []string{workloadComponent},
 			severities: allSeverities,
 			expectedOutput: `Summary Report for test
@@ -627,7 +627,7 @@ Severities: C=CRITICAL H=HIGH M=MEDIUM L=LOW U=UNKNOWN`,
 				ClusterName:     "test",
 				Vulnerabilities: []Resource{deployOrionWithVulns},
 			},
-			scanners:   []string{types.VulnerabilityScanner},
+			scanners:   types.Scanners{types.VulnerabilityScanner},
 			severities: allSeverities,
 			expectedOutput: `Summary Report for test
 =======================
@@ -648,7 +648,7 @@ Severities: C=CRITICAL H=HIGH M=MEDIUM L=LOW U=UNKNOWN`,
 				ClusterName:       "test",
 				Misconfigurations: []Resource{roleWithMisconfig},
 			},
-			scanners:   []string{types.RBACScanner},
+			scanners:   types.Scanners{types.RBACScanner},
 			severities: allSeverities,
 			expectedOutput: `Summary Report for test
 =======================
@@ -669,7 +669,7 @@ Severities: C=CRITICAL H=HIGH M=MEDIUM L=LOW U=UNKNOWN`,
 				ClusterName:     "test",
 				Vulnerabilities: []Resource{deployLuaWithSecrets},
 			},
-			scanners:   []string{types.SecretScanner},
+			scanners:   types.Scanners{types.SecretScanner},
 			severities: allSeverities,
 			expectedOutput: `Summary Report for test
 =======================
@@ -690,7 +690,7 @@ Severities: C=CRITICAL H=HIGH M=MEDIUM L=LOW U=UNKNOWN`,
 				ClusterName:       "test",
 				Misconfigurations: []Resource{apiseverPodWithMisconfigAndInfra},
 			},
-			scanners:   []string{types.MisconfigScanner},
+			scanners:   types.Scanners{types.MisconfigScanner},
 			components: []string{infraComponent},
 			severities: allSeverities,
 			expectedOutput: `Summary Report for test
@@ -712,7 +712,7 @@ Severities: C=CRITICAL H=HIGH M=MEDIUM L=LOW U=UNKNOWN`,
 				ClusterName:       "test",
 				Misconfigurations: []Resource{apiseverPodWithMisconfigAndInfra},
 			},
-			scanners: []string{
+			scanners: types.Scanners{
 				types.VulnerabilityScanner,
 				types.MisconfigScanner,
 				types.SecretScanner,
@@ -738,7 +738,7 @@ Severities: C=CRITICAL H=HIGH M=MEDIUM L=LOW U=UNKNOWN`,
 				ClusterName:       "test",
 				Misconfigurations: []Resource{apiseverPodWithMisconfigAndInfra},
 			},
-			scanners: []string{
+			scanners: types.Scanners{
 				types.MisconfigScanner,
 				types.VulnerabilityScanner,
 				types.RBACScanner,

pkg/k8s/report/summary.go

@@ -35,7 +35,7 @@ func NewSummaryWriter(output io.Writer, requiredSevs []dbTypes.Severity, columnH
 	}
 }
 
-func ColumnHeading(scanners, components, availableColumns []string) []string {
+func ColumnHeading(scanners types.Scanners, components, availableColumns []string) []string {
 	columns := []string{
 		NamespaceColumn,
 		ResourceColumn,

pkg/k8s/report/summary_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 func TestReport_ColumnHeading(t *testing.T) {
-	allScanners := []string{
+	allScanners := types.Scanners{
 		types.VulnerabilityScanner,
 		types.MisconfigScanner,
 		types.SecretScanner,
@@ -19,7 +19,7 @@ func TestReport_ColumnHeading(t *testing.T) {
 
 	tests := []struct {
 		name             string
-		scanners         []string
+		scanners         types.Scanners
 		components       []string
 		availableColumns []string
 		want             []string
@@ -67,7 +67,7 @@ func TestReport_ColumnHeading(t *testing.T) {
 		},
 		{
 			name:     "config column only",
-			scanners: []string{types.MisconfigScanner},
+			scanners: types.Scanners{types.MisconfigScanner},
 			components: []string{
 				workloadComponent,
 				infraComponent,
@@ -81,7 +81,7 @@ func TestReport_ColumnHeading(t *testing.T) {
 		},
 		{
 			name:             "secret column only",
-			scanners:         []string{types.SecretScanner},
+			scanners:         types.Scanners{types.SecretScanner},
 			components:       []string{},
 			availableColumns: WorkloadColumns(),
 			want: []string{
@@ -92,7 +92,7 @@ func TestReport_ColumnHeading(t *testing.T) {
 		},
 		{
 			name:             "vuln column only",
-			scanners:         []string{types.VulnerabilityScanner},
+			scanners:         types.Scanners{types.VulnerabilityScanner},
 			components:       []string{},
 			availableColumns: WorkloadColumns(),
 			want: []string{

pkg/k8s/scanner/scanner.go

@@ -5,7 +5,6 @@ import (
 	"io"
 
 	"github.com/cheggaaa/pb/v3"
-	"golang.org/x/exp/slices"
 	"golang.org/x/xerrors"
 
 	"github.com/aquasecurity/trivy-kubernetes/pkg/artifacts"
@@ -63,7 +62,7 @@ func (s *Scanner) Scan(ctx context.Context, artifacts []*artifacts.Artifact) (re
 	for _, artifact := range artifacts {
 		bar.Increment()
 
-		if shouldScanVulnsOrSecrets(s.opts.Scanners) {
+		if s.opts.Scanners.AnyEnabled(types.VulnerabilityScanner, types.SecretScanner) {
 			resources, err := s.scanVulns(ctx, artifact)
 			if err != nil {
 				return report.Report{}, xerrors.Errorf("scanning vulnerabilities error: %w", err)
@@ -140,8 +139,3 @@ func (s *Scanner) filter(ctx context.Context, r types.Report, artifact *artifact
 	}
 	return report.CreateResource(artifact, r, nil), nil
 }
-
-func shouldScanVulnsOrSecrets(scanners []string) bool {
-	return slices.Contains(scanners, types.VulnerabilityScanner) ||
-		slices.Contains(scanners, types.SecretScanner)
-}

pkg/misconf/scanner.go

@@ -0,0 +1,387 @@
+package misconf
+
+import (
+	"bytes"
+	"context"
+	_ "embed"
+	"fmt"
+	"io/fs"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+
+	"github.com/samber/lo"
+	"golang.org/x/xerrors"
+
+	"github.com/aquasecurity/defsec/pkg/detection"
+	"github.com/aquasecurity/defsec/pkg/scan"
+	"github.com/aquasecurity/defsec/pkg/scanners"
+	"github.com/aquasecurity/defsec/pkg/scanners/azure/arm"
+	cfscanner "github.com/aquasecurity/defsec/pkg/scanners/cloudformation"
+	cfparser "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"
+	tfscanner "github.com/aquasecurity/defsec/pkg/scanners/terraform"
+	"github.com/aquasecurity/memoryfs"
+	"github.com/aquasecurity/trivy/pkg/fanal/analyzer/config"
+	"github.com/aquasecurity/trivy/pkg/fanal/types"
+	"github.com/aquasecurity/trivy/pkg/log"
+)
+
+var enabledDefsecTypes = map[detection.FileType]string{
+	detection.FileTypeAzureARM:       types.AzureARM,
+	detection.FileTypeCloudFormation: types.CloudFormation,
+	detection.FileTypeTerraform:      types.Terraform,
+	detection.FileTypeDockerfile:     types.Dockerfile,
+	detection.FileTypeKubernetes:     types.Kubernetes,
+	detection.FileTypeHelm:           types.Helm,
+}
+
+type Scanner struct {
+	filePatterns []string
+	scanners     map[string]scanners.FSScanner
+}
+
+func NewScanner(filePatterns []string, opt config.ScannerOption) (Scanner, error) {
+	opts := []options.ScannerOption{
+		options.ScannerWithSkipRequiredCheck(true),
+		options.ScannerWithEmbeddedPolicies(!opt.DisableEmbeddedPolicies),
+	}
+
+	policyFS, policyPaths, err := createPolicyFS(opt.PolicyPaths)
+	if err != nil {
+		return Scanner{}, err
+	}
+	if policyFS != nil {
+		opts = append(opts, options.ScannerWithPolicyFilesystem(policyFS))
+	}
+
+	if opt.Trace {
+		opts = append(opts, options.ScannerWithPerResultTracing(true))
+	}
+
+	if opt.RegoOnly {
+		opts = append(opts, options.ScannerWithRegoOnly(true))
+	}
+
+	if len(policyPaths) > 0 {
+		opts = append(opts, options.ScannerWithPolicyDirs(policyPaths...))
+	}
+
+	if len(opt.DataPaths) > 0 {
+		opts = append(opts, options.ScannerWithDataDirs(opt.DataPaths...))
+	}
+
+	if len(opt.Namespaces) > 0 {
+		opts = append(opts, options.ScannerWithPolicyNamespaces(opt.Namespaces...))
+	}
+
+	helmOpts := addHelmOpts(opts, opt)
+	tfOpts := addTFOpts(opts, opt)
+
+	return Scanner{
+		filePatterns: filePatterns,
+		scanners: map[string]scanners.FSScanner{
+			types.AzureARM:       arm.New(opts...),
+			types.Terraform:      tfscanner.New(tfOpts...),
+			types.CloudFormation: cfscanner.New(opts...),
+			types.Dockerfile:     dfscanner.NewScanner(opts...),
+			types.Kubernetes:     k8sscanner.NewScanner(opts...),
+			types.Helm:           helm.New(helmOpts...),
+		},
+	}, nil
+}
+
+func addTFOpts(opts []options.ScannerOption, scannerOption config.ScannerOption) []options.ScannerOption {
+	if len(scannerOption.TerraformTFVars) > 0 {
+		opts = append(opts, tfscanner.ScannerWithTFVarsPaths(scannerOption.TerraformTFVars...))
+	}
+
+	return opts
+}
+
+func addHelmOpts(opts []options.ScannerOption, scannerOption config.ScannerOption) []options.ScannerOption {
+	if len(scannerOption.HelmValueFiles) > 0 {
+		opts = append(opts, helm.ScannerWithValuesFile(scannerOption.HelmValueFiles...))
+	}
+
+	if len(scannerOption.HelmValues) > 0 {
+		opts = append(opts, helm.ScannerWithValues(scannerOption.HelmValues...))
+	}
+
+	if len(scannerOption.HelmFileValues) > 0 {
+		opts = append(opts, helm.ScannerWithFileValues(scannerOption.HelmFileValues...))
+	}
+
+	if len(scannerOption.HelmStringValues) > 0 {
+		opts = append(opts, helm.ScannerWithStringValues(scannerOption.HelmStringValues...))
+	}
+
+	return opts
+}
+
+// for a given set of paths, find the most specific filesystem path that contains all the descendants
+// the function also returns a filtered version of the input paths that are compatible with a fs.FS
+// using the resultant target path. This means they will always use "/" as a separator
+func findFSTarget(paths []string) (string, []string, error) {
+	if len(paths) == 0 {
+		return "", nil, xerrors.New("must specify at least one path")
+	}
+
+	var absPaths []string
+	var minSegmentCount int
+	for _, relPath := range paths {
+		abs, err := filepath.Abs(relPath)
+		if err != nil {
+			return "", nil, xerrors.Errorf("failed to derive absolute path from '%s': %w", relPath, err)
+		}
+		count := len(strings.Split(filepath.ToSlash(abs), "/"))
+		if count < minSegmentCount || minSegmentCount == 0 {
+			minSegmentCount = count
+		}
+		absPaths = append(absPaths, abs)
+	}
+
+	var outputSegments []string
+	for i := 0; i < minSegmentCount; i++ {
+		required := strings.Split(absPaths[0], string(filepath.Separator))[i]
+		match := true
+		for _, path := range absPaths[1:] {
+			actual := strings.Split(path, string(filepath.Separator))[i]
+			if required != actual {
+				match = false
+				break
+			}
+		}
+		if !match {
+			break
+		}
+		outputSegments = append(outputSegments, required)
+	}
+
+	slashTarget := strings.Join(outputSegments, "/")
+	if slashTarget == "" {
+		slashTarget = string(filepath.Separator)
+	}
+
+	var cleanPaths []string
+	for _, path := range absPaths {
+		path := filepath.ToSlash(path)
+		path = strings.TrimPrefix(path, slashTarget)
+		path = strings.TrimPrefix(path, "/")
+		if path == "" {
+			path = "."
+		}
+		cleanPaths = append(cleanPaths, path)
+	}
+
+	// we don't use filepath.Join here as we need to maintain the root "/"
+	target := strings.Join(outputSegments, string(filepath.Separator))
+	if target == "" || filepath.VolumeName(target) == target {
+		target += string(filepath.Separator)
+	}
+	return target, cleanPaths, nil
+}
+
+func createPolicyFS(policyPaths []string) (fs.FS, []string, error) {
+	if len(policyPaths) == 0 {
+		return nil, nil, nil
+	}
+	var outsideCWD bool
+	for _, path := range policyPaths {
+		if strings.Contains(path, "..") || strings.HasPrefix(path, "/") || (len(path) > 1 && path[1] == ':') {
+			outsideCWD = true
+			break
+		}
+	}
+	// all policy paths are inside the CWD, so create a filesystem from CWD to load from
+	if !outsideCWD {
+		cwd, err := os.Getwd()
+		if err != nil {
+			return nil, nil, err
+		}
+		var cleanPaths []string
+		for _, path := range policyPaths {
+			path = strings.TrimPrefix(path, ".")
+			path = strings.TrimPrefix(path, "/")
+			cleanPaths = append(cleanPaths, path)
+		}
+		return os.DirFS(cwd), cleanPaths, nil
+	}
+
+	target, cleanPaths, err := findFSTarget(policyPaths)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return os.DirFS(target), cleanPaths, nil
+}
+
+func (s *Scanner) hasCustomPatternForType(t string) bool {
+	for _, pattern := range s.filePatterns {
+		if strings.HasPrefix(pattern, t+":") {
+			return true
+		}
+	}
+	return false
+}
+
+// Scan detects misconfigurations.
+func (s *Scanner) Scan(ctx context.Context, files []types.File) ([]types.Misconfiguration, error) {
+	mapMemoryFS := make(map[string]*memoryfs.FS)
+	for t := range s.scanners {
+		mapMemoryFS[t] = memoryfs.New()
+	}
+
+	for _, file := range files {
+		for defsecType, localType := range enabledDefsecTypes {
+			buffer := bytes.NewReader(file.Content)
+			if !s.hasCustomPatternForType(localType) && !detection.IsType(file.Path, buffer, defsecType) {
+				continue
+			}
+			// Replace with more detailed config type
+			file.Type = localType
+
+			if memfs, ok := mapMemoryFS[file.Type]; ok {
+				if filepath.Dir(file.Path) != "." {
+					if err := memfs.MkdirAll(filepath.Dir(file.Path), os.ModePerm); err != nil {
+						return nil, xerrors.Errorf("memoryfs mkdir error: %w", err)
+					}
+				}
+				if err := memfs.WriteFile(file.Path, file.Content, os.ModePerm); err != nil {
+					return nil, xerrors.Errorf("memoryfs write error: %w", err)
+				}
+			}
+		}
+	}
+
+	var misconfs []types.Misconfiguration
+	for t, scanner := range s.scanners {
+		results, err := scanner.ScanFS(ctx, mapMemoryFS[t], ".")
+		if err != nil {
+			if _, ok := err.(*cfparser.InvalidContentError); ok {
+				log.Logger.Errorf("scan %q was broken with InvalidContentError: %v", scanner.Name(), err)
+				continue
+			}
+			return nil, xerrors.Errorf("scan config error: %w", err)
+		}
+
+		misconfs = append(misconfs, ResultsToMisconf(t, scanner.Name(), results)...)
+	}
+
+	// Sort misconfigurations
+	for _, misconf := range misconfs {
+		sort.Slice(misconf.Successes, func(i, j int) bool {
+			if misconf.Successes[i].AVDID == misconf.Successes[j].AVDID {
+				return misconf.Successes[i].StartLine < misconf.Successes[j].StartLine
+			}
+			return misconf.Successes[i].AVDID < misconf.Successes[j].AVDID
+		})
+		sort.Slice(misconf.Warnings, func(i, j int) bool {
+			if misconf.Warnings[i].AVDID == misconf.Warnings[j].AVDID {
+				return misconf.Warnings[i].StartLine < misconf.Warnings[j].StartLine
+			}
+			return misconf.Warnings[i].AVDID < misconf.Warnings[j].AVDID
+		})
+		sort.Slice(misconf.Failures, func(i, j int) bool {
+			if misconf.Failures[i].AVDID == misconf.Failures[j].AVDID {
+				return misconf.Failures[i].StartLine < misconf.Failures[j].StartLine
+			}
+			return misconf.Failures[i].AVDID < misconf.Failures[j].AVDID
+		})
+	}
+
+	return misconfs, nil
+}
+
+// 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 {
+		flattened := result.Flatten()
+
+		query := fmt.Sprintf("data.%s.%s", result.RegoNamespace(), result.RegoRule())
+
+		ruleID := result.Rule().AVDID
+		if result.RegoNamespace() != "" && len(result.Rule().Aliases) > 0 {
+			ruleID = result.Rule().Aliases[0]
+		}
+
+		cause := NewCauseWithCode(result)
+
+		misconfResult := types.MisconfResult{
+			Namespace: result.RegoNamespace(),
+			Query:     query,
+			Message:   flattened.Description,
+			PolicyMetadata: types.PolicyMetadata{
+				ID:                 ruleID,
+				AVDID:              result.Rule().AVDID,
+				Type:               fmt.Sprintf("%s Security Check", scannerName),
+				Title:              result.Rule().Summary,
+				Description:        result.Rule().Explanation,
+				Severity:           string(flattened.Severity),
+				RecommendedActions: flattened.Resolution,
+				References:         flattened.Links,
+			},
+			CauseMetadata: cause,
+			Traces:        result.Traces(),
+		}
+
+		filePath := flattened.Location.Filename
+		misconf, ok := misconfs[filePath]
+		if !ok {
+			misconf = types.Misconfiguration{
+				FileType: configType,
+				FilePath: filePath,
+			}
+		}
+
+		if flattened.Warning {
+			misconf.Warnings = append(misconf.Warnings, misconfResult)
+		} else {
+			switch flattened.Status {
+			case scan.StatusPassed:
+				misconf.Successes = append(misconf.Successes, misconfResult)
+			case scan.StatusIgnored:
+				misconf.Exceptions = append(misconf.Exceptions, misconfResult)
+			case scan.StatusFailed:
+				misconf.Failures = append(misconf.Failures, misconfResult)
+			}
+		}
+		misconfs[filePath] = misconf
+	}
+
+	return types.ToMisconfigurations(misconfs)
+}
+
+func NewCauseWithCode(underlying scan.Result) types.CauseMetadata {
+	flat := underlying.Flatten()
+	cause := types.CauseMetadata{
+		Resource:  flat.Resource,
+		Provider:  flat.RuleProvider.DisplayName(),
+		Service:   flat.RuleService,
+		StartLine: flat.Location.StartLine,
+		EndLine:   flat.Location.EndLine,
+	}
+	if code, err := underlying.GetCode(); err == nil {
+		cause.Code = types.Code{
+			Lines: lo.Map(code.Lines, func(l scan.Line, i int) types.Line {
+				return types.Line{
+					Number:      l.Number,
+					Content:     l.Content,
+					IsCause:     l.IsCause,
+					Annotation:  l.Annotation,
+					Truncated:   l.Truncated,
+					Highlighted: l.Highlighted,
+					FirstCause:  l.FirstCause,
+					LastCause:   l.LastCause,
+				}
+			}),
+		}
+	}
+	return cause
+}

pkg/misconf/scanner_test.go

@@ -11,28 +11,25 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/aquasecurity/trivy/pkg/fanal/analyzer"
+	"github.com/aquasecurity/trivy/pkg/fanal/analyzer/config"
-	"github.com/aquasecurity/trivy/pkg/fanal/artifact"
 	"github.com/aquasecurity/trivy/pkg/fanal/types"
 )
 
-func Test_Handle(t *testing.T) {
+func TestScanner_Scan(t *testing.T) {
 	tests := []struct {
 		name         string
-		files        map[types.HandlerType][]types.File
+		files        []types.File
 		filePatterns []string
 		wantFilePath string
 		wantFileType string
 	}{
 		{
 			name: "happy path. Dockerfile",
-			files: map[types.HandlerType][]types.File{
+			files: []types.File{
-				types.MisconfPostHandler: {
+				{
-					{
+					Path:    "Dockerfile",
-						Path:    "Dockerfile",
+					Type:    types.Dockerfile,
-						Type:    types.Dockerfile,
+					Content: []byte(`FROM alpine`),
-						Content: []byte(`FROM alpine`),
-					},
 				},
 			},
 			wantFilePath: "Dockerfile",
@@ -40,13 +37,11 @@ func Test_Handle(t *testing.T) {
 		},
 		{
 			name: "happy path. Dockerfile with custom file name",
-			files: map[types.HandlerType][]types.File{
+			files: []types.File{
-				types.MisconfPostHandler: {
+				{
-					{
+					Path:    "dockerf",
-						Path:    "dockerf",
+					Type:    types.Dockerfile,
-						Type:    types.Dockerfile,
+					Content: []byte(`FROM alpine`),
-						Content: []byte(`FROM alpine`),
-					},
 				},
 			},
 			filePatterns: []string{"dockerfile:dockerf"},
@@ -56,18 +51,14 @@ func Test_Handle(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			result := &analyzer.AnalysisResult{
+			s, err := NewScanner(tt.filePatterns, config.ScannerOption{})
-				Files: tt.files,
+			require.NoError(t, err)
-			}
-			misconfHandler, err := newMisconfPostHandler(artifact.Option{FilePatterns: tt.filePatterns})
-			assert.NoError(t, err)
-			blobInfo := &types.BlobInfo{}
 
-			err = misconfHandler.Handle(context.Background(), result, blobInfo)
+			misconfs, err := s.Scan(context.Background(), tt.files)
-			assert.NoError(t, err)
+			require.NoError(t, err)
-			assert.Equal(t, 1, len(blobInfo.Misconfigurations), "wrong number of misconfigurations found")
+			assert.Equal(t, 1, len(misconfs), "wrong number of misconfigurations found")
-			assert.Equal(t, tt.wantFilePath, blobInfo.Misconfigurations[0].FilePath, "filePaths don't equal")
+			assert.Equal(t, tt.wantFilePath, misconfs[0].FilePath, "filePaths don't equal")
-			assert.Equal(t, tt.wantFileType, blobInfo.Misconfigurations[0].FileType, "fileTypes don't equal")
+			assert.Equal(t, tt.wantFileType, misconfs[0].FileType, "fileTypes don't equal")
 		})
 	}
 }

pkg/rpc/client/client.go

@@ -82,7 +82,7 @@ func (s Scanner) Scan(ctx context.Context, target, artifactKey string, blobKeys
 			BlobIds:    blobKeys,
 			Options: &rpc.ScanOptions{
 				VulnType:          opts.VulnType,
-				Scanners:          opts.Scanners,
+				Scanners:          opts.Scanners.StringSlice(),
 				ListAllPackages:   opts.ListAllPackages,
 				LicenseCategories: licenseCategories,
 			},

pkg/rpc/server/server.go

@@ -5,6 +5,7 @@ import (
 
 	google_protobuf "github.com/golang/protobuf/ptypes/empty"
 	"github.com/google/wire"
+	"github.com/samber/lo"
 	"golang.org/x/xerrors"
 
 	"github.com/aquasecurity/trivy/pkg/fanal/cache"
@@ -42,9 +43,12 @@ func teeError(err error) error {
 
 // Scan scans and return response
 func (s *ScanServer) Scan(ctx context.Context, in *rpcScanner.ScanRequest) (*rpcScanner.ScanResponse, error) {
+	scanners := lo.Map(in.Options.Scanners, func(s string, index int) types.Scanner {
+		return types.Scanner(s)
+	})
 	options := types.ScanOptions{
 		VulnType:        in.Options.VulnType,
-		Scanners:        in.Options.Scanners,
+		Scanners:        scanners,
 		ListAllPackages: in.Options.ListAllPackages,
 	}
 	results, os, err := s.localScanner.Scan(ctx, in.Target, in.ArtifactId, in.BlobIds, options)

pkg/rpc/server/server_test.go

@@ -53,10 +53,11 @@ func TestScanServer_Scan(t *testing.T) {
 			},
 			scanExpectation: scanner.DriverScanExpectation{
 				Args: scanner.DriverScanArgs{
-					CtxAnything: true,
+					CtxAnything:     true,
-					Target:      "alpine:3.11",
+					Target:          "alpine:3.11",
-					ImageID:     "sha256:e7d92cdc71feacf90708cb59182d0df1b911f8ae022d29e8e95d75ca6a99776a",
+					ImageID:         "sha256:e7d92cdc71feacf90708cb59182d0df1b911f8ae022d29e8e95d75ca6a99776a",
-					LayerIDs:    []string{"sha256:5216338b40a7b96416b8b9858974bbe4acc3096ee60acbc4dfb1ee02aecceb10"},
+					LayerIDs:        []string{"sha256:5216338b40a7b96416b8b9858974bbe4acc3096ee60acbc4dfb1ee02aecceb10"},
+					OptionsAnything: true,
 				},
 				Returns: scanner.DriverScanReturns{
 					Results: types.Results{
@@ -152,10 +153,11 @@ func TestScanServer_Scan(t *testing.T) {
 			},
 			scanExpectation: scanner.DriverScanExpectation{
 				Args: scanner.DriverScanArgs{
-					CtxAnything: true,
+					CtxAnything:     true,
-					Target:      "alpine:3.11",
+					Target:          "alpine:3.11",
-					ImageID:     "sha256:e7d92cdc71feacf90708cb59182d0df1b911f8ae022d29e8e95d75ca6a99776a",
+					ImageID:         "sha256:e7d92cdc71feacf90708cb59182d0df1b911f8ae022d29e8e95d75ca6a99776a",
-					LayerIDs:    []string{"sha256:5216338b40a7b96416b8b9858974bbe4acc3096ee60acbc4dfb1ee02aecceb10"},
+					LayerIDs:        []string{"sha256:5216338b40a7b96416b8b9858974bbe4acc3096ee60acbc4dfb1ee02aecceb10"},
+					OptionsAnything: true,
 				},
 				Returns: scanner.DriverScanReturns{
 					Err: errors.New("error"),

pkg/scanner/local/scan.go

@@ -114,7 +114,7 @@ func (s Scanner) Scan(ctx context.Context, target, artifactKey string, blobKeys
 	}
 
 	// Scan packages for vulnerabilities
-	if slices.Contains(options.Scanners, types.VulnerabilityScanner) {
+	if options.Scanners.Enabled(types.VulnerabilityScanner) {
 		var vulnResults types.Results
 		vulnResults, eosl, err = s.scanVulnerabilities(target, artifactDetail, options)
 		if err != nil {
@@ -138,17 +138,30 @@ func (s Scanner) Scan(ctx context.Context, target, artifactKey string, blobKeys
 	}
 
 	// Scan secrets
-	if slices.Contains(options.Scanners, types.SecretScanner) {
+	if options.Scanners.Enabled(types.SecretScanner) {
 		secretResults := s.secretsToResults(artifactDetail.Secrets)
 		results = append(results, secretResults...)
 	}
 
 	// Scan licenses
-	if slices.Contains(options.Scanners, types.LicenseScanner) {
+	if options.Scanners.Enabled(types.LicenseScanner) {
 		licenseResults := s.scanLicenses(artifactDetail, options.LicenseCategories)
 		results = append(results, licenseResults...)
 	}
 
+	// Scan misconfiguration on container image config
+	if options.ImageConfigScanners.Enabled(types.MisconfigScanner) {
+		if im := artifactDetail.ImageMisconfiguration; im != nil {
+			im.FilePath = target // Set the target name to the file path as container image config is not a real file.
+			results = append(results, s.MisconfsToResults([]ftypes.Misconfiguration{*im})...)
+		}
+	}
+
+	// Scan secrets on container image config
+	if options.ImageConfigScanners.Enabled(types.SecretScanner) {
+		// TODO
+	}
+
 	// For WASM plugins and custom analyzers
 	if len(artifactDetail.CustomResources) != 0 {
 		results = append(results, types.Result{
@@ -538,7 +551,6 @@ func mergePkgs(pkgs, pkgsFromCommands []ftypes.Package) []ftypes.Package {
 	return pkgs
 }
 
-func ShouldScanMisconfigOrRbac(scanners []string) bool {
+func ShouldScanMisconfigOrRbac(scanners types.Scanners) bool {
-	return slices.Contains(scanners, types.MisconfigScanner) ||
+	return scanners.AnyEnabled(types.MisconfigScanner, types.RBACScanner)
-		slices.Contains(scanners, types.RBACScanner)
 }

pkg/scanner/local/scan_test.go

@@ -46,7 +46,7 @@ func TestScanner_Scan(t *testing.T) {
 						types.VulnTypeOS,
 						types.VulnTypeLibrary,
 					},
-					Scanners: []string{types.VulnerabilityScanner},
+					Scanners: types.Scanners{types.VulnerabilityScanner},
 				},
 			},
 			fixtures: []string{"testdata/fixtures/happy.yaml"},
@@ -156,7 +156,7 @@ func TestScanner_Scan(t *testing.T) {
 						types.VulnTypeOS,
 						types.VulnTypeLibrary,
 					},
-					Scanners:        []string{types.VulnerabilityScanner},
+					Scanners:        types.Scanners{types.VulnerabilityScanner},
 					ListAllPackages: true,
 				},
 			},
@@ -307,7 +307,7 @@ func TestScanner_Scan(t *testing.T) {
 						types.VulnTypeOS,
 						types.VulnTypeLibrary,
 					},
-					Scanners:        []string{types.VulnerabilityScanner},
+					Scanners:        types.Scanners{types.VulnerabilityScanner},
 					ListAllPackages: true,
 				},
 			},
@@ -416,7 +416,7 @@ func TestScanner_Scan(t *testing.T) {
 						types.VulnTypeOS,
 						types.VulnTypeLibrary,
 					},
-					Scanners: []string{types.VulnerabilityScanner},
+					Scanners: types.Scanners{types.VulnerabilityScanner},
 				},
 			},
 			fixtures: []string{"testdata/fixtures/happy.yaml"},
@@ -499,7 +499,7 @@ func TestScanner_Scan(t *testing.T) {
 						types.VulnTypeOS,
 						types.VulnTypeLibrary,
 					},
-					Scanners: []string{types.VulnerabilityScanner},
+					Scanners: types.Scanners{types.VulnerabilityScanner},
 				},
 			},
 			fixtures: []string{"testdata/fixtures/happy.yaml"},
@@ -582,7 +582,7 @@ func TestScanner_Scan(t *testing.T) {
 						types.VulnTypeOS,
 						types.VulnTypeLibrary,
 					},
-					Scanners: []string{types.VulnerabilityScanner},
+					Scanners: types.Scanners{types.VulnerabilityScanner},
 				},
 			},
 			fixtures: []string{"testdata/fixtures/happy.yaml"},
@@ -658,7 +658,7 @@ func TestScanner_Scan(t *testing.T) {
 						types.VulnTypeOS,
 						types.VulnTypeLibrary,
 					},
-					Scanners: []string{types.VulnerabilityScanner},
+					Scanners: types.Scanners{types.VulnerabilityScanner},
 				},
 			},
 			fixtures: []string{"testdata/fixtures/happy.yaml"},
@@ -679,7 +679,7 @@ func TestScanner_Scan(t *testing.T) {
 				layerIDs: []string{"sha256:5216338b40a7b96416b8b9858974bbe4acc3096ee60acbc4dfb1ee02aecceb10"},
 				options: types.ScanOptions{
 					VulnType: []string{types.VulnTypeLibrary},
-					Scanners: []string{types.VulnerabilityScanner},
+					Scanners: types.Scanners{types.VulnerabilityScanner},
 				},
 			},
 			fixtures: []string{"testdata/fixtures/happy.yaml"},
@@ -788,7 +788,7 @@ func TestScanner_Scan(t *testing.T) {
 				target:   "/app/configs",
 				layerIDs: []string{"sha256:5216338b40a7b96416b8b9858974bbe4acc3096ee60acbc4dfb1ee02aecceb10"},
 				options: types.ScanOptions{
-					Scanners: []string{types.MisconfigScanner},
+					Scanners: types.Scanners{types.MisconfigScanner},
 				},
 			},
 			fixtures: []string{"testdata/fixtures/happy.yaml"},
@@ -941,7 +941,7 @@ func TestScanner_Scan(t *testing.T) {
 						types.VulnTypeOS,
 						types.VulnTypeLibrary,
 					},
-					Scanners: []string{types.VulnerabilityScanner},
+					Scanners: types.Scanners{types.VulnerabilityScanner},
 				},
 			},
 			fixtures: []string{"testdata/fixtures/happy.yaml"},
@@ -962,7 +962,7 @@ func TestScanner_Scan(t *testing.T) {
 				layerIDs: []string{"sha256:5216338b40a7b96416b8b9858974bbe4acc3096ee60acbc4dfb1ee02aecceb10"},
 				options: types.ScanOptions{
 					VulnType: []string{types.VulnTypeLibrary},
-					Scanners: []string{types.VulnerabilityScanner},
+					Scanners: types.Scanners{types.VulnerabilityScanner},
 				},
 			},
 			fixtures: []string{"testdata/fixtures/sad.yaml"},

pkg/types/scanoptions.go

@@ -7,7 +7,8 @@ import (
 // ScanOptions holds the attributes for scanning vulnerabilities
 type ScanOptions struct {
 	VulnType            []string
-	Scanners            []string
+	Scanners            Scanners
+	ImageConfigScanners Scanners // Scanners for container image configuration
 	ScanRemovedPackages bool
 	Platform            string
 	ListAllPackages     bool

pkg/types/target.go

@@ -1,10 +1,18 @@
 package types
 
+import (
+	"github.com/samber/lo"
+	"golang.org/x/exp/slices"
+)
+
 // VulnType represents vulnerability type
 type VulnType = string
 
 // Scanner represents the type of security scanning
-type Scanner = string
+type Scanner string
+
+// Scanners is a slice of scanners
+type Scanners []Scanner
 
 const (
 	// VulnTypeUnknown is a vulnerability type of unknown
@@ -16,8 +24,11 @@ const (
 	// VulnTypeLibrary is a vulnerability type of programming language dependencies
 	VulnTypeLibrary = VulnType("library")
 
-	// ScannerUnknown is the scanner of unknown
+	// UnknownScanner is the scanner of unknown
-	ScannerUnknown = Scanner("unknown")
+	UnknownScanner = Scanner("unknown")
+
+	// NoneScanner is the scanner of none
+	NoneScanner = Scanner("none")
 
 	// VulnerabilityScanner is the scanner of vulnerabilities
 	VulnerabilityScanner = Scanner("vuln")
@@ -40,11 +51,42 @@ var (
 		VulnTypeOS,
 		VulnTypeLibrary,
 	}
-	Scanners = []string{
+
+	AllScanners = Scanners{
 		VulnerabilityScanner,
 		MisconfigScanner,
 		RBACScanner,
 		SecretScanner,
 		LicenseScanner,
+		NoneScanner,
+	}
+
+	// AllImageConfigScanners has a list of available scanners on container image config.
+	// The container image in container registries consists of manifest, config and layers.
+	// Trivy is also able to detect security issues on the image config.
+	AllImageConfigScanners = Scanners{
+		MisconfigScanner,
+		SecretScanner,
+		NoneScanner,
 	}
 )
+
+func (scanners Scanners) Enabled(s Scanner) bool {
+	return slices.Contains(scanners, s)
+}
+
+// AnyEnabled returns true if any of the passed scanners is included.
+func (scanners Scanners) AnyEnabled(ss ...Scanner) bool {
+	for _, s := range ss {
+		if scanners.Enabled(s) {
+			return true
+		}
+	}
+	return false
+}
+
+func (scanners Scanners) StringSlice() []string {
+	return lo.Map(scanners, func(s Scanner, _ int) string {
+		return string(s)
+	})
+}