Skip to content

Commit f7e3d05

Browse files
authored
build(deps): bump open-vulnerability-client from 7.3.1 to 7.3.2 (#7577)
1 parent 20c62ec commit f7e3d05

File tree

7 files changed

+8
-14
lines changed

7 files changed

+8
-14
lines changed

core/src/main/java/org/owasp/dependencycheck/analyzer/OssIndexAnalyzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ private Vulnerability transform(final ComponentReport report, final ComponentRep
359359
availabilityImpact = CvssV2Data.CiaType.fromValue(tmp);
360360
}
361361
final String severity = Cvss2Severity.of((float) cvssScore).name().toUpperCase();
362-
final CvssV2Data cvssData = new CvssV2Data("2.0", source.getCvssVector(), accessVector,
362+
final CvssV2Data cvssData = new CvssV2Data(CvssV2Data.Version._2_0, source.getCvssVector(), accessVector,
363363
accessComplexity, authentication, confidentialityImpact,
364364
integrityImpact, availabilityImpact, cvssScore,
365365
severity, null, null, null, null, null, null, null, null, null, null);

core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -741,12 +741,7 @@ public Vulnerability getVulnerability(String cve, Connection conn) throws Databa
741741
integrityImpact == null ? "" : integrityImpact.value().substring(0, 1),
742742
availabilityImpact == null ? "" : availabilityImpact.value().substring(0, 1));
743743

744-
//some older test data may not correctly have the version set.
745-
String cveVersion = "2.0";
746-
if (rsV.getString(18) != null) {
747-
cveVersion = rsV.getString(18);
748-
}
749-
final CvssV2Data cvssData = new CvssV2Data(cveVersion, vector, accessVector,
744+
final CvssV2Data cvssData = new CvssV2Data(CvssV2Data.Version._2_0, vector, accessVector,
750745
accessComplexity, authentication, confidentialityImpact,
751746
integrityImpact, availabilityImpact, rsV.getDouble(11), rsV.getString(3),
752747
null, null, null, null, null, null, null, null, null, null);

core/src/main/java/org/owasp/dependencycheck/processing/BundlerAuditProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ private void addCriticalityToVulnerability(String parentName, Vulnerability vuln
242242
score = 2.0;
243243
}
244244
LOGGER.debug("bundle-audit vulnerability missing CVSS data: {}", vulnerability.getName());
245-
final CvssV2Data cvssData = new CvssV2Data("2.0", null, null, null, null, null, null, null, score, criticality.toUpperCase(),
245+
final CvssV2Data cvssData = new CvssV2Data(CvssV2Data.Version._2_0, null, null, null, null, null, null, null, score, criticality.toUpperCase(),
246246
null, null, null, null, null, null, null, null, null, null);
247247
final CvssV2 cvssV2 = new CvssV2(null, null, cvssData, criticality.toUpperCase(), null, null, null, null, null, null, null);
248248
vulnerability.setCvssV2(cvssV2);

core/src/main/java/org/owasp/dependencycheck/utils/CvssUtil.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ public static CvssV2 vectorToCvssV2(String vectorString, Double baseScore) {
115115
vectorString));
116116
}
117117

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

127126
final String baseSeverity = cvssV2ScoreToSeverity(baseScore);
128-
final CvssV2Data data = new CvssV2Data(version, vectorString, accessVector, attackComplexity,
127+
final CvssV2Data data = new CvssV2Data(CvssV2Data.Version._2_0, vectorString, accessVector, attackComplexity,
129128
authentication, confidentialityImpact, integrityImpact, availabilityImpact, baseScore, baseSeverity,
130129
null, null, null, null, null, null, null, null, null, null);
131130
final CvssV2 cvss = new CvssV2(null, null, data, baseSeverity, null, null, null, null, null, null, null);

core/src/test/java/org/owasp/dependencycheck/data/nvd/ecosystem/UrlEcosystemMapperTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void testGetEcosystemMustHandleNullCveReferences() {
3838
// Given
3939
UrlEcosystemMapper mapper = new UrlEcosystemMapper();
4040

41-
CveItem cveItem = new CveItem();
41+
CveItem cveItem = new CveItem(null,null,null,null,null);
4242
DefCveItem defCveItem = new DefCveItem(cveItem);
4343

4444
// When
@@ -53,7 +53,7 @@ public void testGetEcosystemMustHandleNullCve() {
5353
// Given
5454
UrlEcosystemMapper mapper = new UrlEcosystemMapper();
5555

56-
DefCveItem cveItem = new DefCveItem();
56+
DefCveItem cveItem = new DefCveItem(null);
5757

5858
// When
5959
String output = mapper.getEcosystem(cveItem);

core/src/test/java/org/owasp/dependencycheck/dependency/VulnerabilityTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ private CvssV3 createCvssV3(double score, String severity) {
171171

172172

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

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@ Copyright (c) 2012 - Jeremy Long
932932
<dependency>
933933
<groupId>io.github.jeremylong</groupId>
934934
<artifactId>open-vulnerability-clients</artifactId>
935-
<version>7.3.1</version>
935+
<version>7.3.2</version>
936936
</dependency>
937937
<dependency>
938938
<groupId>org.anarres.jdiagnostics</groupId>

0 commit comments

Comments
 (0)