Skip to content

Aliases for internal vulnerabilites #5699:Fix suggestion #5709

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
anton-jj wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Aliases for internal vulnerabilites #5699:Fix suggestion #5709

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7fab8d6
Add alias handling during vulnerability creation
Jan 14, 2026
44d30c1
Update alias synchronization for vulnerability updates
Jan 14, 2026
052f6a1
Clear internal alias ID on vulnerability deletion
Jan 14, 2026
4170ba2
Small changes on getting aliases
Jan 15, 2026
25c2957
Small changes update vulnerability
Jan 19, 2026
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
40 changes: 38 additions & 2 deletions src/main/java/org/dependencytrack/resources/v1/VulnerabilityResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import org.dependencytrack.model.Cwe;
import org.dependencytrack.model.Project;
import org.dependencytrack.model.Vulnerability;
import org.dependencytrack.model.VulnerabilityAlias;
import org.dependencytrack.model.VulnerableSoftware;
import org.dependencytrack.model.validation.ValidUuid;
import org.dependencytrack.parser.common.resolver.CweResolver;
Expand All @@ -68,6 +69,7 @@
import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;

/**
* JAX-RS resources for processing vulnerabilities.
Expand Down Expand Up @@ -350,13 +352,24 @@ public Response createVulnerability(Vulnerability jsonVulnerability) {
validator.validateProperty(jsonVulnerability, "cvssV3Vector"),
validator.validateProperty(jsonVulnerability, "owaspRRVector"),
validator.validateProperty(jsonVulnerability, "vulnerableVersions"),
validator.validateProperty(jsonVulnerability, "patchedVersions")
validator.validateProperty(jsonVulnerability, "patchedVersions"),
validator.validateProperty(jsonVulnerability, "aliases")
);

try (QueryManager qm = new QueryManager()) {
Vulnerability vulnerability = qm.getVulnerabilityByVulnId(
Vulnerability.Source.INTERNAL, jsonVulnerability.getVulnId().trim());
if (vulnerability == null) {
List<VulnerabilityAlias> aliases = new ArrayList<>();
if (!jsonVulnerability.getAliases().isEmpty()) {
VulnerabilityAlias alias = new VulnerabilityAlias();
alias.setInternalId(jsonVulnerability.getVulnId());
alias.setCveId(jsonVulnerability.getAliases().getFirst().getCveId());
alias.setGhsaId(jsonVulnerability.getAliases().getFirst().getGhsaId());
alias.setOsvId(jsonVulnerability.getAliases().getFirst().getOsvId());
aliases.add(alias);
}
jsonVulnerability.setAliases(aliases);
final List<Integer> cweIds = new ArrayList<>();
if (jsonVulnerability.getCwes() != null) {
for (int i = 0; i < jsonVulnerability.getCwes().size(); i++) {
Expand All @@ -381,6 +394,7 @@ public Response createVulnerability(Vulnerability jsonVulnerability) {
return qm.callInTransaction(() -> {
final Vulnerability persistentVuln = qm.createVulnerability(jsonVulnerability, true);
qm.synchronizeVulnerableSoftware(persistentVuln, vsList, Vulnerability.Source.INTERNAL);
if (!persistentVuln.getAliases().isEmpty()) qm.synchronizeVulnerabilityAlias(persistentVuln.getAliases().getFirst());
if (persistentVuln.getVulnerableSoftware() != null && !persistentVuln.getVulnerableSoftware().isEmpty()) {
persistentVuln.setAffectedComponents(persistentVuln.getVulnerableSoftware().stream()
.peek(vs -> vs.setAffectedVersionAttributions(qm.getAffectedVersionAttributions(persistentVuln, vs)))
Expand Down Expand Up @@ -431,15 +445,34 @@ public Response updateVulnerability(Vulnerability jsonVuln) {
validator.validateProperty(jsonVuln, "cvssV3Vector"),
validator.validateProperty(jsonVuln, "owaspRRVector"),
validator.validateProperty(jsonVuln, "vulnerableVersions"),
validator.validateProperty(jsonVuln, "patchedVersions")
validator.validateProperty(jsonVuln, "patchedVersions"),
validator.validateProperty(jsonVuln, "aliases")
);
try (QueryManager qm = new QueryManager()) {
Vulnerability vulnerability = qm.getObjectByUuid(Vulnerability.class, jsonVuln.getUuid());
if (vulnerability != null && Vulnerability.Source.INTERNAL.name().equals(vulnerability.getSource())) {
if (!vulnerability.getVulnId().equals(jsonVuln.getVulnId())) {
return Response.status(Response.Status.NOT_ACCEPTABLE).entity("The vulnId may not be changed.").build();
}
List<VulnerabilityAlias> aliases = qm.getVulnerabilityAliases(vulnerability);
VulnerabilityAlias alias;
if (aliases == null || aliases.isEmpty()) {
alias = new VulnerabilityAlias();
alias.setUuid(UUID.randomUUID());
aliases = new ArrayList<>();
aliases.add(alias);
}

alias = aliases.get(0);

VulnerabilityAlias incoming = jsonVuln.getAliases().isEmpty() ? null : jsonVuln.getAliases().getFirst();
if (incoming != null) {
alias.setInternalId(incoming.getInternalId());
alias.setCveId(incoming.getCveId());
alias.setGhsaId(incoming.getGhsaId());
alias.setOsvId(incoming.getOsvId());
}
jsonVuln.setAliases(aliases);
final List<Integer> cweIds = new ArrayList<>();
if (jsonVuln.getCwes() != null) {
for (int i = 0; i < jsonVuln.getCwes().size(); i++) {
Expand All @@ -464,6 +497,7 @@ public Response updateVulnerability(Vulnerability jsonVuln) {
return qm.callInTransaction(() -> {
final Vulnerability persistentVuln = qm.updateVulnerability(jsonVuln, true);
qm.synchronizeVulnerableSoftware(persistentVuln, vsList, Vulnerability.Source.INTERNAL);
qm.synchronizeVulnerabilityAlias(jsonVuln.getAliases().getFirst());
if (persistentVuln.getVulnerableSoftware() != null && !persistentVuln.getVulnerableSoftware().isEmpty()) {
persistentVuln.setAffectedComponents(persistentVuln.getVulnerableSoftware().stream()
.peek(vs -> vs.setAffectedVersionAttributions(qm.getAffectedVersionAttributions(persistentVuln, vs)))
Expand Down Expand Up @@ -501,11 +535,13 @@ public Response deleteVulnerability(
@PathParam("uuid") @ValidUuid String uuid) {
try (QueryManager qm = new QueryManager()) {
final Vulnerability vulnerability = qm.getObjectByUuid(Vulnerability.class, uuid);
List<VulnerabilityAlias> aliases = qm.getVulnerabilityAliases(vulnerability);
if (vulnerability != null) {
if (Vulnerability.Source.INTERNAL.name().equals(vulnerability.getSource())) {
if (vulnerability.getComponents().size() > 0) {
return Response.status(Response.Status.PRECONDITION_FAILED).entity("Portfolio components or services are affected by this vulnerability. Unable to delete.").build();
} else {
if (!aliases.isEmpty()) aliases.getFirst().setInternalId(null);
qm.deleteAffectedVersionAttributions(vulnerability);
qm.delete(vulnerability);
return Response.status(Response.Status.NO_CONTENT).build();
Expand Down