Merge branch 'master' into bugfix/issue-3438-rewriter-double-scheme

CHANGELOG.md

@@ -10,9 +10,21 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
 
 ## Unreleased ([details][unreleased changes details])
 
+### Added
+
+- #3415 - Allow Robots.txt generation to serve different file by requested resource path
+- #3426 - Content Sync: view history of completed jobs
+
 ### Changed
 
 - #3420 - Redirect Map Manager - enable Redirect Map Manager in AEM CS (would require a specific - not public yet - AEM CS release version, TBA)
+- #3429 - UI Widgets - add uniq function to embedded lodash library to resolve issue with composite multifield widget
+- #3423 - Redirect Manager - status code is not retaining its value in the dialog after authoring
+- #3417 - Configurable recursion in Content Sync
+
+### Fixed
+
+- #3413 - Redirect Manager: Interface triggers an error because of wrong deprecated resource type
 
 ## 6.6.4 - 2024-08-14
 

all/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.adobe.acs</groupId>
         <artifactId>acs-aem-commons</artifactId>
-        <version>6.6.5-SNAPSHOT</version>
+        <version>6.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- ====================================================================== -->

bundle-cloud/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.adobe.acs</groupId>
         <artifactId>acs-aem-commons</artifactId>
-        <version>6.6.5-SNAPSHOT</version>
+        <version>6.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- ====================================================================== -->

bundle-onprem/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.adobe.acs</groupId>
         <artifactId>acs-aem-commons</artifactId>
-        <version>6.6.5-SNAPSHOT</version>
+        <version>6.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- ====================================================================== -->

bundle/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.adobe.acs</groupId>
         <artifactId>acs-aem-commons</artifactId>
-        <version>6.6.5-SNAPSHOT</version>
+        <version>6.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- ====================================================================== -->

bundle/src/main/java/com/adobe/acs/commons/contentsync/ConfigurationUtils.java

@@ -20,13 +20,17 @@
 package com.adobe.acs.commons.contentsync;
 
 import com.adobe.acs.commons.contentsync.impl.LastModifiedStrategy;
+import org.apache.jackrabbit.JcrConstants;
 import org.apache.sling.api.resource.PersistenceException;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceUtil;
 
+import java.io.ByteArrayInputStream;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 import static com.adobe.acs.commons.contentsync.RemoteInstance.CONNECT_TIMEOUT;
 import static com.adobe.acs.commons.contentsync.RemoteInstance.SOCKET_TIMEOUT;
@@ -64,4 +68,34 @@ public static Resource getHostsResource(ResourceResolver resourceResolver) throw
         resourceProperties.put(JCR_PRIMARYTYPE, NT_UNSTRUCTURED);
         return ResourceUtil.getOrCreateResource(resourceResolver, HOSTS_PATH, resourceProperties, NT_SLING_FOLDER, true);
     }
+
+    public static void persistAuditLog(ResourceResolver resourceResolver, String path, long count, String data) throws PersistenceException {
+
+        String auditHome = CONFIG_PATH + "/audit";
+        ResourceUtil.getOrCreateResource(resourceResolver, auditHome,
+                Collections.singletonMap(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED), JcrConstants.NT_FOLDER, false);
+
+        Map<String, Object> auditProps = new HashMap<>();
+        auditProps.put(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED);
+        auditProps.put("syncPath", path);
+        auditProps.put(JcrConstants.JCR_MIXINTYPES, "mix:created");
+        auditProps.put("count", count);
+        String auditResourcePath = auditHome + "/" + UUID.randomUUID();
+        ResourceUtil.getOrCreateResource(resourceResolver, auditResourcePath, auditProps, null, false);
+
+        String auditLogPath = auditResourcePath + "/log";
+        ResourceUtil.getOrCreateResource(resourceResolver, auditLogPath,
+                Collections.singletonMap(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_FILE), null, false);
+
+        Map<String, Object> props = new HashMap<>();
+        props.put(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_RESOURCE);
+        props.put(JcrConstants.JCR_MIMETYPE, "text/plain");
+
+        props.put(JcrConstants.JCR_DATA, new ByteArrayInputStream(data.getBytes()));
+
+        ResourceUtil.getOrCreateResource(resourceResolver, auditLogPath + "/" + JcrConstants.JCR_CONTENT,
+                props, null, false);
+
+        resourceResolver.commit();
+    }
 }

