Skip to content

Send composer package names with "/" separator to Trivy #6055

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
Abdelmonem-BEN-NACEUR wants to merge 1 commit into
base: master
Choose a base branch
from
+52 −2
Open

Send composer package names with "/" separator to Trivy #6055

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
5 changes: 3 additions & 2 deletions src/main/java/org/dependencytrack/tasks/scanners/TrivyAnalysisTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,9 @@ public void analyze(final List<Component> components) {
var name = component.getPurl().getName();

if (component.getPurl().getNamespace() != null) {
if (PackageURL.StandardTypes.GOLANG.equals(component.getPurl().getType()) ||
PackageURL.StandardTypes.NPM.equals(component.getPurl().getType())) {
if (PackageURL.StandardTypes.GOLANG.equals(component.getPurl().getType()) ||
PackageURL.StandardTypes.NPM.equals(component.getPurl().getType()) ||
PackageURL.StandardTypes.COMPOSER.equals(component.getPurl().getType())) {
name = component.getPurl().getNamespace() + "/" + name;
} else {
name = component.getPurl().getNamespace() + ":" + name;
Expand Down
49 changes: 49 additions & 0 deletions src/test/java/org/dependencytrack/tasks/scanners/TrivyAnalysisTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,55 @@ void testAnalyzeRespectsConfiguredScanningOption() throws InvalidProtocolBufferE
assertThat(scanRequest.getOptions().getPkgTypes(0)).isEqualTo("library");
}

@Test
void testAnalyzeComposerComponentUsesSlashSeparator() throws InvalidProtocolBufferException {
stubFor(post(urlPathEqualTo("/twirp/trivy.cache.v1.Cache/PutBlob"))
.willReturn(aResponse()
.withStatus(200)
.withHeader("Content-Type", "application/protobuf")));

stubFor(post(urlPathEqualTo("/twirp/trivy.scanner.v1.Scanner/Scan"))
.willReturn(aResponse()
.withStatus(200)
.withHeader("Content-Type", "application/protobuf")
.withBody(ScanResponse.newBuilder().build().toByteArray())));

stubFor(post(urlPathEqualTo("/twirp/trivy.cache.v1.Cache/DeleteBlobs"))
.willReturn(aResponse()
.withStatus(200)
.withHeader("Content-Type", "application/json")));

var project = new Project();
project.setName("acme-app");
project = qm.createProject(project, null, false);

var component = new Component();
component.setProject(project);
component.setGroup("symfony");
component.setName("http-foundation");
component.setVersion("6.4.15");
component.setPurl("pkg:composer/symfony/http-foundation@6.4.15");
component = qm.createComponent(component, false);

new TrivyAnalysisTask().inform(new TrivyAnalysisEvent(
List.of(component), VulnerabilityAnalysisLevel.BOM_UPLOAD_ANALYSIS));

// The PutBlob request body carries the composer coordinate sent to
// Trivy. Packagist indexes composer packages as "vendor/package"
// (slash), so DT must transmit "symfony/http-foundation" rather than
// "symfony:http-foundation" for the Trivy server to match.
var putBlobRequests = WireMock.findAll(postRequestedFor(
urlPathEqualTo("/twirp/trivy.cache.v1.Cache/PutBlob")));
assertThat(putBlobRequests).hasSize(1);

final trivy.proto.cache.v1.PutBlobRequest putBlobRequest =
trivy.proto.cache.v1.PutBlobRequest.parseFrom(putBlobRequests.get(0).getBody());
assertThat(putBlobRequest.getBlobInfo().getApplicationsList())
.anySatisfy(app -> assertThat(app.getPackagesList())
.anySatisfy(pkg -> assertThat(pkg.getName())
.isEqualTo("symfony/http-foundation")));
}

private static final ConcurrentLinkedQueue<Notification> NOTIFICATIONS = new ConcurrentLinkedQueue<>();

public static class NotificationSubscriber implements Subscriber {
Expand Down