Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
3e45f7ebf4 | ||
|
|
0e05bb61bc | ||
|
|
0635ea7a35 | ||
|
|
25287b1580 | ||
|
|
0458179597 |
68
.clangformat
Normal file
68
.clangformat
Normal file
@@ -0,0 +1,68 @@
|
||||
---
|
||||
#BasedOnStyle: WebKit
|
||||
TabWidth: '4'
|
||||
IndentWidth: '4'
|
||||
UseTab: 'Always'
|
||||
AlignOperands: 'true'
|
||||
AlignAfterOpenBracket: 'Align'
|
||||
AlignConsecutiveAssignments: 'true'
|
||||
AlignConsecutiveDeclarations: 'true'
|
||||
AlignEscapedNewlines: 'Left'
|
||||
AlignTrailingComments: 'true'
|
||||
AllowAllParametersOfDeclarationOnNextLine: 'true'
|
||||
AllowShortBlocksOnASingleLine: 'false'
|
||||
AllowShortCaseLabelsOnASingleLine: 'false'
|
||||
AllowShortFunctionsOnASingleLine: 'All'
|
||||
AllowShortIfStatementsOnASingleLine: 'false'
|
||||
AllowShortLoopsOnASingleLine: 'false'
|
||||
AlwaysBreakAfterReturnType: 'None'
|
||||
AlwaysBreakTemplateDeclarations: 'true'
|
||||
AlwaysBreakBeforeMultilineStrings: 'false'
|
||||
BinPackArguments: 'false'
|
||||
BinPackParameters: 'false'
|
||||
BreakBeforeBraces: 'Custom'
|
||||
BraceWrapping:
|
||||
AfterEnum: 'true'
|
||||
AfterClass: 'true'
|
||||
AfterControlStatement: 'true'
|
||||
AfterStruct: 'true'
|
||||
AfterFunction: 'true'
|
||||
AfterNamespace: 'true'
|
||||
AfterUnion: 'true'
|
||||
AfterExternBlock: 'true'
|
||||
BeforeCatch: 'true'
|
||||
BeforeElse: 'true'
|
||||
SplitEmptyRecord: 'false'
|
||||
SplitEmptyNamespace: 'false'
|
||||
SplitEmptyFunction: 'false'
|
||||
BreakBeforeBinaryOperators: 'true'
|
||||
BreakBeforeTernaryOperators: 'false'
|
||||
BreakConstructorInitializersBeforeComma: 'false'
|
||||
BreakBeforeInheritanceComma: 'false'
|
||||
BreakStringLiterals: 'true'
|
||||
ColumnLimit: '140'
|
||||
CompactNamespaces: 'false'
|
||||
Cpp11BracedListStyle: 'true'
|
||||
ConstructorInitializerAllOnOneLineOrOnePerLine: 'false'
|
||||
DerivePointerAlignment: 'false'
|
||||
IndentCaseLabels: 'true'
|
||||
IndentPPDirectives: 'AfterHash'
|
||||
KeepEmptyLinesAtTheStartOfBlocks: 'true'
|
||||
Language: 'Java'
|
||||
NamespaceIndentation: 'All'
|
||||
PointerAlignment: 'Right'
|
||||
ReflowComments: 'true'
|
||||
SortIncludes: 'true'
|
||||
SortUsingDeclarations: 'true'
|
||||
SpaceAfterCStyleCast: 'false'
|
||||
SpaceAfterTemplateKeyword: 'false'
|
||||
SpaceBeforeAssignmentOperators: 'true'
|
||||
SpaceBeforeParens: ControlStatements
|
||||
SpaceInEmptyParentheses: 'false'
|
||||
SpacesInAngles: 'false'
|
||||
SpacesInCStyleCastParentheses: 'false'
|
||||
SpacesInContainerLiterals: 'false'
|
||||
SpacesInParentheses: 'false'
|
||||
SpacesInSquareBrackets: 'false'
|
||||
Standard: 'Auto'
|
||||
...
|
||||
@@ -1,4 +1,5 @@
|
||||
sudo: false
|
||||
dist: trusty
|
||||
language: java
|
||||
jdk:
|
||||
- oraclejdk8
|
||||
70
README.md
70
README.md
@@ -1,6 +1,70 @@
|
||||
Bukkit-SSHD
|
||||
Spigot-SSHD
|
||||
===========
|
||||
|
||||
[](https://travis-ci.org/rmichela/Bukkit-SSHD)
|
||||
[](https://travis-ci.org/Justasic/Spigot-SSHD)
|
||||
|
||||
An SSHD daemon embedded in a Bukkit plugin.
|
||||
Have you ever wished you could remotely access your server's admin console without having to setup a complex remote access system? Now you can with SSHD.
|
||||
|
||||
SSHD securely exposes your Spigot admin console using the SSH protocol - the same protocol that serves as the secure foundation for nearly all remote server administration.
|
||||
|
||||
- Compatible with all ssh clients, regardless of operating system.
|
||||
- Remotely view your server log in real-time.
|
||||
- Remotely issue commands from the server console, just as if you were on the server itself.
|
||||
- Supports multiple concurrent remote connections.
|
||||
- Strong identity support using public key authentication.
|
||||
- Remotely script your server by issuing one-off console commands with ssh.
|
||||
|
||||
## Why should I use SSHD?
|
||||
|
||||
- Your server runs on Windows.
|
||||
- You are in a shared hosting environment that only gives you access to the - log files.
|
||||
- You want to share access to your server console, but don't want to give anybody access to the machine its running on.
|
||||
- You always wanted to use RCON, but want to see the server log as well.
|
||||
- You are tired of running your server in a Screen session.
|
||||
- You just want to access your server console using SSH.
|
||||
|
||||
## Configuration
|
||||
|
||||
- **listenAddress** - The network interface(s) SSHD should listen on. (Default all)
|
||||
- **port** - Specify the port SSHD should listen on. (Default 22)
|
||||
- **username/password** - The credentials used to log into the server console. (Default blank)
|
||||
|
||||
Note: By default, only public key authentication is enabled. This is the most secure authentication mode! Setting a username and password will make your server less secure.
|
||||
|
||||
## Setting Up Public Key Authentication
|
||||
|
||||
Setting up public key authentication with SSH requires first generating a public and private key pair and then installing just the public key on your Spigot server.
|
||||
|
||||
On Windows
|
||||
|
||||
1. TODO
|
||||
|
||||
On Linux/OS X
|
||||
|
||||
1. TODO
|
||||
|
||||
## Commands
|
||||
None - just install and go.
|
||||
|
||||
## Permissions
|
||||
|
||||
None - SSHD uses cryptographic certificates or a secure username and password to verify remote access.
|
||||
|
||||
## Source Code
|
||||
[Get the source on GitHub](https://github.com/Justasic/Spigot-SSHD "Source Code")
|
||||
|
||||
## Metrics
|
||||
|
||||
This plugin utilizes Hidendra's plugin metrics system. the following information is collected and sent to mcstats.org unless opted out:
|
||||
|
||||
- A unique identifier
|
||||
- The server's version of Java
|
||||
- Whether the server is in offline or online mode
|
||||
- Plugin's version
|
||||
- Server's version
|
||||
- OS version/name and architecture
|
||||
- core count for the CPU
|
||||
- Number of players online
|
||||
- Metrics version
|
||||
|
||||
Opting out of this service can be done by editing plugins/Plugin Metrics/config.yml and changing opt-out to true.
|
||||
|
||||
53
pom.xml
53
pom.xml
@@ -5,9 +5,14 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>com.ryanmichela</groupId>
|
||||
<artifactId>SSHD</artifactId>
|
||||
<version>1.3.4.1</version>
|
||||
<url>http://dev.bukkit.org/server-mods/sshd/</url>
|
||||
<artifactId>sshd</artifactId>
|
||||
<version>1.3.5</version>
|
||||
<url>https://github.com/Justasic/Bukkit-SSHD/</url>
|
||||
|
||||
<properties>
|
||||
<java.version>1.8</java.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
|
||||
<!-- Repositories -->
|
||||
<repositories>
|
||||
@@ -30,33 +35,59 @@
|
||||
<dependency>
|
||||
<groupId>org.bukkit</groupId>
|
||||
<artifactId>bukkit</artifactId>
|
||||
<version>1.12.2-R0.1-SNAPSHOT</version>
|
||||
<version>1.14.4-R0.1-SNAPSHOT</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.sshd</groupId>
|
||||
<artifactId>sshd-core</artifactId>
|
||||
<version>1.6.0</version>
|
||||
<version>2.3.0</version>
|
||||
<scope>compile</scope>
|
||||
<type>jar</type>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.sshd</groupId>
|
||||
<artifactId>sshd-mina</artifactId>
|
||||
<version>2.3.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.sshd</groupId>
|
||||
<artifactId>sshd-common</artifactId>
|
||||
<version>2.3.0</version>
|
||||
<scope>compile</scope>
|
||||
<type>jar</type>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.sshd</groupId>
|
||||
<artifactId>sshd-sftp</artifactId>
|
||||
<version>2.3.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>net.i2p.crypto</groupId>
|
||||
<artifactId>eddsa</artifactId>
|
||||
<version>0.3.0</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.apache.mina</groupId>
|
||||
<artifactId>mina-core</artifactId>
|
||||
<version>2.0.16</version>
|
||||
<version>2.1.3</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.25</version>
|
||||
<version>1.7.28</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-jdk14</artifactId>
|
||||
<version>1.7.25</version>
|
||||
<version>1.7.28</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
@@ -89,6 +120,8 @@
|
||||
|
||||
<!-- Build -->
|
||||
<build>
|
||||
<defaultGoal>clean package</defaultGoal>
|
||||
|
||||
<resources>
|
||||
<resource>
|
||||
<targetPath>.</targetPath>
|
||||
@@ -104,7 +137,7 @@
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<version>3.1.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
@@ -126,7 +159,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.5.1</version>
|
||||
<version>3.7.0</version>
|
||||
<configuration>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
|
||||
@@ -11,28 +11,36 @@ import java.util.Map;
|
||||
*/
|
||||
public class ConfigPasswordAuthenticator implements PasswordAuthenticator {
|
||||
|
||||
private Map<String, Integer> failCounts = new HashMap<String, Integer>();
|
||||
private Map<String, Integer> FailCounts = new HashMap<String, Integer>();
|
||||
|
||||
@Override
|
||||
public boolean authenticate(String username, String password, ServerSession serverSession) {
|
||||
if (SshdPlugin.instance.getConfig().getString("credentials." + username).equals(password)) {
|
||||
failCounts.put(username, 0);
|
||||
public boolean authenticate(String username, String password, ServerSession ss)
|
||||
{
|
||||
if (SshdPlugin.instance.getConfig().getString("Credentials." + username).equals(password))
|
||||
{
|
||||
FailCounts.put(username, 0);
|
||||
return true;
|
||||
}
|
||||
SshdPlugin.instance.getLogger().info("Failed login for " + username + " using password authentication.");
|
||||
|
||||
try {
|
||||
Integer tries = SshdPlugin.instance.getConfig().getInt("LoginRetries");
|
||||
|
||||
try
|
||||
{
|
||||
Thread.sleep(3000);
|
||||
if (failCounts.containsKey(username)) {
|
||||
failCounts.put(username, failCounts.get(username) + 1);
|
||||
} else {
|
||||
failCounts.put(username, 1);
|
||||
if (this.FailCounts.containsKey(username))
|
||||
this.FailCounts.put(username, this.FailCounts.get(username) + 1);
|
||||
else
|
||||
this.FailCounts.put(username, 1);
|
||||
|
||||
if (this.FailCounts.get(username) >= tries)
|
||||
{
|
||||
this.FailCounts.put(username, 0);
|
||||
ss.close(true);
|
||||
}
|
||||
if (failCounts.get(username) >= 3) {
|
||||
failCounts.put(username, 0);
|
||||
serverSession.close(true);
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
catch (InterruptedException e)
|
||||
{
|
||||
// do nothing
|
||||
}
|
||||
return false;
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
package com.ryanmichela.sshd;
|
||||
|
||||
import org.apache.sshd.server.Command;
|
||||
import org.apache.sshd.server.CommandFactory;
|
||||
import org.apache.sshd.server.command.Command;
|
||||
import org.apache.sshd.server.command.CommandFactory;
|
||||
import org.apache.sshd.server.channel.ChannelSession;
|
||||
import org.apache.sshd.server.Environment;
|
||||
import org.apache.sshd.server.ExitCallback;
|
||||
import org.bukkit.Bukkit;
|
||||
@@ -16,7 +17,7 @@ import java.io.OutputStream;
|
||||
public class ConsoleCommandFactory implements CommandFactory {
|
||||
|
||||
@Override
|
||||
public Command createCommand(String command) {
|
||||
public Command createCommand(ChannelSession cs, String command) {
|
||||
return new ConsoleCommand(command);
|
||||
}
|
||||
|
||||
@@ -50,7 +51,7 @@ public class ConsoleCommandFactory implements CommandFactory {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void start(Environment environment) throws IOException {
|
||||
public void start(ChannelSession cs, Environment environment) throws IOException {
|
||||
try {
|
||||
SshdPlugin.instance.getLogger()
|
||||
.info("[U: " + environment.getEnv().get(Environment.ENV_USER) + "] " + command);
|
||||
@@ -63,8 +64,6 @@ public class ConsoleCommandFactory implements CommandFactory {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void destroy() {
|
||||
|
||||
}
|
||||
public void destroy(ChannelSession cn) {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,11 +18,55 @@ import java.util.logging.LogRecord;
|
||||
public class ConsoleLogFormatter extends Formatter {
|
||||
|
||||
private SimpleDateFormat dateFormat;
|
||||
private static final Map<ChatColor, String> replacements = new EnumMap<ChatColor, String>(ChatColor.class);
|
||||
|
||||
public ConsoleLogFormatter() {
|
||||
this.dateFormat = new SimpleDateFormat("HH:mm:ss");
|
||||
}
|
||||
|
||||
public static String ColorizeString(String str)
|
||||
{
|
||||
// ORIGINAL CODE FROM org.bukkit.craftbukkit.command.ColouredConsoleSender
|
||||
|
||||
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 = str;
|
||||
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();
|
||||
return result;
|
||||
}
|
||||
|
||||
public String format(LogRecord logrecord) {
|
||||
try {
|
||||
Class.forName("org.bukkit.craftbukkit.command.ColouredConsoleSender");
|
||||
@@ -50,51 +94,9 @@ 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();
|
||||
private void colorize(LogRecord logrecord)
|
||||
{
|
||||
String result = ColorizeString(logrecord.getMessage());
|
||||
logrecord.setMessage(result);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,21 @@
|
||||
package com.ryanmichela.sshd;
|
||||
|
||||
import com.ryanmichela.sshd.ConsoleCommandCompleter;
|
||||
import com.ryanmichela.sshd.ConsoleLogFormatter;
|
||||
import com.ryanmichela.sshd.FlushyOutputStream;
|
||||
import com.ryanmichela.sshd.FlushyStreamHandler;
|
||||
import com.ryanmichela.sshd.SshTerminal;
|
||||
import com.ryanmichela.sshd.SshdPlugin;
|
||||
import com.ryanmichela.sshd.StreamHandlerAppender;
|
||||
import com.ryanmichela.sshd.implementations.SSHDCommandSender;
|
||||
import com.ryanmichela.sshd.ConsoleLogFormatter;
|
||||
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.server.Command;
|
||||
import org.apache.sshd.server.shell.ShellFactory;
|
||||
import org.apache.sshd.server.command.Command;
|
||||
import org.apache.sshd.server.channel.ChannelSession;
|
||||
import org.apache.sshd.server.Environment;
|
||||
import org.apache.sshd.server.ExitCallback;
|
||||
import org.bukkit.Bukkit;
|
||||
@@ -13,22 +23,17 @@ import org.bukkit.Bukkit;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.net.InetAddress;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.StreamHandler;
|
||||
|
||||
public class ConsoleShellFactory implements Factory<Command> {
|
||||
public class ConsoleShellFactory implements ShellFactory {
|
||||
|
||||
static SSHDCommandSender sshdCommandSender = new SSHDCommandSender();
|
||||
|
||||
public Command get() {
|
||||
return this.create();
|
||||
}
|
||||
|
||||
public Command create() {
|
||||
public Command createShell(ChannelSession cs) {
|
||||
return new ConsoleShell();
|
||||
}
|
||||
|
||||
public static class ConsoleShell implements Command, Runnable {
|
||||
public class ConsoleShell implements Command, Runnable {
|
||||
|
||||
private InputStream in;
|
||||
private OutputStream out;
|
||||
@@ -36,9 +41,11 @@ public class ConsoleShellFactory implements Factory<Command> {
|
||||
private ExitCallback callback;
|
||||
private Environment environment;
|
||||
private Thread thread;
|
||||
private String Username;
|
||||
|
||||
StreamHandlerAppender streamHandlerAppender;
|
||||
public static ConsoleReader consoleReader;
|
||||
public ConsoleReader ConsoleReader;
|
||||
public SSHDCommandSender SshdCommandSender;
|
||||
|
||||
public InputStream getIn() {
|
||||
return in;
|
||||
@@ -72,69 +79,104 @@ public class ConsoleShellFactory implements Factory<Command> {
|
||||
this.callback = callback;
|
||||
}
|
||||
|
||||
public void start(Environment env) throws IOException {
|
||||
try {
|
||||
consoleReader = new ConsoleReader(in, new FlushyOutputStream(out), new SshTerminal());
|
||||
consoleReader.setExpandEvents(true);
|
||||
consoleReader.addCompleter(new ConsoleCommandCompleter());
|
||||
@Override
|
||||
public void start(ChannelSession cs, Environment env) throws IOException
|
||||
{
|
||||
try
|
||||
{
|
||||
this.ConsoleReader = new ConsoleReader(in, new FlushyOutputStream(out), new SshTerminal());
|
||||
this.ConsoleReader.setExpandEvents(true);
|
||||
this.ConsoleReader.addCompleter(new ConsoleCommandCompleter());
|
||||
|
||||
StreamHandler streamHandler = new FlushyStreamHandler(out, new ConsoleLogFormatter(), consoleReader);
|
||||
StreamHandler streamHandler = new FlushyStreamHandler(out, new ConsoleLogFormatter(), this.ConsoleReader);
|
||||
streamHandlerAppender = new StreamHandlerAppender(streamHandler);
|
||||
|
||||
((Logger) LogManager.getRootLogger()).addAppender(streamHandlerAppender);
|
||||
((Logger)LogManager.getRootLogger()).addAppender(streamHandlerAppender);
|
||||
|
||||
environment = env;
|
||||
thread = new Thread(this, "SSHD ConsoleShell " + env.getEnv().get(Environment.ENV_USER));
|
||||
this.environment = env;
|
||||
this.Username = env.getEnv().get(Environment.ENV_USER);
|
||||
this.SshdCommandSender = new SSHDCommandSender();
|
||||
this.SshdCommandSender.console = this;
|
||||
thread = new Thread(this, "SSHD ConsoleShell " + this.Username);
|
||||
thread.start();
|
||||
} catch (Exception e) {
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw new IOException("Error starting shell", e);
|
||||
}
|
||||
}
|
||||
|
||||
public void destroy() {
|
||||
((Logger) LogManager.getRootLogger()).removeAppender(streamHandlerAppender);
|
||||
@Override
|
||||
public void destroy(ChannelSession cs) { ((Logger)LogManager.getRootLogger()).removeAppender(streamHandlerAppender); }
|
||||
|
||||
public void run()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!SshdPlugin.instance.getConfig().getString("Mode").equals("RPC"))
|
||||
printPreamble(this.ConsoleReader);
|
||||
while (true)
|
||||
{
|
||||
String command = this.ConsoleReader.readLine("\r>", null);
|
||||
// The user sent CTRL+D to close the shell, terminate the session.
|
||||
if (command == null)
|
||||
break;
|
||||
// Skip someone spamming enter
|
||||
if (command.trim().isEmpty())
|
||||
continue;
|
||||
// User wants to exit
|
||||
if (command.equals("exit") || command.equals("quit"))
|
||||
break;
|
||||
// Clear the text from the screen (on supported terminals)
|
||||
if (command.equals("cls"))
|
||||
{
|
||||
this.ConsoleReader.clearScreen();
|
||||
continue;
|
||||
}
|
||||
|
||||
public void run() {
|
||||
try {
|
||||
if (!SshdPlugin.instance.getConfig().getString("mode").equals("RPC"))
|
||||
printPreamble(consoleReader);
|
||||
while (true) {
|
||||
String command = consoleReader.readLine("\r>", null);
|
||||
if (command == null) continue;
|
||||
if (command.equals("exit") || command.equals("quit")) break;
|
||||
Bukkit.getScheduler().runTask(SshdPlugin.instance, () -> {
|
||||
if (SshdPlugin.instance.getConfig().getString("mode").equals("RPC") &&
|
||||
command.startsWith("rpc")) {
|
||||
//NO ECHO NO PREAMBLE AND SHIT
|
||||
Bukkit.getScheduler().runTask(
|
||||
SshdPlugin.instance, () ->
|
||||
{
|
||||
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(this.SshdCommandSender, cmd);
|
||||
}
|
||||
else
|
||||
{
|
||||
SshdPlugin.instance.getLogger().info("<" + this.Username + "> " + command);
|
||||
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
|
||||
}
|
||||
});
|
||||
}
|
||||
} catch (IOException e) {
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
SshdPlugin.instance.getLogger().log(Level.SEVERE, "Error processing command from SSH", e);
|
||||
} finally {
|
||||
}
|
||||
finally
|
||||
{
|
||||
SshdPlugin.instance.getLogger().log(Level.INFO, this.Username + " disconnected from SSH.");
|
||||
callback.onExit(0);
|
||||
}
|
||||
}
|
||||
|
||||
private void printPreamble(ConsoleReader consoleReader) throws IOException {
|
||||
consoleReader.println(" _____ _____ _ _ _____" + "\r");
|
||||
consoleReader.println(" / ____/ ____| | | | __ \\" + "\r");
|
||||
consoleReader.println("| (___| (___ | |__| | | | |" + "\r");
|
||||
consoleReader.println(" \\___ \\\\___ \\| __ | | | |" + "\r");
|
||||
consoleReader.println(" ____) |___) | | | | |__| |" + "\r");
|
||||
consoleReader.println("|_____/_____/|_| |_|_____/" + "\r");
|
||||
consoleReader.println("Connected to: " + Bukkit.getServer().getName() + "\r");
|
||||
consoleReader.println("- " + Bukkit.getServer().getMotd() + "\r");
|
||||
consoleReader.println("\r");
|
||||
consoleReader.println("Type 'exit' to exit the shell." + "\r");
|
||||
consoleReader.println("===============================================" + "\r");
|
||||
private void printPreamble(ConsoleReader cr) throws IOException
|
||||
{
|
||||
cr.println(" _____ _____ _ _ _____" + "\r");
|
||||
cr.println(" / ____/ ____| | | | __ \\" + "\r");
|
||||
cr.println("| (___| (___ | |__| | | | |" + "\r");
|
||||
cr.println(" \\___ \\\\___ \\| __ | | | |" + "\r");
|
||||
cr.println(" ____) |___) | | | | |__| |" + "\r");
|
||||
cr.println("|_____/_____/|_| |_|_____/" + "\r");
|
||||
// Doesn't really guarantee our actual system hostname but
|
||||
// it's better than not having one at all.
|
||||
cr.println("Connected to: " + InetAddress.getLocalHost().getHostName() + " (" + Bukkit.getServer().getName() + ")\r");
|
||||
cr.println(ConsoleLogFormatter.ColorizeString(Bukkit.getServer().getMotd()) + "\r");
|
||||
cr.println("\r");
|
||||
cr.println("Type 'exit' to exit the shell." + "\r");
|
||||
cr.println("===============================================" + "\r");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,98 +0,0 @@
|
||||
package com.ryanmichela.sshd;
|
||||
|
||||
import org.apache.commons.codec.binary.Base64;
|
||||
|
||||
import java.io.Reader;
|
||||
import java.math.BigInteger;
|
||||
import java.security.KeyFactory;
|
||||
import java.security.PublicKey;
|
||||
import java.security.spec.DSAPublicKeySpec;
|
||||
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:";
|
||||
|
||||
public PemDecoder(Reader in) {
|
||||
super(in);
|
||||
}
|
||||
|
||||
public PublicKey getPemBytes() throws Exception {
|
||||
StringBuilder b64 = new StringBuilder();
|
||||
|
||||
String line = readLine();
|
||||
if (!line.matches(BEGIN)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
for (line = readLine(); line != null; line = readLine()) {
|
||||
if (!line.matches(END) && !line.startsWith(COMMENT)) {
|
||||
b64.append(line.trim());
|
||||
}
|
||||
}
|
||||
|
||||
return decodePublicKey(b64.toString());
|
||||
}
|
||||
|
||||
private byte[] bytes;
|
||||
private int pos;
|
||||
|
||||
private PublicKey decodePublicKey(String keyLine) throws Exception {
|
||||
bytes = null;
|
||||
pos = 0;
|
||||
|
||||
// look for the Base64 encoded part of the line to decode
|
||||
// both ssh-rsa and ssh-dss begin with "AAAA" due to the length bytes
|
||||
for (String part : keyLine.split(" ")) {
|
||||
if (part.startsWith("AAAA")) {
|
||||
bytes = Base64.decodeBase64(part.getBytes());
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (bytes == null) {
|
||||
throw new IllegalArgumentException("no Base64 part to decode");
|
||||
}
|
||||
|
||||
String type = decodeType();
|
||||
if (type.equals("ssh-rsa")) {
|
||||
BigInteger e = decodeBigInt();
|
||||
BigInteger m = decodeBigInt();
|
||||
RSAPublicKeySpec spec = new RSAPublicKeySpec(m, e);
|
||||
return KeyFactory.getInstance("RSA").generatePublic(spec);
|
||||
} else if (type.equals("ssh-dss")) {
|
||||
BigInteger p = decodeBigInt();
|
||||
BigInteger q = decodeBigInt();
|
||||
BigInteger g = decodeBigInt();
|
||||
BigInteger y = decodeBigInt();
|
||||
DSAPublicKeySpec spec = new DSAPublicKeySpec(y, p, q, g);
|
||||
return KeyFactory.getInstance("DSA").generatePublic(spec);
|
||||
} else {
|
||||
throw new IllegalArgumentException("unknown type " + type);
|
||||
}
|
||||
}
|
||||
|
||||
private String decodeType() {
|
||||
int len = decodeInt();
|
||||
String type = new String(bytes, pos, len);
|
||||
pos += len;
|
||||
return type;
|
||||
}
|
||||
|
||||
private int decodeInt() {
|
||||
return ((bytes[pos++] & 0xFF) << 24) | ((bytes[pos++] & 0xFF) << 16)
|
||||
| ((bytes[pos++] & 0xFF) << 8) | (bytes[pos++] & 0xFF);
|
||||
}
|
||||
|
||||
private BigInteger decodeBigInt() {
|
||||
int len = decodeInt();
|
||||
byte[] bigIntBytes = new byte[len];
|
||||
System.arraycopy(bytes, pos, bigIntBytes, 0, len);
|
||||
pos += len;
|
||||
return new BigInteger(bigIntBytes);
|
||||
}
|
||||
}
|
||||
@@ -1,52 +1,80 @@
|
||||
package com.ryanmichela.sshd;
|
||||
|
||||
import org.apache.commons.lang.ArrayUtils;
|
||||
import org.apache.sshd.common.config.keys.AuthorizedKeyEntry;
|
||||
import org.apache.sshd.common.config.keys.PublicKeyEntryResolver;
|
||||
import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
|
||||
import org.apache.sshd.server.session.ServerSession;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.List;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.io.FileReader;
|
||||
import java.security.PublicKey;
|
||||
|
||||
/**
|
||||
* Copyright 2013 Ryan Michela
|
||||
*/
|
||||
public class PublicKeyAuthenticator implements PublickeyAuthenticator {
|
||||
|
||||
public class PublicKeyAuthenticator implements PublickeyAuthenticator
|
||||
{
|
||||
private File authorizedKeysDir;
|
||||
private Map<String, Integer> FailCounts = new HashMap<String, Integer>();
|
||||
|
||||
public PublicKeyAuthenticator(File authorizedKeysDir) {
|
||||
this.authorizedKeysDir = authorizedKeysDir;
|
||||
}
|
||||
public PublicKeyAuthenticator(File authorizedKeysDir) { this.authorizedKeysDir = authorizedKeysDir; }
|
||||
|
||||
@Override
|
||||
public boolean authenticate(String username, PublicKey key, ServerSession session) {
|
||||
@Override public boolean authenticate(String username, PublicKey key, ServerSession session)
|
||||
{
|
||||
byte[] keyBytes = key.getEncoded();
|
||||
File keyFile = new File(authorizedKeysDir, username);
|
||||
Integer tries = SshdPlugin.instance.getConfig().getInt("LoginRetries");
|
||||
|
||||
if (keyFile.exists()) {
|
||||
try {
|
||||
if (keyFile.exists())
|
||||
{
|
||||
try
|
||||
{
|
||||
// Read all the public key entries
|
||||
List<AuthorizedKeyEntry> pklist = AuthorizedKeyEntry.readAuthorizedKeys(keyFile.toPath());
|
||||
// Get an authenticator
|
||||
PublickeyAuthenticator auth = PublickeyAuthenticator.fromAuthorizedEntries(username, session, pklist,
|
||||
PublicKeyEntryResolver.IGNORING);
|
||||
|
||||
FileReader fr = new FileReader(keyFile);
|
||||
PemDecoder pd = new PemDecoder(fr);
|
||||
PublicKey k = pd.getPemBytes();
|
||||
pd.close();
|
||||
|
||||
if (k != null) {
|
||||
if (ArrayUtils.isEquals(key.getEncoded(), k.getEncoded())) {
|
||||
// Validate that the logging in user has the same valid SSH key
|
||||
if (auth.authenticate(username, key, session))
|
||||
{
|
||||
FailCounts.put(username, 0);
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
SshdPlugin.instance.getLogger().severe("Failed to parse PEM file. " + keyFile.getAbsolutePath());
|
||||
else
|
||||
{
|
||||
SshdPlugin.instance.getLogger().info(
|
||||
username + " failed authentication via SSH session using key file " + keyFile.getAbsolutePath());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
SshdPlugin.instance.getLogger()
|
||||
.severe("Failed to process public key " + keyFile.getAbsolutePath() + ". " + e.getMessage());
|
||||
|
||||
// If the user fails with several SSH keys, then terminate the connection.
|
||||
if (this.FailCounts.containsKey(username))
|
||||
this.FailCounts.put(username, this.FailCounts.get(username) + 1);
|
||||
else
|
||||
this.FailCounts.put(username, 1);
|
||||
|
||||
if (this.FailCounts.get(username) >= tries)
|
||||
{
|
||||
this.FailCounts.put(username, 0);
|
||||
session.close(true);
|
||||
}
|
||||
} 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.");
|
||||
|
||||
return false;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
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.");
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
@@ -6,6 +6,8 @@ import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
|
||||
import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
import com.ryanmichela.sshd.ConsoleShellFactory;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.FileSystems;
|
||||
@@ -15,16 +17,19 @@ import java.util.logging.Level;
|
||||
/**
|
||||
* Copyright 2013 Ryan Michela
|
||||
*/
|
||||
public class SshdPlugin extends JavaPlugin {
|
||||
public
|
||||
class SshdPlugin extends JavaPlugin
|
||||
{
|
||||
|
||||
private SshServer sshd;
|
||||
public static SshdPlugin instance;
|
||||
|
||||
@Override
|
||||
public void onLoad() {
|
||||
@Override public void onLoad()
|
||||
{
|
||||
saveDefaultConfig();
|
||||
File authorizedKeys = new File(getDataFolder(), "authorized_keys");
|
||||
if (!authorizedKeys.exists()) {
|
||||
if (!authorizedKeys.exists())
|
||||
{
|
||||
authorizedKeys.mkdirs();
|
||||
}
|
||||
|
||||
@@ -34,45 +39,49 @@ public class SshdPlugin extends JavaPlugin {
|
||||
getLogger().setLevel(Level.INFO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
@Override public void onEnable()
|
||||
{
|
||||
instance = this;
|
||||
|
||||
sshd = SshServer.setUpDefaultServer();
|
||||
sshd.setPort(getConfig().getInt("port", 22));
|
||||
String host = getConfig().getString("listenAddress", "all");
|
||||
sshd.setPort(getConfig().getInt("Port", 1025));
|
||||
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.toPath()));
|
||||
sshd.setShellFactory(new ConsoleShellFactory());
|
||||
sshd.setPasswordAuthenticator(new ConfigPasswordAuthenticator());
|
||||
sshd.setPublickeyAuthenticator(new PublicKeyAuthenticator(authorizedKeys));
|
||||
|
||||
if (getConfig().getBoolean("enableSFTP")) {
|
||||
if (getConfig().getBoolean("EnableSFTP"))
|
||||
{
|
||||
sshd.setSubsystemFactories(Collections.singletonList(new SftpSubsystemFactory()));
|
||||
sshd.setFileSystemFactory(new VirtualFileSystemFactory(
|
||||
FileSystems.getDefault().getPath(
|
||||
getDataFolder().getAbsolutePath()
|
||||
).getParent().getParent()
|
||||
));
|
||||
sshd.setFileSystemFactory(
|
||||
new VirtualFileSystemFactory(FileSystems.getDefault().getPath(getDataFolder().getAbsolutePath()).getParent().getParent()));
|
||||
}
|
||||
|
||||
sshd.setCommandFactory(new ConsoleCommandFactory());
|
||||
try {
|
||||
try
|
||||
{
|
||||
sshd.start();
|
||||
} catch (IOException e) {
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
getLogger().log(Level.SEVERE, "Failed to start SSH server! ", e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
try {
|
||||
@Override public void onDisable()
|
||||
{
|
||||
try
|
||||
{
|
||||
sshd.stop();
|
||||
} catch (Exception e) {
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
// do nothing
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ryanmichela.sshd.implementations;
|
||||
|
||||
import com.ryanmichela.sshd.ConsoleShellFactory;
|
||||
import com.ryanmichela.sshd.SshdPlugin;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
@@ -16,6 +15,8 @@ import org.bukkit.permissions.PermissionAttachment;
|
||||
import org.bukkit.permissions.PermissionAttachmentInfo;
|
||||
import org.bukkit.plugin.Plugin;
|
||||
|
||||
import com.ryanmichela.sshd.ConsoleShellFactory;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.Set;
|
||||
@@ -25,16 +26,24 @@ public class SSHDCommandSender implements ConsoleCommandSender, CommandSender {
|
||||
|
||||
private final PermissibleBase perm = new PermissibleBase(this);
|
||||
private final SSHDConversationTracker conversationTracker = new SSHDConversationTracker();
|
||||
// Set by the upstream allocating function
|
||||
public ConsoleShellFactory.ConsoleShell console;
|
||||
|
||||
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) {
|
||||
public void sendRawMessage(String message)
|
||||
{
|
||||
// What the fuck does this code even do? Are we sending to one client or all of them?
|
||||
if (this.console.ConsoleReader == null)
|
||||
return;
|
||||
try
|
||||
{
|
||||
this.console.ConsoleReader.println(ChatColor.stripColor(message));
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
SshdPlugin.instance.getLogger().log(Level.SEVERE, "Error sending message to SSHDCommandSender", e);
|
||||
}
|
||||
}
|
||||
@@ -44,7 +53,7 @@ public class SSHDCommandSender implements ConsoleCommandSender, CommandSender {
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return "SSHD CONSOLE";
|
||||
return "SSHD Console";
|
||||
}
|
||||
|
||||
public boolean isOp() {
|
||||
|
||||
@@ -1,22 +1,35 @@
|
||||
# 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
|
||||
ListenAddress: all
|
||||
# The port the SSH server will listen on. Note that anything above 1024 will require you to run
|
||||
# the whole minecraft server with elevated privileges, this is not recommended and you should
|
||||
# use iptables to route packets from a lower port.
|
||||
Port: 1025
|
||||
|
||||
# Operational mode. Don't touch if you don't know what you're doing. Can be either DEFAULT or RPC
|
||||
mode: DEFAULT
|
||||
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
|
||||
EnableSFTP: true
|
||||
|
||||
# Number of times a person can fail to use an SSH key or enter a password
|
||||
# before it terminates the connection.
|
||||
LoginRetries: 3
|
||||
|
||||
# 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
|
||||
# name (no file extension).
|
||||
# To authorize a user to login with their public key, install their key using the
|
||||
# OpenSSH authorized_keys file format in the authorized_users directory. Name the key
|
||||
# file with the user's username and no extension. Note: If you want to let a user have
|
||||
# many keys, you can append the keys to their file in authorized_users.
|
||||
|
||||
# For less secure username and password based authentication, complete the sections below.
|
||||
credentials:
|
||||
|
||||
# Type of hashing to use for the passwords below.
|
||||
# Options are: PLAIN (insecure), bcrypt, pbkdf, sha256
|
||||
PasswordType: bcrypt
|
||||
|
||||
# Associate each username with a password hash (or the password if the PasswordType is set to PLAIN)
|
||||
Credentials:
|
||||
# user1: password1
|
||||
# user2: password2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
name: SSHD
|
||||
version: ${project.version}
|
||||
author: Ryan Michela, Haarolean, toxuin
|
||||
author: Ryan Michela, Haarolean, toxuin, Justin Crawford
|
||||
main: com.ryanmichela.sshd.SshdPlugin
|
||||
Reference in New Issue
Block a user