Skip to content

fix: count unique transitive, direct and total independently #368

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: count unique transitive, direct and total independently #368

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
26 changes: 22 additions & 4 deletions src/main/java/com/redhat/exhort/integration/providers/ProviderResponseHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -53,6 +54,7 @@
import com.redhat.exhort.model.CvssScoreComparable.DependencyScoreComparator;
import com.redhat.exhort.model.CvssScoreComparable.TransitiveScoreComparator;
import com.redhat.exhort.model.DependencyTree;
import com.redhat.exhort.model.DirectDependency;
import com.redhat.exhort.model.ProviderResponse;
import com.redhat.exhort.model.trustedcontent.IndexedRecommendation;
import com.redhat.exhort.model.trustedcontent.TrustedContentResponse;
Expand Down Expand Up @@ -425,9 +427,21 @@ private SourceSummary buildSummary(
var counter = new VulnerabilityCounter();
var directRefs =
tree.dependencies().keySet().stream().map(PackageRef::ref).collect(Collectors.toSet());
var transitiveRefs =
tree.dependencies().values().stream()
.map(DirectDependency::transitive)
.flatMap(Set::stream)
.map(PackageRef::ref)
.toList();
issuesData
.entrySet()
.forEach(e -> incrementCounter(e.getValue(), counter, directRefs.contains(e.getKey())));
.forEach(
e ->
incrementCounter(
e.getValue(),
counter,
directRefs.contains(e.getKey()),
transitiveRefs.contains(e.getKey())));
Long recommendationsCount =
sourceReport.stream().filter(s -> s.getRecommendation() != null).count();
counter.recommendations.set(recommendationsCount.intValue());
Expand All @@ -436,7 +450,7 @@ private SourceSummary buildSummary(
}

private void incrementCounter(
List<Issue> issues, VulnerabilityCounter counter, boolean isDirect) {
List<Issue> issues, VulnerabilityCounter counter, boolean isDirect, boolean isTransitive) {
if (!issues.isEmpty()) {
counter.dependencies.incrementAndGet();
}
Expand All @@ -453,6 +467,9 @@ private void incrementCounter(
if (isDirect) {
counter.direct.addAndGet(vulnerabilities);
}
if (isTransitive) {
counter.transitive.addAndGet(vulnerabilities);
}
if (i.getRemediation() != null
&& i.getRemediation().getTrustedContent() != null
&& i.getRemediation().getTrustedContent().getRef() != null) {
Expand All @@ -475,6 +492,7 @@ private int countVulnerabilities(Issue i) {

private static final record VulnerabilityCounter(
AtomicInteger total,
AtomicInteger transitive,
AtomicInteger critical,
AtomicInteger high,
AtomicInteger medium,
Expand All @@ -496,6 +514,7 @@ private static final record VulnerabilityCounter(
new AtomicInteger(),
new AtomicInteger(),
new AtomicInteger(),
new AtomicInteger(),
new AtomicInteger());
}

Expand All @@ -507,10 +526,9 @@ SourceSummary getSummary() {
.medium(medium.get())
.low(low.get())
.direct(direct.get())
.transitive(total.get() - direct.get())
.transitive(transitive.get())
.dependencies(dependencies.get())
.remediations(remediations.get())
// Will be calculated later when TC recommendations will be added.
.recommendations(recommendations.get())
.unscanned(unscanned.get());
}
Expand Down
52 changes: 52 additions & 0 deletions src/test/java/com/redhat/exhort/integration/providers/ProviderResponseHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,19 @@ private static Stream<Arguments> getSummaryValues() {
.transitive(1)
.medium(2)
.dependencies(2)
.unscanned(0)),
Arguments.of(
Map.of(
"pkg:npm/aa@1", List.of(buildIssue(1, 5f)),
"pkg:npm/aaa@1", List.of(buildIssue(2, 5f))),
null,
buildTreeWithSameTransitiveDirect(),
new SourceSummary()
.total(2)
.direct(2)
.transitive(1)
.medium(2)
.dependencies(2)
.unscanned(0)));
}

Expand Down Expand Up @@ -622,6 +635,45 @@ private static DependencyTree buildTreeWithDuplicates() {
return DependencyTree.builder().dependencies(direct).build();
}

private static DependencyTree buildTreeWithSameTransitiveDirect() {
Map<PackageRef, DirectDependency> direct =
Map.of(
PackageRef.builder()
.name("aa")
.version("1")
.pkgManager(Constants.NPM_PURL_TYPE)
.build(),
DirectDependency.builder()
.ref(
PackageRef.builder()
.name("aa")
.version("1")
.pkgManager(Constants.NPM_PURL_TYPE)
.build())
.transitive(
Set.of(
PackageRef.builder()
.name("aaa")
.version("1")
.pkgManager(Constants.NPM_PURL_TYPE)
.build()))
.build(),
PackageRef.builder()
.name("aaa")
.version("1")
.pkgManager(Constants.NPM_PURL_TYPE)
.build(),
DirectDependency.builder()
.ref(
PackageRef.builder()
.name("aaa")
.version("1")
.pkgManager(Constants.NPM_PURL_TYPE)
.build())
.build());
return DependencyTree.builder().dependencies(direct).build();
}

private static Issue buildIssue(int id, Float score) {
return new Issue()
.id(String.format("ISSUE-00%d", id))
Expand Down