You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gg...@apache.org on 2015/04/29 13:16:41 UTC
[1/2] camel git commit: [CAMEL-8718] Prevent FTP(s) connection leak
after failed authentication
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x e8ffd9704 -> aef88ab1c
[CAMEL-8718] Prevent FTP(s) connection leak after failed authentication
(cherry picked from commit e129b88c223e53595113b54a3637e6fabb5a940f)
(cherry picked from commit 0972db060fa21f4d8136f63c30e835d300812e7d)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c18c4157
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c18c4157
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c18c4157
Branch: refs/heads/camel-2.14.x
Commit: c18c4157d30fa81785c8e7d938006818da5af34b
Parents: e8ffd97
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Wed Apr 29 12:00:54 2015 +0200
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Wed Apr 29 13:15:30 2015 +0200
----------------------------------------------------------------------
.../file/remote/RemoteFileConsumer.java | 18 ++-
.../remote/FtpBadLoginConnectionLeakTest.java | 136 +++++++++++++++++++
2 files changed, 152 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c18c4157/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
index 5b4b12c..80e2d1e 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
@@ -154,9 +154,23 @@ public abstract class RemoteFileConsumer<T> extends GenericFileConsumer<T> {
try {
isConnected = getOperations().sendNoop();
} catch (Exception ex) {
- // here we just ignore the exception and try to reconnect
+ // here we just ignore the exception and try to reconnect
+ if (log.isDebugEnabled()) {
+ log.debug("Exception checking connection status: " + ex.getMessage());
+ }
+ }
+
+ try {
+ // we may as well be connected, but not logged in. let's disconnect to prevent connection leak
+ if (getOperations().isConnected()) {
+ getOperations().disconnect();
+ }
+ } catch (Exception ex) {
+ if (log.isDebugEnabled()) {
+ log.debug("Exception during disconnect: " + ex.getMessage());
+ }
}
-
+
if (!loggedIn || !isConnected) {
if (log.isDebugEnabled()) {
log.debug("Not connected/logged in, connecting to: {}", remoteServer());
http://git-wip-us.apache.org/repos/asf/camel/blob/c18c4157/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
new file mode 100644
index 0000000..54b1574
--- /dev/null
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
@@ -0,0 +1,136 @@
+/**
+ * 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.component.file.remote;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.net.SocketFactory;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+import org.junit.Test;
+
+public class FtpBadLoginConnectionLeakTest extends FtpServerTestSupport {
+
+ private final AtomicInteger exceptionCount = new AtomicInteger(0);
+
+ private String getFtpUrl() {
+ return "ftp://dummy@localhost:" + getPort() + "/badlogin?password=cantremeber&maximumReconnectAttempts=0" +
+ "&throwExceptionOnConnectFailed=false&ftpClient.socketFactory=#sf";
+ }
+
+ /**
+ * Mapping of socket hashcode to two element tab ([connect() called, close() called])
+ */
+ private Map<Integer, boolean[]> socketAudits = new HashMap<>();
+
+ @Override
+
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry jndi = super.createRegistry();
+
+ final SocketFactory defaultSocketFactory = SocketFactory.getDefault();
+ SocketFactory sf = new AuditingSocketFactory();
+ jndi.bind("sf", sf);
+ return jndi;
+ }
+
+ @Test
+ public void testConnectionLeak() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(0);
+
+ // let's have several login attempts
+ Thread.sleep(3000L);
+
+ stopCamelContext();
+
+ for (Map.Entry<Integer, boolean[]> socketStats : socketAudits.entrySet()) {
+ assertTrue("Socket should be connected", socketStats.getValue()[0]);
+ assertEquals("Socket should be closed", socketStats.getValue()[1], socketStats.getValue()[0]);
+ }
+
+ mock.assertIsSatisfied();
+ }
+
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from(getFtpUrl()).to("mock:result");
+ }
+ };
+ }
+
+ /**
+ * {@link SocketFactory} which creates {@link Socket}s that expose statistics about {@link Socket#connect(SocketAddress)}/{@link Socket#close()}
+ * invocations
+ */
+ private class AuditingSocketFactory extends SocketFactory {
+
+ @Override
+ public Socket createSocket(String s, int i) throws IOException {
+ return null;
+ }
+
+ @Override
+ public Socket createSocket(String s, int i, InetAddress inetAddress, int i1) throws IOException {
+ return null;
+ }
+
+ @Override
+ public Socket createSocket(InetAddress inetAddress, int i) throws IOException {
+ return null;
+ }
+
+ @Override
+ public Socket createSocket() throws IOException {
+ AuditingSocket socket = new AuditingSocket();
+ socketAudits.put(System.identityHashCode(socket), new boolean[] { false, false });
+ return socket;
+ }
+
+ @Override
+ public Socket createSocket(InetAddress inetAddress, int i, InetAddress inetAddress1, int i1) throws IOException {
+ return null;
+ }
+ }
+
+ /**
+ * {@link Socket} which counts connect()/close() invocations
+ */
+ private class AuditingSocket extends Socket {
+
+ @Override
+ public void connect(SocketAddress endpoint, int timeout) throws IOException {
+ super.connect(endpoint, timeout);
+ socketAudits.get(System.identityHashCode(this))[0] = true;
+ }
+
+ @Override
+ public synchronized void close() throws IOException {
+ super.close();
+ socketAudits.get(System.identityHashCode(this))[1] = true;
+ }
+ }
+
+}
[2/2] camel git commit: [CAMEL-8718] Do not disconnect if connected &
logged in
Posted by gg...@apache.org.
[CAMEL-8718] Do not disconnect if connected & logged in
(cherry picked from commit 5553474960c83ed8828ed252031818c050a6436f)
(cherry picked from commit 4b03939afdc00120252a368acf504e333d750be9)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aef88ab1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aef88ab1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aef88ab1
Branch: refs/heads/camel-2.14.x
Commit: aef88ab1cde8bc8379041b8d65b1d31d58a21335
Parents: c18c415
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Wed Apr 29 12:22:58 2015 +0200
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Wed Apr 29 13:15:31 2015 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/file/remote/RemoteFileConsumer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/aef88ab1/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
index 80e2d1e..9408ea4 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
@@ -162,7 +162,7 @@ public abstract class RemoteFileConsumer<T> extends GenericFileConsumer<T> {
try {
// we may as well be connected, but not logged in. let's disconnect to prevent connection leak
- if (getOperations().isConnected()) {
+ if (!isConnected && getOperations().isConnected()) {
getOperations().disconnect();
}
} catch (Exception ex) {