Skip to content

Commit

Permalink
fix: dotnet PURL types are invalid (#1649)
Browse files Browse the repository at this point in the history
Signed-off-by: Keith Zantow <[email protected]>
  • Loading branch information
kzantow authored Mar 3, 2023
1 parent c4cbe21 commit 304be4a
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 13 deletions.
12 changes: 11 additions & 1 deletion syft/pkg/cataloger/dotnet/package.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,17 @@ func packageURL(m pkg.DotnetDepsMetadata) string {
var qualifiers packageurl.Qualifiers

return packageurl.NewPackageURL(
packageurl.TypeDotnet,
// This originally was packageurl.TypeDotnet, but this isn't a valid PURL type, according to:
// https://github.com/package-url/purl-spec/blob/master/PURL-TYPES.rst
// Some history:
// https://github.com/anchore/packageurl-go/pull/8 added the type to Anchore's fork
// due to this PR: https://github.com/anchore/syft/pull/951
// There were questions about "dotnet" being the right purlType at the time, but it was
// acknowledged that scanning a dotnet file does not necessarily mean the packages found
// are nuget packages and so the alternate type was added. Since this is still an invalid
// PURL type, however, we will use TypeNuget and revisit at such time there is a better
// official PURL type available.
packageurl.TypeNuget,
"",
m.Name,
m.Version,
Expand Down
24 changes: 12 additions & 12 deletions syft/pkg/cataloger/dotnet/parse_dotnet_deps_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func TestParseDotnetDeps(t *testing.T) {
{
Name: "AWSSDK.Core",
Version: "3.7.10.6",
PURL: "pkg:dotnet/[email protected]",
PURL: "pkg:nuget/[email protected]",
Locations: fixtureLocationSet,
Language: pkg.Dotnet,
Type: pkg.DotnetPkg,
Expand All @@ -32,7 +32,7 @@ func TestParseDotnetDeps(t *testing.T) {
{
Name: "Microsoft.Extensions.DependencyInjection.Abstractions",
Version: "6.0.0",
PURL: "pkg:dotnet/[email protected]",
PURL: "pkg:nuget/[email protected]",
Locations: fixtureLocationSet,
Language: pkg.Dotnet,
Type: pkg.DotnetPkg,
Expand All @@ -48,7 +48,7 @@ func TestParseDotnetDeps(t *testing.T) {
{
Name: "Microsoft.Extensions.DependencyInjection",
Version: "6.0.0",
PURL: "pkg:dotnet/[email protected]",
PURL: "pkg:nuget/[email protected]",
Locations: fixtureLocationSet,
Language: pkg.Dotnet,
Type: pkg.DotnetPkg,
Expand All @@ -64,7 +64,7 @@ func TestParseDotnetDeps(t *testing.T) {
{
Name: "Microsoft.Extensions.Logging.Abstractions",
Version: "6.0.0",
PURL: "pkg:dotnet/[email protected]",
PURL: "pkg:nuget/[email protected]",
Locations: fixtureLocationSet,
Language: pkg.Dotnet,
Type: pkg.DotnetPkg,
Expand All @@ -80,7 +80,7 @@ func TestParseDotnetDeps(t *testing.T) {
{
Name: "Microsoft.Extensions.Logging",
Version: "6.0.0",
PURL: "pkg:dotnet/[email protected]",
PURL: "pkg:nuget/[email protected]",
Locations: fixtureLocationSet,
Language: pkg.Dotnet,
Type: pkg.DotnetPkg,
Expand All @@ -97,7 +97,7 @@ func TestParseDotnetDeps(t *testing.T) {
{
Name: "Microsoft.Extensions.Options",
Version: "6.0.0",
PURL: "pkg:dotnet/[email protected]",
PURL: "pkg:nuget/[email protected]",
Locations: fixtureLocationSet,
Language: pkg.Dotnet,
Type: pkg.DotnetPkg,
Expand All @@ -113,7 +113,7 @@ func TestParseDotnetDeps(t *testing.T) {
{
Name: "Microsoft.Extensions.Primitives",
Version: "6.0.0",
PURL: "pkg:dotnet/[email protected]",
PURL: "pkg:nuget/[email protected]",
Locations: fixtureLocationSet,
Language: pkg.Dotnet,
Type: pkg.DotnetPkg,
Expand All @@ -129,7 +129,7 @@ func TestParseDotnetDeps(t *testing.T) {
{
Name: "Newtonsoft.Json",
Version: "13.0.1",
PURL: "pkg:dotnet/[email protected]",
PURL: "pkg:nuget/[email protected]",
Locations: fixtureLocationSet,
Language: pkg.Dotnet,
Type: pkg.DotnetPkg,
Expand All @@ -145,7 +145,7 @@ func TestParseDotnetDeps(t *testing.T) {
{
Name: "Serilog.Sinks.Console",
Version: "4.0.1",
PURL: "pkg:dotnet/[email protected]",
PURL: "pkg:nuget/[email protected]",
Locations: fixtureLocationSet,
Language: pkg.Dotnet,
Type: pkg.DotnetPkg,
Expand All @@ -161,7 +161,7 @@ func TestParseDotnetDeps(t *testing.T) {
{
Name: "Serilog",
Version: "2.10.0",
PURL: "pkg:dotnet/[email protected]",
PURL: "pkg:nuget/[email protected]",
Locations: fixtureLocationSet,
Language: pkg.Dotnet,
Type: pkg.DotnetPkg,
Expand All @@ -177,7 +177,7 @@ func TestParseDotnetDeps(t *testing.T) {
{
Name: "System.Diagnostics.DiagnosticSource",
Version: "6.0.0",
PURL: "pkg:dotnet/[email protected]",
PURL: "pkg:nuget/[email protected]",
Locations: fixtureLocationSet,
Language: pkg.Dotnet,
Type: pkg.DotnetPkg,
Expand All @@ -193,7 +193,7 @@ func TestParseDotnetDeps(t *testing.T) {
{
Name: "System.Runtime.CompilerServices.Unsafe",
Version: "6.0.0",
PURL: "pkg:dotnet/[email protected]",
PURL: "pkg:nuget/[email protected]",
Locations: fixtureLocationSet,
Language: pkg.Dotnet,
Type: pkg.DotnetPkg,
Expand Down

0 comments on commit 304be4a

Please sign in to comment.