bundle/src/main/java/com/adobe/acs/commons/contentsync/impl/LastModifiedStrategy.java

@@ -60,17 +60,17 @@ public List<CatalogItem> getItems(SlingHttpServletRequest request) {
         if (rootPath == null) {
             throw new IllegalArgumentException("root request parameter is required");
         }
+        boolean recursive = "true".equals(request.getParameter("recursive"));
 
         Resource root = request.getResourceResolver().getResource(rootPath);
         if (root == null) {
             return Collections.emptyList();
         }
-
         List<CatalogItem> items = new ArrayList<>();
         new AbstractResourceVisitor() {
             @Override
             public void visit(Resource res) {
-                if (!accepts(res)) {
+                if ((!recursive && !res.getPath().equals(root.getPath())) || !accepts(res)) {
                     return;
                 }
                 JsonObjectBuilder json = Json.createObjectBuilder();

bundle/src/main/java/com/adobe/acs/commons/contentsync/package-info.java

@@ -17,5 +17,5 @@
  * limitations under the License.
  * #L%
  */
-@org.osgi.annotation.versioning.Version("1.1.0")
+@org.osgi.annotation.versioning.Version("1.2.0")
 package com.adobe.acs.commons.contentsync;

bundle/src/main/java/com/adobe/acs/commons/wcm/impl/RobotsServlet.java

@@ -52,6 +52,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -79,6 +80,8 @@ public final class RobotsServlet extends SlingSafeMethodsServlet {
 
     private String robotsContentsPropertyPath;
 
+    private final Map<String, String> robotsContentsPropertyPathMap = new HashMap<>();
+
     private boolean printGroupingComments;
 
     private int crawlDelay;
@@ -95,6 +98,16 @@ public final class RobotsServlet extends SlingSafeMethodsServlet {
     protected void activate(RobotsServletConfig config) {
         externalizerDomain = config.externalizer_domain();
         robotsContentsPropertyPath = config.robots_content_property_path();
+        for (String mapping : config.robots_content_property_pathMappings()) {
+            if (StringUtils.isNotBlank(mapping)) {
+                String[] mappingParts = mapping.split("=");
+                if (mappingParts.length == 2) {
+                    robotsContentsPropertyPathMap.put(mappingParts[0], mappingParts[1]);
+                } else {
+                    log.warn("Invalid robots_content_property_path mapping: {}", mapping);
+                }
+            }
+        }
         printGroupingComments = config.print_grouping_comments();
         crawlDelay = config.crawl_delay();
 
@@ -111,7 +124,7 @@ protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse r
     }
 
     private void write(SlingHttpServletRequest request, SlingHttpServletResponse response) throws IOException {
-        if (StringUtils.isNotBlank(robotsContentsPropertyPath)) {
+        if (StringUtils.isNotBlank(robotsContentsPropertyPath) || !robotsContentsPropertyPathMap.isEmpty()) {
             writeFromBinaryProperty(request, response);
         } else {
             writeFromOsgiConfig(request, response);
@@ -211,9 +224,18 @@ private void addRuleForPageHavingBooleanProperty(Page page, List<String> propNam
     }
 
     private void writeFromBinaryProperty(SlingHttpServletRequest request, SlingHttpServletResponse response) throws IOException {
-        String absoluteRobotsContentsPropertyPath = robotsContentsPropertyPath;
+        String absoluteRobotsContentsPropertyPath = robotsContentsPropertyPathMap.get(request.getResource().getPath());
+        if (StringUtils.isBlank(absoluteRobotsContentsPropertyPath)) {
+            if (StringUtils.isNotBlank(robotsContentsPropertyPath)) {
+                absoluteRobotsContentsPropertyPath = robotsContentsPropertyPath;
+            } else {
+                log.error("robots file requested but resource path {} not found in mappings", request.getResource().getPath());
+                response.sendError(HttpServletResponse.SC_NOT_FOUND);
+                return;
+            }
+        }
         if (!absoluteRobotsContentsPropertyPath.startsWith("/")) {
-            absoluteRobotsContentsPropertyPath = request.getResource().getPath() + "/" + robotsContentsPropertyPath;
+            absoluteRobotsContentsPropertyPath = request.getResource().getPath() + "/" + absoluteRobotsContentsPropertyPath;
         }
 
         boolean written = false;
@@ -334,6 +356,9 @@ private String buildAllowedOrDisallowedDirective(boolean isAllowed, String allow
         @AttributeDefinition(name = "Robots Content Property", description = "Path (either relative or absolute) to a String or Binary property containing the entire robots.txt contents. This could be a page property (e.g. robotsTxtContents) or the contents of a file within the DAM (e.g. /content/dam/my-site/seo/robots.txt/jcr:content/renditions/original/jcr:content/jcr:data). If this is specified, all other configurations are effectively ignored.")
         String robots_content_property_path();
 
+        @AttributeDefinition(name = "Robots Content Property Map", description = "Overrides Robots Content Property with mappings of <resource path>=<Robots Content Property> such that only a resource matching the exact <resource path> will honor the Robots Content Property. If a valid mapping is not found for the current resource path, Robots Content Property will be used as a fallback if specified.")
+        String[] robots_content_property_pathMappings() default {};
+
         @AttributeDefinition(name = "User Agent Directives", description = "A set of User-agent directives to add to the robots file. Each directive is optionally pre-fixed with a ruleGroupName. Syntax: [<ruleGroupName>:]<user agent name>")
         String[] user_agent_directives() default {};
 

bundle/src/test/java/com/adobe/acs/commons/contentsync/impl/TestLastModifiedStrategy.java

@@ -199,4 +199,42 @@ public void testCustomExporter() {
         assertEquals(path + ".infinity.json", item.getContentUri());
         assertEquals(customExporter, item.getCustomExporter());
     }
+
+    @Test
+    public void testRecursive()  {
+        doAnswer(invocation -> {
+            GenericServlet servlet = mock(GenericServlet.class);
+            doReturn(REDIRECT_SERVLET).when(servlet).getServletName();
+            return servlet;
+        }).when(servletResolver).resolveServlet(any(SlingHttpServletRequest.class));
+
+        context.create().page("/content/wknd");
+        context.create().page("/content/wknd/en");
+        context.create().page("/content/wknd/en/home");
+        MockSlingHttpServletRequest request = context.request();
+
+        request.addRequestParameter("root", "/content/wknd");
+        request.addRequestParameter("recursive", "true");
+
+        List<CatalogItem> items = updateStrategy.getItems(request);
+        assertEquals(3, items.size());
+    }
+
+    @Test
+    public void testNonRecursive()  {
+        doAnswer(invocation -> {
+            GenericServlet servlet = mock(GenericServlet.class);
+            doReturn(REDIRECT_SERVLET).when(servlet).getServletName();
+            return servlet;
+        }).when(servletResolver).resolveServlet(any(SlingHttpServletRequest.class));
+
+        context.create().page("/content/wknd");
+        context.create().page("/content/wknd/en");
+        context.create().page("/content/wknd/en/home");
+        MockSlingHttpServletRequest request = context.request();
+        request.addRequestParameter("root", "/content/wknd");
+
+        List<CatalogItem> items = updateStrategy.getItems(request);
+        assertEquals(1, items.size());
+    }
 }

bundle/src/test/java/com/adobe/acs/commons/wcm/impl/RobotsServletTest.java

@@ -85,13 +85,40 @@ public void testWriteFromPageProperty() throws IOException, ServletException {
         assertResponse("RobotsServlet_testWriteFromPageProperty.txt", response);
     }
 
+    @Test
+    public void testWriteFromPagePropertyFromPathMappings() throws IOException, ServletException {
+        Map<String, Object> props = new HashMap<>();
+        props.put("sling.servlet.resourceTypes", "geometrixx/components/structure/page");
+        props.put("robots.content.property.pathMappings", new String[] {"/content/geometrixx/es/jcr:content=thisPropDoesntExist",
+                "/content/geometrixx/en/jcr:content=robotsContents"});
+        RobotsServlet robotsServlet = context.registerInjectActivateService(new RobotsServlet(), props);
+        robotsServlet.doGet(request, response);
+        assertEquals("servlet returned an error", 200, response.getStatus());
+        assertResponse("RobotsServlet_testWriteFromPageProperty.txt", response);
+    }
+
     @Test
     public void testWriteFromAsset() throws ServletException, IOException {
         context.create().asset("/content/dam/geometrixx/robots.txt", getClass().getResourceAsStream("RobotsServlet_testWriteFromAsset.txt"), "text/plain");
 
         Map<String, Object> props = new HashMap<>();
         props.put("sling.servlet.resourceTypes", "geometrixx/components/structure/page");
         props.put("robots.content.property.path", "/content/dam/geometrixx/robots.txt/jcr:content/renditions/original/jcr:content/jcr:data");
+        props.put("robots.content.property.pathMappings", new String[] {"/content/some/other/page/jcr:content=/some/other/path/jcr:data"});
+        RobotsServlet robotsServlet = context.registerInjectActivateService(new RobotsServlet(), props);
+        robotsServlet.doGet(request, response);
+        assertEquals("servlet returned an error", 200, response.getStatus());
+        assertResponse("RobotsServlet_testWriteFromAsset.txt", response);
+    }
+
+    @Test
+    public void testWriteFromAssetFromMappings() throws ServletException, IOException {
+        context.create().asset("/content/dam/geometrixx/robots.txt", getClass().getResourceAsStream("RobotsServlet_testWriteFromAsset.txt"), "text/plain");
+
+        Map<String, Object> props = new HashMap<>();
+        props.put("sling.servlet.resourceTypes", "geometrixx/components/structure/page");
+        props.put("robots.content.property.pathMappings", new String[] {"/content/some/other/page/jcr:content=/some/other/path/jcr:data",
+                "/content/geometrixx/en/jcr:content=/content/dam/geometrixx/robots.txt/jcr:content/renditions/original/jcr:content/jcr:data"});
         RobotsServlet robotsServlet = context.registerInjectActivateService(new RobotsServlet(), props);
         robotsServlet.doGet(request, response);
         assertEquals("servlet returned an error", 200, response.getStatus());
@@ -245,6 +272,17 @@ public void testWriteFromNonExistentPropertyRelative() throws ServletException,
         assertEquals("servlet did not return the expected error", 404, response.getStatus());
     }
 
+    @Test
+    public void testWriteFromNonExistentPathMapping() throws ServletException, IOException {
+        Map<String, Object> props = new HashMap<>();
+        props.put("sling.servlet.resourceTypes", "geometrixx/components/structure/page");
+        props.put("robots.content.property.pathMappings", new String[] {"/content/some/other/page/jcr:content=/non/existent/path",
+                "", "/content/geometrixx/en/jcr:content"});
+        RobotsServlet robotsServlet = context.registerInjectActivateService(new RobotsServlet(), props);
+        robotsServlet.doGet(request, response);
+        assertEquals("servlet did not return the expected error", 404, response.getStatus());
+    }
+
     private void assertResponse(String expectedResponseOutputResourceName, MockSlingHttpServletResponse response) throws IOException {
         try (InputStream resourceAsStream = getClass().getResourceAsStream(expectedResponseOutputResourceName)) {
             // both response and input stream contains OS dependent line endings (no need to normalize)

oakpal-checks/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.adobe.acs</groupId>
         <artifactId>acs-aem-commons</artifactId>
-        <version>6.6.5-SNAPSHOT</version>
+        <version>6.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- ====================================================================== -->

pom.xml

@@ -25,7 +25,7 @@
 
     <groupId>com.adobe.acs</groupId>
     <artifactId>acs-aem-commons</artifactId>
-    <version>6.6.5-SNAPSHOT</version>
+    <version>6.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ACS AEM Commons - Reactor Project</name>

ui.apps/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.adobe.acs</groupId>
         <artifactId>acs-aem-commons</artifactId>
-        <version>6.6.5-SNAPSHOT</version>
+        <version>6.7.0-SNAPSHOT</version>
     </parent>
 
     <!-- ====================================================================== -->