You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/05/05 19:12:28 UTC

[camel] 03/08: CAMEL-15013: Template components - Add option to turn on|off allow using header with override template

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-2.25.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 0d1584af9ebd0673de8778c61f9694b2d28bd38c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue May 5 15:48:29 2020 +0200

    CAMEL-15013: Template components - Add option to turn on|off allow using header with override template
---
 .../apache/camel/component/mvel/MvelComponent.java | 22 ++++++++++++-
 .../apache/camel/component/mvel/MvelEndpoint.java  | 38 +++++++++++++++++-----
 .../camel/language/mvel/MvelComponentTest.java     |  7 ++--
 3 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelComponent.java b/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelComponent.java
index 5ac1cb6..53eb41d 100644
--- a/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelComponent.java
+++ b/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelComponent.java
@@ -21,6 +21,7 @@ import java.util.Map;
 import org.apache.camel.Endpoint;
 import org.apache.camel.impl.UriEndpointComponent;
 import org.apache.camel.util.ResourceHelper;
+import org.apache.camel.spi.Metadata;
 
 /**
  * An <a href="http://camel.apache.org/mvel.html">Mvel Component</a>
@@ -28,6 +29,9 @@ import org.apache.camel.util.ResourceHelper;
  */
 public class MvelComponent extends UriEndpointComponent {
 
+    @Metadata(defaultValue = "false")
+    private boolean allowTemplateFromHeader;
+
     public MvelComponent() {
         super(MvelEndpoint.class);
     }
@@ -36,8 +40,10 @@ public class MvelComponent extends UriEndpointComponent {
         boolean cache = getAndRemoveParameter(parameters, "contentCache", Boolean.class, Boolean.TRUE);
 
         MvelEndpoint answer = new MvelEndpoint(uri, this, remaining);
-        setProperties(answer, parameters);
         answer.setContentCache(cache);
+        answer.setAllowTemplateFromHeader(allowTemplateFromHeader);
+
+        setProperties(answer, parameters);
 
         // if its a http resource then append any remaining parameters and update the resource uri
         if (ResourceHelper.isHttpUri(remaining)) {
@@ -48,4 +54,18 @@ public class MvelComponent extends UriEndpointComponent {
         return answer;
     }
 
+    public boolean isAllowTemplateFromHeader() {
+        return allowTemplateFromHeader;
+    }
+
+    /**
+     * Whether to allow to use resource template from header or not (default false).
+     *
+     * Enabling this allows to specify dynamic templates via message header. However this can
+     * be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care.
+     */
+    public void setAllowTemplateFromHeader(boolean allowTemplateFromHeader) {
+        this.allowTemplateFromHeader = allowTemplateFromHeader;
+    }
+
 }
diff --git a/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java b/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java
index c82973c..4187413 100644
--- a/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java
+++ b/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java
@@ -40,8 +40,11 @@ import org.mvel2.templates.TemplateRuntime;
 @UriEndpoint(firstVersion = "2.12.0", scheme = "mvel", title = "MVEL", syntax = "mvel:resourceUri", producerOnly = true, label = "transformation,script")
 public class MvelEndpoint extends ResourceEndpoint {
 
+    @UriParam(defaultValue = "false")
+    private boolean allowTemplateFromHeader;
     @UriParam
     private String encoding;
+
     private volatile String template;
     private volatile CompiledTemplate compiled;
 
@@ -64,6 +67,20 @@ public class MvelEndpoint extends ResourceEndpoint {
         return "mvel:" + getResourceUri();
     }
 
+    public boolean isAllowTemplateFromHeader() {
+        return allowTemplateFromHeader;
+    }
+
+    /**
+     * Whether to allow to use resource template from header or not (default false).
+     *
+     * Enabling this allows to specify dynamic templates via message header. However this can
+     * be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care.
+     */
+    public void setAllowTemplateFromHeader(boolean allowTemplateFromHeader) {
+        this.allowTemplateFromHeader = allowTemplateFromHeader;
+    }
+
     public String getEncoding() {
         return encoding;
     }
@@ -80,21 +97,26 @@ public class MvelEndpoint extends ResourceEndpoint {
         String path = getResourceUri();
         ObjectHelper.notNull(path, "resourceUri");
 
-        String newResourceUri = exchange.getIn().getHeader(MvelConstants.MVEL_RESOURCE_URI, String.class);
-        if (newResourceUri != null) {
-            exchange.getIn().removeHeader(MvelConstants.MVEL_RESOURCE_URI);
+        if (allowTemplateFromHeader) {
+            String newResourceUri = exchange.getIn().getHeader(MvelConstants.MVEL_RESOURCE_URI, String.class);
+            if (newResourceUri != null) {
+                exchange.getIn().removeHeader(MvelConstants.MVEL_RESOURCE_URI);
 
-            log.debug("{} set to {} creating new endpoint to handle exchange", MvelConstants.MVEL_RESOURCE_URI, newResourceUri);
-            MvelEndpoint newEndpoint = findOrCreateEndpoint(getEndpointUri(), newResourceUri);
-            newEndpoint.onExchange(exchange);
-            return;
+                log.debug("{} set to {} creating new endpoint to handle exchange", MvelConstants.MVEL_RESOURCE_URI, newResourceUri);
+                MvelEndpoint newEndpoint = findOrCreateEndpoint(getEndpointUri(), newResourceUri);
+                newEndpoint.onExchange(exchange);
+                return;
+            }
         }
 
         CompiledTemplate compiled;
         ParserContext mvelContext = ParserContext.create();
         Map<String, Object> variableMap = ExchangeHelper.createVariableMap(exchange);
 
-        String content = exchange.getIn().getHeader(MvelConstants.MVEL_TEMPLATE, String.class);
+        String content = null;
+        if (allowTemplateFromHeader) {
+            content = exchange.getIn().getHeader(MvelConstants.MVEL_TEMPLATE, String.class);
+        }
         if (content != null) {
             // use content from header
             if (log.isDebugEnabled()) {
diff --git a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java
index 996ae6f..768fecc 100644
--- a/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java
+++ b/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelComponentTest.java
@@ -41,7 +41,7 @@ public class MvelComponentTest extends CamelTestSupport {
 
     @Test
     public void testMvelTemplate() throws Exception {
-        Exchange exchange = template.request("direct:a", new Processor() {
+        Exchange exchange = template.request("direct:b", new Processor() {
             @Override
             public void process(Exchange exchange) throws Exception {
                 exchange.getIn().setBody(7);
@@ -54,7 +54,7 @@ public class MvelComponentTest extends CamelTestSupport {
 
     @Test
     public void testMvelUri() throws Exception {
-        Exchange exchange = template.request("direct:a", new Processor() {
+        Exchange exchange = template.request("direct:b", new Processor() {
             @Override
             public void process(Exchange exchange) throws Exception {
                 exchange.getIn().setBody(7);
@@ -71,6 +71,9 @@ public class MvelComponentTest extends CamelTestSupport {
                 // START SNIPPET: example
                 from("direct:a").
                         to("mvel:template.mvel");
+
+                from("direct:b").
+                        to("mvel:template.mvel?allowTemplateFromHeader=true");
                 // END SNIPPET: example
             }
         };