Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ private Vulnerability transform(final ComponentReport report, final ComponentRep
availabilityImpact = CvssV2Data.CiaType.fromValue(tmp);
}
final String severity = Cvss2Severity.of((float) cvssScore).name().toUpperCase();
final CvssV2Data cvssData = new CvssV2Data("2.0", source.getCvssVector(), accessVector,
final CvssV2Data cvssData = new CvssV2Data(CvssV2Data.Version._2_0, source.getCvssVector(), accessVector,
accessComplexity, authentication, confidentialityImpact,
integrityImpact, availabilityImpact, cvssScore,
severity, null, null, null, null, null, null, null, null, null, null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -741,12 +741,7 @@ public Vulnerability getVulnerability(String cve, Connection conn) throws Databa
integrityImpact == null ? "" : integrityImpact.value().substring(0, 1),
availabilityImpact == null ? "" : availabilityImpact.value().substring(0, 1));

//some older test data may not correctly have the version set.
String cveVersion = "2.0";
if (rsV.getString(18) != null) {
cveVersion = rsV.getString(18);
}
final CvssV2Data cvssData = new CvssV2Data(cveVersion, vector, accessVector,
final CvssV2Data cvssData = new CvssV2Data(CvssV2Data.Version._2_0, vector, accessVector,
accessComplexity, authentication, confidentialityImpact,
integrityImpact, availabilityImpact, rsV.getDouble(11), rsV.getString(3),
null, null, null, null, null, null, null, null, null, null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ private void addCriticalityToVulnerability(String parentName, Vulnerability vuln
score = 2.0;
}
LOGGER.debug("bundle-audit vulnerability missing CVSS data: {}", vulnerability.getName());
final CvssV2Data cvssData = new CvssV2Data("2.0", null, null, null, null, null, null, null, score, criticality.toUpperCase(),
final CvssV2Data cvssData = new CvssV2Data(CvssV2Data.Version._2_0, null, null, null, null, null, null, null, score, criticality.toUpperCase(),
null, null, null, null, null, null, null, null, null, null);
final CvssV2 cvssV2 = new CvssV2(null, null, cvssData, criticality.toUpperCase(), null, null, null, null, null, null, null);
vulnerability.setCvssV2(cvssV2);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ public static CvssV2 vectorToCvssV2(String vectorString, Double baseScore) {
vectorString));
}

final String version = CvssV2Data.Version._2_0.value();
//"AV:L/AC:L/Au:N/C:N/I:N/A:C"
final CvssV2Data.AccessVectorType accessVector = CvssV2Data.AccessVectorType.fromValue(metrics.get("AV"));
final CvssV2Data.AccessComplexityType attackComplexity = CvssV2Data.AccessComplexityType.fromValue(metrics.get("AC"));
Expand All @@ -125,7 +124,7 @@ public static CvssV2 vectorToCvssV2(String vectorString, Double baseScore) {
final CvssV2Data.CiaType availabilityImpact = CvssV2Data.CiaType.fromValue(metrics.get("A"));

final String baseSeverity = cvssV2ScoreToSeverity(baseScore);
final CvssV2Data data = new CvssV2Data(version, vectorString, accessVector, attackComplexity,
final CvssV2Data data = new CvssV2Data(CvssV2Data.Version._2_0, vectorString, accessVector, attackComplexity,
authentication, confidentialityImpact, integrityImpact, availabilityImpact, baseScore, baseSeverity,
null, null, null, null, null, null, null, null, null, null);
final CvssV2 cvss = new CvssV2(null, null, data, baseSeverity, null, null, null, null, null, null, null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void testGetEcosystemMustHandleNullCveReferences() {
// Given
UrlEcosystemMapper mapper = new UrlEcosystemMapper();

CveItem cveItem = new CveItem();
CveItem cveItem = new CveItem(null,null,null,null,null);
DefCveItem defCveItem = new DefCveItem(cveItem);

// When
Expand All @@ -53,7 +53,7 @@ public void testGetEcosystemMustHandleNullCve() {
// Given
UrlEcosystemMapper mapper = new UrlEcosystemMapper();

DefCveItem cveItem = new DefCveItem();
DefCveItem cveItem = new DefCveItem(null);

// When
String output = mapper.getEcosystem(cveItem);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ private CvssV3 createCvssV3(double score, String severity) {


private CvssV2 createCvssV2(double score, String severity) {
CvssV2Data v2Data = new CvssV2Data("2.0", severity, CvssV2Data.AccessVectorType.NETWORK,
CvssV2Data v2Data = new CvssV2Data(CvssV2Data.Version._2_0, severity, CvssV2Data.AccessVectorType.NETWORK,
CvssV2Data.AccessComplexityType.MEDIUM, CvssV2Data.AuthenticationType.MULTIPLE,
CvssV2Data.CiaType.PARTIAL, CvssV2Data.CiaType.PARTIAL, CvssV2Data.CiaType.PARTIAL,

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ Copyright (c) 2012 - Jeremy Long
<dependency>
<groupId>io.github.jeremylong</groupId>
<artifactId>open-vulnerability-clients</artifactId>
<version>7.3.1</version>
<version>7.3.2</version>
</dependency>
<dependency>
<groupId>org.anarres.jdiagnostics</groupId>
Expand Down