add cpe for redhat packages

djcrabhat · djcrabhat · commit 54abff687f0a · 2022-09-04T14:56:53.000-07:00
diff --git a/src/main/java/org/cyclonedx/contrib/com/lmco/efoss/unix/sbom/generator/RedHatSBomGenerator.java b/src/main/java/org/cyclonedx/contrib/com/lmco/efoss/unix/sbom/generator/RedHatSBomGenerator.java
@@ -95,7 +95,7 @@ public Bom generateSBom() {
             } catch (MalformedPackageURLException e) {
                 logger.debug("Can't get purl", e);
             }
-			cpe = getCpe(software, version);
+			cpe = getCpe(detailMap.get("Name"), version);
 
 			try {
 				String downloadUrl = getPackageDownloadUrl(software);
@@ -112,9 +112,8 @@ public Bom generateSBom() {
         return bom;
     }
 
-	private String getCpe(String software, String version) {
-		// TODO
-		return null;
+	private String getCpe(String pack, String version) {
+		return String.format("cpe:2.3:a:%s:%s:%s:*:*:*:*:*:*:*", pack, pack, version);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public Bom generateSBom() {`
`95`	`95`	`} catch (MalformedPackageURLException e) {`
`96`	`96`	`logger.debug("Can't get purl", e);`
`97`	`97`	`}`
`98`		`- cpe = getCpe(software, version);`
	`98`	`+ cpe = getCpe(detailMap.get("Name"), version);`
`99`	`99`
`100`	`100`	`try {`
`101`	`101`	`String downloadUrl = getPackageDownloadUrl(software);`
`@@ -112,9 +112,8 @@ public Bom generateSBom() {`
`112`	`112`	`return bom;`
`113`	`113`	`}`
`114`	`114`
`115`		`- private String getCpe(String software, String version) {`
`116`		`- // TODO`
`117`		`- return null;`
	`115`	`+ private String getCpe(String pack, String version) {`
	`116`	`+ return String.format("cpe:2.3:a:%s:%s:%s:::::::*", pack, pack, version);`
`118`	`117`	`}`
`119`	`118`
`120`	`119`	`/**`