Changed * to all

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.ryanmichela</groupId>
     <artifactId>SSHD</artifactId>
-    <version>1.0</version>
+    <version>1.2</version>
     <url>http://dev.bukkit.org/server-mods/sshd/</url>
 
     <!-- Repositories -->
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>craftbukkit</artifactId>
-            <version>1.6.4-R1.0</version>
+            <version>1.7.9-R0.2</version>
             <scope>provided</scope>
             <type>jar</type>
         </dependency>
@@ -41,11 +41,6 @@
             <scope>compile</scope>
             <type>jar</type>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.bouncycastle</groupId>-->
-            <!--<artifactId>bcprov-jdk16</artifactId>-->
-            <!--<version>1.46</version>-->
-        <!--</dependency>-->
     </dependencies>
 
     <!-- Build -->
@@ -75,6 +70,7 @@
                             </excludes>
                         </filter>
                     </filters>
+                    <minimizeJar>true</minimizeJar>
                 </configuration>
             </plugin>
             <!-- Compile plugin -->
@@ -83,8 +79,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                     <showDeprecation>true</showDeprecation>
                 </configuration>
             </plugin>

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

@@ -53,7 +53,7 @@ public class ConsoleCommandFactory implements CommandFactory {
                 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");
+                SshdPlugin.instance.getLogger().severe("Error processing command from SSH -" + e.getMessage());
             } finally {
                 callback.onExit(0);
             }

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

@@ -0,0 +1,42 @@
+package com.ryanmichela.sshd;
+
+/**
+ * Copyright 2013 Ryan Michela
+ */
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.text.SimpleDateFormat;
+import java.util.logging.Formatter;
+import java.util.logging.LogRecord;
+
+public class ConsoleLogFormatter extends Formatter {
+
+    private SimpleDateFormat dateFormat;
+
+    public ConsoleLogFormatter() {
+        this.dateFormat = new SimpleDateFormat("HH:mm:ss");
+    }
+
+    public String format(LogRecord logrecord) {
+        StringBuilder stringbuilder = new StringBuilder();
+
+        stringbuilder.append(" [");
+        stringbuilder.append(this.dateFormat.format(Long.valueOf(logrecord.getMillis()))).append(" ");
+
+        stringbuilder.append(logrecord.getLevel().getName()).append("]: ");
+        stringbuilder.append(this.formatMessage(logrecord));
+        stringbuilder.append('\n');
+        Throwable throwable = logrecord.getThrown();
+
+        if (throwable != null) {
+            StringWriter stringwriter = new StringWriter();
+
+            throwable.printStackTrace(new PrintWriter(stringwriter));
+            stringbuilder.append(stringwriter.toString());
+        }
+
+        return stringbuilder.toString();
+    }
+}
+

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

@@ -1,5 +1,7 @@
 package com.ryanmichela.sshd;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.Logger;
 import org.apache.sshd.common.Factory;
 import org.apache.sshd.server.Command;
 import org.apache.sshd.server.Environment;
