Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
02b700b07f | ||
|
|
87cb4d8929 | ||
|
|
ac6a552e95 | ||
|
|
0951c6f971 | ||
|
|
5a9a5245b9 | ||
|
|
396351771c | ||
|
|
f034cef465 | ||
|
|
956f0cc3ef | ||
|
|
027605e743 | ||
|
|
be9c53bf6f | ||
|
|
f9a3ddec43 | ||
|
|
2326c7e2cb |
87
pom.xml
87
pom.xml
@@ -6,14 +6,14 @@
|
|||||||
|
|
||||||
<groupId>com.ryanmichela</groupId>
|
<groupId>com.ryanmichela</groupId>
|
||||||
<artifactId>SSHD</artifactId>
|
<artifactId>SSHD</artifactId>
|
||||||
<version>1.0</version>
|
<version>1.3.3</version>
|
||||||
<url>http://dev.bukkit.org/server-mods/sshd/</url>
|
<url>http://dev.bukkit.org/server-mods/sshd/</url>
|
||||||
|
|
||||||
<!-- Repositories -->
|
<!-- Repositories -->
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
<id>bukkit-repo</id>
|
<id>spigot-repo</id>
|
||||||
<url>http://repo.bukkit.org/content/groups/public/</url>
|
<url>https://hub.spigotmc.org/nexus/content/groups/public</url>
|
||||||
</repository>
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
@@ -30,32 +30,85 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bukkit</groupId>
|
<groupId>org.bukkit</groupId>
|
||||||
<artifactId>craftbukkit</artifactId>
|
<artifactId>craftbukkit</artifactId>
|
||||||
<version>1.6.4-R1.0</version>
|
<version>1.12.2-R0.1-SNAPSHOT</version>
|
||||||
<scope>provided</scope>
|
<scope>system</scope>
|
||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
|
<systemPath>${basedir}/bukkit-build/bukkit.jar</systemPath>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.sshd</groupId>
|
<groupId>org.apache.sshd</groupId>
|
||||||
<artifactId>sshd-core</artifactId>
|
<artifactId>sshd-core</artifactId>
|
||||||
<version>0.9.0</version>
|
<version>1.6.0</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!--<dependency>-->
|
|
||||||
<!--<groupId>org.bouncycastle</groupId>-->
|
<dependency>
|
||||||
<!--<artifactId>bcprov-jdk16</artifactId>-->
|
<groupId>org.apache.mina</groupId>
|
||||||
<!--<version>1.46</version>-->
|
<artifactId>mina-core</artifactId>
|
||||||
<!--</dependency>-->
|
<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>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<!-- Build -->
|
<!-- Build -->
|
||||||
<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>
|
<plugins>
|
||||||
<!-- Shade plugin -->
|
|
||||||
<plugin>
|
<plugin>
|
||||||
|
<artifactId>maven-assembly-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>single</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<configuration>
|
||||||
|
<finalName>${project.name}-${project.version}</finalName>
|
||||||
|
<appendAssemblyId>false</appendAssemblyId>
|
||||||
|
<descriptorRefs>
|
||||||
|
<descriptorRef>jar-with-dependencies</descriptorRef>
|
||||||
|
</descriptorRefs>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<!-- Shade plugin -->
|
||||||
|
<!-- <plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-shade-plugin</artifactId>
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
<version>1.5</version>
|
<version>1.7</version>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<phase>package</phase>
|
<phase>package</phase>
|
||||||
@@ -75,16 +128,18 @@
|
|||||||
</excludes>
|
</excludes>
|
||||||
</filter>
|
</filter>
|
||||||
</filters>
|
</filters>
|
||||||
|
<minimizeJar>true</minimizeJar>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin> -->
|
||||||
|
|
||||||
<!-- Compile plugin -->
|
<!-- Compile plugin -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.0</version>
|
<version>3.0</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>1.7</source>
|
<source>1.8</source>
|
||||||
<target>1.7</target>
|
<target>1.8</target>
|
||||||
<showDeprecation>true</showDeprecation>
|
<showDeprecation>true</showDeprecation>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.ryanmichela.sshd;
|
package com.ryanmichela.sshd;
|
||||||
|
|
||||||
import org.apache.sshd.server.PasswordAuthenticator;
|
import org.apache.sshd.server.auth.password.PasswordAuthenticator;
|
||||||
import org.apache.sshd.server.session.ServerSession;
|
import org.apache.sshd.server.session.ServerSession;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ package com.ryanmichela.sshd;
|
|||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.command.CommandMap;
|
import org.bukkit.command.CommandMap;
|
||||||
import org.bukkit.craftbukkit.libs.jline.console.completer.Completer;
|
import jline.console.completer.Completer;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.ExecutionException;
|
import java.util.concurrent.ExecutionException;
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ public class ConsoleCommandFactory implements CommandFactory {
|
|||||||
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);
|
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
SshdPlugin.instance.getLogger().severe("Error processing command from SSH");
|
SshdPlugin.instance.getLogger().severe("Error processing command from SSH -" + e.getMessage());
|
||||||
} finally {
|
} finally {
|
||||||
callback.onExit(0);
|
callback.onExit(0);
|
||||||
}
|
}
|
||||||
|
|||||||
92
src/main/java/com/ryanmichela/sshd/ConsoleLogFormatter.java
Normal file
92
src/main/java/com/ryanmichela/sshd/ConsoleLogFormatter.java
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
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;
|
||||||
|
|
||||||
|
public class ConsoleLogFormatter extends Formatter {
|
||||||
|
|
||||||
|
private SimpleDateFormat dateFormat;
|
||||||
|
|
||||||
|
public ConsoleLogFormatter() {
|
||||||
|
this.dateFormat = new SimpleDateFormat("HH:mm:ss");
|
||||||
|
}
|
||||||
|
|
||||||
|
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(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();
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,20 +1,23 @@
|
|||||||
package com.ryanmichela.sshd;
|
package com.ryanmichela.sshd;
|
||||||
|
|
||||||
|
import jline.console.ConsoleReader;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.core.Logger;
|
||||||
import org.apache.sshd.common.Factory;
|
import org.apache.sshd.common.Factory;
|
||||||
import org.apache.sshd.server.Command;
|
import org.apache.sshd.server.Command;
|
||||||
import org.apache.sshd.server.Environment;
|
import org.apache.sshd.server.Environment;
|
||||||
import org.apache.sshd.server.ExitCallback;
|
import org.apache.sshd.server.ExitCallback;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.craftbukkit.libs.jline.console.ConsoleReader;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.util.logging.Formatter;
|
|
||||||
import java.util.logging.Logger;
|
|
||||||
import java.util.logging.StreamHandler;
|
import java.util.logging.StreamHandler;
|
||||||
|
|
||||||
public class ConsoleShellFactory implements Factory<Command> {
|
public class ConsoleShellFactory implements Factory<Command> {
|
||||||
|
public Command get() {
|
||||||
|
return this.create();
|
||||||
|
}
|
||||||
|
|
||||||
public Command create() {
|
public Command create() {
|
||||||
return new ConsoleShell();
|
return new ConsoleShell();
|
||||||
@@ -29,7 +32,7 @@ public class ConsoleShellFactory implements Factory<Command> {
|
|||||||
private Environment environment;
|
private Environment environment;
|
||||||
private Thread thread;
|
private Thread thread;
|
||||||
|
|
||||||
StreamHandler streamHandler;
|
StreamHandlerAppender streamHandlerAppender;
|
||||||
ConsoleReader consoleReader;
|
ConsoleReader consoleReader;
|
||||||
|
|
||||||
public InputStream getIn() {
|
public InputStream getIn() {
|
||||||
@@ -66,19 +69,18 @@ public class ConsoleShellFactory implements Factory<Command> {
|
|||||||
|
|
||||||
public void start(Environment env) throws IOException {
|
public void start(Environment env) throws IOException {
|
||||||
|
|
||||||
Formatter bukkitFormatter = Bukkit.getLogger().getHandlers()[0].getFormatter();
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
consoleReader = new ConsoleReader(in, new FlushyOutputStream(out), new SshTerminal());
|
consoleReader = new ConsoleReader(in, new FlushyOutputStream(out), new SshTerminal());
|
||||||
consoleReader.setExpandEvents(true);
|
consoleReader.setExpandEvents(true);
|
||||||
consoleReader.addCompleter(new ConsoleCommandCompleter());
|
consoleReader.addCompleter(new ConsoleCommandCompleter());
|
||||||
|
|
||||||
streamHandler = new FlushyStreamHandler(out, bukkitFormatter, consoleReader);
|
StreamHandler streamHandler = new FlushyStreamHandler(out, new ConsoleLogFormatter(), consoleReader);
|
||||||
Bukkit.getLogger().addHandler(streamHandler);
|
streamHandlerAppender = new StreamHandlerAppender(streamHandler);
|
||||||
Logger.getLogger("").addHandler(streamHandler);
|
|
||||||
|
((Logger) LogManager.getRootLogger()).addAppender(streamHandlerAppender);
|
||||||
|
|
||||||
environment = env;
|
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();
|
thread.start();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new IOException("Error starting shell", e);
|
throw new IOException("Error starting shell", e);
|
||||||
@@ -86,22 +88,22 @@ public class ConsoleShellFactory implements Factory<Command> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void destroy() {
|
public void destroy() {
|
||||||
Bukkit.getLogger().removeHandler(streamHandler);
|
((Logger) LogManager.getRootLogger()).removeAppender(streamHandlerAppender);
|
||||||
Logger.getLogger("").removeHandler(streamHandler);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void run() {
|
public void run() {
|
||||||
String command;
|
|
||||||
try {
|
try {
|
||||||
printPreamble(consoleReader);
|
printPreamble(consoleReader);
|
||||||
while(true) {
|
while (true) {
|
||||||
command = consoleReader.readLine("\r>", null);
|
String command = consoleReader.readLine("\r>", null);
|
||||||
if (command != null) {
|
if (command != null) {
|
||||||
if (command.equals("exit")) {
|
if (command.equals("exit")) {
|
||||||
break;
|
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);
|
Bukkit.getScheduler().runTask(SshdPlugin.instance, () -> {
|
||||||
|
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
@@ -111,18 +113,18 @@ public class ConsoleShellFactory implements Factory<Command> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void printPreamble(ConsoleReader consoleReader) throws IOException{
|
private void printPreamble(ConsoleReader consoleReader) throws IOException {
|
||||||
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("|_____/_____/|_| |_|_____/" + "\r");
|
||||||
consoleReader.println("Connected to: " + Bukkit.getServer().getName());
|
consoleReader.println("Connected to: " + Bukkit.getServer().getName() + "\r");
|
||||||
consoleReader.println("- " + Bukkit.getServer().getMotd());
|
consoleReader.println("- " + Bukkit.getServer().getMotd() + "\r");
|
||||||
consoleReader.println();
|
consoleReader.println("\r");
|
||||||
consoleReader.println("Type 'exit' to exit the shell.");
|
consoleReader.println("Type 'exit' to exit the shell." + "\r");
|
||||||
consoleReader.println("===============================================");
|
consoleReader.println("===============================================" + "\r");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
package com.ryanmichela.sshd;
|
package com.ryanmichela.sshd;
|
||||||
|
|
||||||
import org.apache.sshd.common.SshException;
|
import org.apache.sshd.common.SshException;
|
||||||
import org.bukkit.craftbukkit.libs.jline.console.ConsoleReader;
|
import jline.console.ConsoleReader;
|
||||||
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.ryanmichela.sshd;
|
package com.ryanmichela.sshd;
|
||||||
|
|
||||||
import org.apache.mina.util.Base64;
|
import org.apache.commons.codec.binary.Base64;
|
||||||
|
|
||||||
import java.io.Reader;
|
import java.io.Reader;
|
||||||
import java.math.BigInteger;
|
import java.math.BigInteger;
|
||||||
@@ -22,7 +22,7 @@ public class PemDecoder extends java.io.BufferedReader {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public PublicKey getPemBytes() throws Exception {
|
public PublicKey getPemBytes() throws Exception {
|
||||||
StringBuffer b64 = new StringBuffer();
|
StringBuilder b64 = new StringBuilder();
|
||||||
|
|
||||||
String line = readLine();
|
String line = readLine();
|
||||||
if (!line.matches(BEGIN)) {
|
if (!line.matches(BEGIN)) {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package com.ryanmichela.sshd;
|
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.auth.pubkey.PublickeyAuthenticator;
|
||||||
import org.apache.sshd.server.session.ServerSession;
|
import org.apache.sshd.server.session.ServerSession;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|||||||
@@ -28,9 +28,7 @@ public class ReflectionUtil {
|
|||||||
modifiersField.setInt(f, f.getModifiers() & ~Modifier.FINAL);
|
modifiersField.setInt(f, f.getModifiers() & ~Modifier.FINAL);
|
||||||
|
|
||||||
f.set(o, newValue);
|
f.set(o, newValue);
|
||||||
} catch (NoSuchFieldException ex) {
|
} catch (NoSuchFieldException | IllegalAccessException ex) {
|
||||||
System.out.println("*** " + c.getName() + ":" + ex);
|
|
||||||
} catch (IllegalAccessException ex) {
|
|
||||||
System.out.println("*** " + c.getName() + ":" + ex);
|
System.out.println("*** " + c.getName() + ":" + ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.ryanmichela.sshd;
|
package com.ryanmichela.sshd;
|
||||||
|
|
||||||
import org.bukkit.craftbukkit.libs.jline.TerminalSupport;
|
import jline.TerminalSupport;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Copyright 2013 Ryan Michela
|
* Copyright 2013 Ryan Michela
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.ryanmichela.sshd;
|
package com.ryanmichela.sshd;
|
||||||
|
|
||||||
import org.apache.sshd.SshServer;
|
import org.apache.sshd.server.SshServer;
|
||||||
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
|
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
|
|
||||||
@@ -35,11 +35,13 @@ public class SshdPlugin extends JavaPlugin {
|
|||||||
|
|
||||||
sshd = SshServer.setUpDefaultServer();
|
sshd = SshServer.setUpDefaultServer();
|
||||||
sshd.setPort(getConfig().getInt("port", 22));
|
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 hostKey = new File(getDataFolder(), "hostkey");
|
||||||
File authorizedKeys = new File(getDataFolder(), "authorized_keys");
|
File authorizedKeys = new File(getDataFolder(), "authorized_keys");
|
||||||
|
|
||||||
sshd.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(hostKey.getPath()));
|
sshd.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(hostKey));
|
||||||
sshd.setShellFactory(new ConsoleShellFactory());
|
sshd.setShellFactory(new ConsoleShellFactory());
|
||||||
sshd.setPasswordAuthenticator(new ConfigPasswordAuthenticator());
|
sshd.setPasswordAuthenticator(new ConfigPasswordAuthenticator());
|
||||||
sshd.setPublickeyAuthenticator(new PublicKeyAuthenticator(authorizedKeys));
|
sshd.setPublickeyAuthenticator(new PublicKeyAuthenticator(authorizedKeys));
|
||||||
@@ -55,7 +57,7 @@ public class SshdPlugin extends JavaPlugin {
|
|||||||
public void onDisable() {
|
public void onDisable() {
|
||||||
try {
|
try {
|
||||||
sshd.stop();
|
sshd.stop();
|
||||||
} catch (InterruptedException e) {
|
} catch (Exception e) {
|
||||||
// do nothing
|
// do nothing
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
101
src/main/java/com/ryanmichela/sshd/StreamHandlerAppender.java
Normal file
101
src/main/java/com/ryanmichela/sshd/StreamHandlerAppender.java
Normal file
@@ -0,0 +1,101 @@
|
|||||||
|
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;
|
||||||
|
|
||||||
|
if(logEvent.getLevel().equals(org.apache.logging.log4j.Level.DEBUG)) {
|
||||||
|
level = java.util.logging.Level.FINE;
|
||||||
|
} else if(logEvent.getLevel().equals(org.apache.logging.log4j.Level.INFO)) {
|
||||||
|
level = java.util.logging.Level.INFO;
|
||||||
|
} else if(logEvent.getLevel().equals(org.apache.logging.log4j.Level.WARN)) {
|
||||||
|
level = java.util.logging.Level.WARNING;
|
||||||
|
} 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();
|
||||||
|
|
||||||
|
|
||||||
|
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 State getState() {
|
||||||
|
return State.INITIALIZED;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void initialize() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void start() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void stop() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isStarted() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isStopped() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -22,10 +22,7 @@ public class PluginSlf4jFactory implements ILoggerFactory {
|
|||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
private boolean isEnabled(Level level) {
|
private boolean isEnabled(Level level) {
|
||||||
if (SshdPlugin.instance != null) {
|
return SshdPlugin.instance != null && SshdPlugin.instance.getLogger().isLoggable(level);
|
||||||
return SshdPlugin.instance.getLogger().isLoggable(level);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void log(Level level, String s, Object[] objects) {
|
private void log(Level level, String s, Object[] objects) {
|
||||||
|
|||||||
@@ -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
|
port: 22
|
||||||
|
|
||||||
# By default, only public key authentication is enabled. This is the most secure mode.
|
# By default, only public key authentication is enabled. This is the most secure mode.
|
||||||
@@ -9,4 +12,4 @@ port: 22
|
|||||||
# For less secure username and password based authentication, complete the sections below.
|
# For less secure username and password based authentication, complete the sections below.
|
||||||
credentials:
|
credentials:
|
||||||
# user1: password1
|
# user1: password1
|
||||||
# user2: password2
|
# user2: password2
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
name: SSHD
|
name: SSHD
|
||||||
version: "1.0"
|
version: ${project.version}
|
||||||
author: Ryan Michela
|
author: Ryan Michela, Haarolean, toxuin
|
||||||
main: com.ryanmichela.sshd.SshdPlugin
|
main: com.ryanmichela.sshd.SshdPlugin
|
||||||
Reference in New Issue
Block a user