Add global plugin config to the apk, cos, dpkg and rpm plugins.

PiperOrigin-RevId: 846651631

Author: mtrzos

binary/proto/config.proto

@@ -53,6 +53,8 @@ message PluginSpecificConfig {
     HashiCorpVaultValidatorConfig hashicorp_vault_validator = 7;
     SDPInspectConfig sdp_inspect = 8;
     POMXMLNetConfig pom_xml_net = 9;
+    DpkgConfig dpkg = 10;
+    RpmConfig rpm = 11;
   }
 }
 
@@ -111,3 +113,14 @@ message POMXMLNetConfig {
   // The URL of the upstream Maven registry.
   string upstream_registry = 1;
 }
+
+message DpkgConfig {
+  // IncludeNotInstalled includes packages that are not installed
+  // (e.g. `deinstall`, `purge`, and those missing a status field).
+  bool include_not_installed = 1;
+}
+
+message RpmConfig {
+  // Timeout in seconds for parsing the RPM database.
+  int64 timeout_seconds = 1;
+}

binary/proto/config_go_proto/config.pb.go

@@ -267,10 +267,10 @@ var (
 
 	// OS extractors.
 	OS = InitMap{
-		dpkg.Name:     {noCFG(dpkg.NewDefault)},
-		apk.Name:      {noCFG(apk.NewDefault)},
-		rpm.Name:      {noCFG(rpm.NewDefault)},
-		cos.Name:      {noCFG(cos.NewDefault)},
+		dpkg.Name:     {dpkg.New},
+		apk.Name:      {apk.New},
+		rpm.Name:      {rpm.New},
+		cos.Name:      {cos.New},
 		snap.Name:     {noCFG(snap.NewDefault)},
 		nix.Name:      {noCFG(nix.New)},
 		module.Name:   {noCFG(module.NewDefault)},
@@ -494,7 +494,7 @@ func noCFG(f func() filesystem.Extractor) InitFn {
 // ExtractorsFromName returns a list of extractors from a name.
 func ExtractorsFromName(name string, cfg *cpb.PluginConfig) ([]filesystem.Extractor, error) {
 	if initers, ok := extractorNames[name]; ok {
-		result := []filesystem.Extractor{}
+		var result []filesystem.Extractor
 		for _, initer := range initers {
 			result = append(result, initer(cfg))
 		}

extractor/filesystem/list/list.go

@@ -30,52 +30,31 @@ import (
 	"github.com/google/osv-scalibr/plugin"
 	"github.com/google/osv-scalibr/purl"
 	"github.com/google/osv-scalibr/stats"
+
+	cpb "github.com/google/osv-scalibr/binary/proto/config_go_proto"
 )
 
 const (
 	// Name is the unique name of this extractor.
 	Name = "os/apk"
 )
 
-// Config is the configuration for the Extractor.
-type Config struct {
-	// Stats is a stats collector for reporting metrics.
-	Stats stats.Collector
-	// MaxFileSizeBytes is the maximum file size this extractor will unmarshal. If
-	// `FileRequired` gets a bigger file, it will return false,
-	MaxFileSizeBytes int64
-}
-
-// DefaultConfig returns the default configuration for the extractor.
-func DefaultConfig() Config {
-	return Config{
-		MaxFileSizeBytes: 0,
-		Stats:            nil,
-	}
-}
-
 // Extractor extracts packages from the APK database.
 type Extractor struct {
-	stats            stats.Collector
+	Stats            stats.Collector
 	maxFileSizeBytes int64
 }
 
 // New returns an APK extractor.
 //
 // For most use cases, initialize with:
 // ```
-// e := New(DefaultConfig())
+// e := New(&cpb.PluginConfig{})
 // ```
-func New(cfg Config) *Extractor {
-	return &Extractor{
-		stats:            cfg.Stats,
-		maxFileSizeBytes: cfg.MaxFileSizeBytes,
-	}
+func New(cfg *cpb.PluginConfig) filesystem.Extractor {
+	return &Extractor{maxFileSizeBytes: cfg.MaxFileSizeBytes}
 }
 
-// NewDefault returns an extractor with the default config settings.
-func NewDefault() filesystem.Extractor { return New(DefaultConfig()) }
-
 // Name of the extractor.
 func (e Extractor) Name() string { return Name }
 
@@ -109,10 +88,10 @@ func (e Extractor) FileRequired(api filesystem.FileAPI) bool {
 }
 
 func (e Extractor) reportFileRequired(path string, fileSizeBytes int64, result stats.FileRequiredResult) {
-	if e.stats == nil {
+	if e.Stats == nil {
 		return
 	}
-	e.stats.AfterFileRequired(e.Name(), &stats.FileRequiredStats{
+	e.Stats.AfterFileRequired(e.Name(), &stats.FileRequiredStats{
 		Path:          path,
 		Result:        result,
 		FileSizeBytes: fileSizeBytes,
@@ -122,12 +101,12 @@ func (e Extractor) reportFileRequired(path string, fileSizeBytes int64, result s
 // Extract extracts packages from lib/apk/db/installed passed through the scan input.
 func (e Extractor) Extract(ctx context.Context, input *filesystem.ScanInput) (inventory.Inventory, error) {
 	pkgs, err := e.extractFromInput(ctx, input)
-	if e.stats != nil {
+	if e.Stats != nil {
 		var fileSizeBytes int64
 		if input.Info != nil {
 			fileSizeBytes = input.Info.Size()
 		}
-		e.stats.AfterFileExtracted(e.Name(), &stats.FileExtractedStats{
+		e.Stats.AfterFileExtracted(e.Name(), &stats.FileExtractedStats{
 			Path:          input.Path,
 			Result:        filesystem.ExtractorErrorToFileExtractedResult(err),
 			FileSizeBytes: fileSizeBytes,