Repository: mina-sshd Updated Branches: refs/heads/master 7ccbd0663 -> 9f0bb1bce
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9f0bb1bc/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java index 5265af0..f2dfc68 100644 --- a/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java +++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java @@ -29,8 +29,8 @@ import org.apache.sshd.common.ServiceFactory; import org.apache.sshd.common.Session; import org.apache.sshd.common.SshConstants; import org.apache.sshd.common.SshException; -import org.apache.sshd.common.util.Buffer; import org.apache.sshd.common.util.CloseableUtils; +import org.apache.sshd.common.util.buffer.Buffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9f0bb1bc/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuth.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuth.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuth.java index d5aa426..993575b 100644 --- a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuth.java +++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuth.java @@ -20,7 +20,7 @@ package org.apache.sshd.deprecated; import java.io.IOException; -import org.apache.sshd.common.util.Buffer; +import org.apache.sshd.common.util.buffer.Buffer; /** * TODO Add javadoc http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9f0bb1bc/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthAgent.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthAgent.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthAgent.java index d6906e6..efcd610 100644 --- a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthAgent.java +++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthAgent.java @@ -25,8 +25,9 @@ import java.util.Iterator; import org.apache.sshd.agent.SshAgent; import org.apache.sshd.client.session.ClientSessionImpl; import org.apache.sshd.common.SshConstants; -import org.apache.sshd.common.util.Buffer; import org.apache.sshd.common.util.KeyUtils; +import org.apache.sshd.common.util.buffer.Buffer; +import org.apache.sshd.common.util.buffer.ByteArrayBuffer; /** * Authentication delegating to an SSH agent @@ -59,8 +60,8 @@ public class UserAuthAgent extends AbstractUserAuth { buffer.putPublicKey(key); - Buffer bs = new Buffer(); - bs.putString(session.getKex().getH()); + Buffer bs = new ByteArrayBuffer(); + bs.putBytes(session.getKex().getH()); bs.putByte(SshConstants.SSH_MSG_USERAUTH_REQUEST); bs.putString(session.getUsername()); bs.putString(service); @@ -69,7 +70,7 @@ public class UserAuthAgent extends AbstractUserAuth { bs.putString(KeyUtils.getKeyType(key)); bs.putPublicKey(key); - Buffer bs2 = new Buffer(); + Buffer bs2 = new ByteArrayBuffer(); bs2.putString(KeyUtils.getKeyType(key)); bs2.putBytes(agent.sign(key, bs.getCompactData())); buffer.putBytes(bs2.array(), bs2.rpos(), bs2.available()); @@ -82,6 +83,7 @@ public class UserAuthAgent extends AbstractUserAuth { } } + @Override public Result next(Buffer buffer) throws IOException { if (buffer == null) { if (keys.hasNext()) { @@ -108,7 +110,7 @@ public class UserAuthAgent extends AbstractUserAuth { } } else { // TODO: check packets - log.info("Received unknown packet: {}", cmd); + log.info("Received unknown packet: {}", Byte.valueOf(cmd)); return Result.Continued; } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9f0bb1bc/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java index 0ff3353..126b1b3 100644 --- a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java +++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.apache.sshd.client.UserInteraction; import org.apache.sshd.client.session.ClientSessionImpl; import org.apache.sshd.common.SshConstants; -import org.apache.sshd.common.util.Buffer; +import org.apache.sshd.common.util.buffer.Buffer; import static org.apache.sshd.common.SshConstants.*; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9f0bb1bc/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPassword.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPassword.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPassword.java index 9410c9a..43aec24 100644 --- a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPassword.java +++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPassword.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.apache.sshd.client.session.ClientSessionImpl; import org.apache.sshd.common.SshConstants; -import org.apache.sshd.common.util.Buffer; +import org.apache.sshd.common.util.buffer.Buffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9f0bb1bc/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPublicKey.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPublicKey.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPublicKey.java index 6cb43bd..73f15bb 100644 --- a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPublicKey.java +++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPublicKey.java @@ -25,8 +25,9 @@ import org.apache.sshd.client.session.ClientSessionImpl; import org.apache.sshd.common.NamedFactory; import org.apache.sshd.common.Signature; import org.apache.sshd.common.SshConstants; -import org.apache.sshd.common.util.Buffer; import org.apache.sshd.common.util.KeyUtils; +import org.apache.sshd.common.util.buffer.Buffer; +import org.apache.sshd.common.util.buffer.ByteArrayBuffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,6 +47,7 @@ public class UserAuthPublicKey extends AbstractUserAuth { this.key = key; } + @Override public Result next(Buffer buffer) throws IOException { if (buffer == null) { try { @@ -64,8 +66,8 @@ public class UserAuthPublicKey extends AbstractUserAuth { Signature verif = NamedFactory.Utils.create(session.getFactoryManager().getSignatureFactories(), alg); verif.init(key.getPublic(), key.getPrivate()); - Buffer bs = new Buffer(); - bs.putString(session.getKex().getH()); + Buffer bs = new ByteArrayBuffer(); + bs.putBytes(session.getKex().getH()); bs.putByte(SshConstants.SSH_MSG_USERAUTH_REQUEST); bs.putString(session.getUsername()); bs.putString(service); @@ -75,7 +77,7 @@ public class UserAuthPublicKey extends AbstractUserAuth { bs.putPublicKey(key.getPublic()); verif.update(bs.array(), bs.rpos(), bs.available()); - bs = new Buffer(); + bs = new ByteArrayBuffer(); bs.putString(alg); bs.putBytes(verif.sign()); buffer.putBytes(bs.array(), bs.rpos(), bs.available()); @@ -96,7 +98,7 @@ public class UserAuthPublicKey extends AbstractUserAuth { log.debug("Received SSH_MSG_USERAUTH_FAILURE"); return Result.Failure; } else { - log.debug("Received unknown packet {}", cmd); + log.debug("Received unknown packet {}", Byte.valueOf(cmd)); // TODO: check packets return Result.Continued; } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9f0bb1bc/sshd-core/src/test/java/org/apache/sshd/server/channel/ChannelSessionTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/channel/ChannelSessionTest.java b/sshd-core/src/test/java/org/apache/sshd/server/channel/ChannelSessionTest.java index 02d4444..15bb12c 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/channel/ChannelSessionTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/channel/ChannelSessionTest.java @@ -18,14 +18,15 @@ */ package org.apache.sshd.server.channel; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.Collection; import org.apache.sshd.common.channel.ChannelAsyncOutputStream; -import org.apache.sshd.common.util.Buffer; +import org.apache.sshd.common.util.buffer.Buffer; +import org.apache.sshd.common.util.buffer.ByteArrayBuffer; import org.apache.sshd.server.Signal; import org.apache.sshd.server.SignalListener; import org.apache.sshd.util.BaseTest; @@ -41,7 +42,7 @@ public class ChannelSessionTest extends BaseTest { */ @Test public void testHandleWindowAdjust() throws Exception { - final Buffer buffer = new Buffer(); + final Buffer buffer = new ByteArrayBuffer(); buffer.putInt(1234); final ChannelSession channelSession = new ChannelSession(); @@ -60,6 +61,7 @@ public class ChannelSessionTest extends BaseTest { public void testAddSignalListenerOnDuplicateSignals() { ChannelSession.StandardEnvironment environ = new ChannelSession.StandardEnvironment(); SignalListener listener = new SignalListener() { + @Override public void signal(Signal signal) { // ignored } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9f0bb1bc/sshd-core/src/test/java/org/apache/sshd/util/AsyncEchoShellFactory.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/AsyncEchoShellFactory.java b/sshd-core/src/test/java/org/apache/sshd/util/AsyncEchoShellFactory.java index 3d02bb7..dc86ab9 100644 --- a/sshd-core/src/test/java/org/apache/sshd/util/AsyncEchoShellFactory.java +++ b/sshd-core/src/test/java/org/apache/sshd/util/AsyncEchoShellFactory.java @@ -29,7 +29,7 @@ import org.apache.sshd.common.future.SshFutureListener; import org.apache.sshd.common.io.IoInputStream; import org.apache.sshd.common.io.IoOutputStream; import org.apache.sshd.common.io.IoWriteFuture; -import org.apache.sshd.common.util.Buffer; +import org.apache.sshd.common.util.buffer.ByteArrayBuffer; import org.apache.sshd.server.AsyncCommand; import org.apache.sshd.server.ChannelSessionAware; import org.apache.sshd.server.Command; @@ -45,6 +45,7 @@ import org.apache.sshd.server.channel.ChannelSession; */ public class AsyncEchoShellFactory implements Factory<Command> { + @Override public Command create() { return new EchoShell(); } @@ -70,57 +71,71 @@ public class AsyncEchoShellFactory implements Factory<Command> { return environment; } + @Override public void setInputStream(InputStream in) { } + @Override public void setOutputStream(OutputStream out) { } + @Override public void setErrorStream(OutputStream err) { } + @Override public void setIoInputStream(IoInputStream in) { } + @Override public void setIoOutputStream(IoOutputStream out) { this.out = new BufferedIoOutputStream(out); } + @Override public void setIoErrorStream(IoOutputStream err) { this.err = new BufferedIoOutputStream(err); } + @Override public void setExitCallback(ExitCallback callback) { this.callback = callback; } + @Override public void setChannelSession(ChannelSession session) { this.session = session; } + @Override public void start(Environment env) throws IOException { environment = env; session.setDataReceiver(this); } + @Override public void close() throws IOException { out.close(false).addListener(new SshFutureListener<CloseFuture>() { + @Override public void operationComplete(CloseFuture future) { callback.onExit(0); } }); } + @Override public void destroy() { } + @Override public int data(final ChannelSession channel, byte[] buf, int start, int len) throws IOException { buffer.append(new String(buf, start, len)); for (int i = 0; i < buffer.length(); i++) { if (buffer.charAt(i) == '\n') { final String s = buffer.substring(0, i + 1); final byte[] bytes = s.getBytes(); - out.write(new Buffer(bytes)).addListener(new SshFutureListener<IoWriteFuture>() { + out.write(new ByteArrayBuffer(bytes)).addListener(new SshFutureListener<IoWriteFuture>() { + @Override public void operationComplete(IoWriteFuture future) { try { channel.getLocalWindow().consumeAndCheck(bytes.length); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9f0bb1bc/sshd-core/src/test/java/org/apache/sshd/util/BogusChannel.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/BogusChannel.java b/sshd-core/src/test/java/org/apache/sshd/util/BogusChannel.java index f4a9d18..ce47b18 100644 --- a/sshd-core/src/test/java/org/apache/sshd/util/BogusChannel.java +++ b/sshd-core/src/test/java/org/apache/sshd/util/BogusChannel.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.apache.sshd.client.future.DefaultOpenFuture; import org.apache.sshd.client.future.OpenFuture; import org.apache.sshd.common.channel.AbstractChannel; -import org.apache.sshd.common.util.Buffer; +import org.apache.sshd.common.util.buffer.Buffer; public class BogusChannel extends AbstractChannel {
