Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions binary/proto/package_metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
spb "github.com/google/osv-scalibr/binary/proto/scan_result_go_proto"
asdfmeta "github.com/google/osv-scalibr/extractor/filesystem/language/asdf/metadata"
"github.com/google/osv-scalibr/extractor/filesystem/language/dotnet/depsjson"
denometa "github.com/google/osv-scalibr/extractor/filesystem/language/javascript/denojson/metadata"
javascriptmeta "github.com/google/osv-scalibr/extractor/filesystem/language/javascript/packagejson/metadata"
"github.com/google/osv-scalibr/extractor/filesystem/language/python/wheelegg"
apkmeta "github.com/google/osv-scalibr/extractor/filesystem/os/apk/metadata"
Expand All @@ -45,6 +46,9 @@ var (
reflect.TypeOf(&spb.Package_JavascriptMetadata{}): func(p *spb.Package) any {
return javascriptmeta.ToStruct(p.GetJavascriptMetadata())
},
reflect.TypeOf(&spb.Package_DenoMetadata{}): func(p *spb.Package) any {
return denometa.ToStruct(p.GetDenoMetadata())
},
reflect.TypeOf(&spb.Package_DepsjsonMetadata{}): func(p *spb.Package) any {
return depsjson.ToStruct(p.GetDepsjsonMetadata())
},
Expand Down Expand Up @@ -95,6 +99,7 @@ var (
_ = []MetadataProtoSetter{
(*wheelegg.PythonPackageMetadata)(nil),
(*javascriptmeta.JavascriptPackageJSONMetadata)(nil),
(*denometa.JavascriptDenoJSONMetadata)(nil),
(*depsjson.Metadata)(nil),
(*netports.Metadata)(nil),
(*apkmeta.Metadata)(nil),
Expand Down
12 changes: 12 additions & 0 deletions binary/proto/scan_result.proto
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ message Package {
oneof metadata {
PythonPackageMetadata python_metadata = 5;
JavascriptPackageJSONMetadata javascript_metadata = 6;
JavascriptDenoJSONMetadata deno_metadata = 56;
APKPackageMetadata apk_metadata = 7;
DPKGPackageMetadata dpkg_metadata = 8;
RPMPackageMetadata rpm_metadata = 9;
Expand Down Expand Up @@ -308,6 +309,17 @@ message JavascriptPackageJSONMetadata {
bool from_npm_repository = 4;
}

// The additional data of a deno package.
message JavascriptDenoJSONMetadata {
oneof cdn {
bool from_denoland_cdn = 1;
bool from_unpkg_cdn = 2;
bool from_esm_cdn = 3;
}

string url = 4 ;
}

// The additional data found in APK packages.
message APKPackageMetadata {
reserved 7;
Expand Down
Loading