Skip to content

Commit

Permalink
Merge branch 'master' into feature/make-dispatcher-rules-work-in-cloud
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidjgonzalez
davidjgonzalez authored Aug 30, 2023
2 parents 8a028a5 + 4be29a1 commit 1921914
Show file tree
Hide file tree
Showing 9 changed files with 210 additions and 55 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)

## Fixed

- #3040 - Fixed bug where namespaced multi-fields would have the namespace 2 times
- #3140 - Fixed issue where malformed MCP process nodes can cause a NPE that breaks the entire MPC reporting UI. Now displays more friendly values in UI to help remove the invalid nodes.
- #3150 - Support for case-insensitive redirect rules ( [NC] flag equivalent of apache)
- #3138 - Re-arrange action removes data from redirect node
Expand Down
51 changes: 46 additions & 5 deletions .../com/adobe/acs/commons/granite/ui/components/impl/include/IncludeDecoratorFilterImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,12 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.engine.EngineConstants;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.ConfigurationPolicy;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.metatype.annotations.Designate;
import org.osgi.service.metatype.annotations.ObjectClassDefinition;

import javax.annotation.CheckForNull;
import javax.servlet.Filter;
Expand All @@ -35,6 +39,9 @@


import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.function.Predicate;

@Component(
service = Filter.class,
Expand All @@ -43,6 +50,7 @@
EngineConstants.SLING_FILTER_SCOPE+"="+ EngineConstants.FILTER_SCOPE_INCLUDE
}
)
@Designate(ocd = IncludeDecoratorFilterImpl.Config.class)
public class IncludeDecoratorFilterImpl implements Filter {

static final String RESOURCE_TYPE = "acs-commons/granite/ui/components/include";
Expand All @@ -65,7 +73,28 @@ public class IncludeDecoratorFilterImpl implements Filter {
* Prefix value parameters passed downwards
*/
static final String PREFIX = "ACS_AEM_COMMONS_INCLUDE_PREFIX_";



static final String REQ_ATTR_IGNORE_CHILDREN_RESOURCE_TYPE = "ACS_AEM_COMMONS_EXCLUDE_CHILDREN_RESOURCE_TYPE";

private List<String> resourceTypesIgnoreChildren;

@ObjectClassDefinition(
name = "ACS AEM Commons - IncludeDecoratorFilterImpl",
description = "Used to perform the namespacing / parameterization in the include context")
public @interface Config {
String[] resourceTypesIgnoreChildren() default {
"granite/ui/components/coral/foundation/form/multifield"
};
}

@Activate
@Modified
public void init(Config config) {
this.resourceTypesIgnoreChildren = Arrays.asList(config.resourceTypesIgnoreChildren());
}


@Override
public void init(FilterConfig filterConfig) throws ServletException {
// no-op
Expand All @@ -77,16 +106,28 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
ValueMap parameters = ValueMap.EMPTY;

if(servletRequest instanceof SlingHttpServletRequest){

SlingHttpServletRequest request = (SlingHttpServletRequest) servletRequest;

if(request.getResourceResolver().isResourceType(request.getResource(), RESOURCE_TYPE)){
Predicate<String> typeCheckFn = (resourceType) -> request.getResourceResolver().isResourceType(request.getResource(), resourceType);

if(typeCheckFn.test(RESOURCE_TYPE)){
performFilter(request, servletResponse, chain, parameters);
return;
}else if(resourceTypesIgnoreChildren.stream().anyMatch(typeCheckFn)){
boolean ignoreChildren = resourceTypesIgnoreChildren.stream().anyMatch(typeCheckFn);
if(ignoreChildren){
request.setAttribute(REQ_ATTR_IGNORE_CHILDREN_RESOURCE_TYPE, request.getResource().getResourceType());
}
chain.doFilter(servletRequest, servletResponse);
if(ignoreChildren){
request.removeAttribute(REQ_ATTR_IGNORE_CHILDREN_RESOURCE_TYPE);
}
return;
}

}

chain.doFilter(servletRequest, servletResponse);
}

Expand Down
91 changes: 57 additions & 34 deletions ...obe/acs/commons/granite/ui/components/impl/include/NamespaceDecoratedValueMapBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,35 +19,37 @@

import com.adobe.acs.commons.util.TypeUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.sling.api.SlingConstants;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.api.wrappers.ValueMapDecorator;


import java.util.Map;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Optional;
import java.util.Iterator;
import java.util.function.Supplier;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import static com.adobe.acs.commons.granite.ui.components.impl.include.IncludeDecoratorFilterImpl.REQ_ATTR_NAMESPACE;
import static com.adobe.acs.commons.granite.ui.components.impl.include.IncludeDecoratorFilterImpl.PREFIX;
import static com.adobe.acs.commons.granite.ui.components.impl.include.IncludeDecoratorFilterImpl.*;
import static org.apache.commons.lang3.StringUtils.*;


public class NamespaceDecoratedValueMapBuilder {

public static final String REQ_ATTR_TEST_FLAG = "ACS_COMMONS_TEST_FLAG";
private final SlingHttpServletRequest request;

private final Map<String,Object> copyMap;
private final String[] namespacedProperties;

static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("(\\$\\{\\{([a-zA-Z0-9]+?)(:(.+?))??\\}\\})+?");
static final Pattern PLACEHOLDER_TYPE_HINTED_PATTERN = Pattern.compile("(.*)\\$\\{\\{(\\(([a-zA-Z]+)\\)){1}([a-zA-Z0-9]+)(:(.+))?\\}\\}(.*)?");

public NamespaceDecoratedValueMapBuilder(SlingHttpServletRequest request, Resource resource, String[] namespacedProperties) {
this.request = request;
this.copyMap = new HashMap<>(resource.getValueMap());
Expand All @@ -59,9 +61,30 @@ public NamespaceDecoratedValueMapBuilder(SlingHttpServletRequest request, Resour
this.applyNameSpacing();
}

private void applyNameSpacing() {
/**
* Checks whether the resource type given is the request resource's resource type.
* Using a separate branch for unit tests, as the AEM Mocks are bugged (returns the jcr:primaryType instead)
* @param resourceType
* @return
*/
private boolean isResourceType(String resourceType){
if(request.getAttribute(REQ_ATTR_TEST_FLAG) != null
&& resourceType.equals(copyMap.get( SlingConstants.NAMESPACE_PREFIX +":"+SlingConstants.PROPERTY_RESOURCE_TYPE))){
return true;
}else {
return request.getResourceResolver().isResourceType(request.getResource(), request.getAttribute(REQ_ATTR_IGNORE_CHILDREN_RESOURCE_TYPE).toString());
}
}

if (request.getAttribute(REQ_ATTR_NAMESPACE) != null) {
private void applyNameSpacing() {
;
Supplier<Boolean> shouldConsiderNamespacing = () ->
request.getAttribute(REQ_ATTR_NAMESPACE) != null
&& ( request.getAttribute(REQ_ATTR_IGNORE_CHILDREN_RESOURCE_TYPE) == null
|| isResourceType(request.getAttribute(REQ_ATTR_IGNORE_CHILDREN_RESOURCE_TYPE).toString())
);

if (shouldConsiderNamespacing.get()) {
for (String namespacedProp : namespacedProperties) {
if (copyMap.containsKey(namespacedProp)) {

Expand All @@ -86,85 +109,85 @@ private void applyNameSpacing() {
}

}

public ValueMap build(){
return new ValueMapDecorator(copyMap);
}

private void applyDynamicVariables() {
for(Iterator<Map.Entry<String,Object>> iterator = this.copyMap.entrySet().iterator(); iterator.hasNext();){

Map.Entry<String,Object> entry = iterator.next();

if(entry.getValue() instanceof String) {
final Object filtered = filter(entry.getValue().toString(), this.request);
copyMap.put(entry.getKey(), filtered);
}

}
}


private Object filter(String value, SlingHttpServletRequest request) {
Object filtered = applyTypeHintedPlaceHolders(value, request);

if(filtered != null){
return filtered;
}

return applyPlaceHolders(value, request);
}

private Object applyTypeHintedPlaceHolders(String value, SlingHttpServletRequest request) {
Matcher matcher = PLACEHOLDER_TYPE_HINTED_PATTERN.matcher(value);

if (matcher.find()) {

String prefix = matcher.group(1);
String typeHint = matcher.group(3);
String paramKey = matcher.group(4);
String defaultValue = matcher.group(6);
String suffix = matcher.group(7);

String requestParamValue = (request.getAttribute(PREFIX + paramKey) != null) ? request.getAttribute(PREFIX + paramKey).toString() : null;
String chosenValue = defaultString(requestParamValue, defaultValue);
String finalValue = defaultIfEmpty(prefix, EMPTY) + chosenValue + defaultIfEmpty(suffix, EMPTY);

return isNotEmpty(typeHint) ? castTypeHintedValue(typeHint, finalValue) : finalValue;
}

return null;
}

private String applyPlaceHolders(String value, SlingHttpServletRequest request) {
Matcher matcher = PLACEHOLDER_PATTERN.matcher(value);
StringBuffer buffer = new StringBuffer();

while (matcher.find()) {

String paramKey = matcher.group(2);
String defaultValue = matcher.group(4);

String requestParamValue = (request.getAttribute(PREFIX + paramKey) != null) ? request.getAttribute(PREFIX + paramKey).toString() : null;
String chosenValue = defaultString(requestParamValue, defaultValue);

if(chosenValue == null){
chosenValue = StringUtils.EMPTY;
}

matcher.appendReplacement(buffer, chosenValue);

}

matcher.appendTail(buffer);

return buffer.toString();
}

private Object castTypeHintedValue(String typeHint, String chosenValue) {

final Class<?> clazz;

switch(typeHint.toLowerCase()){
case "boolean":
clazz = Boolean.class;
Expand All @@ -179,7 +202,7 @@ private Object castTypeHintedValue(String typeHint, String chosenValue) {
clazz = String.class;
break;
}

return TypeUtil.toObjectType(chosenValue, clazz);
}
}
9 changes: 6 additions & 3 deletions ...va/com/adobe/acs/commons/granite/ui/components/impl/include/NamespaceResourceWrapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.commons.collections.iterators.TransformIterator;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;

import javax.annotation.Nonnull;
Expand All @@ -37,10 +38,12 @@ public class NamespaceResourceWrapper extends FilteringResourceWrapper {

private final SlingHttpServletRequest request;
private final String[] namespacedProperties;

private final ValueMap valueMap;

public NamespaceResourceWrapper(@Nonnull Resource resource, @Nonnull ExpressionResolver expressionResolver,
@Nonnull SlingHttpServletRequest request, String[] namespacedProperties) {
@Nonnull SlingHttpServletRequest request,
String[] namespacedProperties) {
super(resource, expressionResolver, request);
this.expressionResolver = expressionResolver;
this.request = request;
Expand All @@ -59,7 +62,7 @@ public Resource getChild(String relPath) {
return null;
}

NamespaceResourceWrapper wrapped =new NamespaceResourceWrapper(child, expressionResolver, request,namespacedProperties);
NamespaceResourceWrapper wrapped =new NamespaceResourceWrapper(child, expressionResolver, request,namespacedProperties);

if(!isVisible(wrapped)){
return null;
Expand Down Expand Up @@ -99,4 +102,4 @@ public ValueMap getValueMap() {
}


}
}
18 changes: 11 additions & 7 deletions ...commons/granite/ui/components/impl/include/NamespacedTransformedResourceProviderImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
@Component(service = NamespacedTransformedResourceProvider.class)
@Designate(ocd = NamespacedTransformedResourceProviderImpl.Config.class)
public class NamespacedTransformedResourceProviderImpl implements NamespacedTransformedResourceProvider {

@ObjectClassDefinition(
name = "ACS AEM Commons - NamespacedTransformedResourceProvider",
description = "Transforms a resource underlying children with a namespace. Used for granite dialog snippets to be included in a granular way.")
Expand All @@ -44,21 +44,25 @@ public class NamespacedTransformedResourceProviderImpl implements NamespacedTran
)
String[] properties() default {"name", "fileNameParameter", "fileReferenceParameter"};
}

@Reference
private ExpressionResolver expressionResolver;

private String[] namespacedProperties;

@Activate
@Modified
public void init(Config config) {
this.namespacedProperties = config.properties();
}

@Override
public Resource transformResourceWithNameSpacing(SlingHttpServletRequest request, Resource targetResource) {
return new NamespaceResourceWrapper(targetResource, expressionResolver, request, namespacedProperties);
return new NamespaceResourceWrapper(
targetResource,
expressionResolver,
request,
namespacedProperties);
}

}
Loading

0 comments on commit 1921914

Please sign in to comment.