You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2014/02/03 09:09:50 UTC
[1/3] git commit: Add an helper method on OpenFuture to wait and
verify the result
Updated Branches:
refs/heads/master 8f7dff123 -> 464b6fe57
Add an helper method on OpenFuture to wait and verify the result
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/65e96aa9
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/65e96aa9
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/65e96aa9
Branch: refs/heads/master
Commit: 65e96aa983f2d81d36e3a1f54ccd6f31646ec79d
Parents: 8f7dff1
Author: Guillaume Nodet <gn...@apache.org>
Authored: Fri Jan 31 15:37:30 2014 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Fri Jan 31 15:37:30 2014 +0100
----------------------------------------------------------------------
.../apache/sshd/client/future/DefaultOpenFuture.java | 13 +++++++++++++
.../java/org/apache/sshd/client/future/OpenFuture.java | 8 ++++++++
2 files changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/65e96aa9/sshd-core/src/main/java/org/apache/sshd/client/future/DefaultOpenFuture.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/future/DefaultOpenFuture.java b/sshd-core/src/main/java/org/apache/sshd/client/future/DefaultOpenFuture.java
index bbfa272..ca6cb07 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/future/DefaultOpenFuture.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/future/DefaultOpenFuture.java
@@ -18,6 +18,7 @@
*/
package org.apache.sshd.client.future;
+import org.apache.sshd.common.SshException;
import org.apache.sshd.common.future.DefaultSshFuture;
/**
@@ -31,6 +32,18 @@ public class DefaultOpenFuture extends DefaultSshFuture<OpenFuture> implements O
super(lock);
}
+ public void verify() throws SshException {
+ try {
+ await();
+ }
+ catch (InterruptedException e) {
+ throw new SshException("Channel opening interrupted", e);
+ }
+ if (!isOpened()) {
+ throw new SshException("Channel opening failed", getException());
+ }
+ }
+
public Throwable getException() {
Object v = getValue();
if (v instanceof Throwable) {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/65e96aa9/sshd-core/src/main/java/org/apache/sshd/client/future/OpenFuture.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/future/OpenFuture.java b/sshd-core/src/main/java/org/apache/sshd/client/future/OpenFuture.java
index e0d2337..3b833dc 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/future/OpenFuture.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/future/OpenFuture.java
@@ -18,6 +18,7 @@
*/
package org.apache.sshd.client.future;
+import org.apache.sshd.common.SshException;
import org.apache.sshd.common.future.SshFuture;
/**
@@ -28,6 +29,13 @@ import org.apache.sshd.common.future.SshFuture;
public interface OpenFuture extends SshFuture<OpenFuture> {
/**
+ * Wait and verify that the channel has been successfuly opened.
+ *
+ * @throws org.apache.sshd.common.SshException if the authentication failed for any reason
+ */
+ void verify() throws SshException;
+
+ /**
* Returns the cause of the connection failure.
*
* @return <tt>null</tt> if the connect operation is not finished yet,
[2/3] git commit: Fix ChannelOutputStream logging
Posted by gn...@apache.org.
Fix ChannelOutputStream logging
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/bfa22dfd
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/bfa22dfd
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/bfa22dfd
Branch: refs/heads/master
Commit: bfa22dfd7e9e13e656bcfc2f0e2a02c44b103da2
Parents: 65e96aa
Author: Guillaume Nodet <gn...@apache.org>
Authored: Fri Jan 31 17:44:20 2014 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Fri Jan 31 17:44:20 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/sshd/common/channel/ChannelOutputStream.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/bfa22dfd/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelOutputStream.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelOutputStream.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelOutputStream.java
index 6aeafbc..5c3c959 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelOutputStream.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelOutputStream.java
@@ -128,7 +128,7 @@ public class ChannelOutputStream extends OutputStream {
}
lastSize = length;
remoteWindow.waitAndConsume(length);
- log.debug("Send {} on channel {}", cmd, channel.getId());
+ log.debug("Send {} on channel {}", cmd == SshConstants.SSH_MSG_CHANNEL_DATA ? "SSH_MSG_CHANNEL_DATA" : "SSH_MSG_CHANNEL_EXTENDED_DATA", channel.getId());
channel.writePacket(buf);
}
} catch (WindowClosedException e) {
[3/3] git commit: Improve PortForwardingTest
Posted by gn...@apache.org.
Improve PortForwardingTest
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/464b6fe5
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/464b6fe5
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/464b6fe5
Branch: refs/heads/master
Commit: 464b6fe57a15b2fd08b0e679dae842f8d4d365a4
Parents: bfa22df
Author: Guillaume Nodet <gn...@apache.org>
Authored: Fri Jan 31 17:44:30 2014 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Fri Jan 31 17:44:30 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/sshd/PortForwardingTest.java | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/464b6fe5/sshd-core/src/test/java/org/apache/sshd/PortForwardingTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/PortForwardingTest.java b/sshd-core/src/test/java/org/apache/sshd/PortForwardingTest.java
index b9c4452..9077951 100644
--- a/sshd-core/src/test/java/org/apache/sshd/PortForwardingTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/PortForwardingTest.java
@@ -26,9 +26,7 @@ import java.util.Set;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Logger;
import com.jcraft.jsch.Session;
-import com.jcraft.jsch.UserInfo;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.core.service.IoHandlerAdapter;
@@ -64,6 +62,7 @@ public class PortForwardingTest {
private int sshPort;
private int echoPort;
private IoAcceptor acceptor;
+ private SshClient client;
@Before
public void setUp() throws Exception {
@@ -104,6 +103,9 @@ public class PortForwardingTest {
if (acceptor != null) {
acceptor.dispose();
}
+ if (client != null) {
+ client.stop();
+ }
}
@Test
@@ -124,6 +126,7 @@ public class PortForwardingTest {
s.close();
session.delPortForwardingR(forwardedPort);
+ session.disconnect();
}
@Test
@@ -146,6 +149,7 @@ public class PortForwardingTest {
s.close();
session.stopRemotePortForwarding(remote);
+ session.close(false).await();
}
@Test
@@ -167,6 +171,7 @@ public class PortForwardingTest {
s.close();
session.stopRemotePortForwarding(bound);
+ session.close(false).await();
}
@Test
@@ -186,6 +191,7 @@ public class PortForwardingTest {
s.close();
session.delPortForwardingL(forwardedPort);
+ session.disconnect();
}
@Test
@@ -207,6 +213,7 @@ public class PortForwardingTest {
s.close();
session.stopLocalPortForwarding(bound);
+ session.close(false).await();
}
@Test
@@ -227,6 +234,8 @@ public class PortForwardingTest {
String res = new String(buf, 0, n);
assertEquals("Hello", res);
channel.close(false);
+
+ session.close(false).await();
}
@Test(timeout = 20000)
@@ -268,6 +277,7 @@ public class PortForwardingTest {
}
session.delPortForwardingR(forwardedPort);
+ session.disconnect();
}
/**
@@ -354,7 +364,7 @@ public class PortForwardingTest {
}
protected ClientSession createNativeSession() throws Exception {
- SshClient client = SshClient.setUpDefaultClient();
+ client = SshClient.setUpDefaultClient();
client.setTcpipForwardingFilter(new BogusForwardingFilter());
client.start();
ConnectFuture sessionFuture = client.connect("localhost", sshPort);