Do not prepend /jcr_root at the beginning of the pattern. instead it has to be provided explicitly

Author: santiagoGPNC

accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigFilesRetrieverImpl.java

@@ -58,7 +58,8 @@ public Map<String, String> getConfigFileContentFromPackage(Archive archive, Coll
         return configurations;
     }
 
-    private Map<String, String> getConfigurations(PackageEntryOrNode configFileOrDir, Collection<String> configFilePatterns) throws Exception {
+    private Map<String, String> getConfigurations(PackageEntryOrNode configFileOrDir, Collection<String> configFilePatterns)
+            throws Exception {
         Map<String, String> configs = new TreeMap<String, String>();
 
         for (PackageEntryOrNode entry : configFileOrDir.getChildren()) {
@@ -67,18 +68,16 @@ private Map<String, String> getConfigurations(PackageEntryOrNode configFileOrDir
                 configs.putAll(resultsFromDir);
                 continue;
             }
-
             if (isRelevantConfiguration(entry, configFileOrDir.getName(), slingSettingsService, configFilePatterns)) {
                 LOG.debug("Found relevant YAML file {}", entry.getName());
                 configs.put(entry.getPath(), entry.getContentAsString());
             }
-
         }
         return configs;
     }
 
     static boolean isRelevantConfiguration(final PackageEntryOrNode entry, final String parentName,
-                                           ExtendedSlingSettingsService slingSettings, Collection<String> configFilePatterns) throws Exception {
+            ExtendedSlingSettingsService slingSettings, Collection<String> configFilePatterns) throws Exception {
         boolean matchPattern = configFilePatterns.isEmpty();
         for (String pathPattern : configFilePatterns) {
             if (entry.getPath().matches(pathPattern)) {
@@ -90,9 +89,8 @@ static boolean isRelevantConfiguration(final PackageEntryOrNode entry, final Str
             return false;
         }
         String entryName = entry.getName();
-        if (!entryName.endsWith(".yaml") && !entryName.equals("config") /*
-         * name 'config' without .yaml allowed for backwards compatibility
-         */) {
+        // name 'config' without .yaml allowed for backwards compatibility
+        if (!entryName.endsWith(".yaml") && !entryName.equals("config")) {
             return false;
         }
 

accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/impl/AcToolInstallHookServiceImpl.java

@@ -48,8 +48,7 @@ public PersistableInstallationLogger installYamlFilesFromPackage(VaultPackage va
         Set<Object> propertiesKeys = packageProperties.keySet();
         for (Object property : propertiesKeys) {
             if (property.toString().matches(ACL_HOOK_PATHS)) {
-                // archive paths have a /jcr_root prefix which users shouldnt worry about
-                configPathPatterns.add("/jcr_root" + packageProperties.getProperty(property.toString()));
+                configPathPatterns.add(packageProperties.getProperty(property.toString()));
             }
         }
 

accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/ConfigFilesRetrieverImplTest.java

@@ -97,16 +97,16 @@ public void testIsRelevantConfigurationsFiltered() throws Exception {
         Set<String> currentRunmodes = new HashSet<String>(
                 Arrays.asList("author"));
         slingSettings = new ExtendedSlingSettingsServiceImpl(currentRunmodes);
-        Assert.assertTrue((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/conf", "file.yaml"), "config.author",
+        Assert.assertTrue((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/jcr_root/conf", "file.yaml"), "config.author",
                 slingSettings, ImmutableList.<String> of())));
-        Assert.assertTrue((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/conf", "file.yaml"), "config.author",
-                slingSettings, ImmutableList.<String> of("/noMatch", "/conf/.*"))));
-        Assert.assertFalse((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/conf", "file.yaml"), "config.author",
-                slingSettings, ImmutableList.<String> of("/conf/test.*.yaml"))));
-        Assert.assertTrue((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/conf", "file.yaml"), "config.author",
-                slingSettings, ImmutableList.<String> of("/conf/.*\\.yaml", "/noMatch"))));
-        Assert.assertFalse((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/conf", "file.yaml"), "config.author",
-                slingSettings, ImmutableList.<String> of("/nonconf.*"))));
+        Assert.assertTrue((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/jcr_root/conf", "file.yaml"), "config.author",
+                slingSettings, ImmutableList.<String> of("/noMatch", "/jcr_root/conf/.*"))));
+        Assert.assertFalse((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/jcr_root/conf", "file.yaml"), "config.author",
+                slingSettings, ImmutableList.<String> of("/jcr_root/conf/test.*.yaml"))));
+        Assert.assertTrue((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/jcr_root/conf", "file.yaml"), "config.author",
+                slingSettings, ImmutableList.<String> of("/jcr_root/conf/.*\\.yaml", "/noMatch"))));
+        Assert.assertFalse((ConfigFilesRetrieverImpl.isRelevantConfiguration(new StubEntry("/jcr_root/conf", "file.yaml"), "config.author",
+                slingSettings, ImmutableList.<String> of("/jcr_root/nonconf.*"))));
 
     }
 

docs/ApplyConfig.md

@@ -69,7 +69,9 @@ If you would rather use the filevault-package-maven-plugin for building the pack
 </plugin>
 ```
 
-The `*.yaml` files are installed directly from the package content and respect the [run mode semantics](Configuration.md). Otherwise there is no limitation, so the YAML files will be picked up from anywhere in the package (as long as the parent node does not contain a `.` followed by one or multiple not matching run modes). If you wish to limit where the YAML files are looked upon you can add one or more package properties with a regular expression to match the desired paths. The properties names should start with `actool.hook.paths.patterns`:
+The `*.yaml` files are installed directly from the package content and respect the [run mode semantics](Configuration.md). Otherwise there is no limitation, so the YAML files will be picked up from anywhere in the package (as long as the parent node does not contain a `.` followed by one or multiple not matching run modes).
+
+If you wish to limit which YAML files are picked up by the installation hook, you can add one or more regular expressions as package properties that start with the prefix `actool.hook.paths.patterns`. If the path of a file within the package matches any of the provided patterns, it will be picked up by the installation hook:
 
 ```
 <plugin>
@@ -78,8 +80,8 @@ The `*.yaml` files are installed directly from the package content and respect t
     <configuration>
         <properties>
             <installhook.actool.class>biz.netcentric.cq.tools.actool.installhook.AcToolInstallHook</installhook.actool.class>
-            <actool.hook.paths.patterns.groups>/apps/myapp/acl/groups.*</actool.hook.paths.patterns.groups>
-            <actool.hook.paths.patterns.users>/apps/myapp/acl/users.*</actool.hook.paths.patterns.users>
+            <actool.hook.paths.patterns.groups>/jcr_content/apps/myapp/acl/groups.*</actool.hook.paths.patterns.groups>
+            <actool.hook.paths.patterns.users>/jcr_content/apps/myapp/acl/users.*</actool.hook.paths.patterns.users>
         </properties>
     </configuration>
 </plugin>