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

Fix: Exact match between CPE with NA (-) update part #2240

Merged
merged 1 commit into from
Dec 9, 2022
Merged

Fix: Exact match between CPE with NA (-) update part #2240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 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 @@ -198,6 +198,10 @@ private static boolean containsSpecialCharacter(String value) {
* <code>false</code>
*/
private static boolean compareUpdate(VulnerableSoftware vs, String targetUpdate) {

if (targetUpdate != null && targetUpdate.equals(vs.getUpdate())) {
return true;
}
if (LogicalValue.NA.getAbbreviation().equals(vs.getUpdate())) {
return false;
}
Expand Down
35 changes: 34 additions & 1 deletion 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 @@ -6,8 +6,12 @@
import org.dependencytrack.model.Project;
import org.dependencytrack.model.Vulnerability;
import org.dependencytrack.model.VulnerableSoftware;
import org.dependencytrack.parser.nvd.ModelConverter;
import org.junit.Test;
import us.springett.parsers.cpe.exceptions.CpeEncodingException;
import us.springett.parsers.cpe.exceptions.CpeParsingException;

import java.util.Collections;
import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;
Expand All @@ -18,7 +22,7 @@ public class InternalAnalysisTaskTest extends PersistenceCapableTest {
public void testIssue1574() {
var project = new Project();
project.setName("acme-app");
project = qm.createProject(project, List.of(), false);
project = qm.createProject(project, Collections.emptyList(), false);
var component = new Component();
component.setProject(project);
component.setName("github.com/tidwall/gjson");
Expand Down Expand Up @@ -47,4 +51,33 @@ public void testIssue1574() {
assertThat(vulnerabilities.getList(Vulnerability.class).get(0).getVulnId()).isEqualTo("GHSA-wjm3-fq3r-5x46");
}

@Test
public void testExactMatchWithNAUpdate() throws CpeParsingException, CpeEncodingException {
var project = new Project();
project.setName("acme-app");
project = qm.createProject(project, Collections.emptyList(), false);
var component = new Component();
component.setProject(project);
component.setGroup("xiph");
component.setName("speex");
component.setVersion("1.2");
component.setCpe("cpe:2.3:a:xiph:speex:1.2:-:*:*:*:*:*:*");
component = qm.createComponent(component, false);

var vulnerableSoftware = ModelConverter.convertCpe23UriToVulnerableSoftware("cpe:2.3:a:xiph:speex:1.2:-:*:*:*:*:*:*");
vulnerableSoftware = qm.persist(vulnerableSoftware);

var vulnerability = new Vulnerability();
vulnerability.setVulnId("CVE-2020-23904");
vulnerability.setSource(Vulnerability.Source.NVD);
vulnerability.setVulnerableSoftware(List.of(vulnerableSoftware));
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-2020-23904");
}

}