fix: Node factory methods are not invoked through NodesFactoryAccess when NodesFactory is extended.

Author: nstdio

src/main/java/cz/jirutka/rsql/parser/NodesFactoryAccess.java

@@ -75,7 +75,7 @@ private static MethodHandle methodHandle(Lookup lookup, String name, Class<?>...
     }
 
     static LogicalNode create(NodesFactory factory, LogicalOperator operator, List<Node> children) {
-        if (LOGICAL_NODE_MH == null) {
+        if (LOGICAL_NODE_MH == null || factory.getClass() != NodesFactory.class) {
             return factory.createLogicalNode(operator, children);
         } else {
             try {
@@ -92,7 +92,7 @@ static LogicalNode create(NodesFactory factory, LogicalOperator operator, List<N
 
     static ComparisonNode create(NodesFactory factory, String operatorToken, String selector, List<String> arguments)
         throws UnknownOperatorException {
-        if (COMP_NODE_MH == null) {
+        if (COMP_NODE_MH == null || factory.getClass() != NodesFactory.class) {
             return factory.createComparisonNode(operatorToken, selector, arguments);
         } else {
             try {

src/test/groovy/cz/jirutka/rsql/parser/NodesFactoryAccessSpec.groovy

@@ -24,6 +24,7 @@
 package cz.jirutka.rsql.parser
 
 import cz.jirutka.rsql.parser.ast.ComparisonNode
+import cz.jirutka.rsql.parser.ast.ComparisonOperator
 import cz.jirutka.rsql.parser.ast.LogicalOperator
 import cz.jirutka.rsql.parser.ast.NodesFactory
 import spock.lang.Specification
@@ -81,4 +82,61 @@ class NodesFactoryAccessSpec extends Specification {
 
         actual.arguments.size() == arguments.size()
     }
+
+    def 'Should not use trusted constructors when NodesFactory is inherited'(LogicalOperator op) {
+        given:
+        def factory = new NodesFactoryExtended(defaultOperators())
+        def children = [
+            new ComparisonNode(EQUAL, 'a1', ['b1']),
+            new ComparisonNode(NOT_EQUAL, 'a2', ['b2'])
+        ]
+
+        when:
+        def actual = NodesFactoryAccess.create(factory, op, children)
+
+        then:
+        actual.children.size() == children.size()
+
+        and: 'original is not modified by modifying copy'
+        def childrenCopy = actual.children
+        childrenCopy.removeLast()
+        childrenCopy.size() + 1 == children.size()
+
+        and: 'modifying original it should not change in the LogicalNode'
+        children.removeLast()
+
+        actual.children.size() == children.size() + 1
+
+        where:
+        op << LogicalOperator.values()
+    }
+
+    def 'Should not use trusted constructors when NodesFactory is inherited and creating comparison node'() {
+        given:
+        def factory = new NodesFactoryExtended(defaultOperators())
+        def arguments = ['x', 'y', 'z']
+
+        when:
+        def actual = NodesFactoryAccess.create(factory, '=in=', 'a1', arguments)
+
+        then:
+        actual.arguments.size() == arguments.size()
+
+        and: 'original is not modified by modifying copy'
+        def childrenCopy = actual.arguments
+        childrenCopy.removeLast()
+        childrenCopy.size() + 1 == arguments.size()
+
+        and: 'modifying original it should not change in the ComparisonNode'
+        arguments.removeLast()
+
+        actual.arguments.size() == arguments.size() + 1
+    }
+
+    static class NodesFactoryExtended extends NodesFactory {
+
+        NodesFactoryExtended(Set<ComparisonOperator> operators) {
+            super(operators)
+        }
+    }
 }