Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CDX schema to v1.6 #780

Merged
merged 2 commits into from
Jul 18, 2024
Merged

Update CDX schema to v1.6 #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb75e6b
update cdx version to 1.6
sahibamittal Jul 11, 2024
8b49ca8
remove proto cdx 1.4
sahibamittal Jul 18, 2024
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
2 changes: 1 addition & 1 deletion src/main/java/org/dependencytrack/event/kafka/KafkaTopics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import alpine.Config;
import org.apache.kafka.common.serialization.Serde;
import org.apache.kafka.common.serialization.Serdes;
import org.cyclonedx.proto.v1_4.Bom;
import org.cyclonedx.proto.v1_6.Bom;
import org.dependencytrack.common.ConfigKey;
import org.dependencytrack.event.kafka.serialization.KafkaProtobufSerde;
import org.dependencytrack.proto.mirror.v1.EpssItem;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/dependencytrack/event/kafka/processor/VulnerabilityMirrorProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
import io.github.nscuro.versatile.version.VersioningScheme;
import org.apache.commons.lang3.StringUtils;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.cyclonedx.proto.v1_4.Bom;
import org.cyclonedx.proto.v1_4.Component;
import org.cyclonedx.proto.v1_4.VulnerabilityAffects;
import org.cyclonedx.proto.v1_6.Bom;
import org.cyclonedx.proto.v1_6.Component;
import org.cyclonedx.proto.v1_6.VulnerabilityAffects;
import org.dependencytrack.event.kafka.processor.api.Processor;
import org.dependencytrack.model.Vulnerability;
import org.dependencytrack.model.VulnerableSoftware;
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/dependencytrack/event/kafka/processor/VulnerabilityScanResultProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ private void processScannerResult(final QueryManager qm, final Component compone
private Set<Vulnerability> syncVulnerabilities(final QueryManager qm, final ScanKey scanKey, final ScannerResult scannerResult) {
final var syncedVulns = new HashSet<Vulnerability>();

for (final org.cyclonedx.proto.v1_4.Vulnerability reportedVuln : scannerResult.getBom().getVulnerabilitiesList()) {
for (final org.cyclonedx.proto.v1_6.Vulnerability reportedVuln : scannerResult.getBom().getVulnerabilitiesList()) {
final Vulnerability vuln;
try {
vuln = ModelConverterCdxToVuln.convert(qm, scannerResult.getBom(), reportedVuln, true);
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/org/dependencytrack/parser/dependencytrack/ModelConverterCdxToVuln.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
package org.dependencytrack.parser.dependencytrack;

import org.apache.commons.lang3.StringUtils;
import org.cyclonedx.proto.v1_4.Bom;
import org.cyclonedx.proto.v1_4.ScoreMethod;
import org.cyclonedx.proto.v1_4.Source;
import org.cyclonedx.proto.v1_4.VulnerabilityRating;
import org.cyclonedx.proto.v1_4.VulnerabilityReference;
import org.cyclonedx.proto.v1_6.Bom;
import org.cyclonedx.proto.v1_6.ScoreMethod;
import org.cyclonedx.proto.v1_6.Source;
import org.cyclonedx.proto.v1_6.VulnerabilityRating;
import org.cyclonedx.proto.v1_6.VulnerabilityReference;
import org.dependencytrack.model.AnalyzerIdentity;
import org.dependencytrack.model.Severity;
import org.dependencytrack.model.Vulnerability;
Expand All @@ -46,17 +46,17 @@
import java.util.Objects;

import static org.apache.commons.lang3.StringUtils.trimToNull;
import static org.cyclonedx.proto.v1_4.ScoreMethod.SCORE_METHOD_CVSSV2;
import static org.cyclonedx.proto.v1_4.ScoreMethod.SCORE_METHOD_CVSSV3;
import static org.cyclonedx.proto.v1_4.ScoreMethod.SCORE_METHOD_CVSSV31;
import static org.cyclonedx.proto.v1_4.ScoreMethod.SCORE_METHOD_OWASP;
import static org.cyclonedx.proto.v1_6.ScoreMethod.SCORE_METHOD_CVSSV2;
import static org.cyclonedx.proto.v1_6.ScoreMethod.SCORE_METHOD_CVSSV3;
import static org.cyclonedx.proto.v1_6.ScoreMethod.SCORE_METHOD_CVSSV31;
import static org.cyclonedx.proto.v1_6.ScoreMethod.SCORE_METHOD_OWASP;

public final class ModelConverterCdxToVuln {

static final String TITLE_PROPERTY_NAME = "dependency-track:vuln:title";

public static Vulnerability convert(final QueryManager qm, final Bom bom,
final org.cyclonedx.proto.v1_4.Vulnerability cycloneVuln,
final org.cyclonedx.proto.v1_6.Vulnerability cycloneVuln,
boolean isAliasSyncEnabled) {
if (cycloneVuln == null) {
return null;
Expand Down Expand Up @@ -209,7 +209,7 @@ public static Vulnerability convert(final QueryManager qm, final Bom bom,
return vuln;
}

private static VulnerabilityAlias convert(final org.cyclonedx.proto.v1_4.Vulnerability cycloneVuln,
private static VulnerabilityAlias convert(final org.cyclonedx.proto.v1_6.Vulnerability cycloneVuln,
final VulnerabilityReference cycloneAlias) {
final var alias = new VulnerabilityAlias();
switch (cycloneVuln.getSource().getName()) {
Expand Down Expand Up @@ -244,7 +244,7 @@ private static VulnerabilityAlias convert(final org.cyclonedx.proto.v1_4.Vulnera
public static Severity calculateSeverity(Bom bom) {
if (bom.getVulnerabilitiesCount() > 0
&& bom.getVulnerabilities(0).getRatingsCount() > 0) {
org.cyclonedx.proto.v1_4.Severity severity =
org.cyclonedx.proto.v1_6.Severity severity =
bom.getVulnerabilities(0).getRatings(0).getSeverity();
final VulnerabilityRating rating = bom.getVulnerabilities(0).getRatings(0);
if (rating.hasSeverity()) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/proto/buf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ version: v1
name: github.com/DependencyTrack/hyades-apiserver
lint:
ignore:
- org/cyclonedx/v1_4/cyclonedx.proto
- org/cyclonedx/v1_6/cyclonedx.proto
Loading
Loading