You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/08/26 09:27:44 UTC
[1/2] camel git commit: CAMEL-10270: Jetty 9 X-Forwarded-For
Configuration. Thanks to Remco Schoen.
Repository: camel
Updated Branches:
refs/heads/master e7eca7c6b -> cff69b0cb
CAMEL-10270: Jetty 9 X-Forwarded-For Configuration. Thanks to Remco Schoen.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/08f46a76
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/08f46a76
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/08f46a76
Branch: refs/heads/master
Commit: 08f46a76de7c697d8c816a7129bb3d4053f3f5a6
Parents: e7eca7c
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Aug 26 11:16:35 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Aug 26 11:26:38 2016 +0200
----------------------------------------------------------------------
.../camel/component/jetty/JettyHttpComponent.java | 17 +++++++++++++++++
.../component/jetty9/JettyHttpComponent9.java | 5 ++++-
2 files changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/08f46a76/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 72e7419..8e06626 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -129,6 +129,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements
protected Integer responseHeaderSize;
protected String proxyHost;
protected ErrorHandler errorHandler;
+ protected boolean useXForwardedForHeader;
private Integer proxyPort;
private boolean sendServerVersion = true;
@@ -993,6 +994,22 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements
public boolean isSendServerVersion() {
return sendServerVersion;
}
+
+ /**
+ * To use the X-Fowarded-For header in HttpServletRequest.getRemoteAddr.
+ */
+ @Metadata(description = "To use the X-Fowarded-For header in HttpServletRequest.getRemoteAddr.")
+ public boolean isUseXForwardedForHeader() {
+ return useXForwardedForHeader;
+ }
+
+ /**
+ * To use a http proxy to configure the port number.
+ */
+ @Metadata(description = "To use the X-Fowarded-For header in HttpServletRequest.getRemoteAddr.")
+ public void setUseXForwardedForHeader(boolean useXForwardedForHeader) {
+ this.useXForwardedForHeader = useXForwardedForHeader;
+ }
/**
* If the option is true, jetty will send the server header with the jetty version information to the client which sends the request.
http://git-wip-us.apache.org/repos/asf/camel/blob/08f46a76/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
index 66a49cf..0b2177f 100644
--- a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
+++ b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
@@ -30,6 +30,7 @@ import org.apache.camel.util.ObjectHelper;
import org.eclipse.jetty.server.AbstractConnector;
import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.ForwardedRequestCustomizer;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
@@ -91,7 +92,9 @@ public class JettyHttpComponent9 extends JettyHttpComponent {
if (responseHeaderSize != null) {
httpConfig.setResponseHeaderSize(responseHeaderSize);
}
-
+ if (useXForwardedForHeader) {
+ httpConfig.addCustomizer(new ForwardedRequestCustomizer());
+ }
HttpConnectionFactory httpFactory = new org.eclipse.jetty.server.HttpConnectionFactory(httpConfig);
ArrayList<ConnectionFactory> connectionFactories = new ArrayList<ConnectionFactory>();
[2/2] camel git commit: CAMEL-10270: Updated camel-jetty9 docs
Posted by ac...@apache.org.
CAMEL-10270: Updated camel-jetty9 docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cff69b0c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cff69b0c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cff69b0c
Branch: refs/heads/master
Commit: cff69b0cb6a6362c281025477658c2d8734da001
Parents: 08f46a7
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Aug 26 11:25:58 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Aug 26 11:27:11 2016 +0200
----------------------------------------------------------------------
.../springboot/JettyHttpComponentConfiguration9.java | 12 ++++++++++++
.../camel-jetty9/src/main/docs/jetty-component.adoc | 3 ++-
2 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cff69b0c/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
----------------------------------------------------------------------
diff --git a/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java b/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
index 0f23b7b..f622174 100644
--- a/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
+++ b/components-starter/camel-jetty9-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
@@ -169,6 +169,10 @@ public class JettyHttpComponentConfiguration9 {
*/
private Integer proxyPort;
/**
+ * To use the X-Fowarded-For header in HttpServletRequest.getRemoteAddr.
+ */
+ private Boolean useXForwardedForHeader;
+ /**
* If the option is true jetty server will send the date header to the
* client which sends the request. NOTE please make sure there is no any
* other camel-jetty endpoint is share the same port otherwise this option
@@ -409,6 +413,14 @@ public class JettyHttpComponentConfiguration9 {
this.proxyPort = proxyPort;
}
+ public Boolean getUseXForwardedForHeader() {
+ return useXForwardedForHeader;
+ }
+
+ public void setUseXForwardedForHeader(Boolean useXForwardedForHeader) {
+ this.useXForwardedForHeader = useXForwardedForHeader;
+ }
+
public Boolean getSendServerVersion() {
return sendServerVersion;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/cff69b0c/components/camel-jetty9/src/main/docs/jetty-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/main/docs/jetty-component.adoc b/components/camel-jetty9/src/main/docs/jetty-component.adoc
index 13ed693..778d0d9 100644
--- a/components/camel-jetty9/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty9/src/main/docs/jetty-component.adoc
@@ -54,7 +54,7 @@ Options
// component options: START
-The Jetty 9 component supports 30 options which are listed below.
+The Jetty 9 component supports 31 options which are listed below.
@@ -89,6 +89,7 @@ The Jetty 9 component supports 30 options which are listed below.
| responseHeaderSize | Integer | Allows to configure a custom value of the response header size on the Jetty connectors.
| proxyHost | String | To use a http proxy to configure the hostname.
| proxyPort | Integer | To use a http proxy to configure the port number.
+| useXForwardedForHeader | boolean | To use the X-Fowarded-For header in HttpServletRequest.getRemoteAddr.
| sendServerVersion | boolean | If the option is true jetty server will send the date header to the client which sends the request. NOTE please make sure there is no any other camel-jetty endpoint is share the same port otherwise this option may not work as expected.
| allowJavaSerializedObject | boolean | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk.
| headerFilterStrategy | HeaderFilterStrategy | To use a custom HeaderFilterStrategy to filter header to and from Camel message.