feat(cyclonedx): add support for custom package Properties

pkg/fanal/types/package.go

@@ -216,6 +216,9 @@ type Package struct {
 
 	// Files installed by the package
 	InstalledFiles []string `json:",omitempty"`
+
+	// Additional information about the component
+	Properties map[string]string `json:",omitempty"`
 }
 
 func (pkg *Package) Empty() bool {

pkg/sbom/io/decode.go

@@ -428,6 +428,11 @@ func fillPkgFieldsFromComponentProps(props []core.Property, pkg *ftypes.Package)
 			buildInfo.Nvr = prop.Value
 		case core.PropertyArch:
 			buildInfo.Arch = prop.Value
+		default:
+			if pkg.Properties == nil {
+				pkg.Properties = make(map[string]string)
+			}
+			pkg.Properties[prop.Name] = prop.Value
 		}
 	}
 

pkg/sbom/io/decode_test.go

@@ -102,6 +102,10 @@ var (
 				Name:  core.PropertySrcVersion,
 				Value: "2.0.0",
 			},
+			{
+				Name:  "custom_property",
+				Value: "property value",
+			},
 		},
 		Licenses: []string{"GPL-2.0"},
 	}
@@ -286,6 +290,9 @@ func TestDecoder_Decode_OSPackages(t *testing.T) {
 										"rhel-9-for-aarch64-appstream-source-rpms",
 									},
 								},
+								Properties: map[string]string{
+									"custom_property": "property value",
+								},
 							},
 						},
 					},

pkg/sbom/io/encode.go

@@ -453,6 +453,14 @@ func (*Encoder) component(result types.Result, pkg ftypes.Package) *core.Compone
 		}
 	}
 
+	for name, value := range pkg.Properties {
+		properties = append(properties, core.Property{
+			Name:     name,
+			Value:    value,
+			External: true,
+		})
+	}
+
 	var files []core.File
 	if pkg.FilePath != "" || pkg.Digest != "" {
 		files = append(files, core.File{

pkg/sbom/io/encode_test.go

@@ -122,6 +122,9 @@ func TestEncoder_Encode(t *testing.T) {
 										Version:   "2.13.4",
 									},
 								},
+								Properties: map[string]string{
+									"custom_property": "property value",
+								},
 							},
 							{
 								ID:       "com.fasterxml.jackson.core:jackson-databind:2.13.4",
@@ -358,6 +361,10 @@ func TestEncoder_Encode(t *testing.T) {
 							Name:  core.PropertyPkgType,
 							Value: "jar",
 						},
+						{
+							Name:  "custom_property",
+							Value: "property value",
+						},
 					},
 					PkgIdentifier: ftypes.PkgIdentifier{
 						UID: "A6BD5A2FE5C00E10",