Skip to content

Fix vuln policy bundle sync ignoring nested files #1990

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

Merged
nscuro merged 1 commit into from
Apr 16, 2026
Merged

Fix vuln policy bundle sync ignoring nested files #1990

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
7 changes: 6 additions & 1 deletion .../src/main/java/org/dependencytrack/policy/vulnerability/SyncVulnPolicyBundleActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,12 @@ private List<VulnerabilityPolicy> parseAndValidatePolicies(BundleFile bundleFile
final var entries = zipFile.entries();
while (entries.hasMoreElements()) {
final ZipEntry zipEntry = entries.nextElement();
if (!POLICY_FILE_NAME_PATTERN.matcher(zipEntry.getName()).matches()) {
if (zipEntry.isDirectory()) {
continue;
}

final String fileName = Path.of(zipEntry.getName()).getFileName().toString();
Comment thread
nscuro marked this conversation as resolved.
if (!POLICY_FILE_NAME_PATTERN.matcher(fileName).matches()) {
LOGGER.debug("Skipping file '{}': Unexpected file name pattern", zipEntry.getName());
continue;
}
Expand Down
28 changes: 28 additions & 0 deletions .../test/java/org/dependencytrack/policy/vulnerability/SyncVulnPolicyBundleActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,34 @@ void shouldPreferBasicAuthOverBearerToken() throws Exception {
.withHeader("Authorization", WireMock.equalTo("Basic dXNlcjpwYXNz")));
}

@Test
void shouldProcessPoliciesInSubdirectories() throws Exception {
final UUID bundleUuid = UUID.randomUUID();
final Path bundlePath = Files.createTempFile(tempDir, "test-bundle-", ".zip");
try (final var fos = Files.newOutputStream(bundlePath);
final var zos = new java.util.zip.ZipOutputStream(fos)) {
zos.putNextEntry(new java.util.zip.ZipEntry("my-bundle/policy-0.yaml"));
zos.write(VALID_POLICY.getBytes(java.nio.charset.StandardCharsets.UTF_8));
}

wireMock.stubFor(WireMock.get("/bundle.zip")
.willReturn(WireMock.aResponse()
.withStatus(200)
.withBody(Files.readAllBytes(bundlePath))));

final var activity = createActivity(wireMock.baseUrl() + "/bundle.zip");
activity.execute(mock(ActivityContext.class), createActivityArg(bundleUuid));

final VulnPolicyBundleRow bundle = withJdbiHandle(
handle -> handle.attach(VulnerabilityPolicyDao.class).getBundleByUuid(bundleUuid));
assertThat(bundle).isNotNull();

final List<VulnPolicyIdentityRow> policies = withJdbiHandle(
handle -> handle.attach(VulnerabilityPolicyDao.class).getAllByBundleId(bundle.id()));
assertThat(policies).singleElement().satisfies(policy ->
assertThat(policy.name()).isEqualTo("Valid"));
}

private static SyncVulnPolicyBundleActivity createActivity(String bundleUrl) {
final Config config = new SmallRyeConfigBuilder()
.withDefaultValue("dt.vulnerability.policy.bundle.url", bundleUrl)
Expand Down
Loading