Skip to content
Open
Changes from 1 commit
Commits
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
63 changes: 60 additions & 3 deletions core/src/main/java/com/themecleanflex/models/ReferenceModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.peregrine.commons.util.PerConstants;

import com.peregrine.commons.util.PerUtil;
import com.peregrine.nodetypes.models.AbstractComponent;
import com.peregrine.nodetypes.models.IComponent;
import org.apache.sling.api.resource.Resource;
Expand All @@ -21,12 +22,18 @@
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
import java.util.Set;

import javax.inject.Inject;

import static java.util.Objects.isNull;

import static org.apache.commons.lang.StringUtils.contains;
import static org.apache.commons.lang.StringUtils.isBlank;

/*
//GEN[:DATA
{
Expand Down Expand Up @@ -567,10 +574,11 @@ public String getReferenceJson() {
}

private String generateReferenceJson() {
if(reference == null || "".equals(reference)) {
if (isBlank(reference) || createsReferenceLoop(getResource(), new HashSet<>())) {
return null;
}
ResourceResolver resourceResolver = getResource().getResourceResolver();

ResourceResolver resourceResolver = getResource().getResourceResolver();
Resource referencedResource = resourceResolver.getResource(reference+"/jcr:content");
if(referencedResource == null) {
LOG.error("Reference '{}' does not resolve to a resource.", reference);
Expand Down Expand Up @@ -602,7 +610,56 @@ private String generateReferenceJson() {
return null;
}

// find a node with the given key/value pair in our json output
private boolean createsReferenceLoop(final Resource resource, final Set<String> forbiddenPaths) {
if (forbiddenPaths.contains(resource.getPath())) {
return true;
}

forbiddenPaths.addAll(forbiddenReferences(resource.getPath()));
if (Optional.of(resource)
.filter(r -> r.isResourceType("themecleanflex/components/reference"))
.map(Resource::getValueMap)
.map(props -> props.get("reference", String.class))
.map(resource.getResourceResolver()::getResource)
.map(r -> createsReferenceLoop(r, forbiddenPaths))
.orElse(false)) {
return true;
}

for (final Resource child : resource.getChildren()) {
if (createsReferenceLoop(child, forbiddenPaths)) {
return true;
}
}

return false;
}

private static Set<String> forbiddenReferences(final String path) {
final Set<String> result = new HashSet<>();
result.add(path);
if (!isJcrContentDescendant(path)) {
if (PerUtil.isJcrContent(path)) {
result.add(PerUtil.getParent(path));
}

return result;
}

String parent = path;
do {
parent = PerUtil.getParent(parent);
result.add(parent);
} while (!PerUtil.isJcrContent(parent));
result.add(PerUtil.getParent(parent));
return result;
}

private static boolean isJcrContentDescendant(final String path) {
return contains(path, "/jcr:content/");
}

// find a node with the given key/value pair in our json output
private Map findNode(Map map, String name, String value) {
for (Object key : map.keySet()) {
Object val = map.get(key);
Expand Down