Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

mass auto-format

  • Loading branch information...
commit 3267860db400e031f9c2ecbcb32c679c06637198 1 parent d6eb5a0
@shikhar shikhar authored
Showing with 243 additions and 189 deletions.
  1. +1 −1  src/main/java/examples/LocalPF.java
  2. +2 −2 src/main/java/net/schmizz/concurrent/ErrorDeliveryUtil.java
  3. +2 −1  src/main/java/net/schmizz/sshj/AndroidConfig.java
  4. +1 −0  src/main/java/net/schmizz/sshj/Config.java
  5. +1 −1  src/main/java/net/schmizz/sshj/DefaultConfig.java
  6. +3 −7 src/main/java/net/schmizz/sshj/SSHClient.java
  7. +55 −30 src/main/java/net/schmizz/sshj/common/Base64.java
  8. +0 −2  src/main/java/net/schmizz/sshj/common/ByteArrayUtils.java
  9. +1 −0  src/main/java/net/schmizz/sshj/common/ErrorNotifiable.java
  10. +0 −3  src/main/java/net/schmizz/sshj/common/KeyType.java
  11. +1 −0  src/main/java/net/schmizz/sshj/common/SecurityUtils.java
  12. +3 −3 src/main/java/net/schmizz/sshj/connection/Connection.java
  13. +4 −3 src/main/java/net/schmizz/sshj/connection/channel/AbstractChannel.java
  14. +1 −0  src/main/java/net/schmizz/sshj/connection/channel/Channel.java
  15. +2 −2 src/main/java/net/schmizz/sshj/connection/channel/ChannelInputStream.java
  16. +2 −2 src/main/java/net/schmizz/sshj/connection/channel/SocketStreamCopyMonitor.java
  17. +1 −1  src/main/java/net/schmizz/sshj/connection/channel/direct/LocalPortForwarder.java
  18. +5 −2 src/main/java/net/schmizz/sshj/connection/channel/direct/Session.java
  19. +3 −3 src/main/java/net/schmizz/sshj/connection/channel/forwarded/AbstractForwardedChannel.java
  20. +8 −8 src/main/java/net/schmizz/sshj/connection/channel/forwarded/RemotePortForwarder.java
  21. +4 −4 src/main/java/net/schmizz/sshj/sftp/PacketReader.java
  22. +1 −1  src/main/java/net/schmizz/sshj/sftp/RemoteDirectory.java
  23. +11 −11 src/main/java/net/schmizz/sshj/sftp/RemoteFile.java
  24. +4 −2 src/main/java/net/schmizz/sshj/sftp/Response.java
  25. +2 −1  src/main/java/net/schmizz/sshj/sftp/SFTPEngine.java
  26. +1 −1  src/main/java/net/schmizz/sshj/transport/Converter.java
  27. +2 −2 src/main/java/net/schmizz/sshj/transport/Decoder.java
  28. +9 −9 src/main/java/net/schmizz/sshj/transport/NegotiatedAlgorithms.java
  29. +4 −4 src/main/java/net/schmizz/sshj/transport/Transport.java
  30. +12 −9 src/main/java/net/schmizz/sshj/transport/TransportImpl.java
  31. +1 −0  src/main/java/net/schmizz/sshj/transport/cipher/AES128CBC.java
  32. +1 −0  src/main/java/net/schmizz/sshj/transport/cipher/AES128CTR.java
  33. +1 −0  src/main/java/net/schmizz/sshj/transport/cipher/AES192CBC.java
  34. +1 −0  src/main/java/net/schmizz/sshj/transport/cipher/AES192CTR.java
  35. +1 −0  src/main/java/net/schmizz/sshj/transport/cipher/AES256CBC.java
  36. +1 −0  src/main/java/net/schmizz/sshj/transport/cipher/AES256CTR.java
  37. +1 −0  src/main/java/net/schmizz/sshj/transport/cipher/BlowfishCBC.java
  38. +1 −0  src/main/java/net/schmizz/sshj/transport/cipher/NoneCipher.java
  39. +1 −0  src/main/java/net/schmizz/sshj/transport/cipher/TripleDESCBC.java
  40. +1 −0  src/main/java/net/schmizz/sshj/transport/compression/DelayedZlibCompression.java
  41. +1 −0  src/main/java/net/schmizz/sshj/transport/compression/NoneCompression.java
  42. +2 −1  src/main/java/net/schmizz/sshj/transport/compression/ZlibCompression.java
  43. +2 −1  src/main/java/net/schmizz/sshj/transport/kex/DHG14.java
  44. +10 −10 src/main/java/net/schmizz/sshj/transport/kex/DHGroupData.java
  45. +1 −0  src/main/java/net/schmizz/sshj/transport/random/SingletonRandomFactory.java
  46. +10 −10 src/main/java/net/schmizz/sshj/transport/verification/ConsoleKnownHostsVerifier.java
  47. +6 −3 src/main/java/net/schmizz/sshj/userauth/UserAuthImpl.java
  48. +1 −1  src/main/java/net/schmizz/sshj/userauth/keyprovider/KeyProviderUtil.java
  49. +1 −1  src/main/java/net/schmizz/sshj/userauth/keyprovider/OpenSSHKeyFile.java
  50. +2 −6 src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java
  51. +1 −0  src/main/java/net/schmizz/sshj/userauth/method/AuthKeyboardInteractive.java
  52. +5 −4 src/main/java/net/schmizz/sshj/userauth/method/KeyedAuthMethod.java
  53. +2 −1  src/main/java/net/schmizz/sshj/userauth/password/AccountResource.java
  54. +4 −2 src/main/java/net/schmizz/sshj/userauth/password/PrivateKeyStringResource.java
  55. +0 −2  src/main/java/net/schmizz/sshj/xfer/FileSystemFile.java
  56. +1 −1  src/main/java/net/schmizz/sshj/xfer/FileTransfer.java
  57. +2 −1  src/main/java/net/schmizz/sshj/xfer/LocalSourceFile.java
  58. +1 −0  src/main/java/net/schmizz/sshj/xfer/scp/SCPException.java
  59. +7 −7 src/main/java/net/schmizz/sshj/xfer/scp/SCPFileTransfer.java
  60. +2 −1  src/test/java/net/schmizz/sshj/SmokeTest.java
  61. +2 −3 src/test/java/net/schmizz/sshj/keyprovider/OpenSSHKeyFileTest.java
  62. +1 −0  src/test/java/net/schmizz/sshj/util/BufferTest.java
  63. +23 −19 src/test/java/net/schmizz/sshj/util/KeyUtil.java
