From ef3f7a2eaf02652a35516b397f4cd76564409f82 Mon Sep 17 00:00:00 2001 From: Jeroen van Erp Date: Mon, 23 Jan 2017 14:40:33 +0100 Subject: [PATCH] Fixed more warnings --- .../transport/IdentificationStringParser.java | 7 +++++-- .../net/schmizz/sshj/common/SecurityUtils.java | 2 +- .../connection/channel/AbstractChannel.java | 2 ++ .../net/schmizz/sshj/sftp/PacketReader.java | 11 ++++++----- .../java/net/schmizz/sshj/sftp/RemoteFile.java | 18 +++++++++--------- .../sshj/transport/cipher/NoneCipher.java | 2 ++ .../schmizz/sshj/util/gss/BogusGSSContext.java | 4 +++- .../sshj/util/gss/BogusGSSCredential.java | 4 +++- 8 files changed, 31 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/hierynomus/sshj/transport/IdentificationStringParser.java b/src/main/java/com/hierynomus/sshj/transport/IdentificationStringParser.java index 7c23475e..cb55e5ce 100644 --- a/src/main/java/com/hierynomus/sshj/transport/IdentificationStringParser.java +++ b/src/main/java/com/hierynomus/sshj/transport/IdentificationStringParser.java @@ -62,8 +62,11 @@ public class IdentificationStringParser { } } - private void logHeaderLine(Buffer.PlainBuffer lineBuffer) { - + private void logHeaderLine(Buffer.PlainBuffer lineBuffer) throws Buffer.BufferException { + byte[] bytes = new byte[lineBuffer.available()]; + lineBuffer.readRawBytes(bytes); + String header = new String(bytes, 0, bytes.length - 1); + log.debug("Received header: {}", header); } private String readIdentification(Buffer.PlainBuffer lineBuffer) throws Buffer.BufferException, TransportException { diff --git a/src/main/java/net/schmizz/sshj/common/SecurityUtils.java b/src/main/java/net/schmizz/sshj/common/SecurityUtils.java index 67ff7669..a549b90c 100644 --- a/src/main/java/net/schmizz/sshj/common/SecurityUtils.java +++ b/src/main/java/net/schmizz/sshj/common/SecurityUtils.java @@ -254,7 +254,7 @@ public class SecurityUtils { throw new SSHRuntimeException("Failed to register BouncyCastle as the defaut JCE provider"); } } + registrationDone = true; } - registrationDone = true; } } diff --git a/src/main/java/net/schmizz/sshj/connection/channel/AbstractChannel.java b/src/main/java/net/schmizz/sshj/connection/channel/AbstractChannel.java index fa89f028..2698d251 100644 --- a/src/main/java/net/schmizz/sshj/connection/channel/AbstractChannel.java +++ b/src/main/java/net/schmizz/sshj/connection/channel/AbstractChannel.java @@ -329,6 +329,8 @@ public abstract class AbstractChannel protected void gotUnknown(Message msg, SSHPacket buf) throws ConnectionException, TransportException { + log.warn("Got unknown packet with type {}", msg); + } protected void handleRequest(String reqType, SSHPacket buf) diff --git a/src/main/java/net/schmizz/sshj/sftp/PacketReader.java b/src/main/java/net/schmizz/sshj/sftp/PacketReader.java index a2db39ab..30233ed4 100644 --- a/src/main/java/net/schmizz/sshj/sftp/PacketReader.java +++ b/src/main/java/net/schmizz/sshj/sftp/PacketReader.java @@ -24,10 +24,11 @@ import java.io.InputStream; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -public class PacketReader - extends Thread { +public class PacketReader extends Thread { - /** Logger */ + /** + * Logger + */ private final Logger log; private final InputStream in; @@ -63,7 +64,7 @@ public class PacketReader | lenBuf[3] & 0x000000ffL); if (len > SFTPPacket.MAX_SIZE) { - throw new SSHException(String.format("Indicated packet length %d too large", len)); + throw new SSHException(String.format("Indicated packet length %d too large", len)); } return (int) len; @@ -99,7 +100,7 @@ public class PacketReader log.debug("Received {} packet", resp.getType()); if (promise == null) throw new SFTPException("Received [" + resp.readType() + "] response for request-id " + resp.getRequestID() - + ", no such request was made"); + + ", no such request was made"); else promise.deliver(resp); } diff --git a/src/main/java/net/schmizz/sshj/sftp/RemoteFile.java b/src/main/java/net/schmizz/sshj/sftp/RemoteFile.java index 24043c21..14d054e1 100644 --- a/src/main/java/net/schmizz/sshj/sftp/RemoteFile.java +++ b/src/main/java/net/schmizz/sshj/sftp/RemoteFile.java @@ -81,10 +81,10 @@ public class RemoteFile protected Promise asyncWrite(long fileOffset, byte[] data, int off, int len) throws IOException { return requester.request(newRequest(PacketType.WRITE) - .putUInt64(fileOffset) - // TODO The SFTP spec claims this field is unneeded...? See #187 - .putUInt32(len) - .putRawBytes(data, off, len) + .putUInt64(fileOffset) + // TODO The SFTP spec claims this field is unneeded...? See #187 + .putUInt32(len) + .putRawBytes(data, off, len) ); } @@ -194,10 +194,10 @@ public class RemoteFile @Override public long skip(long n) throws IOException { - final long fileLength = length(); - final Long previousFileOffset = fileOffset; - fileOffset = Math.min(fileOffset + n, fileLength); - return fileOffset - previousFileOffset; + final long fileLength = length(); + final Long previousFileOffset = fileOffset; + fileOffset = Math.min(fileOffset + n, fileLength); + return fileOffset - previousFileOffset; } @Override @@ -341,7 +341,7 @@ public class RemoteFile public int available() throws IOException { boolean lastRead = true; while (!eof && (pending.available() <= 0) && lastRead) { - lastRead = retrieveUnconfirmedRead(false /*blocking*/); + lastRead = retrieveUnconfirmedRead(false /*blocking*/); } return pending.available(); } diff --git a/src/main/java/net/schmizz/sshj/transport/cipher/NoneCipher.java b/src/main/java/net/schmizz/sshj/transport/cipher/NoneCipher.java index e4f47fba..d576d3c6 100644 --- a/src/main/java/net/schmizz/sshj/transport/cipher/NoneCipher.java +++ b/src/main/java/net/schmizz/sshj/transport/cipher/NoneCipher.java @@ -46,10 +46,12 @@ public class NoneCipher @Override public void init(Mode mode, byte[] bytes, byte[] bytes1) { + // Nothing to do } @Override public void update(byte[] input, int inputOffset, int inputLen) { + // Nothing to do } } diff --git a/src/test/java/net/schmizz/sshj/util/gss/BogusGSSContext.java b/src/test/java/net/schmizz/sshj/util/gss/BogusGSSContext.java index 8f650756..892faac2 100644 --- a/src/test/java/net/schmizz/sshj/util/gss/BogusGSSContext.java +++ b/src/test/java/net/schmizz/sshj/util/gss/BogusGSSContext.java @@ -70,7 +70,9 @@ public class BogusGSSContext } @Override - public void dispose() throws GSSException {} + public void dispose() throws GSSException { + // Nothing to do + } @Override public int getWrapSizeLimit(int qop, boolean confReq, int maxTokenSize) throws GSSException { diff --git a/src/test/java/net/schmizz/sshj/util/gss/BogusGSSCredential.java b/src/test/java/net/schmizz/sshj/util/gss/BogusGSSCredential.java index a211b5ca..6a747e93 100644 --- a/src/test/java/net/schmizz/sshj/util/gss/BogusGSSCredential.java +++ b/src/test/java/net/schmizz/sshj/util/gss/BogusGSSCredential.java @@ -34,7 +34,9 @@ public class BogusGSSCredential } @Override - public void dispose() throws GSSException {} + public void dispose() throws GSSException { + // Nothing to do + } @Override public GSSName getName() throws GSSException {