fix: only output valid cyclonedx license choices (#1879)

* fix: only output valid cyclonedx license choices Signed-off-by: Keith Zantow <[email protected]> * chore: update tests Signed-off-by: Keith Zantow <[email protected]> * chore: return nil for emtpty cdx license list Signed-off-by: Keith Zantow <[email protected]> --------- Signed-off-by: Keith Zantow <[email protected]>
anchore · Jun 22, 2023 · f79cb95 · f79cb95
1 parent c27d5b1
commit f79cb95
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 36 deletions.
diff --git a/syft/formats/common/cyclonedxhelpers/licenses.go b/syft/formats/common/cyclonedxhelpers/licenses.go
@@ -12,40 +12,36 @@ import (
 
 // This should be a function that just surfaces licenses already validated in the package struct
 func encodeLicenses(p pkg.Package) *cyclonedx.Licenses {
-	spdxc, otherc, ex := separateLicenses(p)
-	if len(otherc) > 0 {
+	spdx, other, ex := separateLicenses(p)
+	out := spdx
+	out = append(out, other...)
+
+	if len(other) > 0 || len(spdx) > 0 {
 		// found non spdx related licenses
 		// build individual license choices for each
 		// complex expressions are not combined and set as NAME fields
 		for _, e := range ex {
-			otherc = append(otherc, cyclonedx.LicenseChoice{
+			if e == "" {
+				continue
+			}
+			out = append(out, cyclonedx.LicenseChoice{
 				License: &cyclonedx.License{
 					Name: e,
 				},
 			})
 		}
-		otherc = append(otherc, spdxc...)
-		return &otherc
-	}
-
-	if len(spdxc) > 0 {
-		for _, l := range ex {
-			spdxc = append(spdxc, cyclonedx.LicenseChoice{
-				License: &cyclonedx.License{
-					Name: l,
-				},
+	} else if len(ex) > 0 {
+		// only expressions found
+		e := mergeSPDX(ex)
+		if e != "" {
+			out = append(out, cyclonedx.LicenseChoice{
+				Expression: e,
 			})
 		}
-		return &spdxc
 	}
 
-	if len(ex) > 0 {
-		// only expressions found
-		var expressions cyclonedx.Licenses
-		expressions = append(expressions, cyclonedx.LicenseChoice{
-			Expression: mergeSPDX(ex),
-		})
-		return &expressions
+	if len(out) > 0 {
+		return &out
 	}
 
 	return nil
@@ -185,20 +181,20 @@ func reduceOuter(expression string) string {
 
 	for _, c := range expression {
 		if string(c) == "(" && openCount > 0 {
-			fmt.Fprintf(&sb, "%c", c)
+			_, _ = fmt.Fprintf(&sb, "%c", c)
 		}
 		if string(c) == "(" {
 			openCount++
 			continue
 		}
 		if string(c) == ")" && openCount > 1 {
-			fmt.Fprintf(&sb, "%c", c)
+			_, _ = fmt.Fprintf(&sb, "%c", c)
 		}
 		if string(c) == ")" {
 			openCount--
 			continue
 		}
-		fmt.Fprintf(&sb, "%c", c)
+		_, _ = fmt.Fprintf(&sb, "%c", c)
 	}
 
 	return sb.String()

diff --git a/syft/formats/common/cyclonedxhelpers/licenses_test.go b/syft/formats/common/cyclonedxhelpers/licenses_test.go
@@ -18,9 +18,8 @@ func Test_encodeLicense(t *testing.T) {
 		expected *cyclonedx.Licenses
 	}{
 		{
-			name:     "no licenses",
-			input:    pkg.Package{},
-			expected: nil,
+			name:  "no licenses",
+			input: pkg.Package{},
 		},
 		{
 			name: "no SPDX licenses",
@@ -48,12 +47,12 @@ func Test_encodeLicense(t *testing.T) {
 			expected: &cyclonedx.Licenses{
 				{
 					License: &cyclonedx.License{
-						Name: "FOOBAR",
+						ID: "MIT",
 					},
 				},
 				{
 					License: &cyclonedx.License{
-						ID: "MIT",
+						Name: "FOOBAR",
 					},
 				},
 			},
@@ -97,25 +96,25 @@ func Test_encodeLicense(t *testing.T) {
 			expected: &cyclonedx.Licenses{
 				{
 					License: &cyclonedx.License{
-						Name: "FakeLicense",
-						URL:  "htts://someurl.com",
+						ID:  "MIT",
+						URL: "https://opensource.org/licenses/MIT",
 					},
 				},
 				{
 					License: &cyclonedx.License{
-						Name: "MIT AND GPL-3.0-only",
+						ID:  "MIT",
+						URL: "https://spdx.org/licenses/MIT.html",
 					},
 				},
 				{
 					License: &cyclonedx.License{
-						ID:  "MIT",
-						URL: "https://opensource.org/licenses/MIT",
+						Name: "FakeLicense",
+						URL:  "htts://someurl.com",
 					},
 				},
 				{
 					License: &cyclonedx.License{
-						ID:  "MIT",
-						URL: "https://spdx.org/licenses/MIT.html",
+						Name: "MIT AND GPL-3.0-only",
 					},
 				},
 			},