@@ -10,8 +12,6 @@ import org.bukkit.craftbukkit.libs.jline.console.ConsoleReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.logging.Formatter;
-import java.util.logging.Logger;
 import java.util.logging.StreamHandler;
 
 public class ConsoleShellFactory implements Factory<Command> {
@@ -29,7 +29,7 @@ public class ConsoleShellFactory implements Factory<Command> {
         private Environment environment;
         private Thread thread;
 
-        StreamHandler streamHandler;
+        StreamHandlerAppender streamHandlerAppender;
         ConsoleReader consoleReader;
 
         public InputStream getIn() {
@@ -66,19 +66,18 @@ public class ConsoleShellFactory implements Factory<Command> {
 
         public void start(Environment env) throws IOException {
 
-            Formatter bukkitFormatter = Bukkit.getLogger().getHandlers()[0].getFormatter();
-
             try {
                 consoleReader = new ConsoleReader(in, new FlushyOutputStream(out), new SshTerminal());
                 consoleReader.setExpandEvents(true);
                 consoleReader.addCompleter(new ConsoleCommandCompleter());
 
-                streamHandler = new FlushyStreamHandler(out, bukkitFormatter, consoleReader);
-                Bukkit.getLogger().addHandler(streamHandler);
-                Logger.getLogger("").addHandler(streamHandler);
+                StreamHandler streamHandler = new FlushyStreamHandler(out, new ConsoleLogFormatter(), consoleReader);
+                streamHandlerAppender = new StreamHandlerAppender(streamHandler);
+
+                ((Logger) LogManager.getRootLogger()).addAppender(streamHandlerAppender);
 
                 environment = env;
-                thread = new Thread(this, "EchoShell " + env.getEnv().get(Environment.ENV_USER));
+                thread = new Thread(this, "SSHD ConsoleShell " + env.getEnv().get(Environment.ENV_USER));
                 thread.start();
             } catch (Exception e) {
                 throw new IOException("Error starting shell", e);
@@ -86,8 +85,7 @@ public class ConsoleShellFactory implements Factory<Command> {
         }
 
         public void destroy() {
-            Bukkit.getLogger().removeHandler(streamHandler);
-            Logger.getLogger("").removeHandler(streamHandler);
+            ((Logger) LogManager.getRootLogger()).removeAppender(streamHandlerAppender);
         }
 
         public void run() {
@@ -100,7 +98,7 @@ public class ConsoleShellFactory implements Factory<Command> {
                         if (command.equals("exit")) {
                             break;
                         }
-                        SshdPlugin.instance.getLogger().info("[U: " + 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/PublicKeyAuthenticator.java

@@ -1,6 +1,6 @@
 package com.ryanmichela.sshd;
 
-import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.sshd.server.PublickeyAuthenticator;
 import org.apache.sshd.server.session.ServerSession;
 

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

@@ -35,6 +35,8 @@ public class SshdPlugin extends JavaPlugin {
 
         sshd = SshServer.setUpDefaultServer();
         sshd.setPort(getConfig().getInt("port", 22));
+        String host = getConfig().getString("listenAddress", "all");
+        sshd.setHost(host.equals("all") ? null : host);
 
         File hostKey = new File(getDataFolder(), "hostkey");
         File authorizedKeys = new File(getDataFolder(), "authorized_keys");
@@ -55,7 +57,7 @@ public class SshdPlugin extends JavaPlugin {
     public void onDisable() {
         try {
             sshd.stop();
-        } catch (InterruptedException e) {
+        } catch (Exception e) {
             // do nothing
         }
     }

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

@@ -0,0 +1,83 @@
+package com.ryanmichela.sshd;
+
+import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.ErrorHandler;
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.LogEvent;
+
+import java.io.Serializable;
+import java.util.UUID;
+import java.util.logging.LogRecord;
+import java.util.logging.StreamHandler;
+
+/**
+ * Copyright 2014 Ryan Michela
+ */
+public class StreamHandlerAppender implements Appender {
+    private StreamHandler streamHandler;
+    private UUID uuid;
+
+    public StreamHandlerAppender(StreamHandler streamHandler) {
+        this.streamHandler = streamHandler;
+        uuid = UUID.randomUUID();
+    }
+
+    @Override
+    public void append(LogEvent logEvent) {
+        java.util.logging.Level level;
+        switch (logEvent.getLevel())
+        {
+            case DEBUG: level = java.util.logging.Level.FINE; break;
+            case INFO: level = java.util.logging.Level.INFO; break;
+            case WARN: level = java.util.logging.Level.WARNING; break;
+            case ERROR: level = java.util.logging.Level.SEVERE; break;
+            default: level = java.util.logging.Level.INFO; break;
+        }
+
+        String message = logEvent.getMessage().getFormattedMessage();
+
+
+        LogRecord logRecord = new LogRecord(level, message);
+        streamHandler.publish(logRecord);
+    }
+
+    @Override
+    public String getName() {
+        return "StreamHandlerAppender:" + uuid.toString();
+    }
+
+    @Override
+    public Layout<? extends Serializable> getLayout() {
+        return null;
+    }
+
+    @Override
+    public boolean ignoreExceptions() {
+        return false;
+    }
+
+    @Override
+    public ErrorHandler getHandler() {
+        return null;
+    }
+
+    @Override
+    public void setHandler(ErrorHandler errorHandler) {
+
+    }
+
+    @Override
+    public void start() {
+
+    }
+
+    @Override
+    public void stop() {
+
+    }
+
+    @Override
+    public boolean isStarted() {
+        return true;
+    }
+}

src/main/resources/config.yml

@@ -1,4 +1,7 @@
-# This is the port the SSH server will listen on.
+# The IP addresses(s) the SSH server will listen on. Use a comma separated list for multiple addresses.
+# Leave as "all" for all addresses.
+listenAddress: all
+# The port the SSH server will listen on.
 port: 22
 
 # By default, only public key authentication is enabled. This is the most secure mode.

src/main/resources/plugin.yml

@@ -1,4 +1,4 @@
 name: SSHD
-version: "1.0"
+version: "1.2"
 author: Ryan Michela
 main: com.ryanmichela.sshd.SshdPlugin