Version bump

Fixed #6 once more
Added exit command alias

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.ryanmichela</groupId>
     <artifactId>SSHD</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.4.1</version>
     <url>http://dev.bukkit.org/server-mods/sshd/</url>
 
     <!-- Repositories -->

src/main/java/com/ryanmichela/sshd/ConfigPasswordAuthenticator.java

@@ -10,6 +10,7 @@ import java.util.Map;
  * Copyright 2013 Ryan Michela
  */
 public class ConfigPasswordAuthenticator implements PasswordAuthenticator {
+
     private Map<String, Integer> failCounts = new HashMap<String, Integer>();
 
     @Override

src/main/java/com/ryanmichela/sshd/ConsoleCommandCompleter.java

@@ -4,15 +4,16 @@ package com.ryanmichela.sshd;
  * Copyright 2013 Ryan Michela
  */
 
+import jline.console.completer.Completer;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandMap;
-import jline.console.completer.Completer;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
 
 public class ConsoleCommandCompleter implements Completer {
+
     public int complete(final String buffer, final int cursor, final List<CharSequence> candidates) {
         Waitable<List<String>> waitable = new Waitable<List<String>>() {
             @Override

src/main/java/com/ryanmichela/sshd/ConsoleCommandFactory.java

@@ -14,12 +14,14 @@ import java.io.OutputStream;
  * Copyright 2013 Ryan Michela
  */
 public class ConsoleCommandFactory implements CommandFactory {
+
     @Override
     public Command createCommand(String command) {
         return new ConsoleCommand(command);
     }
 
     public class ConsoleCommand implements Command {
+
         private String command;
 
         private InputStream in;
@@ -50,7 +52,8 @@ public class ConsoleCommandFactory implements CommandFactory {
         @Override
         public void start(Environment environment) throws IOException {
             try {
-                SshdPlugin.instance.getLogger().info("[U: " + environment.getEnv().get(Environment.ENV_USER) + "] " + command);
+                SshdPlugin.instance.getLogger()
+                        .info("[U: " + environment.getEnv().get(Environment.ENV_USER) + "] " + command);
                 Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
             } catch (Exception e) {
                 SshdPlugin.instance.getLogger().severe("Error processing command from SSH -" + e.getMessage());

src/main/java/com/ryanmichela/sshd/ConsoleLogFormatter.java

@@ -54,20 +54,29 @@ public class ConsoleLogFormatter extends Formatter {
         // ORIGINAL CODE FROM org.bukkit.craftbukkit.command.ColouredConsoleSender
         final Map<ChatColor, String> replacements = new EnumMap<>(ChatColor.class);
 
-        replacements.put(ChatColor.BLACK, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.BLACK).boldOff().toString());
-        replacements.put(ChatColor.DARK_BLUE, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.BLUE).boldOff().toString());
-        replacements.put(ChatColor.DARK_GREEN, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.GREEN).boldOff().toString());
-        replacements.put(ChatColor.DARK_AQUA, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.CYAN).boldOff().toString());
-        replacements.put(ChatColor.DARK_RED, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.RED).boldOff().toString());
-        replacements.put(ChatColor.DARK_PURPLE, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.MAGENTA).boldOff().toString());
-        replacements.put(ChatColor.GOLD, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.YELLOW).boldOff().toString());
+        replacements
+                .put(ChatColor.BLACK, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.BLACK).boldOff().toString());
+        replacements
+                .put(ChatColor.DARK_BLUE, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.BLUE).boldOff().toString());
+        replacements.put(ChatColor.DARK_GREEN,
+                Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.GREEN).boldOff().toString());
+        replacements
+                .put(ChatColor.DARK_AQUA, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.CYAN).boldOff().toString());
+        replacements
+                .put(ChatColor.DARK_RED, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.RED).boldOff().toString());
+        replacements.put(ChatColor.DARK_PURPLE,
+                Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.MAGENTA).boldOff().toString());
+        replacements
+                .put(ChatColor.GOLD, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.YELLOW).boldOff().toString());
         replacements.put(ChatColor.GRAY, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.WHITE).boldOff().toString());
