Hardened jcr query traversal limit

Author: krystian-panek-vmltech

core/src/main/java/dev/vml/es/acm/core/repo/Repo.java

@@ -1,6 +1,6 @@
 package dev.vml.es.acm.core.repo;
 
-import dev.vml.es.acm.core.util.StreamUtils;
+import dev.vml.es.acm.core.util.JcrUtils;
 import java.util.stream.Stream;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
@@ -177,15 +177,13 @@ public Stream<RepoResource> queryRaw(String sql) {
             Query query = queryManager.createQuery(sql, Query.JCR_SQL2);
             QueryResult result = query.execute();
 
-            return StreamUtils.asNodeStream(result.getNodes()).map(n -> {
+            return JcrUtils.asNodeStream(result.getNodes()).map(n -> {
                 try {
                     return new RepoResource(this, n.getPath());
                 } catch (RepositoryException e) {
                     throw new RepoException("Cannot read node path from query result!", e);
                 }
             });
-        } catch (RepoException e) {
-            throw e;
         } catch (Exception e) {
             throw new RepoException(String.format("Cannot execute raw query '%s'!", sql), e);
         }

core/src/main/java/dev/vml/es/acm/core/util/JcrUtils.java

@@ -0,0 +1,26 @@
+package dev.vml.es.acm.core.util;
+
+import java.util.Iterator;
+import java.util.stream.Stream;
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+
+public class JcrUtils {
+
+    public static Stream<Node> asNodeStream(NodeIterator nodeIterator) {
+        if (nodeIterator == null) {
+            return Stream.empty();
+        }
+        return StreamUtils.asStream(new Iterator<Node>() {
+            @Override
+            public boolean hasNext() {
+                return nodeIterator.hasNext();
+            }
+
+            @Override
+            public Node next() {
+                return nodeIterator.nextNode();
+            }
+        });
+    }
+}

core/src/main/java/dev/vml/es/acm/core/util/StreamUtils.java

@@ -4,8 +4,6 @@
 import java.util.Iterator;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
-import javax.jcr.Node;
-import javax.jcr.NodeIterator;
 
 public class StreamUtils {
 
@@ -14,6 +12,9 @@ public static <T> Stream<T> asStream(Iterator<T> sourceIterator) {
     }
 
     public static <T> Stream<T> asStream(Iterator<T> sourceIterator, boolean parallel) {
+        if (sourceIterator == null) {
+            return Stream.empty();
+        }
         Iterable<T> iterable = () -> sourceIterator;
         return StreamSupport.stream(iterable.spliterator(), parallel);
     }
@@ -34,21 +35,4 @@ public T next() {
             }
         });
     }
-
-    public static Stream<Node> asNodeStream(NodeIterator nodeIterator) {
-        if (nodeIterator == null) {
-            return Stream.empty();
-        }
-        return asStream(new Iterator<Node>() {
-            @Override
-            public boolean hasNext() {
-                return nodeIterator.hasNext();
-            }
-
-            @Override
-            public Node next() {
-                return nodeIterator.nextNode();
-            }
-        });
-    }
 }