Skip to content

Commit 53d1dab

Browse files
authored
fix: rework replaceOrAddVulnerability (#7177)
1 parent e714580 commit 53d1dab

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -505,16 +505,13 @@ protected void processResults(final List<Advisory> advisories, Engine engine,
505505
* @param vuln the vulnerability to add
506506
*/
507507
protected void replaceOrAddVulnerability(Dependency dependency, Vulnerability vuln) {
508-
boolean found = false;
509-
for (Vulnerability existing : dependency.getVulnerabilities()) {
510-
for (Reference ref : existing.getReferences()) {
511-
if (ref.getName() != null
512-
&& vuln.getSource().toString().equals("NPM")
513-
&& ref.getName().equals("https://nodesecurity.io/advisories/" + vuln.getName())) {
514-
found = true;
515-
}
516-
}
517-
}
508+
boolean found = vuln.getSource() == Vulnerability.Source.NPM &&
509+
dependency.getVulnerabilities().stream().anyMatch(existing -> {
510+
return existing.getReferences().stream().anyMatch(ref ->{
511+
return ref.getName() != null
512+
&& ref.getName().equals("https://nodesecurity.io/advisories/" + vuln.getName());
513+
});
514+
});
518515
if (!found) {
519516
dependency.addVulnerability(vuln);
520517
}

0 commit comments

Comments
 (0)