[camel] branch camel-3.7.x updated: CAMEL-16110: don't leak internal QUERY_STRING header (#4956)

[davsclaus]

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

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


The following commit(s) were added to refs/heads/camel-3.7.x by this push:
     new f9d42b1  CAMEL-16110: don't leak internal QUERY_STRING header (#4956)
f9d42b1 is described below

commit f9d42b1a79e421d56b2dd5a236ed587368d4ae1a
Author: fizzet <jen...@gmx.net>
AuthorDate: Fri Jan 29 18:07:41 2021 +0100

    CAMEL-16110: don't leak internal QUERY_STRING header (#4956)
---
 .../org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java  | 3 ++-
 .../camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java
 
b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java
index eb05b4f..179b2f1 100644
--- 
a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java
+++ 
b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java
@@ -91,7 +91,8 @@ public final class CxfHeaderHelper {
 
             // drop this header as we do not want to propagate the http 
method/path into the CXF request message
             if (Exchange.HTTP_METHOD.equalsIgnoreCase(entry.getKey())
-                    || Exchange.HTTP_PATH.equalsIgnoreCase(entry.getKey())) {
+                    || Exchange.HTTP_PATH.equalsIgnoreCase(entry.getKey())
+                    || Exchange.HTTP_QUERY.equalsIgnoreCase(entry.getKey())) {
                 return;
             }
 
diff --git 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java
 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java
index b95279c..adb3286 100644
--- 
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java
+++ 
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java
@@ -48,6 +48,7 @@ public class CxfRsProducerHttpMethodHeaderTest extends 
CamelTestSupport {
                         Message inMessage = exchange.getIn();
                         inMessage.setHeader(Exchange.HTTP_METHOD, "GET");
                         inMessage.setHeader(Exchange.HTTP_PATH, 
"/CxfRsProducerHttpMethodHeaderTest/");
+                        inMessage.setHeader(Exchange.HTTP_QUERY, "q=1");
                         inMessage.setHeader(Exchange.CONTENT_TYPE, 
"application/text");
                         inMessage.setBody("Hello World");
                     }