View
2  src/main/java/examples/LocalPF.java
@@ -42,7 +42,7 @@ public static void main(String... args)
* google.com:80
*/
ssh.newLocalPortForwarder(new InetSocketAddress("localhost", 8080), "google.com", 80)
- .listen();
+ .listen();
} finally {
ssh.disconnect();
View
4 src/main/java/net/schmizz/concurrent/ErrorDeliveryUtil.java
@@ -30,12 +30,12 @@ public static void alertPromises(Throwable x, Collection<? extends Promise> prom
}
public static void alertEvents(Throwable x, Event... events) {
- for (Event e: events)
+ for (Event e : events)
e.deliverError(x);
}
public static void alertEvents(Throwable x, Collection<? extends Event> events) {
- for (Event e: events)
+ for (Event e : events)
e.deliverError(x);
}
View
3  src/main/java/net/schmizz/sshj/AndroidConfig.java
@@ -18,7 +18,8 @@
import net.schmizz.sshj.transport.random.JCERandom;
import net.schmizz.sshj.transport.random.SingletonRandomFactory;
-public class AndroidConfig extends DefaultConfig {
+public class AndroidConfig
+ extends DefaultConfig {
@Override
protected void initRandomFactory(boolean ignored) {
View
1  src/main/java/net/schmizz/sshj/Config.java
@@ -31,6 +31,7 @@
* {@link Compression}, {@link MAC}, {@link Signature}, {@link Random}, and {@link FileKeyProvider}.
*/
public interface Config {
+
/**
* Retrieve the list of named factories for {@code Cipher}.
*
View
2  src/main/java/net/schmizz/sshj/DefaultConfig.java
@@ -137,7 +137,7 @@ protected void initCipherFactories() {
boolean warn = false;
// Ref. https://issues.apache.org/jira/browse/SSHD-24
// "AES256 and AES192 requires unlimited cryptography extension"
- for (Iterator<Factory.Named<Cipher>> i = avail.iterator(); i.hasNext();) {
+ for (Iterator<Factory.Named<Cipher>> i = avail.iterator(); i.hasNext(); ) {
final Factory.Named<Cipher> f = i.next();
try {
final Cipher c = f.create();
View
10 src/main/java/net/schmizz/sshj/SSHClient.java
@@ -16,7 +16,6 @@
package net.schmizz.sshj;
-import net.schmizz.sshj.common.DisconnectReason;
import net.schmizz.sshj.common.Factory;
import net.schmizz.sshj.common.SSHException;
import net.schmizz.sshj.common.SecurityUtils;
@@ -50,7 +49,6 @@
import net.schmizz.sshj.userauth.keyprovider.KeyPairWrapper;
import net.schmizz.sshj.userauth.keyprovider.KeyProvider;
import net.schmizz.sshj.userauth.keyprovider.KeyProviderUtil;
-import net.schmizz.sshj.userauth.keyprovider.OpenSSHKeyFile;
import net.schmizz.sshj.userauth.method.AuthKeyboardInteractive;
import net.schmizz.sshj.userauth.method.AuthMethod;
import net.schmizz.sshj.userauth.method.AuthPassword;
@@ -65,8 +63,6 @@
import java.io.File;
import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
import java.net.SocketAddress;
import java.security.KeyPair;
import java.security.PublicKey;
@@ -444,7 +440,7 @@ public KeyProvider loadKeys(String location)
/**
* Utility function for createing a {@link KeyProvider} instance from given location on the file system. Creates a
* one-off {@link PasswordFinder} using {@link PasswordUtils#createOneOff(char[])}, and calls {@link
- * #loadKeys(String,PasswordFinder)}.
+ * #loadKeys(String, PasswordFinder)}.
*
* @param location location of the key file
* @param passphrase passphrase as a char-array
@@ -505,8 +501,8 @@ public KeyProvider loadKeys(String location, String passphrase)
}
/**
- * Creates a {@link KeyProvider} instance from passed strings. Currently only PKCS8 format
- * private key files are supported (OpenSSH uses this format).
+ * Creates a {@link KeyProvider} instance from passed strings. Currently only PKCS8 format private key files are
+ * supported (OpenSSH uses this format).
* <p/>
*
* @param privateKey the private key as a string
View
85 src/main/java/net/schmizz/sshj/common/Base64.java
@@ -32,7 +32,8 @@
* @see Base64
* @since 1.3
*/
- public static class InputStream extends java.io.FilterInputStream {
+ public static class InputStream
+ extends java.io.FilterInputStream {
private final boolean encode; // Encoding or decoding
private int position; // Current position in the buffer
@@ -99,7 +100,8 @@ public InputStream(java.io.InputStream in, int options) {
* @since 1.3
*/
@Override
- public int read() throws java.io.IOException {
+ public int read()
+ throws java.io.IOException {
// Do we need to get data?
if (position < 0)
@@ -197,7 +199,8 @@ else if (i == 0)
* @since 1.3
*/
@Override
- public int read(byte[] dest, int off, int len) throws java.io.IOException {
+ public int read(byte[] dest, int off, int len)
+ throws java.io.IOException {
int i;
int b;
for (i = 0; i < len; i++) {
@@ -222,7 +225,8 @@ else if (i == 0)
* @see Base64
* @since 1.3
*/
- public static class OutputStream extends java.io.FilterOutputStream {
+ public static class OutputStream
+ extends java.io.FilterOutputStream {
private final boolean encode;
private int position;
@@ -289,7 +293,8 @@ public OutputStream(java.io.OutputStream out, int options) {
* @since 1.3
*/
@Override
- public void close() throws java.io.IOException {
+ public void close()
+ throws java.io.IOException {
// 1. Ensure that pending characters are written
flush();
@@ -308,7 +313,8 @@ public void close() throws java.io.IOException {
* @since 2.3
*/
@Override
- public void flush() throws java.io.IOException {
+ public void flush()
+ throws java.io.IOException {
flushBase64();
super.flush();
}
@@ -318,7 +324,8 @@ public void flush() throws java.io.IOException {
*
* @throws java.io.IOException if there's an error.
*/
- public void flushBase64() throws java.io.IOException {
+ public void flushBase64()
+ throws java.io.IOException {
if (position > 0)
if (encode) {
out.write(encode3to4(b4, buffer, position, options));
@@ -346,7 +353,8 @@ public void resumeEncoding() {
* @throws java.io.IOException if there's an error flushing
* @since 1.5.1
*/
- public void suspendEncoding() throws java.io.IOException {
+ public void suspendEncoding()
+ throws java.io.IOException {
flushBase64();
suspendEncoding = true;
} // end suspendEncoding
@@ -361,7 +369,8 @@ public void suspendEncoding() throws java.io.IOException {
* @since 1.3
*/
@Override
- public void write(byte[] theBytes, int off, int len) throws java.io.IOException {
+ public void write(byte[] theBytes, int off, int len)
+ throws java.io.IOException {
// Encoding suspended?
if (suspendEncoding) {
super.out.write(theBytes, off, len);
@@ -383,7 +392,8 @@ public void write(byte[] theBytes, int off, int len) throws java.io.IOException
* @since 1.3
*/
@Override
- public void write(int theByte) throws java.io.IOException {
+ public void write(int theByte)
+ throws java.io.IOException {
// Encoding suspended?
if (suspendEncoding) {
super.out.write(theByte);
@@ -673,7 +683,8 @@ else if (decodabet[theByte & 0x7f] != WHITE_SPACE_ENC)
* @throws java.io.IOException If bogus characters exist in source data
* @since 1.3
*/
- public static byte[] decode(byte[] source, int off, int len, int options) throws java.io.IOException {
+ public static byte[] decode(byte[] source, int off, int len, int options)
+ throws java.io.IOException {
// Lots of error checking and exception throwing
if (source == null)
@@ -725,7 +736,7 @@ else if (len < 4)
else
// There's a bad input character in the Base64 stream.
throw new java.io.IOException(String.format("Bad Base64 input character '%c' in array position %d",
- source[i], i));
+ source[i], i));
} // each input character
byte[] out = new byte[outBuffPosn];
@@ -743,7 +754,8 @@ else if (len < 4)
* @throws java.io.IOException If there is a problem
* @since 1.4
*/
- public static byte[] decode(String s) throws java.io.IOException {
+ public static byte[] decode(String s)
+ throws java.io.IOException {
return decode(s, NO_OPTIONS);
}
@@ -759,7 +771,8 @@ else if (len < 4)
* @throws NullPointerException if <tt>s</tt> is null
* @since 1.4
*/
- public static byte[] decode(String s, int options) throws java.io.IOException {
+ public static byte[] decode(String s, int options)
+ throws java.io.IOException {
if (s == null)
throw new NullPointerException("Input string was null.");
@@ -833,7 +846,8 @@ else if (len < 4)
* @throws java.io.IOException if there is an error
* @since 2.2
*/
- public static void decodeFileToFile(String infile, String outfile) throws java.io.IOException {
+ public static void decodeFileToFile(String infile, String outfile)
+ throws java.io.IOException {
byte[] decoded = Base64.decodeFromFile(infile);
java.io.OutputStream out = null;
@@ -864,7 +878,8 @@ public static void decodeFileToFile(String infile, String outfile) throws java.i
* @throws java.io.IOException if there is an error
* @since 2.1
*/
- public static byte[] decodeFromFile(String filename) throws java.io.IOException {
+ public static byte[] decodeFromFile(String filename)
+ throws java.io.IOException {
byte[] decodedData = null;
Base64.InputStream bis = null;
@@ -878,12 +893,12 @@ public static void decodeFileToFile(String infile, String outfile) throws java.i
// Check for size of file
if (file.length() > Integer.MAX_VALUE)
throw new java.io.IOException("File is too big for this convenience method (" + file.length()
- + " bytes).");
+ + " bytes).");
buffer = new byte[(int) file.length()];
// Open a stream
bis = new Base64.InputStream(new java.io.BufferedInputStream(new java.io.FileInputStream(file)),
- Base64.DECODE);
+ Base64.DECODE);
// Read until done
while ((numBytes = bis.read(buffer, length, 4096)) >= 0)
@@ -918,7 +933,8 @@ public static void decodeFileToFile(String infile, String outfile) throws java.i
* @throws java.io.IOException if there is an error
* @since 2.1
*/
- public static void decodeToFile(String dataToDecode, String filename) throws java.io.IOException {
+ public static void decodeToFile(String dataToDecode, String filename)
+ throws java.io.IOException {
Base64.OutputStream bos = null;
try {
@@ -950,8 +966,9 @@ public static void decodeToFile(String dataToDecode, String filename) throws jav
* @throws ClassNotFoundException if the decoded object is of a class that cannot be found by the JVM
* @since 1.5
*/
- public static Object decodeToObject(String encodedObject) throws java.io.IOException,
- java.lang.ClassNotFoundException {
+ public static Object decodeToObject(String encodedObject)
+ throws java.io.IOException,
+ java.lang.ClassNotFoundException {
// Decode and gunzip if necessary
byte[] objBytes = decode(encodedObject);
@@ -1078,7 +1095,8 @@ public static String encodeBytes(byte[] source) {
* @see Base64#DO_BREAK_LINES
* @since 2.0
*/
- public static String encodeBytes(byte[] source, int options) throws java.io.IOException {
+ public static String encodeBytes(byte[] source, int options)
+ throws java.io.IOException {
return encodeBytes(source, 0, source.length, options);
} // end encodeBytes
@@ -1137,7 +1155,8 @@ public static String encodeBytes(byte[] source, int off, int len) {
* @see Base64#DO_BREAK_LINES
* @since 2.0
*/
- public static String encodeBytes(byte[] source, int off, int len, int options) throws java.io.IOException {
+ public static String encodeBytes(byte[] source, int off, int len, int options)
+ throws java.io.IOException {
byte[] encoded = encodeBytesToBytes(source, off, len, options);
// Return value according to relevant encoding.
@@ -1189,7 +1208,8 @@ public static String encodeBytes(byte[] source, int off, int len, int options) t
* @see Base64#DO_BREAK_LINES
* @since 2.3.1
*/
- public static byte[] encodeBytesToBytes(byte[] source, int off, int len, int options) throws java.io.IOException {
+ public static byte[] encodeBytesToBytes(byte[] source, int off, int len, int options)
+ throws java.io.IOException {
if (source == null)
throw new NullPointerException("Cannot serialize a null array.");
@@ -1302,7 +1322,8 @@ public static String encodeBytes(byte[] source, int off, int len, int options) t
* @throws java.io.IOException if there is an error
* @since 2.2
*/
- public static void encodeFileToFile(String infile, String outfile) throws java.io.IOException {
+ public static void encodeFileToFile(String infile, String outfile)
+ throws java.io.IOException {
String encoded = Base64.encodeFromFile(infile);
java.io.OutputStream out = null;
@@ -1333,7 +1354,8 @@ public static void encodeFileToFile(String infile, String outfile) throws java.i
* @throws java.io.IOException if there is an error
* @since 2.1
*/
- public static String encodeFromFile(String filename) throws java.io.IOException {
+ public static String encodeFromFile(String filename)
+ throws java.io.IOException {
String encodedData = null;
Base64.InputStream bis = null;
@@ -1348,7 +1370,7 @@ public static String encodeFromFile(String filename) throws java.io.IOException
// Open a stream
bis = new Base64.InputStream(new java.io.BufferedInputStream(new java.io.FileInputStream(file)),
- Base64.ENCODE);
+ Base64.ENCODE);
// Read until done
while ((numBytes = bis.read(buffer, length, 4096)) >= 0)
@@ -1387,7 +1409,8 @@ public static String encodeFromFile(String filename) throws java.io.IOException
* @throws NullPointerException if serializedObject is null
* @since 1.4
*/
- public static String encodeObject(java.io.Serializable serializableObject) throws java.io.IOException {
+ public static String encodeObject(java.io.Serializable serializableObject)
+ throws java.io.IOException {
return encodeObject(serializableObject, NO_OPTIONS);
} // end encodeObject
@@ -1420,7 +1443,8 @@ public static String encodeObject(java.io.Serializable serializableObject) throw
* @see Base64#DO_BREAK_LINES
* @since 2.0
*/
- public static String encodeObject(java.io.Serializable serializableObject, int options) throws java.io.IOException {
+ public static String encodeObject(java.io.Serializable serializableObject, int options)
+ throws java.io.IOException {
if (serializableObject == null)
throw new NullPointerException("Cannot serialize a null object.");
@@ -1481,7 +1505,8 @@ public static String encodeObject(java.io.Serializable serializableObject, int o
* @throws NullPointerException if dataToEncode is null
* @since 2.1
*/
- public static void encodeToFile(byte[] dataToEncode, String filename) throws java.io.IOException {
+ public static void encodeToFile(byte[] dataToEncode, String filename)
+ throws java.io.IOException {
if (dataToEncode == null)
throw new NullPointerException("Data to encode was null.");
View
2  src/main/java/net/schmizz/sshj/common/ByteArrayUtils.java
@@ -35,8 +35,6 @@
*/
package net.schmizz.sshj.common;
-import java.util.Arrays;
-
/** Utility functions for byte arrays. */
public class ByteArrayUtils {
View
1  src/main/java/net/schmizz/sshj/common/ErrorNotifiable.java
@@ -22,6 +22,7 @@
/** Utility functions. */
class Util {
+
/** Notify all {@code notifiables} of given {@code error}. */
public static void alertAll(SSHException error, ErrorNotifiable... notifiables) {
for (ErrorNotifiable notifiable : notifiables)
View
3  src/main/java/net/schmizz/sshj/common/KeyType.java
@@ -32,7 +32,6 @@
/** SSH identifier for RSA keys */
RSA("ssh-rsa") {
-
@Override
public PublicKey readPubKeyFromBuffer(String type, Buffer<?> buf)
throws GeneralSecurityException {
@@ -64,7 +63,6 @@ protected boolean isMyType(Key key) {
/** SSH identifier for DSA keys */
DSA("ssh-dss") {
-
@Override
public PublicKey readPubKeyFromBuffer(String type, Buffer<?> buf)
throws GeneralSecurityException {
@@ -100,7 +98,6 @@ protected boolean isMyType(Key key) {
/** Unrecognized */
UNKNOWN("unknown") {
-
@Override
public PublicKey readPubKeyFromBuffer(String type, Buffer<?> buf)
throws GeneralSecurityException {
View
1  src/main/java/net/schmizz/sshj/common/SecurityUtils.java
@@ -58,6 +58,7 @@
public class SecurityUtils {
private static class BouncyCastleRegistration {
+
public void run()
throws Exception {
if (java.security.Security.getProvider(BOUNCY_CASTLE) == null) {
View
6 src/main/java/net/schmizz/sshj/connection/Connection.java
@@ -89,13 +89,13 @@ void join()
* @param wantReply whether a reply is requested
* @param specifics {@link SSHPacket} containing fields specific to the request
*
- * @return a {@link net.schmizz.concurrent.Promise} for the reply data (in case {@code wantReply} is true) which allows waiting on the
- * reply, or {@code null} if a reply is not requested.
+ * @return a {@link net.schmizz.concurrent.Promise} for the reply data (in case {@code wantReply} is true) which
+ * allows waiting on the reply, or {@code null} if a reply is not requested.
*
* @throws TransportException if there is an error sending the request
*/
public Promise<SSHPacket, ConnectionException> sendGlobalRequest(String name, boolean wantReply,
- byte[] specifics)
+ byte[] specifics)
throws TransportException;
/**
View
7 src/main/java/net/schmizz/sshj/connection/channel/AbstractChannel.java
@@ -35,8 +35,8 @@
*/
package net.schmizz.sshj.connection.channel;
-import net.schmizz.concurrent.Event;
import net.schmizz.concurrent.ErrorDeliveryUtil;
+import net.schmizz.concurrent.Event;
import net.schmizz.sshj.common.Buffer;
import net.schmizz.sshj.common.ByteArrayUtils;
import net.schmizz.sshj.common.DisconnectReason;
@@ -313,7 +313,8 @@ private void gotChannelRequest(SSHPacket buf)
handleRequest(reqType, buf);
}
- private void gotWindowAdjustment(SSHPacket buf) throws ConnectionException {
+ private void gotWindowAdjustment(SSHPacket buf)
+ throws ConnectionException {
final int howMuch;
try {
howMuch = buf.readUInt32AsInt();
@@ -429,7 +430,7 @@ public synchronized void sendEOF()
@Override
public String toString() {
return "< " + type + " channel: id=" + id + ", recipient=" + recipient + ", localWin=" + lwin + ", remoteWin="
- + rwin + " >";
+ + rwin + " >";
}
View
1  src/main/java/net/schmizz/sshj/connection/channel/Channel.java
@@ -32,6 +32,7 @@
/** Direct channels are those that are initiated by us. */
interface Direct
extends Channel {
+
/**
* Request opening this channel from remote end.
*
View
4 src/main/java/net/schmizz/sshj/connection/channel/ChannelInputStream.java
@@ -116,7 +116,7 @@ public int read()
public int read(byte[] b, int off, int len)
throws IOException {
synchronized (buf) {
- for (; ;) {
+ for (; ; ) {
if (buf.available() > 0)
break;
if (eof)
@@ -163,7 +163,7 @@ private void checkWindow()
if (adjustment > 0) {
log.info("Sending SSH_MSG_CHANNEL_WINDOW_ADJUST to #{} for {} bytes", chan.getRecipient(), adjustment);
trans.write(new SSHPacket(Message.CHANNEL_WINDOW_ADJUST)
- .putUInt32(chan.getRecipient()).putUInt32(adjustment));
+ .putUInt32(chan.getRecipient()).putUInt32(adjustment));
win.expand(adjustment);
}
}
View
4 src/main/java/net/schmizz/sshj/connection/channel/SocketStreamCopyMonitor.java
@@ -43,8 +43,8 @@ public void close()
}
public static void monitor(final int frequency, final TimeUnit unit,
- final Event<IOException> x, final Event<IOException> y,
- final Channel channel, final Socket socket) {
+ final Event<IOException> x, final Event<IOException> y,
+ final Channel channel, final Socket socket) {
new SocketStreamCopyMonitor(new Runnable() {
public void run() {
try {
View
2  src/main/java/net/schmizz/sshj/connection/channel/direct/LocalPortForwarder.java
@@ -53,7 +53,7 @@ private void start()
.bufSize(getLocalMaxPacketSize())
.spawnDaemon("chan2soc");
SocketStreamCopyMonitor.monitor(5, TimeUnit.SECONDS, soc2chan, chan2soc, this, sock);
- }
+ }
@Override
protected SSHPacket buildOpenReq() {
View
7 src/main/java/net/schmizz/sshj/connection/channel/direct/Session.java
@@ -82,10 +82,12 @@ void signal(Signal signal)
throws TransportException;
@Deprecated
- String getOutputAsString() throws IOException;
+ String getOutputAsString()
+ throws IOException;
@Deprecated
- String getErrorAsString() throws IOException;
+ String getErrorAsString()
+ throws IOException;
}
@@ -132,6 +134,7 @@ void signal(Signal signal)
/** Subsystem API. */
interface Subsystem
extends Channel {
+
Integer getExitStatus();
}
View
6 src/main/java/net/schmizz/sshj/connection/channel/forwarded/AbstractForwardedChannel.java
@@ -69,9 +69,9 @@ public void confirm()
// Must ensure channel is attached before confirming, data could start coming in immediately!
conn.attach(this);
trans.write(newBuffer(Message.CHANNEL_OPEN_CONFIRMATION)
- .putUInt32(getID())
- .putUInt32(getLocalWinSize())
- .putUInt32(getLocalMaxPacketSize()));
+ .putUInt32(getID())
+ .putUInt32(getLocalWinSize())
+ .putUInt32(getLocalMaxPacketSize()));
open.set();
}
View
16 src/main/java/net/schmizz/sshj/connection/channel/forwarded/RemotePortForwarder.java
@@ -39,18 +39,18 @@
* address (or domain name) and port on which connections for forwarding
* are to be accepted. Some strings used for 'address to bind' have
* special-case semantics.
- * <p/>
+ *
* o &quot;&quot; means that connections are to be accepted on all protocol
* families supported by the SSH implementation.
- * <p/>
+ *
* o &quot;0.0.0.0&quot; means to listen on all IPv4 addresses.
- * <p/>
+ *
* o &quot;::&quot; means to listen on all IPv6 addresses.
- * <p/>
+ *
* o &quot;localhost&quot; means to listen on all protocol families supported by
* the SSH implementation on loopback addresses only ([RFC3330] and
* [RFC3513]).
- * <p/>
+ *
* o &quot;127.0.0.1&quot; and &quot;::1&quot; indicate listening on the loopback
* interfaces for IPv4 and IPv6, respectively.
* </pre>
@@ -198,9 +198,9 @@ public void cancel(Forward forward)
protected SSHPacket req(String reqName, Forward forward)
throws ConnectionException, TransportException {
final byte[] specifics = new Buffer.PlainBuffer().putString(forward.address).putUInt32(forward.port)
- .getCompactData();
+ .getCompactData();
return conn.sendGlobalRequest(reqName, true, specifics)
- .retrieve(conn.getTimeout(), TimeUnit.SECONDS);
+ .retrieve(conn.getTimeout(), TimeUnit.SECONDS);
}
/** @return the active forwards. */
@@ -227,7 +227,7 @@ public void handleOpen(SSHPacket buf)
callListener(listeners.get(chan.getParentForward()), chan);
else
chan.reject(OpenFailException.Reason.ADMINISTRATIVELY_PROHIBITED, "Forwarding was not requested on `"
- + chan.getParentForward() + "`");
+ + chan.getParentForward() + "`");
}
}
View
8 src/main/java/net/schmizz/sshj/sftp/PacketReader.java
@@ -57,9 +57,9 @@ private int getPacketLength()
readIntoBuffer(lenBuf, 0, lenBuf.length);
return (int) (lenBuf[0] << 24 & 0xff000000L
- | lenBuf[1] << 16 & 0x00ff0000L
- | lenBuf[2] << 8 & 0x0000ff00L
- | lenBuf[3] & 0x000000ffL);
+ | lenBuf[1] << 16 & 0x00ff0000L
+ | lenBuf[2] << 8 & 0x0000ff00L
+ | lenBuf[3] & 0x000000ffL);
}
public SFTPPacket<Response> readPacket()
@@ -97,7 +97,7 @@ public void handle()
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);
}
View
2  src/main/java/net/schmizz/sshj/sftp/RemoteDirectory.java
@@ -32,7 +32,7 @@ public RemoteDirectory(Requester requester, String path, String handle) {
throws IOException {
List<RemoteResourceInfo> rri = new LinkedList<RemoteResourceInfo>();
loop:
- for (; ;) {
+ for (; ; ) {
Response res = requester.doRequest(newRequest(PacketType.READDIR));
switch (res.getType()) {
View
22 src/main/java/net/schmizz/sshj/sftp/RemoteFile.java
@@ -39,8 +39,8 @@ public RemoteFileOutputStream getOutputStream() {
public FileAttributes fetchAttributes()
throws IOException {
return requester.doRequest(newRequest(PacketType.FSTAT))
- .ensurePacketTypeIs(PacketType.ATTRS)
- .readFileAttributes();
+ .ensurePacketTypeIs(PacketType.ATTRS)
+ .readFileAttributes();
}
public long length()
@@ -74,9 +74,9 @@ public int read(long fileOffset, byte[] to, int offset, int len)
public void write(long fileOffset, byte[] data, int off, int len)
throws IOException {
requester.doRequest(newRequest(PacketType.WRITE)
- .putUInt64(fileOffset)
- .putUInt32(len - off)
- .putRawBytes(data, off, len)
+ .putUInt64(fileOffset)
+ .putUInt32(len - off)
+ .putRawBytes(data, off, len)
).ensureStatusPacketIsOK();
}
@@ -87,12 +87,12 @@ public void setAttributes(FileAttributes attrs)
public int getOutgoingPacketOverhead() {
return 1 + // packet type
- 4 + // request id
- 4 + // next length
- handle.length() + // next
- 8 + // file offset
- 4 + // data length
- 4; // packet length
+ 4 + // request id
+ 4 + // next length
+ handle.length() + // next
+ 8 + // file offset
+ 4 + // data length
+ 4; // packet length
}
public class RemoteFileOutputStream
View
6 src/main/java/net/schmizz/sshj/sftp/Response.java
@@ -51,7 +51,8 @@ private StatusCode(int code) {
private final PacketType type;
private final long reqID;
- public Response(Buffer<Response> pk, int protocolVersion) throws SFTPException {
+ public Response(Buffer<Response> pk, int protocolVersion)
+ throws SFTPException {
super(pk);
this.protocolVersion = protocolVersion;
this.type = readType();
@@ -74,7 +75,8 @@ public PacketType getType() {
return type;
}
- public StatusCode readStatusCode() throws SFTPException {
+ public StatusCode readStatusCode()
+ throws SFTPException {
try {
return StatusCode.fromInt(readUInt32AsInt());
} catch (BufferException be) {
View
3  src/main/java/net/schmizz/sshj/sftp/SFTPEngine.java
@@ -56,7 +56,8 @@ public SFTPEngine(SessionFactory ssh)
this(ssh, PathHelper.DEFAULT_PATH_SEPARATOR);
}
- public SFTPEngine(SessionFactory ssh, String pathSep) throws SSHException {
+ public SFTPEngine(SessionFactory ssh, String pathSep)
+ throws SSHException {
sub = ssh.startSession().startSubsystem("sftp");
out = sub.getOutputStream();
reader = new PacketReader(this);
View
2  src/main/java/net/schmizz/sshj/transport/Converter.java
@@ -47,7 +47,7 @@
* <p/>
* <pre>
* Each packet is in the following format:
- * <p/>
+ *
* uint32 packet_length
* byte padding_length
* byte[n1] payload; n1 = packet_length - padding_length - 1
View
4 src/main/java/net/schmizz/sshj/transport/Decoder.java
@@ -88,7 +88,7 @@ private int decode()
int need;
/* Decoding loop */
- for (; ;)
+ for (; ; )
if (packetLength == -1) // Waiting for beginning of packet
{
@@ -124,7 +124,7 @@ private int decode()
if (log.isTraceEnabled())
log.trace("Received packet #{}: {}", seq, plain.printHex());
- packetHandler.handle(plain.readMessageID(), plain); // Process the decoded packet //
+ packetHandler.handle(plain.readMessageID(), plain); // Process the decoded packet
inputBuffer.clear();
packetLength = -1;
View
18 src/main/java/net/schmizz/sshj/transport/NegotiatedAlgorithms.java
@@ -92,15 +92,15 @@ public String getServer2ClientCompressionAlgorithm() {
@Override
public String toString() {
- return ("[ " + //
- "kex=" + kex + "; " + //
- "sig=" + sig + "; " + //
- "c2sCipher=" + c2sCipher + "; " + //
- "s2cCipher=" + s2cCipher + "; " + //
- "c2sMAC=" + c2sMAC + "; " + //
- "s2cMAC=" + s2cMAC + "; " + //
- "c2sComp=" + c2sComp + "; " + //
- "s2cComp=" + s2cComp + //
+ return ("[ " +
+ "kex=" + kex + "; " +
+ "sig=" + sig + "; " +
+ "c2sCipher=" + c2sCipher + "; " +
+ "s2cCipher=" + s2cCipher + "; " +
+ "c2sMAC=" + c2sMAC + "; " +
+ "s2cMAC=" + s2cMAC + "; " +
+ "c2sComp=" + c2sComp + "; " +
+ "s2cComp=" + s2cComp +
" ]");
}
View
8 src/main/java/net/schmizz/sshj/transport/Transport.java
@@ -178,12 +178,14 @@ long sendUnimplemented()
*/
void join()
throws TransportException;
+
/**
* Joins the thread calling this method to the transport's death.
*
* @throws TransportException if the transport dies of an exception
*/
- void join(int timeout, TimeUnit unit) throws TransportException;
+ void join(int timeout, TimeUnit unit)
+ throws TransportException;
/** Send a disconnection packet with reason as {@link DisconnectReason#BY_APPLICATION}, and closes this transport. */
void disconnect();
@@ -226,9 +228,7 @@ long write(SSHPacket payload)
*/
void setDisconnectListener(DisconnectListener listener);
- /**
- * @return the current disconnect listener.
- */
+ /** @return the current disconnect listener. */
DisconnectListener getDisconnectListener();
}
View
21 src/main/java/net/schmizz/sshj/transport/TransportImpl.java
@@ -35,8 +35,8 @@
*/
package net.schmizz.sshj.transport;
-import net.schmizz.concurrent.Event;
import net.schmizz.concurrent.ErrorDeliveryUtil;
+import net.schmizz.concurrent.Event;
import net.schmizz.sshj.AbstractService;
import net.schmizz.sshj.Config;
import net.schmizz.sshj.Service;
@@ -62,12 +62,14 @@
private static final class NullService
extends AbstractService {
+
NullService(Transport trans) {
super("null-service", trans);
}
}
static final class ConnInfo {
+
final String host;
final int port;
final InputStream in;
@@ -185,11 +187,11 @@ private String readIdentification(Buffer.PlainBuffer buffer)
String ident;
byte[] data = new byte[256];
- for (; ;) {
+ for (; ; ) {
int savedBufPos = buffer.rpos();
int pos = 0;
boolean needLF = false;
- for (; ;) {
+ for (; ; ) {
if (buffer.available() == 0) {
// Need more data, so undo reading and return null
buffer.rpos(savedBufPos);
@@ -217,7 +219,7 @@ private String readIdentification(Buffer.PlainBuffer buffer)
if (!ident.startsWith("SSH-2.0-") && !ident.startsWith("SSH-1.99-"))
throw new TransportException(DisconnectReason.PROTOCOL_VERSION_NOT_SUPPORTED,
- "Server does not support SSHv2, identified as: " + ident);
+ "Server does not support SSHv2, identified as: " + ident);
return ident;
}
@@ -438,9 +440,9 @@ private void sendDisconnect(DisconnectReason reason, String message) {
log.debug("Sending SSH_MSG_DISCONNECT: reason=[{}], msg=[{}]", reason, message);
try {
write(new SSHPacket(Message.DISCONNECT)
- .putUInt32(reason.toInt())
- .putString(message)
- .putString(""));
+ .putUInt32(reason.toInt())
+ .putString(message)
+ .putString(""));
} catch (IOException worthless) {
log.debug("Error writing packet: {}", worthless.toString());
}
@@ -501,7 +503,8 @@ else if (msg.in(20, 21) || msg.in(30, 49)) // kex packet
}
}
- private void gotDebug(SSHPacket buf) throws TransportException {
+ private void gotDebug(SSHPacket buf)
+ throws TransportException {
try {
final boolean display = buf.readBoolean();
final String message = buf.readString();
@@ -529,7 +532,7 @@ private void gotServiceAccept()
try {
if (!serviceAccept.hasWaiters())
throw new TransportException(DisconnectReason.PROTOCOL_ERROR,
- "Got a service accept notification when none was awaited");
+ "Got a service accept notification when none was awaited");
serviceAccept.set();
} finally {
serviceAccept.unlock();
View
1  src/main/java/net/schmizz/sshj/transport/cipher/AES128CBC.java
@@ -42,6 +42,7 @@
/** Named factory for AES128CBC Cipher */
public static class Factory
implements net.schmizz.sshj.common.Factory.Named<Cipher> {
+
@Override
public Cipher create() {
return new AES128CBC();
View
1  src/main/java/net/schmizz/sshj/transport/cipher/AES128CTR.java
@@ -42,6 +42,7 @@
/** Named factory for AES128CBC Cipher */
public static class Factory
implements net.schmizz.sshj.common.Factory.Named<Cipher> {
+
@Override
public Cipher create() {
return new AES128CTR();
View
1  src/main/java/net/schmizz/sshj/transport/cipher/AES192CBC.java
@@ -42,6 +42,7 @@
/** Named factory for AES192CBC Cipher */
public static class Factory
implements net.schmizz.sshj.common.Factory.Named<Cipher> {
+
@Override
public Cipher create() {
return new AES192CBC();
View
1  src/main/java/net/schmizz/sshj/transport/cipher/AES192CTR.java
@@ -42,6 +42,7 @@
/** Named factory for AES192CTR Cipher */
public static class Factory
implements net.schmizz.sshj.common.Factory.Named<Cipher> {
+
@Override
public Cipher create() {
return new AES192CTR();
View
1  src/main/java/net/schmizz/sshj/transport/cipher/AES256CBC.java
@@ -42,6 +42,7 @@
/** Named factory for AES256CBC Cipher */
public static class Factory
implements net.schmizz.sshj.common.Factory.Named<Cipher> {
+
@Override
public Cipher create() {
return new AES256CBC();
View
1  src/main/java/net/schmizz/sshj/transport/cipher/AES256CTR.java
@@ -42,6 +42,7 @@
/** Named factory for AES256CBC Cipher */
public static class Factory
implements net.schmizz.sshj.common.Factory.Named<Cipher> {
+
@Override
public Cipher create() {
return new AES256CTR();
View
1  src/main/java/net/schmizz/sshj/transport/cipher/BlowfishCBC.java
@@ -42,6 +42,7 @@
/** Named factory for BlowfishCBC Cipher */
public static class Factory
implements net.schmizz.sshj.common.Factory.Named<Cipher> {
+
@Override
public Cipher create() {
return new BlowfishCBC();
View
1  src/main/java/net/schmizz/sshj/transport/cipher/NoneCipher.java
@@ -42,6 +42,7 @@
/** Named factory for the no-op Cipher */
public static class Factory
implements net.schmizz.sshj.common.Factory.Named<Cipher> {
+
@Override
public Cipher create() {
return new NoneCipher();
View
1  src/main/java/net/schmizz/sshj/transport/cipher/TripleDESCBC.java
@@ -42,6 +42,7 @@
/** Named factory for TripleDESCBC Cipher */
public static class Factory
implements net.schmizz.sshj.common.Factory.Named<Cipher> {
+
@Override
public Cipher create() {
return new TripleDESCBC();
View
1  src/main/java/net/schmizz/sshj/transport/compression/DelayedZlibCompression.java
@@ -46,6 +46,7 @@
/** Named factory for the ZLib Delayed Compression. */
public static class Factory
implements net.schmizz.sshj.common.Factory.Named<Compression> {
+
@Override
public Compression create() {
return new DelayedZlibCompression();
View
1  src/main/java/net/schmizz/sshj/transport/compression/NoneCompression.java
@@ -42,6 +42,7 @@
/** Named factory for the no-op <code>Compression</code> */
public static class Factory
implements net.schmizz.sshj.common.Factory.Named<Compression> {
+
@Override
public Compression create() {
return null;
View
3  src/main/java/net/schmizz/sshj/transport/compression/ZlibCompression.java
@@ -49,6 +49,7 @@
/** Named factory for the ZLib Compression. */
public static class Factory
implements net.schmizz.sshj.common.Factory.Named<Compression> {
+
@Override
public Compression create() {
return new ZlibCompression();
@@ -125,7 +126,7 @@ public void uncompress(Buffer from, Buffer to)
return;
default:
throw new TransportException(DisconnectReason.COMPRESSION_ERROR, "uncompress: inflate returned "
- + status);
+ + status);
}
}
}
View
3  src/main/java/net/schmizz/sshj/transport/kex/DHG14.java
@@ -63,7 +63,8 @@ public String getName() {
}
@Override
- protected void initDH(DH dh) throws GeneralSecurityException {
+ protected void initDH(DH dh)
+ throws GeneralSecurityException {
dh.init(DHGroupData.P14, DHGroupData.G);
}
View
20 src/main/java/net/schmizz/sshj/transport/kex/DHGroupData.java
@@ -45,18 +45,18 @@
public static final BigInteger P1 =
new BigInteger("1797693134862315907708391567937874531978602960487560117064444236841971802161585193" +
- "6894783379586492554150218056548598050364644054819923910005079287700335581663922955" +
- "3136239076508735759914822574862575007425302077447712589550957937778424442426617334" +
- "727629299387668709205606050270810842907692932019128194467627007");
+ "6894783379586492554150218056548598050364644054819923910005079287700335581663922955" +
+ "3136239076508735759914822574862575007425302077447712589550957937778424442426617334" +
+ "727629299387668709205606050270810842907692932019128194467627007");
public static final BigInteger P14 =
new BigInteger("3231700607131100730033891392642382824881794124114023911284200975140074170663435422" +
- "2619689417363569347117901737909704191754605873209195028853758986185622153212175412" +
- "5149017745202702357960782362488842461894775876411059286460994117232454266225221932" +
- "3054091903768052423551912567971587011700105805587765103886184728025797605490356973" +
- "2561526167081339361799541336476559160368317896729073178384589680639671900977202194" +
- "1686472258710314113364293195361934716365332097170774482279885885653692086452966360" +
- "7725026895550592836275112117409697299806841055435958486658329164213621823107899099" +
- "9448652468262416972035911852507045361090559");
+ "2619689417363569347117901737909704191754605873209195028853758986185622153212175412" +
+ "5149017745202702357960782362488842461894775876411059286460994117232454266225221932" +
+ "3054091903768052423551912567971587011700105805587765103886184728025797605490356973" +
+ "2561526167081339361799541336476559160368317896729073178384589680639671900977202194" +
+ "1686472258710314113364293195361934716365332097170774482279885885653692086452966360" +
+ "7725026895550592836275112117409697299806841055435958486658329164213621823107899099" +
+ "9448652468262416972035911852507045361090559");
}
View
1  src/main/java/net/schmizz/sshj/transport/random/SingletonRandomFactory.java
@@ -40,6 +40,7 @@
/** A random factory wrapper that uses a single random instance. The underlying random instance has to be thread safe. */
public class SingletonRandomFactory
implements Random, Factory<Random> {
+
private final Random random;
public SingletonRandomFactory(Factory<Random> factory) {
View
20 src/main/java/net/schmizz/sshj/transport/verification/ConsoleKnownHostsVerifier.java
@@ -41,7 +41,7 @@ public ConsoleKnownHostsVerifier(File khFile, Console console)
protected boolean hostKeyUnverifiableAction(String hostname, PublicKey key) {
final KeyType type = KeyType.fromKey(key);
console.printf("The authenticity of host '%s' can't be established.\n" +
- "%s key fingerprint is %s.\n", hostname, type, SecurityUtils.getFingerprint(key));
+ "%s key fingerprint is %s.\n", hostname, type, SecurityUtils.getFingerprint(key));
String response = console.readLine("Are you sure you want to continue connecting (yes/no)? ");
while (!(response.equalsIgnoreCase(YES) || response.equalsIgnoreCase(NO))) {
response = console.readLine("Please explicitly enter yes/no: ");
@@ -66,15 +66,15 @@ protected boolean hostKeyChangedAction(Entry entry, String hostname, PublicKey k
final String path = getFile().getAbsolutePath();
console.printf(
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" +
- "@ WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED! @\n" +
- "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" +
- "IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!\n" +
- "Someone could be eavesdropping on you right now (man-in-the-middle attack)!\n" +
- "It is also possible that the host key has just been changed.\n" +
- "The fingerprint for the %s key sent by the remote host is\n" +
- "%s.\n" +
- "Please contact your system administrator or" +
- "add correct host key in %s to get rid of this message.\n",
+ "@ WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED! @\n" +
+ "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" +
+ "IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!\n" +
+ "Someone could be eavesdropping on you right now (man-in-the-middle attack)!\n" +
+ "It is also possible that the host key has just been changed.\n" +
+ "The fingerprint for the %s key sent by the remote host is\n" +
+ "%s.\n" +
+ "Please contact your system administrator or" +
+ "add correct host key in %s to get rid of this message.\n",
type, fp, path);
return false;
}
View
9 src/main/java/net/schmizz/sshj/userauth/UserAuthImpl.java
@@ -139,11 +139,13 @@ public void handle(Message msg, SSHPacket buf)
case USERAUTH_BANNER: {
banner = buf.readString();
- } break;
+ }
+ break;
case USERAUTH_SUCCESS: {
authenticated.set();
- } break;
+ }
+ break;
case USERAUTH_FAILURE: {
allowedMethods.clear();
@@ -154,7 +156,8 @@ public void handle(Message msg, SSHPacket buf)
} else {
authenticated.deliverError(new UserAuthException(currentMethod.getName() + " auth failed"));
}
- } break;
+ }
+ break;
default: {
log.debug("Asking `{}` method to handle {} packet", currentMethod.getName(), msg);
View
2  src/main/java/net/schmizz/sshj/userauth/keyprovider/KeyProviderUtil.java
@@ -75,7 +75,7 @@
*/
private static FileKeyProvider.Format detectKeyFileFormat(Reader privateKey,
boolean separatePubKey)
- throws IOException {
+ throws IOException {
BufferedReader br = new BufferedReader(privateKey);
String firstLine = br.readLine();
IOUtils.closeQuietly(br);
View
2  src/main/java/net/schmizz/sshj/userauth/keyprovider/OpenSSHKeyFile.java
@@ -83,7 +83,7 @@ public void init(String privateKey, String publicKey) {
/**
* Read and store the separate public key provided alongside the private key
- *
+ *
* @param publicKey Public key accessible through a {@code Reader}
*/
private void initPubKey(Reader publicKey) {
View
8 src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java
@@ -22,18 +22,13 @@
import net.schmizz.sshj.userauth.password.PrivateKeyFileResource;
import net.schmizz.sshj.userauth.password.PrivateKeyStringResource;
import net.schmizz.sshj.userauth.password.Resource;
-
import org.bouncycastle.openssl.EncryptionException;
import org.bouncycastle.openssl.PEMReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
import java.security.KeyPair;
import java.security.PrivateKey;
import java.security.PublicKey;
@@ -44,6 +39,7 @@
public static class Factory
implements net.schmizz.sshj.common.Factory.Named<FileKeyProvider> {
+
@Override
public FileKeyProvider create() {
return new PKCS8KeyFile();
@@ -127,7 +123,7 @@ protected KeyPair readKeyPair()
PEMReader r = null;
Object o = null;
try {
- for (; ;) {
+ for (; ; ) {
// while the PasswordFinder tells us we should retry
try {
r = new PEMReader(resource.getReader(), pFinder);
View
1  src/main/java/net/schmizz/sshj/userauth/method/AuthKeyboardInteractive.java
@@ -51,6 +51,7 @@ private String buildCommaSeparatedSubmethodList() {
}
private static class CharArrWrap {
+
private final char[] arr;
private CharArrWrap(char[] arr) {
View
9 src/main/java/net/schmizz/sshj/userauth/method/KeyedAuthMethod.java
@@ -48,7 +48,7 @@ protected SSHPacket putPubKey(SSHPacket reqBuf)
// public key as 2 strings: [ key type | key blob ]
reqBuf.putString(KeyType.fromKey(key).toString())
- .putString(new Buffer.PlainBuffer().putPublicKey(key).getCompactData());
+ .putString(new Buffer.PlainBuffer().putPublicKey(key).getCompactData());
return reqBuf;
}
@@ -67,9 +67,10 @@ protected SSHPacket putSig(SSHPacket reqBuf)
throw new UserAuthException("Could not create signature instance for " + kt + " key");
sigger.init(null, key);
- sigger.update(new Buffer.PlainBuffer().putString(params.getTransport().getSessionID()) //
- .putBuffer(reqBuf) // & rest of the data for sig
- .getCompactData());
+ sigger.update(new Buffer.PlainBuffer()
+ .putString(params.getTransport().getSessionID())
+ .putBuffer(reqBuf) // & rest of the data for sig
+ .getCompactData());
reqBuf.putSignature(kt, sigger.sign());
return reqBuf;
}
View
3  src/main/java/net/schmizz/sshj/userauth/password/AccountResource.java
@@ -27,7 +27,8 @@ public AccountResource(String user, String host) {
}
@Override
- public Reader getReader() throws IOException {
+ public Reader getReader()
+ throws IOException {
return new StringReader(getDetail());
}
}
View
6 src/main/java/net/schmizz/sshj/userauth/password/PrivateKeyStringResource.java
@@ -19,14 +19,16 @@
import java.io.Reader;
import java.io.StringReader;
-public class PrivateKeyStringResource extends Resource<String> {
+public class PrivateKeyStringResource
+ extends Resource<String> {
public PrivateKeyStringResource(String string) {
super(string);
}
@Override
- public Reader getReader() throws IOException {
+ public Reader getReader()
+ throws IOException {
return new StringReader(getDetail());
}
View
2  src/main/java/net/schmizz/sshj/xfer/FileSystemFile.java
@@ -26,9 +26,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
public class FileSystemFile
implements LocalSourceFile, LocalDestFile {
View
2  src/main/java/net/schmizz/sshj/xfer/FileTransfer.java
@@ -26,7 +26,7 @@ void download(String remotePath, String localPath)
throws IOException;
void upload(LocalSourceFile localFile, String remotePath)
- throws IOException;
+ throws IOException;
void download(String remotePath, LocalDestFile localFile)
throws IOException;
View
3  src/main/java/net/schmizz/sshj/xfer/LocalSourceFile.java
@@ -34,7 +34,8 @@ InputStream getInputStream()
*
* @throws IOException
*/
- int getPermissions() throws IOException;
+ int getPermissions()
+ throws IOException;
boolean isFile();
View
1  src/main/java/net/schmizz/sshj/xfer/scp/SCPException.java
@@ -19,6 +19,7 @@
public class SCPException
extends SSHException {
+
public SCPException(String message) {
super(message);
}
View
14 src/main/java/net/schmizz/sshj/xfer/scp/SCPFileTransfer.java
@@ -15,8 +15,6 @@
*/
package net.schmizz.sshj.xfer.scp;
-import java.io.IOException;
-
import net.schmizz.sshj.connection.channel.direct.SessionFactory;
import net.schmizz.sshj.xfer.AbstractFileTransfer;
import net.schmizz.sshj.xfer.FileSystemFile;
@@ -24,6 +22,8 @@
import net.schmizz.sshj.xfer.LocalDestFile;
import net.schmizz.sshj.xfer.LocalSourceFile;
+import java.io.IOException;
+
public class SCPFileTransfer
extends AbstractFileTransfer
implements FileTransfer {
@@ -43,7 +43,7 @@ public SCPUploadClient newSCPUploadClient() {
}
private SCPEngine newSCPEngine() {
- return new SCPEngine(sessionFactory, getTransferListener());
+ return new SCPEngine(sessionFactory, getTransferListener());
}
@Override
@@ -65,9 +65,9 @@ public void download(String remotePath, LocalDestFile localFile)
}
@Override
- public void upload(LocalSourceFile localFile, String remotePath)
- throws IOException {
- newSCPUploadClient().copy(localFile, remotePath);
- }
+ public void upload(LocalSourceFile localFile, String remotePath)
+ throws IOException {
+ newSCPUploadClient().copy(localFile, remotePath);
+ }
}
View
3  src/test/java/net/schmizz/sshj/SmokeTest.java
@@ -50,7 +50,8 @@ public void connected()
}
@Test
- public void authenticated() throws UserAuthException, TransportException {
+ public void authenticated()
+ throws UserAuthException, TransportException {
fixture.dummyAuth();
assertTrue(fixture.getClient().isAuthenticated());
}
View
5 src/test/java/net/schmizz/sshj/keyprovider/OpenSSHKeyFileTest.java
@@ -116,7 +116,7 @@ public void retries()
@Test
public void fromString()
- throws IOException, GeneralSecurityException {
+ throws IOException, GeneralSecurityException {
FileKeyProvider dsa = new OpenSSHKeyFile();
String privateKey = readFile("src/test/resources/id_dsa");
String publicKey = readFile("src/test/resources/id_dsa.pub");
@@ -136,12 +136,11 @@ public void setup()
private String readFile(String pathname)
throws IOException {
-
StringBuilder fileContents = new StringBuilder();
Scanner scanner = new Scanner(new File(pathname));
String lineSeparator = System.getProperty("line.separator");
try {
- while(scanner.hasNextLine()) {
+ while (scanner.hasNextLine()) {
fileContents.append(scanner.nextLine() + lineSeparator);
}
return fileContents.toString();
View
1  src/test/java/net/schmizz/sshj/util/BufferTest.java
@@ -28,6 +28,7 @@
/** Tests {@link Buffer} functionality */
public class BufferTest {
+
private Buffer.PlainBuffer posBuf;
private Buffer.PlainBuffer handyBuf;
View
42 src/test/java/net/schmizz/sshj/util/KeyUtil.java
@@ -29,34 +29,38 @@
public class KeyUtil {
/** Creates a DSA private key. */
- public static PrivateKey newDSAPrivateKey(String x, String p, String q, String g) throws GeneralSecurityException {
- return SecurityUtils.getKeyFactory("DSA").generatePrivate(new DSAPrivateKeySpec //
- (new BigInteger(x, 16), //
- new BigInteger(p, 16), //
- new BigInteger(q, 16), //
- new BigInteger(g, 16)));
+ public static PrivateKey newDSAPrivateKey(String x, String p, String q, String g)
+ throws GeneralSecurityException {
+ return SecurityUtils.getKeyFactory("DSA").generatePrivate(new DSAPrivateKeySpec(new BigInteger(x, 16),
+ new BigInteger(p, 16),
+ new BigInteger(q, 16),
+ new BigInteger(g, 16))
+ );
}
/** Creates a DSA public key. */
- public static PublicKey newDSAPublicKey(String y, String p, String q, String g) throws GeneralSecurityException {
- return SecurityUtils.getKeyFactory("DSA").generatePublic(new DSAPublicKeySpec //
- (new BigInteger(y, 16), //
- new BigInteger(p, 16), //
- new BigInteger(q, 16), //
- new BigInteger(g, 16)));
+ public static PublicKey newDSAPublicKey(String y, String p, String q, String g)
+ throws GeneralSecurityException {
+ return SecurityUtils.getKeyFactory("DSA").generatePublic(new DSAPublicKeySpec(new BigInteger(y, 16),
+ new BigInteger(p, 16),
+ new BigInteger(q, 16),
+ new BigInteger(g, 16))
+ );
}
/** Creates an RSA private key. */
- public static PrivateKey newRSAPrivateKey(String modulus, String exponent) throws GeneralSecurityException {
- return SecurityUtils.getKeyFactory("RSA").generatePrivate(new RSAPrivateKeySpec //
- (new BigInteger(modulus, 16), //
- new BigInteger(exponent, 16)));
+ public static PrivateKey newRSAPrivateKey(String modulus, String exponent)
+ throws GeneralSecurityException {
+ return SecurityUtils.getKeyFactory("RSA").generatePrivate(new RSAPrivateKeySpec(new BigInteger(modulus, 16),
+ new BigInteger(exponent, 16))
+ );
}
/** Creates an RSA public key. */
- public static PublicKey newRSAPublicKey(String modulus, String exponent) throws GeneralSecurityException {
- return SecurityUtils.getKeyFactory("RSA").generatePublic(new RSAPublicKeySpec //
- (new BigInteger(modulus, 16), new BigInteger(exponent, 16)));
+ public static PublicKey newRSAPublicKey(String modulus, String exponent)
+ throws GeneralSecurityException {
+ return SecurityUtils.getKeyFactory("RSA").generatePublic(new RSAPublicKeySpec(new BigInteger(modulus, 16),
+ new BigInteger(exponent, 16)));
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.