Enable OpenSSH key handling (#12)

tilln · May 27, 2021 · 0117559 · 0117559
1 parent 452207f
commit 0117559
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>nz.co.breakpoint.jmeter</groupId>
     <artifactId>jmeter-sshmon</artifactId>
     <packaging>jar</packaging>
-    <version>1.3</version>
+    <version>1.4-SNAPSHOT</version>
     <name>jmeter-sshmon</name>
 
     <properties>

diff --git a/src/main/java/nz/co/breakpoint/jmeter/vizualizers/sshmon/KeyHelper.java b/src/main/java/nz/co/breakpoint/jmeter/vizualizers/sshmon/KeyHelper.java
@@ -4,15 +4,15 @@
 import org.apache.log.Logger;
 import org.apache.sshd.common.NamedResource;
 import org.apache.sshd.common.config.keys.FilePasswordProvider;
-import org.apache.sshd.common.config.keys.loader.pem.PEMResourceParserUtils;
+import org.apache.sshd.common.config.keys.loader.KeyPairResourceParser;
+import org.apache.sshd.common.util.security.SecurityUtils;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.KeyPair;
 
 import java.util.Arrays;
 import java.util.List;
 
-// TODO unit tests
 public class KeyHelper {
 
     private static final Logger log = LoggingManager.getLoggerForClass();
@@ -21,9 +21,10 @@ public static KeyPair toKeyPair(String privateKey, String password) throws IOExc
         final NamedResource dummy = NamedResource.ofName("");
         final List<String> lines = Arrays.asList(privateKey.split("\n"));
         log.debug("Extracting key pair from ["+lines+"]");
+        KeyPairResourceParser parser = SecurityUtils.getKeyPairResourceParser();
         try {
-            if (PEMResourceParserUtils.PROXY.canExtractKeyPairs(dummy, lines)) {
-                return PEMResourceParserUtils.PROXY.loadKeyPairs(null, dummy, FilePasswordProvider.of(password), lines).iterator().next();
+            if (parser.canExtractKeyPairs(dummy, lines)) {
+                return parser.loadKeyPairs(null, dummy, FilePasswordProvider.of(password), lines).iterator().next();
             }
             log.error("Unsupported private key format '"+privateKey+"'");
         } catch (GeneralSecurityException e) {

diff --git a/src/test/java/nz/co/breakpoint/jmeter/vizualizers/sshmon/KeyHelperTest.java b/src/test/java/nz/co/breakpoint/jmeter/vizualizers/sshmon/KeyHelperTest.java
@@ -0,0 +1,25 @@
+package nz.co.breakpoint.jmeter.vizualizers.sshmon;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import static org.junit.Assert.assertNotNull;
+
+public class KeyHelperTest {
+
+    String getFileContent(String filename) throws IOException {
+        return new String(Files.readAllBytes(Paths.get(filename)));
+    }
+
+    @Test
+    public void testRSAFormat() throws IOException {
+        assertNotNull(KeyHelper.toKeyPair(getFileContent("src/test/resources/hostkey.key"), ""));
+    }
+
+    @Test
+    public void testOpenSSHFormat() throws IOException {
+        assertNotNull(KeyHelper.toKeyPair(getFileContent("src/test/resources/openssh.key"), "changeit"));
+    }
+}
diff --git a/src/test/resources/openssh.key b/src/test/resources/openssh.key
@@ -0,0 +1,30 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABAF
+8MNkEz3tA1ftREnfVbmIAAAAEAAAAAEAAAEVAAAAB3NzaC1yc2EAAAABJQAAAQEA
+7/W6vTosOxnm7K5hriPosl4JlSx1fwcMCg+0FaBuWroTzdPEcgDwDVlzKNldd2V9
+CNt9yxVR4wOqJAJsP3cPMH75ndz3Nli35vvWYzi/9Ub98tuA532TOozmtkHE24dP
+fD0sJ2v2GkXNeORPAhYxhMYHCDDYcIWGguYH324whbF0m5X6j1u2IaJumwRBLkYm
+9zSjOfv85lYnMDyzsW2FN3W4g00tgYVXw2OtUy9MC7dOOrWikkDA3yHq1244nmfv
+/aoH7F5syGqI924WnWbPWk15+6vAH5sGU+ybL/EULvbTaa2VvU3JPMlYe7x5EJNk
+NBPucNBOv0aQdbO1mMjqgQAAA9DZ92Ehoe1cwqFnCiZ2Eu0LB5aIZ3mHkHOWU1iK
+mizv0qkC37jq5AH0qvy038qM92mxvaKP7DVHHbJTvb1HoJbzJI1pwpWBFHLBBOm9
+uSex5Da/a6o46+ij+Rx+4iv8IFGfvPXMHIAzd5Z9LiB95Z6F0O+jZm0zgTjacXl4
+Q+iG2bHJn/soIYmIiie3O83gk2JJpdau7QOmcskxxsvRv26zlw4Fb6o0m2nwFCtI
+bN4Rc++f7/qEO8+rpe3iNxckuc/bMRON3FffvtH4m1MtMTnjcQbhqELQLhGGc+Cn
+1Blxtdq8jYbJs0wE2NczEY/osrHhQiH6jmW8a0EjU5FsHatzLiI8pnhHP1Fnl9Tm
+oXtBHCUrN6CY4rjoWBqjbyHaDw9A6jYhIp/yqf2eJhDN0Ljub1qWDooN+Nk9zbrM
+RddpyN+9yoBWmnf15YOFu2jJa9s9+x+V8oDiTqWYi53o0wmYS26DLkEp8Pcbw3jQ
+WHzHkFYx7A7V6//IxYlJx4/g99aJBFOcN+sx3IjpfCytHfxVR0BS4ayAmJva5zyf
+tUHp8SPesmVAmbvkl/to1Z9COvGukF22FXuuK8grP00LgbggdpLilzmKWIXdJ37B
+pUfP9RF/PYLKbRlYcP+g8+aTsDwLHNFWFBKFM/jz5t4VLmRzaXk1YAofjbgIHWHg
+YecWz+Ic3qkRhA8EY80eGg9Qh82EXtjTYbX7Utc3iJ8IpiBFN5Gg95sQMybrFtza
+ButrcvNU02GjMf/zYJ5TgniwsGMOnwoZy4tJeM9qy1oXn1qstZv0zaNkdAk36gYP
+6oO27eJmNfHPV1A5TJ/L39Fvk5z9a9uHewOFTwncEcy2oKYlvjleZJc4CL4geQoj
+ddcfQdnEGAeh3e4nWVL2+8h7Bit3oiXT8sonBCqBIX6t6MLyG5AZwcpuoTWuOFxW
+5ARvjqvEv8ckTCwgm1mnRwdqCD32eik7lgpFUhiVUT/091Igi6FRF6S6xXtv5cyA
+JuJVBkPSlOEDpHMV39/9tJKCr6ufu27oZ0zCqgTXzWbf5F4eczBekX/BDI2HyPLn
+2rqV1d0CPh4Q8G4aNKHTDPf/1V/ZbJvf76qel6CP2NrCEaVj+F5ZXOyB6Co2GjfN
+DO+MoJm675zjKNaT2VGjQdue9i9M5W1IgqvZ8Tmqzf83Tp6oxZlWXdrSLhEuiiyf
+2K0ga3x4vVqANTWbBEv3vqKD8AepkuRw5nPfWmjr2bt8ff+QeYgJR0fbH7oAVNBi
+jreyep0iaJwjP1w+AI5/2an14oBN76XgbhGTvpGa5SWz99BX
+-----END OPENSSH PRIVATE KEY-----