Limework/Minecraft-SSHD
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Attempted fix for 1.12.

Browse Source
This commit is contained in:
Haarolean
2017-11-13 04:02:19 +03:00
parent 956f0cc3ef
commit f034cef465
7 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ryanmichela/sshd/ConfigPasswordAuthenticator.java
View File

@@ -1,6 +1,6 @@
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 java.util.HashMap;

2
src/main/java/com/ryanmichela/sshd/PemDecoder.java
View File

@@ -1,6 +1,6 @@
package com.ryanmichela.sshd;
import org.apache.mina.util.Base64;
import org.apache.commons.codec.binary.Base64;
import java.io.Reader;
import java.math.BigInteger;

2
src/main/java/com/ryanmichela/sshd/PublicKeyAuthenticator.java
View File

@@ -1,7 +1,7 @@
package com.ryanmichela.sshd;
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 java.io.File;

4
src/main/java/com/ryanmichela/sshd/SshdPlugin.java
View File

@@ -1,6 +1,6 @@
package com.ryanmichela.sshd;
import org.apache.sshd.SshServer;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
import org.bukkit.plugin.java.JavaPlugin;
@@ -41,7 +41,7 @@ public class SshdPlugin extends JavaPlugin {
File hostKey = new File(getDataFolder(), "hostkey");
File authorizedKeys = new File(getDataFolder(), "authorized_keys");
sshd.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(hostKey.getPath()));
sshd.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(hostKey));
sshd.setShellFactory(new ConsoleShellFactory());
sshd.setPasswordAuthenticator(new ConfigPasswordAuthenticator());
sshd.setPublickeyAuthenticator(new PublicKeyAuthenticator(authorizedKeys));

34
src/main/java/com/ryanmichela/sshd/StreamHandlerAppender.java
View File

@@ -25,15 +25,18 @@ public class StreamHandlerAppender implements Appender {
@Override
public void append(LogEvent logEvent) {
java.util.logging.Level level;
switch (logEvent.getLevel())
{
case DEBUG: level = java.util.logging.Level.FINE; break;
case INFO: level = java.util.logging.Level.INFO; break;
case WARN: level = java.util.logging.Level.WARNING; break;
case ERROR: level = java.util.logging.Level.SEVERE; break;
default: level = java.util.logging.Level.INFO; break;
}
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();
@@ -66,6 +69,16 @@ public class StreamHandlerAppender implements Appender {
}
@Override
public State getState() {
return null; // TODO: Generated method stub
}
@Override
public void initialize() {
// TODO: Generated method stub
}
@Override
public void start() {
@@ -80,4 +93,9 @@ public class StreamHandlerAppender implements Appender {
public boolean isStarted() {
return true;
}
@Override
public boolean isStopped() {
return false; // TODO: Generated method stub
}
}

2
src/main/java/org/slf4j/impl/PluginSlf4jFactory.java
View File

@@ -32,12 +32,14 @@ public class PluginSlf4jFactory implements ILoggerFactory {
if (SshdPlugin.instance != null && isEnabled(level)) {
FormattingTuple ft = MessageFormatter.arrayFormat(s, objects);
SshdPlugin.instance.getLogger().log(level, ft.getMessage(), ft.getThrowable());
SshdPlugin.instance.getLogger().log(level, s, Thread.currentThread().getStackTrace());
}
}
private void log(Level level, String s, Throwable throwable) {
if (SshdPlugin.instance != null && isEnabled(level)) {
SshdPlugin.instance.getLogger().log(level, s, throwable);
SshdPlugin.instance.getLogger().log(level, s, Thread.currentThread().getStackTrace());
}
}