From 5bb76109326829a821fd99deb8a40c196573a8bb Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Tue, 16 Mar 2021 20:31:23 +0100
Subject: [RemoteExec/RemoteReboot] switch to fork of JSch to support more key
formats
---
pom.xml | 14 ++------------
.../java/org/openslx/taskmanager/tasks/RemoteExec.java | 13 -------------
.../java/org/openslx/taskmanager/tasks/RemoteReboot.java | 15 ---------------
3 files changed, 2 insertions(+), 40 deletions(-)
diff --git a/pom.xml b/pom.xml
index b128597..6ad1853 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,24 +111,14 @@
compile
- com.jcraft
+ com.github.mwiede
jsch
- 0.1.54
+ 0.1.62
org.schwering
irclib
2.0.0.Alpha3
-
- com.sshtools
- maverick-synergy-client
- 3.0.0-RC3
-
-
- com.sshtools
- maverick-bc
- 3.0.0-RC3
-
diff --git a/src/main/java/org/openslx/taskmanager/tasks/RemoteExec.java b/src/main/java/org/openslx/taskmanager/tasks/RemoteExec.java
index 8e88599..3bd0954 100644
--- a/src/main/java/org/openslx/taskmanager/tasks/RemoteExec.java
+++ b/src/main/java/org/openslx/taskmanager/tasks/RemoteExec.java
@@ -9,10 +9,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import com.sshtools.common.publickey.InvalidPassphraseException;
-import com.sshtools.common.publickey.SshKeyUtils;
-import com.sshtools.common.publickey.bc.OpenSSHPrivateKeyFileBC;
-import com.sshtools.common.ssh.components.SshKeyPair;
import org.openslx.satserver.util.Util;
import org.openslx.taskmanager.api.AbstractTask;
@@ -81,15 +77,6 @@ public class RemoteExec extends AbstractTask
if ( status.error != null )
return false;
- // Convert ssh key to old rsa format supported by JSch
- try {
- SshKeyPair key = SshKeyUtils.getPrivateKey(sshkey, "");
- sshkey = new String(new OpenSSHPrivateKeyFileBC(key, "").getFormattedKey(),
- StandardCharsets.UTF_8);
- } catch (IOException | InvalidPassphraseException e) {
- e.printStackTrace();
- }
-
JSch.setConfig( "StrictHostKeyChecking", "no" );
sshClient = new JSch();
try {
diff --git a/src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java b/src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java
index 1913891..2776732 100644
--- a/src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java
+++ b/src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java
@@ -1,9 +1,7 @@
package org.openslx.taskmanager.tasks;
-import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Socket;
-import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -15,10 +13,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import com.sshtools.common.publickey.InvalidPassphraseException;
-import com.sshtools.common.publickey.SshKeyUtils;
-import com.sshtools.common.publickey.bc.OpenSSHPrivateKeyFileBC;
-import com.sshtools.common.ssh.components.SshKeyPair;
import org.openslx.taskmanager.api.AbstractTask;
import com.google.gson.annotations.Expose;
@@ -87,15 +81,6 @@ public class RemoteReboot extends AbstractTask
if ( status.error != null )
return false;
- // Convert ssh key to old rsa format supported by JSch
- try {
- SshKeyPair key = SshKeyUtils.getPrivateKey(sshkey, "");
- sshkey = new String(new OpenSSHPrivateKeyFileBC(key, "").getFormattedKey(),
- StandardCharsets.UTF_8);
- } catch (IOException | InvalidPassphraseException e) {
- e.printStackTrace();
- }
-
Date shutdownTime = new Date( System.currentTimeMillis() + minutes * 60 * 1000 );
SimpleDateFormat sdf = new SimpleDateFormat( "HH:mm" );
status.time = sdf.format( shutdownTime );
--
cgit v1.2.3-55-g7522