Implemented IP whitelisting

.travis.yml

@@ -1,4 +0,0 @@
-sudo: false
-language: java
-jdk:
-  - oraclejdk8

README.md

@@ -1,6 +1,4 @@
 Bukkit-SSHD
 ===========
 
-[![Build Status](https://travis-ci.org/rmichela/Bukkit-SSHD.png)](https://travis-ci.org/rmichela/Bukkit-SSHD)
-
 An SSHD daemon embedded in a Bukkit plugin.

pom.xml

@@ -6,14 +6,14 @@
 
     <groupId>com.ryanmichela</groupId>
     <artifactId>SSHD</artifactId>
-    <version>1.3.4</version>
+    <version>1.2</version>
     <url>http://dev.bukkit.org/server-mods/sshd/</url>
 
     <!-- Repositories -->
     <repositories>
         <repository>
-            <id>spigot-repo</id>
+            <id>bukkit-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/groups/public</url>
+            <url>http://repo.bukkit.org/content/groups/public/</url>
         </repository>
     </repositories>
 
@@ -29,107 +29,58 @@
     <dependencies>
         <dependency>
             <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
+            <artifactId>craftbukkit</artifactId>
-            <version>1.12.2-R0.1-SNAPSHOT</version>
+            <version>1.7.9-R0.2</version>
+            <scope>provided</scope>
+            <type>jar</type>
         </dependency>
-
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
-            <version>1.6.0</version>
+            <version>0.9.0</version>
             <scope>compile</scope>
             <type>jar</type>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-core</artifactId>
-            <version>2.0.16</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.25</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>1.7.25</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
-            <version>2.12.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.0</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <version>2.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.10</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <!-- Build -->
     <build>
-        <resources>
-            <resource>
-                <targetPath>.</targetPath>
-                <filtering>true</filtering>
-                <directory>${basedir}/src/main/resources</directory>
-                <includes>
-                    <include>plugin.yml</include>
-                    <include>config.yml</include>
-                </includes>
-            </resource>
-        </resources>
-
         <plugins>
+            <!-- Shade plugin -->
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
-                <version>3.1.0</version>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.5</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
                         <goals>
-                            <goal>single</goal>
+                            <goal>shade</goal>
                         </goals>
                     </execution>
                 </executions>
                 <configuration>
-                    <finalName>${project.name}-${project.version}</finalName>
+                    <filters>
-                    <appendAssemblyId>false</appendAssemblyId>
+                        <filter>
-                    <descriptorRefs>
+                            <artifact>*:*</artifact>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                            <excludes>
-                    </descriptorRefs>
+                                <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
+                                <exclude>META-INF/*.RSA</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                    <minimizeJar>true</minimizeJar>
                 </configuration>
             </plugin>
-            
             <!-- Compile plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.0</version>
                 <configuration>
-                    <source>1.8</source>
+                    <source>1.6</source>
-                    <target>1.8</target>
+                    <target>1.6</target>
                     <showDeprecation>true</showDeprecation>
                 </configuration>
             </plugin>

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

@@ -0,0 +1,142 @@
+/*
+* The MIT License
+*
+* Copyright (c) 2013 Edin Dazdarevic (edin.dazdarevic@gmail.com)
+
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*
+* */
+
+package com.ryanmichela.sshd;
+
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A class that enables to get an IP range from CIDR specification. It supports
+ * both IPv4 and IPv6.
+ */
+public class CIDRUtils {
+    private final String cidr;
+
+    private InetAddress inetAddress;
+    private InetAddress startAddress;
+    private InetAddress endAddress;
+    private final int prefixLength;
+
+
+    public CIDRUtils(String cidr) throws UnknownHostException {
+
+        this.cidr = cidr;
+
+        /* split CIDR to address and prefix part */
+        if (this.cidr.contains("/")) {
+            int index = this.cidr.indexOf("/");
+            String addressPart = this.cidr.substring(0, index);
+            String networkPart = this.cidr.substring(index + 1);
+
+            inetAddress = InetAddress.getByName(addressPart);
+            prefixLength = Integer.parseInt(networkPart);
+
+            calculate();
+        } else {
+            throw new IllegalArgumentException("not an valid CIDR format!");
+        }
+    }
+
+
+    private void calculate() throws UnknownHostException {
+
+        ByteBuffer maskBuffer;
+        int targetSize;
+        if (inetAddress.getAddress().length == 4) {
+            maskBuffer =
+                    ByteBuffer
+                            .allocate(4)
+                            .putInt(-1);
+            targetSize = 4;
+        } else {
+            maskBuffer = ByteBuffer.allocate(16)
+                    .putLong(-1L)
+                    .putLong(-1L);
+            targetSize = 16;
+        }
+
+        BigInteger mask = (new BigInteger(1, maskBuffer.array())).not().shiftRight(prefixLength);
+
+        ByteBuffer buffer = ByteBuffer.wrap(inetAddress.getAddress());
+        BigInteger ipVal = new BigInteger(1, buffer.array());
+
+        BigInteger startIp = ipVal.and(mask);
+        BigInteger endIp = startIp.add(mask.not());
+
+        byte[] startIpArr = toBytes(startIp.toByteArray(), targetSize);
+        byte[] endIpArr = toBytes(endIp.toByteArray(), targetSize);
+
+        this.startAddress = InetAddress.getByAddress(startIpArr);
+        this.endAddress = InetAddress.getByAddress(endIpArr);
+
+    }
+
+    private byte[] toBytes(byte[] array, int targetSize) {
+        int counter = 0;
+        List<Byte> newArr = new ArrayList<Byte>();
+        while (counter < targetSize && (array.length - 1 - counter >= 0)) {
+            newArr.add(0, array[array.length - 1 - counter]);
+            counter++;
+        }
+
+        int size = newArr.size();
+        for (int i = 0; i < (targetSize - size); i++) {
+
+            newArr.add(0, (byte) 0);
+        }
+
+        byte[] ret = new byte[newArr.size()];
+        for (int i = 0; i < newArr.size(); i++) {
+            ret[i] = newArr.get(i);
+        }
+        return ret;
+    }
+
+    public String getNetworkAddress() {
+
+        return this.startAddress.getHostAddress();
+    }
+
+    public String getBroadcastAddress() {
+        return this.endAddress.getHostAddress();
+    }
+
+    public boolean isInRange(String ipAddress) throws UnknownHostException {
+        InetAddress address = InetAddress.getByName(ipAddress);
+        BigInteger start = new BigInteger(1, this.startAddress.getAddress());
+        BigInteger end = new BigInteger(1, this.endAddress.getAddress());
+        BigInteger target = new BigInteger(1, address.getAddress());
+
+        int st = start.compareTo(target);
+        int te = target.compareTo(end);
+
+        return (st == -1 || st == 0) && (te == -1 || te == 0);
+    }
+}

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

@@ -1,6 +1,6 @@
 package com.ryanmichela.sshd;
 
-import org.apache.sshd.server.auth.password.PasswordAuthenticator;
+import org.apache.sshd.server.PasswordAuthenticator;
 import org.apache.sshd.server.session.ServerSession;
 
 import java.util.HashMap;
@@ -9,11 +9,13 @@ import java.util.Map;
 /**
  * Copyright 2013 Ryan Michela
  */
-public class ConfigPasswordAuthenticator implements PasswordAuthenticator {
+public class ConfigPasswordAuthenticator extends IpFilteredAuthenticator implements PasswordAuthenticator {
     private Map<String, Integer> failCounts = new HashMap<String, Integer>();
 
     @Override
     public boolean authenticate(String username, String password, ServerSession serverSession) {
+        if (!ipAddressIsApproved(serverSession)) return false;
+
         if (SshdPlugin.instance.getConfig().getString("credentials." + username).equals(password)) {
             failCounts.put(username, 0);
             return true;

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

@@ -6,7 +6,7 @@ package com.ryanmichela.sshd;
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandMap;
-import jline.console.completer.Completer;
+import org.bukkit.craftbukkit.libs.jline.console.completer.Completer;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;

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

@@ -4,14 +4,9 @@ package com.ryanmichela.sshd;
  * Copyright 2013 Ryan Michela
  */
 
-import org.bukkit.ChatColor;
-import org.fusesource.jansi.Ansi;
-
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.text.SimpleDateFormat;
-import java.util.EnumMap;
-import java.util.Map;
 import java.util.logging.Formatter;
 import java.util.logging.LogRecord;
 
@@ -24,16 +19,10 @@ public class ConsoleLogFormatter extends Formatter {
     }
 
     public String format(LogRecord logrecord) {
-        try {
-            Class.forName("org.bukkit.craftbukkit.command.ColouredConsoleSender");
-        } catch (ClassNotFoundException ignored) {
-            // MEANS WE'RE ON PAPER/TACO/OTHER SHIT
-            colorize(logrecord);
-        }
         StringBuilder stringbuilder = new StringBuilder();
 
         stringbuilder.append(" [");
-        stringbuilder.append(this.dateFormat.format(logrecord.getMillis())).append(" ");
+        stringbuilder.append(this.dateFormat.format(Long.valueOf(logrecord.getMillis()))).append(" ");
 
         stringbuilder.append(logrecord.getLevel().getName()).append("]: ");
         stringbuilder.append(this.formatMessage(logrecord));
@@ -49,44 +38,5 @@ public class ConsoleLogFormatter extends Formatter {
 
         return stringbuilder.toString();
     }
-
-    private void colorize(LogRecord logrecord) {
-        // 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.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.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.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());
-        replacements.put(ChatColor.BOLD, Ansi.ansi().a(Ansi.Attribute.UNDERLINE_DOUBLE).toString());
-        replacements.put(ChatColor.STRIKETHROUGH, Ansi.ansi().a(Ansi.Attribute.STRIKETHROUGH_ON).toString());
-        replacements.put(ChatColor.UNDERLINE, Ansi.ansi().a(Ansi.Attribute.UNDERLINE).toString());
-        replacements.put(ChatColor.ITALIC, Ansi.ansi().a(Ansi.Attribute.ITALIC).toString());
-        replacements.put(ChatColor.RESET, Ansi.ansi().a(Ansi.Attribute.RESET).toString());
-
-        String result = logrecord.getMessage();
-        for (ChatColor color : ChatColor.values()) {
-            if (replacements.containsKey(color)) {
-                result = result.replaceAll("(?i)" + color.toString(), replacements.get(color));
-            } else {
-                result = result.replaceAll("(?i)" + color.toString(), "");
-            }
-        }
-        result += Ansi.ansi().reset().toString();
-        logrecord.setMessage(result);
-    }
 }
 

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

@@ -1,7 +1,5 @@
 package com.ryanmichela.sshd;
 
-import com.ryanmichela.sshd.implementations.SSHDCommandSender;
-import jline.console.ConsoleReader;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.Logger;
 import org.apache.sshd.common.Factory;
@@ -9,26 +7,21 @@ import org.apache.sshd.server.Command;
 import org.apache.sshd.server.Environment;
 import org.apache.sshd.server.ExitCallback;
 import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.libs.jline.console.ConsoleReader;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.logging.Level;
 import java.util.logging.StreamHandler;
 
 public class ConsoleShellFactory implements Factory<Command> {
 
-    static SSHDCommandSender sshdCommandSender = new SSHDCommandSender();
-
-    public Command get() {
-        return this.create();
-    }
-
     public Command create() {
         return new ConsoleShell();
     }
 
     public static class ConsoleShell implements Command, Runnable {
+
         private InputStream in;
         private OutputStream out;
         private OutputStream err;
@@ -37,7 +30,7 @@ public class ConsoleShellFactory implements Factory<Command> {
         private Thread thread;
 
         StreamHandlerAppender streamHandlerAppender;
-        public static ConsoleReader consoleReader;
+        ConsoleReader consoleReader;
 
         public InputStream getIn() {
             return in;
@@ -72,6 +65,7 @@ public class ConsoleShellFactory implements Factory<Command> {
         }
 
         public void start(Environment env) throws IOException {
+
             try {
                 consoleReader = new ConsoleReader(in, new FlushyOutputStream(out), new SshTerminal());
                 consoleReader.setExpandEvents(true);
@@ -95,43 +89,38 @@ public class ConsoleShellFactory implements Factory<Command> {
         }
 
         public void run() {
+            String command;
             try {
-                if (!SshdPlugin.instance.getConfig().getString("mode").equals("RPC"))
                 printPreamble(consoleReader);
                 while(true) {
-                    String command = consoleReader.readLine("\r>", null);
+                    command = consoleReader.readLine("\r>", null);
-                    if (command == null) continue;
+                    if (command != null) {
-                    if (command.equals("exit")) break;
+                        if (command.equals("exit")) {
-                    Bukkit.getScheduler().runTask(SshdPlugin.instance, () -> {
+                            break;
-                        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);
                         Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
                     }
-                    });
                 }
             } catch (IOException e) {
-                SshdPlugin.instance.getLogger().log(Level.SEVERE, "Error processing command from SSH", e);
+                SshdPlugin.instance.getLogger().severe("Error processing command from SSH");
             } finally {
                 callback.onExit(0);
             }
         }
 
         private void printPreamble(ConsoleReader consoleReader) throws IOException{
-            consoleReader.println("  _____ _____ _    _ _____" + "\r");
+            consoleReader.println("  _____ _____ _    _ _____");
-            consoleReader.println(" / ____/ ____| |  | |  __ \\" + "\r");
+            consoleReader.println(" / ____/ ____| |  | |  __ \\");
-            consoleReader.println("| (___| (___ | |__| | |  | |" + "\r");
+            consoleReader.println("| (___| (___ | |__| | |  | |");
-            consoleReader.println(" \\___ \\\\___ \\|  __  | |  | |" + "\r");
+            consoleReader.println(" \\___ \\\\___ \\|  __  | |  | |");
-            consoleReader.println(" ____) |___) | |  | | |__| |" + "\r");
+            consoleReader.println(" ____) |___) | |  | | |__| |");
-            consoleReader.println("|_____/_____/|_|  |_|_____/" + "\r");
+            consoleReader.println("|_____/_____/|_|  |_|_____/");
-            consoleReader.println("Connected to: " + Bukkit.getServer().getName() + "\r");
+            consoleReader.println("Connected to: " + Bukkit.getServer().getName());
-            consoleReader.println("- " + Bukkit.getServer().getMotd() + "\r");
+            consoleReader.println("- " + Bukkit.getServer().getMotd());
-            consoleReader.println("\r");
+            consoleReader.println();
-            consoleReader.println("Type 'exit' to exit the shell." + "\r");
+            consoleReader.println("Type 'exit' to exit the shell.");
-            consoleReader.println("===============================================" + "\r");
+            consoleReader.println("===============================================");
         }
     }
 }

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

@@ -8,7 +8,6 @@ import java.io.OutputStream;
  */
 public class FlushyOutputStream extends OutputStream {
     private OutputStream base;
-    private boolean isClosed = false;
 
     public FlushyOutputStream(OutputStream base) {
         this.base = base;
@@ -16,27 +15,19 @@ public class FlushyOutputStream extends OutputStream {
 
     @Override
     public void write(int b) throws IOException {
-        if(isClosed) return;
         base.write(b);
         base.flush();
     }
 
     @Override
     public void write(byte[] b) throws IOException {
-        if(isClosed) return;
         base.write(b);
         base.flush();
     }
 
     @Override
     public void write(byte[] b, int off, int len) throws IOException {
-        if(isClosed) return;
         base.write(b, off, len);
         base.flush();
     }
-
-    @Override
-    public void close() {
-        isClosed = true;
-    }
 }

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.bukkit.craftbukkit.libs.jline.console.ConsoleReader;
-
 
 import java.io.IOException;
 import java.io.OutputStream;

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

@@ -0,0 +1,28 @@
+package com.ryanmichela.sshd;
+
+import org.apache.sshd.server.session.ServerSession;
+
+import java.net.InetSocketAddress;
+import java.util.List;
+
+/**
+ * Copyright 2014 Ryan Michela
+ */
+public class IpFilteredAuthenticator {
+    private NetworkAddressValidator addressValidator;
+
+    public IpFilteredAuthenticator() {
+        List<String> whitelist = SshdPlugin.instance.getConfig().getStringList("whitelist");
+        if (whitelist.size() > 0) {
+            addressValidator = new NetworkAddressValidator(whitelist);
+        }
+    }
+
+    public boolean ipAddressIsApproved(ServerSession serverSession) {
+        if (addressValidator != null) {
+            String ip = ((InetSocketAddress)serverSession.getIoSession().getRemoteAddress()).getAddress().getHostAddress();
+            return addressValidator.isApproved(ip);
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.ryanmichela.sshd;
+
+/**
+ * Copyright 2014 Ryan Michela
+ */
+
+import java.net.UnknownHostException;
+import java.util.List;
+
+public class NetworkAddressValidator {
+
+    private CIDRUtils[] approvedAddressList = null;
+
+    public NetworkAddressValidator(List<String> approvedAddressList) {
+        this.approvedAddressList = new CIDRUtils[approvedAddressList.size()];
+        for (int i = 0; i < approvedAddressList.size(); i++) {
+            String whitelistEntry = approvedAddressList.get(i);
+            try {
+                if (approvedAddressList.get(i).indexOf("/") > 0) {
+                    this.approvedAddressList[i] = new CIDRUtils(whitelistEntry);
+                } else {
+                    this.approvedAddressList[i] = new CIDRUtils(whitelistEntry + "/32");
+                }
+            } catch (UnknownHostException e) {
+                SshdPlugin.instance.getLogger().severe(whitelistEntry + " is not a valid IPv4 or IPv6 address or CIDR formatted address.");
+            }
+        }
+    }
+
+    public boolean isApproved(String ipAddress) {
+        try {
+            for (CIDRUtils approvedAddress : approvedAddressList) {
+                if (approvedAddress.isInRange(ipAddress)) {
+                    return true;
+                }
+            }
+            return false;
+        } catch (UnknownHostException e) {
+            return false;
+        }
+    }
+}

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

@@ -1,6 +1,6 @@
 package com.ryanmichela.sshd;
 
-import org.apache.commons.codec.binary.Base64;
+import org.apache.mina.util.Base64;
 
 import java.io.Reader;
 import java.math.BigInteger;
@@ -22,7 +22,7 @@ public class PemDecoder extends java.io.BufferedReader {
     }
 
     public PublicKey getPemBytes() throws Exception {
-        StringBuilder b64 = new StringBuilder();
+        StringBuffer b64 = new StringBuffer();
 
         String line = readLine();
         if (!line.matches(BEGIN)) {

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

@@ -1,7 +1,7 @@
 package com.ryanmichela.sshd;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
+import org.apache.sshd.server.PublickeyAuthenticator;
 import org.apache.sshd.server.session.ServerSession;
 
 import java.io.File;
@@ -11,7 +11,7 @@ import java.security.PublicKey;
 /**
  * Copyright 2013 Ryan Michela
  */
-public class PublicKeyAuthenticator implements PublickeyAuthenticator {
+public class PublicKeyAuthenticator extends IpFilteredAuthenticator implements PublickeyAuthenticator {
     private File authorizedKeysDir;
 
     public PublicKeyAuthenticator(File authorizedKeysDir) {
@@ -20,6 +20,8 @@ public class PublicKeyAuthenticator implements PublickeyAuthenticator {
 
     @Override
     public boolean authenticate(String username, PublicKey key, ServerSession session) {
+        if (!ipAddressIsApproved(session)) return false;
+
         byte[] keyBytes = key.getEncoded();
         File keyFile = new File(authorizedKeysDir, username);
 

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

@@ -28,7 +28,9 @@ public class ReflectionUtil {
             modifiersField.setInt(f, f.getModifiers() & ~Modifier.FINAL);
 
             f.set(o, newValue);
-        } catch (NoSuchFieldException | IllegalAccessException ex) {
+        } catch (NoSuchFieldException ex) {
+            System.out.println("*** " + c.getName() + ":" + ex);
+        } catch (IllegalAccessException ex) {
             System.out.println("*** " + c.getName() + ":" + ex);
         }
     }

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

@@ -1,6 +1,6 @@
 package com.ryanmichela.sshd;
 
-import jline.TerminalSupport;
+import org.bukkit.craftbukkit.libs.jline.TerminalSupport;
 
 /**
  * Copyright 2013 Ryan Michela

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

@@ -1,15 +1,11 @@
 package com.ryanmichela.sshd;
 
-import org.apache.sshd.common.file.virtualfs.VirtualFileSystemFactory;
+import org.apache.sshd.SshServer;
-import org.apache.sshd.server.SshServer;
 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
-import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.FileSystems;
-import java.util.Collections;
 import java.util.logging.Level;
 
 /**
@@ -39,31 +35,19 @@ 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");
 
-        sshd.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(hostKey));
+        sshd.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(hostKey.getPath()));
         sshd.setShellFactory(new ConsoleShellFactory());
         sshd.setPasswordAuthenticator(new ConfigPasswordAuthenticator());
         sshd.setPublickeyAuthenticator(new PublicKeyAuthenticator(authorizedKeys));
-
-        if (getConfig().getBoolean("enableSFTP")) {
-            sshd.setSubsystemFactories(Collections.singletonList(new SftpSubsystemFactory()));
-            sshd.setFileSystemFactory(new VirtualFileSystemFactory(
-                    FileSystems.getDefault().getPath(
-                            getDataFolder().getAbsolutePath()
-                    ).getParent().getParent()
-            ));
-        }
-
         sshd.setCommandFactory(new ConsoleCommandFactory());
         try {
             sshd.start();
         } catch (IOException e) {
-            getLogger().log(Level.SEVERE, "Failed to start SSH server! ", e);
+            getLogger().severe("Failed to start SSH server! " + e.getMessage());
         }
     }
 

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

@@ -25,18 +25,15 @@ public class StreamHandlerAppender implements Appender {
     @Override
     public void append(LogEvent logEvent) {
         java.util.logging.Level level;
-
+        switch (logEvent.getLevel())
-        if(logEvent.getLevel().equals(org.apache.logging.log4j.Level.DEBUG)) {
+        {
-            level = java.util.logging.Level.FINE;
+            case DEBUG: level = java.util.logging.Level.FINE; break;
-        } else if(logEvent.getLevel().equals(org.apache.logging.log4j.Level.INFO)) {
+            case INFO: level = java.util.logging.Level.INFO; break;
-            level = java.util.logging.Level.INFO;
+            case WARN: level = java.util.logging.Level.WARNING; break;
-        } else if(logEvent.getLevel().equals(org.apache.logging.log4j.Level.WARN)) {
+            case ERROR: level = java.util.logging.Level.SEVERE; break;
-            level = java.util.logging.Level.WARNING;
+            default: level = java.util.logging.Level.INFO; break;
-        } else if(logEvent.getLevel().equals(org.apache.logging.log4j.Level.ERROR)) {
-            level = java.util.logging.Level.SEVERE;
-        } else {
-            level = java.util.logging.Level.INFO;
         }
+
         String message = logEvent.getMessage().getFormattedMessage();
 
 
@@ -83,9 +80,4 @@ public class StreamHandlerAppender implements Appender {
     public boolean isStarted() {
         return true;
     }
-
-    @Override
-    public boolean isStopped() {
-        return false;
-    }
 }

src/main/java/com/ryanmichela/sshd/implementations/SSHDCommandSender.java

@@ -1,130 +0,0 @@
-package com.ryanmichela.sshd.implementations;
-
-import com.ryanmichela.sshd.ConsoleShellFactory;
-import com.ryanmichela.sshd.SshdPlugin;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.conversations.Conversation;
-import org.bukkit.conversations.ConversationAbandonedEvent;
-import org.bukkit.conversations.ManuallyAbandonedConversationCanceller;
-import org.bukkit.permissions.PermissibleBase;
-import org.bukkit.permissions.Permission;
-import org.bukkit.permissions.PermissionAttachment;
-import org.bukkit.permissions.PermissionAttachmentInfo;
-import org.bukkit.plugin.Plugin;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Set;
-import java.util.logging.Level;
-
-public class SSHDCommandSender implements ConsoleCommandSender, CommandSender {
-
-    private final PermissibleBase perm = new PermissibleBase(this);
-    private final SSHDConversationTracker conversationTracker = new SSHDConversationTracker();
-
-    public void sendMessage(String message) {
-        this.sendRawMessage(message);
-    }
-
-    public void sendRawMessage(String message) {
-        if(ConsoleShellFactory.ConsoleShell.consoleReader == null) return;
-        try {
-            ConsoleShellFactory.ConsoleShell.consoleReader.println(ChatColor.stripColor(message));
-        } catch (IOException e) {
-            SshdPlugin.instance.getLogger().log(Level.SEVERE, "Error sending message to SSHDCommandSender", e);
-        }
-    }
-
-    public void sendMessage(String[] messages) {
-        Arrays.asList(messages).forEach(this::sendMessage);
-    }
-
-    public String getName() {
-        return "SSHD CONSOLE";
-    }
-
-    public boolean isOp() {
-        return true;
-    }
-
-    public void setOp(boolean value) {
-        throw new UnsupportedOperationException("Cannot change operator status of server console");
-    }
-
-    public boolean beginConversation(Conversation conversation) {
-        return this.conversationTracker.beginConversation(conversation);
-    }
-
-    public void abandonConversation(Conversation conversation) {
-        this.conversationTracker.abandonConversation(conversation, new ConversationAbandonedEvent(conversation, new ManuallyAbandonedConversationCanceller()));
-    }
-
-    public void abandonConversation(Conversation conversation, ConversationAbandonedEvent details) {
-        this.conversationTracker.abandonConversation(conversation, details);
-    }
-
-    public void acceptConversationInput(String input) {
-        this.conversationTracker.acceptConversationInput(input);
-    }
-
-    public boolean isConversing() {
-        return this.conversationTracker.isConversing();
-    }
-
-    public boolean isPermissionSet(String name) {
-        return this.perm.isPermissionSet(name);
-    }
-
-    public boolean isPermissionSet(Permission perm) {
-        return this.perm.isPermissionSet(perm);
-    }
-
-    public boolean hasPermission(String name) {
-        return this.perm.hasPermission(name);
-    }
-
-    public boolean hasPermission(Permission perm) {
-        return this.perm.hasPermission(perm);
-    }
-
-    public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value) {
-        return this.perm.addAttachment(plugin, name, value);
-    }
-
-    public PermissionAttachment addAttachment(Plugin plugin) {
-        return this.perm.addAttachment(plugin);
-    }
-
-    public PermissionAttachment addAttachment(Plugin plugin, String name, boolean value, int ticks) {
-        return this.perm.addAttachment(plugin, name, value, ticks);
-    }
-
-    public PermissionAttachment addAttachment(Plugin plugin, int ticks) {
-        return this.perm.addAttachment(plugin, ticks);
-    }
-
-    public void removeAttachment(PermissionAttachment attachment) {
-        this.perm.removeAttachment(attachment);
-    }
-
-    public void recalculatePermissions() {
-        this.perm.recalculatePermissions();
-    }
-
-    public Set<PermissionAttachmentInfo> getEffectivePermissions() {
-        return this.perm.getEffectivePermissions();
-    }
-
-    public boolean isPlayer() {
-        return false;
-    }
-
-    public Server getServer() {
-        return Bukkit.getServer();
-    }
-
-}

src/main/java/com/ryanmichela/sshd/implementations/SSHDConversationTracker.java

@@ -1,78 +0,0 @@
-package com.ryanmichela.sshd.implementations;
-
-import org.bukkit.Bukkit;
-import org.bukkit.conversations.Conversation;
-import org.bukkit.conversations.ConversationAbandonedEvent;
-import org.bukkit.conversations.ManuallyAbandonedConversationCanceller;
-
-import java.util.LinkedList;
-import java.util.logging.Level;
-
-public class SSHDConversationTracker {
-    private LinkedList<Conversation> conversationQueue = new LinkedList<>();
-
-    synchronized boolean beginConversation(Conversation conversation) {
-        if (!this.conversationQueue.contains(conversation)) {
-            this.conversationQueue.addLast(conversation);
-            if (this.conversationQueue.getFirst() == conversation) {
-                conversation.begin();
-                conversation.outputNextPrompt();
-                return true;
-            }
-        }
-
-        return true;
-    }
-
-    synchronized void abandonConversation(Conversation conversation, ConversationAbandonedEvent details) {
-        if (!this.conversationQueue.isEmpty()) {
-            if (this.conversationQueue.getFirst() == conversation) {
-                conversation.abandon(details);
-            }
-
-            if (this.conversationQueue.contains(conversation)) {
-                this.conversationQueue.remove(conversation);
-            }
-
-            if (!this.conversationQueue.isEmpty()) {
-                this.conversationQueue.getFirst().outputNextPrompt();
-            }
-        }
-
-    }
-
-    public synchronized void abandonAllConversations() {
-        LinkedList<Conversation> oldQueue = this.conversationQueue;
-        this.conversationQueue = new LinkedList<>();
-
-        for (Conversation conversation : oldQueue) {
-            try {
-                conversation.abandon(new ConversationAbandonedEvent(conversation, new ManuallyAbandonedConversationCanceller()));
-            } catch (Throwable var5) {
-                Bukkit.getLogger().log(Level.SEVERE, "Unexpected exception while abandoning a conversation", var5);
-            }
-        }
-
-    }
-
-    synchronized void acceptConversationInput(String input) {
-        if (this.isConversing()) {
-            Conversation conversation = this.conversationQueue.getFirst();
-
-            try {
-                conversation.acceptInput(input);
-            } catch (Throwable var4) {
-                conversation.getContext().getPlugin().getLogger().log(Level.WARNING, String.format("Plugin %s generated an exception whilst handling conversation input", conversation.getContext().getPlugin().getDescription().getFullName()), var4);
-            }
-        }
-
-    }
-
-    synchronized boolean isConversing() {
-        return !this.conversationQueue.isEmpty();
-    }
-
-    public synchronized boolean isConversingModaly() {
-        return this.isConversing() && this.conversationQueue.getFirst().isModal();
-    }
-}

src/main/java/org/slf4j/impl/PluginSlf4jFactory.java

@@ -22,7 +22,10 @@ public class PluginSlf4jFactory implements ILoggerFactory {
         private String name;
 
         private boolean isEnabled(Level level) {
-            return SshdPlugin.instance != null && SshdPlugin.instance.getLogger().isLoggable(level);
+            if (SshdPlugin.instance != null) {
+                return SshdPlugin.instance.getLogger().isLoggable(level);
+            }
+            return false;
         }
 
         private void log(Level level, String s, Object[] objects) {

src/main/resources/config.yml

@@ -1,16 +1,6 @@
-# The IP addresses(s) the SSH server will listen on. Use a comma separated list for multiple addresses.
+# This is the port the SSH server will listen on.
-# Leave as "all" for all addresses.
-listenAddress: all
-# The port the SSH server will listen on.
 port: 22
 
-# Operational mode. Don't touch if you don't know what you're doing. Can be either DEFAULT or RPC
-mode: DEFAULT
-
-# Enable built-in SFTP server or not. You'll be able to connect and upload/download files via SFTP protocol.
-# Might be useful for testing purposes as well , i. e. docker containers.
-enableSFTP: true
-
 # By default, only public key authentication is enabled. This is the most secure mode.
 # To authorize a user to log in with public key authentication, install their public
 # PEM certificate in the authorized_users directory. Name the key file with user's user
@@ -20,3 +10,10 @@ enableSFTP: true
 credentials:
 #    user1: password1
 #    user2: password2
+
+# To enable the IP whitelist, add more lines below. Whitelist entries can be expressed
+# in CIDR notation (ip address/mask) for whitelisting a range of IP addresses.
+whitelist:
+#    - ::1/128
+#    - 127.0.0.0/8
+#    - 192.168.0.0/16

src/main/resources/plugin.yml

@@ -1,4 +1,4 @@
 name: SSHD
-version: ${project.version}
+version: "1.2"
-author: Ryan Michela, Haarolean, toxuin
+author: Ryan Michela
 main: com.ryanmichela.sshd.SshdPlugin