-        replacements.put(ChatColor.DARK_GRAY, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.BLACK).bold().toString());
+        replacements
+                .put(ChatColor.DARK_GRAY, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.BLACK).bold().toString());
         replacements.put(ChatColor.BLUE, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.BLUE).bold().toString());
         replacements.put(ChatColor.GREEN, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.GREEN).bold().toString());
         replacements.put(ChatColor.AQUA, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.CYAN).bold().toString());
         replacements.put(ChatColor.RED, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.RED).bold().toString());
-        replacements.put(ChatColor.LIGHT_PURPLE, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.MAGENTA).bold().toString());
+        replacements.put(ChatColor.LIGHT_PURPLE,
+                Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.MAGENTA).bold().toString());
         replacements.put(ChatColor.YELLOW, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.YELLOW).bold().toString());
         replacements.put(ChatColor.WHITE, Ansi.ansi().a(Ansi.Attribute.RESET).fg(Ansi.Color.WHITE).bold().toString());
         replacements.put(ChatColor.MAGIC, Ansi.ansi().a(Ansi.Attribute.BLINK_SLOW).toString());

src/main/java/com/ryanmichela/sshd/ConsoleShellFactory.java

@@ -29,6 +29,7 @@ public class ConsoleShellFactory implements Factory<Command> {
     }
 
     public static class ConsoleShell implements Command, Runnable {
+
         private InputStream in;
         private OutputStream out;
         private OutputStream err;
@@ -101,14 +102,16 @@ public class ConsoleShellFactory implements Factory<Command> {
                 while (true) {
                     String command = consoleReader.readLine("\r>", null);
                     if (command == null) continue;
-                    if (command.equals("exit")) break;
+                    if (command.equals("exit") || command.equals("quit")) break;
                     Bukkit.getScheduler().runTask(SshdPlugin.instance, () -> {
-                        if (SshdPlugin.instance.getConfig().getString("mode").equals("RPC") && command.startsWith("rpc")) {
+                        if (SshdPlugin.instance.getConfig().getString("mode").equals("RPC") &&
+                            command.startsWith("rpc")) {
                             //NO ECHO NO PREAMBLE AND SHIT
                             String cmd = command.substring("rpc".length() + 1, command.length());
                             Bukkit.dispatchCommand(sshdCommandSender, cmd);
                         } else {
-                            SshdPlugin.instance.getLogger().info("<" + environment.getEnv().get(Environment.ENV_USER) + "> " + command);
+                            SshdPlugin.instance.getLogger()
+                                    .info("<" + environment.getEnv().get(Environment.ENV_USER) + "> " + command);
                             Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
                         }
                     });

src/main/java/com/ryanmichela/sshd/FlushyOutputStream.java

@@ -1,5 +1,7 @@
 package com.ryanmichela.sshd;
 
+import org.apache.sshd.common.SshException;
+
 import java.io.IOException;
 import java.io.OutputStream;
 
@@ -7,6 +9,7 @@ import java.io.OutputStream;
  * Copyright 2013 Ryan Michela
  */
 public class FlushyOutputStream extends OutputStream {
+
     private OutputStream base;
     private boolean isClosed = false;
 
@@ -31,8 +34,12 @@ public class FlushyOutputStream extends OutputStream {
     @Override
     public void write(byte[] b, int off, int len) throws IOException {
         if (isClosed) return;
+        try {
             base.write(b, off, len);
             base.flush();
+        } catch (SshException e) {
+            if (!e.getMessage().contains("channel already closed")) throw e;
+        }
     }
 
     @Override

src/main/java/com/ryanmichela/sshd/FlushyStreamHandler.java

@@ -1,8 +1,7 @@
 package com.ryanmichela.sshd;
 
-import org.apache.sshd.common.SshException;
 import jline.console.ConsoleReader;
-
+import org.apache.sshd.common.SshException;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -12,6 +11,7 @@ import java.util.logging.*;
  * Copyright 2013 Ryan Michela
  */
 public class FlushyStreamHandler extends StreamHandler {
+
     private ConsoleReader reader;
 
     public FlushyStreamHandler(OutputStream out, Formatter formatter, ConsoleReader reader) {

src/main/java/com/ryanmichela/sshd/PemDecoder.java

@@ -13,6 +13,7 @@ import java.security.spec.RSAPublicKeySpec;
  * Copyright 2013 Ryan Michela
  */
 public class PemDecoder extends java.io.BufferedReader {
+
     private static final String BEGIN = "^-+\\s*BEGIN.+";
     private static final String END = "^-+\\s*END.+";
     private static final String COMMENT = "Comment:";

src/main/java/com/ryanmichela/sshd/PublicKeyAuthenticator.java

@@ -12,6 +12,7 @@ import java.security.PublicKey;
  * Copyright 2013 Ryan Michela
  */
 public class PublicKeyAuthenticator implements PublickeyAuthenticator {
+
     private File authorizedKeysDir;
 
     public PublicKeyAuthenticator(File authorizedKeysDir) {
@@ -39,10 +40,13 @@ public class PublicKeyAuthenticator implements PublickeyAuthenticator {
                     SshdPlugin.instance.getLogger().severe("Failed to parse PEM file. " + keyFile.getAbsolutePath());
                 }
             } catch (Exception e) {
-                SshdPlugin.instance.getLogger().severe("Failed to process public key " + keyFile.getAbsolutePath() + ". " + e.getMessage());
+                SshdPlugin.instance.getLogger()
+                        .severe("Failed to process public key " + keyFile.getAbsolutePath() + ". " + e.getMessage());
             }
         } else {
-            SshdPlugin.instance.getLogger().warning("Could not locate public key for " + username + ". Make sure the user's key is named the same as their user name without a file extension.");
+            SshdPlugin.instance.getLogger().warning("Could not locate public key for " + username +
+                                                    ". Make sure the user's key is named the same as their user name " +
+                                                    "without a file extension.");
         }
 
         return false;

src/main/java/com/ryanmichela/sshd/ReflectionUtil.java

@@ -8,6 +8,7 @@ import java.lang.reflect.Modifier;
  * Copyright 2013 Ryan Michela
  */
 public class ReflectionUtil {
+
     public static void setProtectedValue(Object o, String field, Object newValue) {
         setProtectedValue(o.getClass(), o, field, newValue);
     }
@@ -87,8 +88,7 @@ public class ReflectionUtil {
             Method m = c.getDeclaredMethod(method, pTypes);
             m.setAccessible(true);
             return m.invoke(o, args);
-        }
-        catch (Exception ex) {
+        } catch (Exception ex) {
             System.out.println("*** " + c.getName() + "." + method + "(): " + ex);
             return null;
         }

src/main/java/com/ryanmichela/sshd/SshdPlugin.java

@@ -16,6 +16,7 @@ import java.util.logging.Level;
  * Copyright 2013 Ryan Michela
  */
 public class SshdPlugin extends JavaPlugin {
+
     private SshServer sshd;
     public static SshdPlugin instance;
 

src/main/java/com/ryanmichela/sshd/StreamHandlerAppender.java

@@ -14,6 +14,7 @@ import java.util.logging.StreamHandler;
  * Copyright 2014 Ryan Michela
  */
 public class StreamHandlerAppender implements Appender {
+
     private StreamHandler streamHandler;
     private UUID uuid;
 

src/main/java/com/ryanmichela/sshd/Waitable.java

@@ -6,11 +6,13 @@ import java.util.concurrent.ExecutionException;
  * Copyright 2013 Ryan Michela
  */
 public abstract class Waitable<T> implements Runnable {
+
     private enum Status {
         WAITING,
         RUNNING,
         FINISHED,
     }
+
     Throwable t = null;
     T value = null;
     Status status = Status.WAITING;