Skip to content
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

Jump to bottom

Port: Fix infinite recursion during policy condition serialization #920

Merged
merged 1 commit into from
Sep 24, 2024
Merged

Port: Fix infinite recursion during policy condition serialization #920

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
44 changes: 23 additions & 21 deletions src/main/java/org/dependencytrack/resources/v1/PolicyConditionResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,6 @@
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.security.SecurityRequirements;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Validator;
import jakarta.ws.rs.BadRequestException;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.PUT;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import org.apache.commons.lang3.StringUtils;
import org.dependencytrack.auth.Permissions;
import org.dependencytrack.model.Policy;
Expand All @@ -53,8 +42,17 @@
import org.projectnessie.cel.common.CELError;
import org.projectnessie.cel.tools.ScriptCreateException;

import javax.jdo.FetchPlan;
import javax.jdo.PersistenceManager;
import jakarta.validation.Validator;
import jakarta.ws.rs.BadRequestException;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.PUT;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.PathParam;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import java.util.ArrayList;
import java.util.Map;

Expand Down Expand Up @@ -105,7 +103,12 @@ public Response createPolicyCondition(
final PolicyCondition pc = qm.createPolicyCondition(policy, jsonPolicyCondition.getSubject(),
jsonPolicyCondition.getOperator(), StringUtils.trimToNull(jsonPolicyCondition.getValue()),
jsonPolicyCondition.getViolationType());
return Response.status(Response.Status.CREATED).entity(detachConditions(qm, pc)).build();

// Prevent infinite recursion during JSON serialization.
qm.makeTransient(pc);
pc.setPolicy(null);

return Response.status(Response.Status.CREATED).entity(pc).build();
} else {
return Response.status(Response.Status.NOT_FOUND).entity("The UUID of the policy could not be found.").build();
}
Expand Down Expand Up @@ -140,7 +143,12 @@ public Response updatePolicyCondition(PolicyCondition jsonPolicyCondition) {
if (pc != null) {
maybeValidateExpression(jsonPolicyCondition);
pc = qm.updatePolicyCondition(jsonPolicyCondition);
return Response.status(Response.Status.CREATED).entity(pc).build();

// Prevent infinite recursion during JSON serialization.
qm.makeTransient(pc);
pc.setPolicy(null);

return Response.status(Response.Status.OK).entity(pc).build();
} else {
return Response.status(Response.Status.NOT_FOUND).entity("The UUID of the policy condition could not be found.").build();
}
Expand Down Expand Up @@ -196,10 +204,4 @@ private void maybeValidateExpression(final PolicyCondition policyCondition) {
}
}

private PolicyCondition detachConditions(final QueryManager qm, final PolicyCondition policyCondition) {
final PersistenceManager pm = qm.getPersistenceManager();
pm.getFetchPlan().setMaxFetchDepth(1); // Ensure policyCondition from policy is not included
pm.getFetchPlan().setDetachmentOptions(FetchPlan.DETACH_LOAD_FIELDS);
return qm.getPersistenceManager().detachCopy(policyCondition);
}
}
Loading
Loading