Skip to content

Mark project as not required and only validate when specified. #6562

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
Zusel wants to merge 1 commit into
base: 4.14.x
Choose a base branch
from
+6 −4
Open

Mark project as not required and only validate when specified. #6562

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
10 changes: 6 additions & 4 deletions src/main/java/org/dependencytrack/resources/v1/AnalysisResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ public Response retrieveAnalysis(@Parameter(description = "The UUID of the proje
public Response updateAnalysis(AnalysisRequest request) {
final Validator validator = getValidator();
failOnValidationError(
validator.validateProperty(request, "project"),
validator.validateProperty(request, "component"),
validator.validateProperty(request, "vulnerability"),
validator.validateProperty(request, "analysisState"),
Expand All @@ -158,13 +157,16 @@ public Response updateAnalysis(AnalysisRequest request) {
);
try (QueryManager qm = new QueryManager()) {
final Project project = qm.getObjectByUuid(Project.class, request.getProject());
if (project == null) {
return Response.status(Response.Status.NOT_FOUND).entity("The project could not be found.").build();
}

final Component component = qm.getObjectByUuid(Component.class, request.getComponent());
if (component == null) {
return Response.status(Response.Status.NOT_FOUND).entity("The component could not be found.").build();
}

if (project != null && component.getProject().getId() != project.getId()){
return Response.status(Response.Status.CONFLICT).entity("The component has a different project than the one specified via the project param.").build();
}

final Vulnerability vulnerability = qm.getObjectByUuid(Vulnerability.class, request.getVulnerability());
if (vulnerability == null) {
return Response.status(Response.Status.NOT_FOUND).entity("The vulnerability could not be found.").build();
Expand Down