Skip to content

Commit cf20290

Browse files
Merge pull request #1650 from frkngksl:chocoExtractor
PiperOrigin-RevId: 854139049
2 parents 6356efe + 9d1b475 commit cf20290

File tree

18 files changed

+1623
-504
lines changed

18 files changed

+1623
-504
lines changed

binary/proto/config.proto

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ message PluginSpecificConfig {
5555
HashiCorpVaultValidatorConfig hashicorp_vault_validator = 7;
5656
SDPInspectConfig sdp_inspect = 8;
5757
POMXMLNetConfig pom_xml_net = 9;
58+
ChocolateyConfig chocolatey = 10;
5859
}
5960
}
6061

@@ -97,6 +98,13 @@ message VMDKConfig {
9798
int64 max_file_size_bytes = 1;
9899
}
99100

101+
message ChocolateyConfig {
102+
// The maximum file size the plugin will process.
103+
// If set, this overrides the global max_file_size_bytes configuration
104+
// for this specific plugin.
105+
int64 max_file_size_bytes = 1;
106+
}
107+
100108
message HashiCorpVaultValidatorConfig {
101109
// The URL of the Vault server to connect to.
102110
// https://developer.hashicorp.com/vault

binary/proto/config_go_proto/config.pb.go

Lines changed: 98 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

binary/proto/package_metadata.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
chromeextensions "github.com/google/osv-scalibr/extractor/filesystem/misc/chrome/extensions"
3030
"github.com/google/osv-scalibr/extractor/filesystem/misc/vscodeextensions"
3131
apkmeta "github.com/google/osv-scalibr/extractor/filesystem/os/apk/metadata"
32+
chocolateymeta "github.com/google/osv-scalibr/extractor/filesystem/os/chocolatey/metadata"
3233
cosmeta "github.com/google/osv-scalibr/extractor/filesystem/os/cos/metadata"
3334
dpkgmeta "github.com/google/osv-scalibr/extractor/filesystem/os/dpkg/metadata"
3435
flatpakmeta "github.com/google/osv-scalibr/extractor/filesystem/os/flatpak/metadata"
@@ -114,6 +115,9 @@ var (
114115
reflect.TypeFor[*spb.Package_WingetMetadata](): func(p *spb.Package) any {
115116
return wingetmeta.ToStruct(p.GetWingetMetadata())
116117
},
118+
reflect.TypeFor[*spb.Package_ChocolateyMetadata](): func(p *spb.Package) any {
119+
return chocolateymeta.ToStruct(p.GetChocolateyMetadata())
120+
},
117121
reflect.TypeFor[*spb.Package_ContainerdContainerMetadata](): func(md *spb.Package) any {
118122
return ctrdfs.ToStruct(md.GetContainerdContainerMetadata())
119123
},
@@ -199,6 +203,7 @@ var (
199203
(*chromeextensions.Metadata)(nil),
200204
(*podman.Metadata)(nil),
201205
(*javalockfile.Metadata)(nil),
206+
(*chocolateymeta.Metadata)(nil),
202207
(*osv.DepGroupMetadata)(nil),
203208
}
204209
)

binary/proto/scan_result.proto

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ message Package {
138138
NvmMetadata nvm_metadata = 56;
139139
NodeVersionMetadata nodeversion_metadata = 58;
140140
DepGroupMetadata dep_group_metadata = 61;
141+
ChocolateyPackageMetadata chocolatey_metadata = 62;
141142
}
142143
// LINT.ThenChange(/binary/proto/package_metadata.go)
143144

@@ -638,6 +639,16 @@ message PodmanMetadata {
638639
bool exited = 8;
639640
}
640641

642+
// The additional data found in Chocolatey packages.
643+
message ChocolateyPackageMetadata {
644+
string name = 1;
645+
string version = 2;
646+
string authors = 3;
647+
string licenseurl = 4;
648+
string projecturl = 5;
649+
string tags = 6;
650+
}
651+
641652
message Protocol {
642653
repeated string names = 1;
643654
}

0 commit comments

Comments
 (0)