You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2018/08/21 13:49:25 UTC
[camel] branch master updated (e9a0ac3 -> 015761d)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from e9a0ac3 CAMEL-12745: NullPointerException in APT IOHelper
new 6a35c60 CAMEL-12744: use SSL configuration in Restlet c...
new 015761d Remove unused import
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../HttpServerMultiplexChannelHandler.java | 1 -
.../camel/component/restlet/RestletProducer.java | 45 +++++++++++++++++++---
2 files changed, 40 insertions(+), 6 deletions(-)
[camel] 01/02: CAMEL-12744: use SSL configuration in Restlet c...
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6a35c60bbf1b24060faf9a689efe1e09e26191d5
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Tue Aug 21 15:10:32 2018 +0200
CAMEL-12744: use SSL configuration in Restlet c...
...lient
We need to pass the `SSLContext` created from the `SSLContextParameters`
via `sslContextFactory` attribute in Restlet client context.
---
.../camel/component/restlet/RestletProducer.java | 45 +++++++++++++++++++---
1 file changed, 40 insertions(+), 5 deletions(-)
diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
index 0b2a864..f4749db 100644
--- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
+++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletProducer.java
@@ -23,14 +23,19 @@ import java.net.URI;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.net.ssl.SSLContext;
+
import org.apache.camel.AsyncCallback;
+import org.apache.camel.CamelContext;
import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultAsyncProducer;
import org.apache.camel.util.URISupport;
+import org.apache.camel.util.jsse.SSLContextParameters;
import org.restlet.Client;
import org.restlet.Context;
import org.restlet.Request;
@@ -38,6 +43,8 @@ import org.restlet.Response;
import org.restlet.Uniform;
import org.restlet.data.Cookie;
import org.restlet.data.CookieSetting;
+import org.restlet.data.Parameter;
+import org.restlet.engine.ssl.SslContextFactory;
import org.restlet.util.Series;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,6 +55,24 @@ import org.slf4j.LoggerFactory;
* @version
*/
public class RestletProducer extends DefaultAsyncProducer {
+ private static final class PredefinedSslContextFactory extends SslContextFactory {
+ private final SSLContext sslContext;
+
+ private PredefinedSslContextFactory(SSLContext sslContext) {
+ this.sslContext = sslContext;
+ }
+
+ @Override
+ public void init(Series<Parameter> parameters) {
+ // nop
+ }
+
+ @Override
+ public SSLContext createSslContext() throws Exception {
+ return sslContext;
+ }
+ }
+
private static final Logger LOG = LoggerFactory.getLogger(RestletProducer.class);
private static final Pattern PATTERN = Pattern.compile("\\{([\\w\\.]*)\\}");
private Client client;
@@ -57,17 +82,27 @@ public class RestletProducer extends DefaultAsyncProducer {
super(endpoint);
this.throwException = endpoint.isThrowExceptionOnFailure();
client = new Client(endpoint.getProtocol());
- client.setContext(new Context());
- client.getContext().getParameters().add("socketTimeout", String.valueOf(endpoint.getSocketTimeout()));
- client.getContext().getParameters().add("socketConnectTimeoutMs", String.valueOf(endpoint.getSocketTimeout()));
+ final Context context = new Context();
+ final Series<Parameter> parameters = context.getParameters();
+ parameters.add("socketTimeout", String.valueOf(endpoint.getSocketTimeout()));
+ parameters.add("socketConnectTimeoutMs", String.valueOf(endpoint.getSocketTimeout()));
RestletComponent component = (RestletComponent) endpoint.getComponent();
if (component.getMaxConnectionsPerHost() != null && component.getMaxConnectionsPerHost() > 0) {
- client.getContext().getParameters().add("maxConnectionsPerHost", String.valueOf(component.getMaxConnectionsPerHost()));
+ parameters.add("maxConnectionsPerHost", String.valueOf(component.getMaxConnectionsPerHost()));
}
if (component.getMaxTotalConnections() != null && component.getMaxTotalConnections() > 0) {
- client.getContext().getParameters().add("maxTotalConnections", String.valueOf(component.getMaxTotalConnections()));
+ parameters.add("maxTotalConnections", String.valueOf(component.getMaxTotalConnections()));
}
+ final ConcurrentMap<String, Object> attributes = context.getAttributes();
+ final CamelContext camelContext = endpoint.getCamelContext();
+ final SSLContextParameters sslContextParameters = endpoint.getSslContextParameters();
+ if (sslContextParameters != null) {
+ final SSLContext sslContext = sslContextParameters.createSSLContext(camelContext);
+ attributes.put("sslContextFactory", new PredefinedSslContextFactory(sslContext));
+ }
+
+ client.setContext(context);
}
@Override
[camel] 02/02: Remove unused import
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 015761dfd9a4f3aae66f5cbf779a320c65da4ff9
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Tue Aug 21 15:20:12 2018 +0200
Remove unused import
---
.../netty4/http/handlers/HttpServerMultiplexChannelHandler.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerMultiplexChannelHandler.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerMultiplexChannelHandler.java
index 3f5f1a1..27fb206 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerMultiplexChannelHandler.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/handlers/HttpServerMultiplexChannelHandler.java
@@ -37,7 +37,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.component.netty4.http.HttpServerConsumerChannelFactory;
import org.apache.camel.component.netty4.http.NettyHttpConsumer;
import org.apache.camel.http.common.CamelServlet;
-import org.apache.camel.http.common.HttpConsumer;
import org.apache.camel.support.RestConsumerContextPathMatcher;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
import org.slf4j.Logger;