release composum-nodes-3.2.1

ist-dresden · Dec 18, 2021 · 6b1c1d9 · 6b1c1d9
2 parents e55a9a4 + e2593f6
commit 6b1c1d9
Show file tree

Hide file tree

Showing 35 changed files with 93 additions and 45 deletions.
diff --git a/commons/pom.xml b/commons/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-commons</artifactId>

diff --git a/console/pom.xml b/console/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-console</artifactId>
@@ -154,6 +154,10 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.settings</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.scripting.jsp</artifactId>

diff --git a/console/src/main/java/com/composum/sling/nodes/console/Condition.java b/console/src/main/java/com/composum/sling/nodes/console/Condition.java
@@ -14,6 +14,7 @@
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.settings.SlingSettingsService;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -44,6 +45,7 @@ public interface Condition {
     String KEY_CLASS = "class";
     String KEY_SERVLET = "servlet";
     String KEY_HTTP = "http";
+    String KEY_RUNMODE = "runmode";
     String KEY_PERMISSION = "permission";
 
     /**
@@ -155,9 +157,35 @@ public boolean accept(@NotNull BeanContext context, @NotNull Resource resource)
 
     // implementations
 
+    /**
+     * check the avaiability of a servlet registered fo a given resource type
+     */
+    class RunmodePermission implements Condition {
+
+        public static final Logger LOG = LoggerFactory.getLogger(ClassAvailability.class);
+
+        protected final List<String> alternatives;
+
+        public RunmodePermission(@NotNull final String pattern) {
+            alternatives = Arrays.asList(StringUtils.split(pattern, ","));
+        }
+
+        @Override
+        public boolean accept(@NotNull final BeanContext context, @NotNull final Resource resource) {
+            final SlingSettingsService settings = context.getService(SlingSettingsService.class);
+            final java.util.Set<String> runmodes = settings.getRunModes();
+            for (final String pattern : alternatives) {
+                if ((!pattern.startsWith("!") && runmodes.contains(pattern))
+                        || (pattern.startsWith("!") && !runmodes.contains(pattern.substring(1)))) {
+                    return true;
+                }
+            }
+            return alternatives.size() == 0;
+        }
+    }
 
     /**
-     * check the permissions of a given service key (feature)
+     * check the avaiability of a servlet registered fo a given resource type
      */
     class ServletPermission implements Condition {
 
@@ -416,6 +444,8 @@ public Options addFactory(@NotNull final String key, @NotNull final Factory fact
             .addFactory(KEY_JCR, (key, pattern) -> JCR_RESOURCE)
             .addFactory(KEY_PERMISSION, (key, pattern) ->
                     pattern instanceof String ? new NodesPermission((String) pattern) : null)
+            .addFactory(KEY_RUNMODE, (key, pattern) ->
+                    pattern instanceof String ? new RunmodePermission((String) pattern) : null)
             .addFactory(KEY_SERVLET, (key, pattern) ->
                     pattern instanceof String ? new ServletPermission((String) pattern) : null)
             .addFactory(KEY_CLASS, (key, pattern) ->

diff --git a/console/src/main/resources/root/libs/composum/nodes/console/js/console.js b/console/src/main/resources/root/libs/composum/nodes/console/js/console.js
@@ -166,11 +166,14 @@
                 var $link = $(event.currentTarget);
                 var redirectUrl = $link.data('redirect');
                 if (redirectUrl) {
-                    var currentPath = CPM.nodes.browser ? CPM.nodes.browser.getCurrentPath() : '';
+                    var currentPath = CPM.nodes.browser && _.isFunction(CPM.nodes.browser.getCurrentPath)
+                        ? CPM.nodes.browser.getCurrentPath() : '';
                     var pathCondition = $link.data('path-condition');
+                    var linkTarget = $link.attr('target');
                     redirectUrl = redirectUrl.replaceAll(/\${path(\..+)?}/g,
-                        (!pathCondition || new RegExp(pathCondition).exec(currentPath)) ? (currentPath + '$1') : '');
-                    window.open(redirectUrl, $link.attr('target'));
+                        (currentPath && (!pathCondition || new RegExp(pathCondition).exec(currentPath)))
+                            ? (currentPath + '$1') : '');
+                    window.open(redirectUrl, linkTarget ? linkTarget : '_self');
                     event.preventDefault();
                     return false;
                 }

diff --git a/corecfg/pom.xml b/corecfg/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-config</artifactId>

diff --git a/jslibs/pom.xml b/jslibs/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-jslibs</artifactId>

diff --git a/osgi/pckginstall/pom.xml b/osgi/pckginstall/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes.osgi</groupId>
         <artifactId>composum-nodes-osgi</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-osgi-package-installer</artifactId>

diff --git a/osgi/pom.xml b/osgi/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <groupId>com.composum.nodes.osgi</groupId>

diff --git a/package/aem/pom.xml b/package/aem/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes-package</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-aem-package</artifactId>

diff --git a/package/aem/src/main/content/jcr_root/libs/composum/nodes/aem/console/content/.content.xml b/package/aem/src/main/content/jcr_root/libs/composum/nodes/aem/console/content/.content.xml
@@ -10,15 +10,17 @@
             description="/libs/composum/nodes/aem/console/components/crxde/description"
             categories="[aem,nodes]"
             order="{Long}20"
-            target="aem"/>
+            target="aem"
+            precondition="[permission:nodes/aem/crxde=read,http:/crx/de/index.jsp]"/>
     <packmgr
             jcr:primaryType="nt:unstructured"
             jcr:title="Packages"
             sling:resourceType="composum/nodes/aem/console/components/packmgr"
             description="/libs/composum/nodes/aem/console/components/packmgr/description"
             categories="[aem,nodes]"
             order="{Long}30"
-            target="aem"/>
+            target="aem"
+            precondition="[permission:nodes/aem/packmgr=read,http:/crx/packmgr/index.jsp]"/>
     <assets
             jcr:primaryType="nt:unstructured"
             jcr:title="Assets"
@@ -27,7 +29,8 @@
             dynamicRedirect="{Boolean}true"
             categories="[aem,nodes]"
             order="{Long}200"
-            target="aem"/>
+            target="aem"
+            precondition="[permission:nodes/aem/assets=read,runmode:author]"/>
     <fragments
             jcr:primaryType="nt:unstructured"
             jcr:title="Fragments"
@@ -36,7 +39,8 @@
             dynamicRedirect="{Boolean}true"
             categories="[aem,nodes]"
             order="{Long}300"
-            target="aem"/>
+            target="aem"
+            precondition="[permission:nodes/aem/fragments=read,runmode:author]"/>
     <sites
             jcr:primaryType="nt:unstructured"
             jcr:title="Sites"
@@ -45,7 +49,8 @@
             dynamicRedirect="{Boolean}true"
             categories="[aem,nodes]"
             order="{Long}400"
-            target="aem"/>
+            target="aem"
+            precondition="[permission:nodes/aem/sites=read,runmode:author]"/>
     <edit
             jcr:primaryType="nt:unstructured"
             jcr:title="Edit"
@@ -54,14 +59,16 @@
             dynamicRedirect="{Boolean}true"
             categories="[aem,nodes]"
             order="{Long}500"
-            target="_blank"/>
+            target="_blank"
+            precondition="[permission:nodes/aem/edit=read,runmode:author]"/>
     <view
             jcr:primaryType="nt:unstructured"
             jcr:title="View"
             sling:redirect="${path.html}"
             pathCondition="^/content(?!(/(dam)/)).*$"
             dynamicRedirect="{Boolean}true"
             categories="[aem,nodes]"
-            order="{Long}500"
-            target="_blank"/>
+            order="{Long}550"
+            target="_blank"
+            precondition="[permission:nodes/aem/view=read]"/>
 </jcr:root>
diff --git a/package/commons/pom.xml b/package/commons/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes-package</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-commons-bundle</artifactId>

diff --git a/package/console/pom.xml b/package/console/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes-package</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-console-bundle</artifactId>
@@ -144,6 +144,10 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.settings</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.scripting.jsp</artifactId>

diff --git a/package/jslibs/pom.xml b/package/jslibs/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes-package</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-jslibs-package</artifactId>

diff --git a/package/pckgmgr/pom.xml b/package/pckgmgr/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes-package</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-pckgmgr-bundle</artifactId>

diff --git a/package/pom.xml b/package/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-package</artifactId>

diff --git a/package/setup/bundle/pom.xml b/package/setup/bundle/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes.setup</groupId>
         <artifactId>composum-nodes-package-setup</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-package-setup-bundle</artifactId>

diff --git a/package/setup/hook/pom.xml b/package/setup/hook/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes.setup</groupId>
         <artifactId>composum-nodes-package-setup</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-package-setup-hook</artifactId>

diff --git a/package/setup/pom.xml b/package/setup/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes-package</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <groupId>com.composum.nodes.setup</groupId>

diff --git a/package/sling/pom.xml b/package/sling/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes-package</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-sling-package</artifactId>

diff --git a/package/usermgr/pom.xml b/package/usermgr/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes-package</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-usermgr-bundle</artifactId>

diff --git a/pckgmgr/pom.xml b/pckgmgr/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-pckgmgr</artifactId>

diff --git a/pckgmgr/src/test/bundle/pom.xml b/pckgmgr/src/test/bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.composum.nodes.test</groupId>
         <artifactId>maven-package-test</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>maven-package-test-bundle</artifactId>

diff --git a/pckgmgr/src/test/package/pom.xml b/pckgmgr/src/test/package/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.composum.nodes.test</groupId>
         <artifactId>maven-package-test</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>maven-package-test-package</artifactId>

diff --git a/pckgmgr/src/test/pom.xml b/pckgmgr/src/test/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.composum.nodes</groupId>
 		<artifactId>composum-nodes</artifactId>
-		<version>3.2.0</version>
+		<version>3.2.1</version>
 		<relativePath>../../../</relativePath>
 	</parent>
 

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.composum.nodes</groupId>
     <artifactId>composum-nodes</artifactId>
-    <version>3.2.0</version>
+    <version>3.2.1</version>
     <packaging>pom</packaging>
 
     <name>Composum Nodes</name>

diff --git a/setup/pom.xml b/setup/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes</groupId>
         <artifactId>composum-nodes</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <groupId>com.composum.nodes.setup</groupId>

diff --git a/setup/slingfeature/pom.xml b/setup/slingfeature/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes.setup</groupId>
         <artifactId>composum-nodes-setup</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-slingfeature</artifactId>

diff --git a/setup/util/pom.xml b/setup/util/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.composum.nodes.setup</groupId>
         <artifactId>composum-nodes-setup</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>composum-nodes-setup-util</artifactId>