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

Change compareVersion behaviour #1929

Closed
wants to merge 2 commits into from
Closed

Change compareVersion behaviour #1929

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
27d84b1
Change compareVersion behaviour: NA in VulnSoftware only match when t…
florentulve Sep 2, 2022
5e40385
#1832 Drop code handling source version NA in compareVersions because…
florentulve Sep 11, 2022
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
6 changes: 1 addition & 5 deletions src/main/java/org/dependencytrack/tasks/scanners/AbstractVulnerableSoftwareAnalysisTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,7 @@ protected void analyzeVersionRange(final QueryManager qm, final List<VulnerableS
* Ported from Dependency-Check v5.2.1
*/
private static boolean compareVersions(VulnerableSoftware vs, String targetVersion) {
// For VulnerableSoftware (could actually be hardware) without a version number.
// e.g. cpe:2.3:o:intel:2000e_firmware:-:*:*:*:*:*:*:*
if (LogicalValue.NA.getAbbreviation().equals(vs.getVersion())) {
return true;
}

//if any of the four conditions will be evaluated - then true;
boolean result = (vs.getVersionEndExcluding() != null && !vs.getVersionEndExcluding().isEmpty())
|| (vs.getVersionStartExcluding() != null && !vs.getVersionStartExcluding().isEmpty())
Expand Down
100 changes: 100 additions & 0 deletions src/test/java/org/dependencytrack/tasks/scanners/InternalAnalysisTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,104 @@ public void testIssue1574() {
assertThat(vulnerabilities.getList(Vulnerability.class).get(0).getVulnId()).isEqualTo("GHSA-wjm3-fq3r-5x46");
}

@Test
public void testVersionNA(){
var project = new Project();
project.setName("acme-app");
project = qm.createProject(project, List.of(), false);
var component = new Component();
component.setProject(project);
component.setName("Apache httpd");
component.setVersion("2.4.53");
component.setCpe("cpe:2.3:a:apache:http_server:2.4.53:*:*:*:*:*:*:*");
component = qm.createComponent(component, false);

var vs1 = new VulnerableSoftware();
vs1.setCpe23("cpe:2.3:a:apache:http_server:-:*:*:*:*:*:*:*");
vs1.setPart("a");
vs1.setVendor("apache");
vs1.setProduct("http_server");
vs1.setVersion("-");
vs1.setVulnerable(true);
var vs = qm.persist(vs1);

var vulnerability = new Vulnerability();
vulnerability.setVulnId("CVE-2007-6420");
vulnerability.setSource(Vulnerability.Source.NVD);
vulnerability.setVulnerableSoftware(List.of(vs));
qm.createVulnerability(vulnerability, false);

var vs2 = new VulnerableSoftware();
vs2.setCpe23("cpe:2.3:a:apache:http_server:*:*:*:*:*:*:*:*");
vs2.setPart("a");
vs2.setVendor("apache");
vs2.setProduct("http_server");
vs2.setVersion("*");
vs2.setVulnerable(true);
vs = qm.persist(vs2);

var vulnerability202231813 = new Vulnerability();
vulnerability202231813.setVulnId("CVE-2022-31813");
vulnerability202231813.setSource(Vulnerability.Source.NVD);
vulnerability202231813.setVulnerableSoftware(List.of(vs2));
qm.createVulnerability(vulnerability202231813, false);

var vs3 = new VulnerableSoftware();
vs3.setCpe23("cpe:2.3:a:apache:http_server:*:*:*:*:*:*:*:*");
vs3.setPart("a");
vs3.setVendor("apache");
vs3.setProduct("http_server");
vs3.setVersionStartIncluding("2.4.0");
vs3.setVersionEndIncluding("2.4.53");
vs3.setVulnerable(true);
vs = qm.persist(vs2);

var vulnerability202226377 = new Vulnerability();
vulnerability202226377.setVulnId("CVE-2022-266377");
vulnerability202226377.setSource(Vulnerability.Source.NVD);
vulnerability202226377.setVulnerableSoftware(List.of(vs3));
qm.createVulnerability(vulnerability202226377, false);

new InternalAnalysisTask().analyze(List.of(component));

final PaginatedResult vulnerabilities = qm.getVulnerabilities(component);
assertThat(vulnerabilities.getTotal()).isEqualTo(2);
assertThat(vulnerabilities.getList(Vulnerability.class).get(0).getVulnId()).isEqualTo("CVE-2022-31813");
assertThat(vulnerabilities.getList(Vulnerability.class).get(1).getVulnId()).isEqualTo("CVE-2022-266377");
}

@Test
public void testVersionFirmwareNA(){
var project = new Project();
project.setName("acme-app");
project = qm.createProject(project, List.of(), false);
var component = new Component();
component.setProject(project);
component.setName("Intel 2000e firmware");
component.setVersion("-");
component.setCpe("cpe:2.3:o:intel:2000e_firmware:-:*:*:*:*:*:*:*");
component = qm.createComponent(component, false);

var vs1 = new VulnerableSoftware();
vs1.setCpe23("cpe:2.3:o:intel:2000e_firmware:-:*:*:*:*:*:*:*");
vs1.setPart("o");
vs1.setVendor("intel");
vs1.setProduct("2000e_firmware");
vs1.setVersion("-");
vs1.setVulnerable(true);
var vs = qm.persist(vs1);

var vulnerability = new Vulnerability();
vulnerability.setVulnId("CVE-2019-0174");
vulnerability.setSource(Vulnerability.Source.NVD);
vulnerability.setVulnerableSoftware(List.of(vs));
qm.createVulnerability(vulnerability, false);

new InternalAnalysisTask().analyze(List.of(component));

final PaginatedResult vulnerabilities = qm.getVulnerabilities(component);
assertThat(vulnerabilities.getTotal()).isEqualTo(1);
assertThat(vulnerabilities.getList(Vulnerability.class).get(0).getVulnId()).isEqualTo("CVE-2019-0174");
}

}