CAMEL-10581: toD should safe split uris to avoid issues with RAW values.

Author: davsclaus

camel-core/src/main/java/org/apache/camel/model/ToDynamicDefinition.java

@@ -18,6 +18,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -47,6 +49,9 @@
 @XmlRootElement(name = "toD")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ToDynamicDefinition extends NoOutputDefinition<ToDynamicDefinition> {
+
+    private static final Pattern RAW_PATTERN = Pattern.compile("RAW\\([^\\)]+\\)");
+
     @XmlAttribute @Metadata(required = "true")
     private String uri;
     @XmlAttribute
@@ -83,7 +88,8 @@ public Processor createProcessor(RouteContext routeContext) throws Exception {
 
     protected Expression createExpression(RouteContext routeContext) {
         List<Expression> list = new ArrayList<Expression>();
-        String[] parts = uri.split("\\+");
+
+        String[] parts = safeSplitRaw(uri);
         for (String part : parts) {
             // the part may have optional language to use, so you can mix languages
             String value = ObjectHelper.after(part, "language:");
@@ -195,5 +201,76 @@ public void setIgnoreInvalidEndpoint(Boolean ignoreInvalidEndpoint) {
         this.ignoreInvalidEndpoint = ignoreInvalidEndpoint;
     }
 
+    // Utilities
+    // -------------------------------------------------------------------------
+
+    private static class Pair {
+        int left;
+        int right;
+        Pair(int left, int right) {
+            this.left = left;
+            this.right = right;
+        }
+    }
+
+    private static List<Pair> checkRAW(String s) {
+        Matcher matcher = RAW_PATTERN.matcher(s);
+        List<Pair> answer = new ArrayList<Pair>();
+        // Check all occurrences
+        while (matcher.find()) {
+            answer.add(new Pair(matcher.start(), matcher.end() - 1));
+        }
+        return answer;
+    }
+
+    private static boolean isRaw(int index, List<Pair>pairs) {
+        for (Pair pair : pairs) {
+            if (index < pair.left) {
+                return false;
+            } else {
+                if (index >= pair.left) {
+                    if (index <= pair.right) {
+                        return true;
+                    } else {
+                        continue;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * We need to split the string safely for each + sign, but avoid splitting within RAW(...).
+     */
+    private static String[] safeSplitRaw(String s) {
+        List<String> list = new ArrayList<>();
+
+        if (!s.contains("+")) {
+            // no plus sign so there is only one part, so no need to split
+            list.add(s);
+        } else {
+            // there is a plus sign so we need to split in a safe manner
+            List<Pair> rawPairs = checkRAW(s);
+            StringBuilder sb = new StringBuilder();
+            char chars[] = s.toCharArray();
+            for (int i = 0; i < chars.length; i++) {
+                char ch = chars[i];
+                if (ch != '+' || isRaw(i, rawPairs)) {
+                    sb.append(ch);
+                } else {
+                    list.add(sb.toString());
+                    sb.setLength(0);
+                }
+            }
+            // any leftover?
+            if (sb.length() > 0) {
+                list.add(sb.toString());
+                sb.setLength(0);
+            }
+        }
+
+        return list.toArray(new String[list.size()]);
+    }
 
 }

camel-core/src/main/java/org/apache/camel/util/UnsafeUriCharactersEncoder.java

@@ -99,6 +99,7 @@ private static List<Pair> checkRAW(String s) {
         List<Pair> answer = new ArrayList<Pair>();
         // Check all occurrences
         while (matcher.find()) {
+            // TODO: should likely be matcher.end() - 1
             answer.add(new Pair(matcher.start(), matcher.end()));
         }
         return answer;

camel-core/src/test/java/org/apache/camel/processor/ToDynamicRawAndXPathTest.java

@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+public class ToDynamicRawAndXPathTest extends ContextTestSupport {
+
+    public void testToDynamicRawAndPlus() throws Exception {
+        getMockEndpoint("mock:RAW(se+ret)foo").expectedBodiesReceived("<order uri=\"foo\"/>");
+        getMockEndpoint("mock:RAW(se+ret)bar").expectedBodiesReceived("<order uri=\"bar\"/>");
+
+        template.sendBody("direct:start", "<order uri=\"foo\"/>");
+        template.sendBody("direct:start", "<order uri=\"bar\"/>");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start")
+                    .toD("mock:RAW(se+ret)+language:xpath:/order/@uri");
+            }
+        };
+    }
+}

camel-core/src/test/java/org/apache/camel/processor/ToDynamicRawTest.java

@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+public class ToDynamicRawTest extends ContextTestSupport {
+
+    public void testToDynamicRaw() throws Exception {
+        getMockEndpoint("mock:RAW(se+ret)").expectedBodiesReceived("Hello Camel");
+
+        template.sendBody("direct:start", "Hello Camel");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start")
+                    .toD("mock:RAW(se+ret)");
+            }
+        };
+    }
+}