KARAF-3882: more on test.
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/4a5ce232 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/4a5ce232 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/4a5ce232 Branch: refs/heads/master Commit: 4a5ce2321e6ab03edbe69bf354f97d0f3a2c95d5 Parents: a717ca6 Author: Benson Margulies <[email protected]> Authored: Sun Jul 26 20:08:19 2015 -0400 Committer: Benson Margulies <[email protected]> Committed: Sun Jul 26 20:08:19 2015 -0400 ---------------------------------------------------------------------- .../apache/karaf/itests/SshKeyFormatTest.java | 23 +++++++++++++++-- itests/src/test/resources/etc/test.pem | 27 ++++++++++++++++++++ itests/src/test/resources/etc/test.pem.pub | 1 + pom.xml | 1 + .../org/apache/karaf/shell/ssh/test.pem | 27 -------------------- .../org/apache/karaf/shell/ssh/test.pem.pub | 1 - 6 files changed, 50 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/4a5ce232/itests/src/test/java/org/apache/karaf/itests/SshKeyFormatTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/SshKeyFormatTest.java b/itests/src/test/java/org/apache/karaf/itests/SshKeyFormatTest.java index 08c009a..a57b13a 100644 --- a/itests/src/test/java/org/apache/karaf/itests/SshKeyFormatTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/SshKeyFormatTest.java @@ -20,8 +20,18 @@ package org.apache.karaf.itests; +import org.apache.sshd.ClientSession; +import org.apache.sshd.SshClient; +import org.apache.sshd.client.future.ConnectFuture; +import org.junit.Test; import org.ops4j.pax.exam.Configuration; import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.TestProbeBuilder; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.OutputStream; +import java.util.Map; import static org.ops4j.pax.exam.CoreOptions.composite; import static org.ops4j.pax.exam.CoreOptions.options; @@ -35,12 +45,21 @@ public class SshKeyFormatTest extends SshCommandTestBase { @Configuration public Option[] config() { + File keyFile = new File("src/test/resources/test.pem"); return options(composite(super.config()), - editConfigurationFilePut("org.apache.karaf.shell.cfg", "hostKey", "/etc/test.pem"), + editConfigurationFilePut("org.apache.karaf.shell.cfg", "hostKey", keyFile.getAbsolutePath()), editConfigurationFilePut("org.apache.karaf.shell.cfg", "hostKeyFormat", "PEM") ); } - + @Test + public void usePemKey() throws Exception { + SshClient client = SshClient.setUpDefaultClient(); + client.start(); + ConnectFuture future = client.connect("karaf", "localhost", 8101).await(); + ClientSession session = future.getSession(); + Map<Object, Object> metadata = session.getMetadataMap(); + session.close(true); + } } http://git-wip-us.apache.org/repos/asf/karaf/blob/4a5ce232/itests/src/test/resources/etc/test.pem ---------------------------------------------------------------------- diff --git a/itests/src/test/resources/etc/test.pem b/itests/src/test/resources/etc/test.pem new file mode 100644 index 0000000..64c6eb4 --- /dev/null +++ b/itests/src/test/resources/etc/test.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEAvHFgGEKjSgg5382ZMw4DUafHmWeQYp7nnvao9ME9O16czyAD +BsdmyTH9rfKdZ14CkzC40LEAQ5kv/ZeDD4/8LsVfUpExhuh9g86hyG4zK9q3GfGg +IeV26GlUeDlBV9W5xJRdJbbj4Cp0OzkxX0+BmgS+f0qUDxUGnTljOlZlnVLgJcbD +YZ5nxHnQ4gtxHtkmmkkIwz4sMiWOdcIoDIV1OQ6dqZoRqwOkpfc+jdsEEnQJZzPx +4BLkD9fcNW5g3uaJupD4idHDTtLhYeTx9c8KvPVurNoF8T2hvWZz9etAez0fmT6f +tvp/9TProfrJQTC3JJeTHBuIfljfkSJ8ecJwTQIDAQABAoIBAQCAdEBvCS3KD2V0 +G/BsjwbQKLC075XKxEtbXwS5IuicidgWkNm/SznTuFIWuyV1Cu5ya2nwSFfHvKqs +ERX0C9B6CWz7GaJLNjwpFzfNKuGS6VqbQsxHjuXJc9NyyIS0XSpuyDves5cOfaIR +pOD0+Xt9A/LfTnUy+sAxeKcdYzuNS35Whi+VmYJZ+UgXc91O9YK0W9bNOQaHtxbW +TO3kZxMwd5MmoiU817Fr3Xo1LFMytQrG2E0l3774NdHs7WALV3gA3uehGND/4UcO +3PTJQpdJXc11sS+bB9qIp0sd/e7LJgUdXDBQhqewO43vlO/1r+u27IF7YYCxN9Wn +h5/jbac5AoGBAPGWa8PG6JoRHioBYBOJyOzSBtTBHuO/kHbUqMlO4U75NbkbdmlU +D3xpH6hS1poP5YvXjwKLiHryrbVCtmh4HSfolFLJXOOeINn8BnFi3RkD+oGzhk0V +DIoI6XoEVHKSmH7oL6sxpkH1ozPmdjmDbcUrTEArJL6dpY4yr8i7/CGzAoGBAMev +UQ+yUCtcfLo1MW4AOop6gWFCy+g0+5VHEHmzTzoo0W8ajLVDBJ/1syQckBW1uNRj +iXOwqFGHIHGuA96iLeiY7gg2KA0slcup1OZsyMA/HHd7DFY3OmDbP+cszREV90Ui +g06fHy1rv4i8lxLE4R0M1Wmz/KUG8TCSXqBJSiX/AoGBAMDlQhaH86FQma0ge/4d +vfiZmiq2KFvg0RCQrFRQT0YnZeXvL5TaMaM8rLJRslhA6R/HdcCqeMbyjhB0vACe +J2l+IzAW57w2vjRPLzXJopAexR5aoZlafTCZ/RIX8vWoZ2qtKaKfegiggTcnhK5X +aoZMFA4IZMZuSYpInmLA9ohRAoGADSHUfOnHJ/LfKQfShl9xeiXwWEsiSdUiLoEL +7lUCgtqoW1wtoMYViceIznkqaKMY0q7xHTCjASmX0qIVExErX76e+N9G5wblmw1C +OR0yXqJH5vuqpgjfx/rjSvrBSbxeFKfeZs9EJ6KMaBuu+8cC3vw3FMqHdPrt5bna +i0QGolUCgYAi7fZAo3BhS8GgAMAcg/Uu9rxNuupW+GHiQNaP53Quq+I9T2RyCvEn +gUiOSRyqW+y7P7nqrL4NQe+PHSJQqWZypQZIoDdNvvIZvpHERjcOKKxPuPhdi0/j +fPJkMBCIbjoRJoQDbiqZoQ7v2YCpYhT85MXX8PMtCeW1OWRKwpepMA== +-----END RSA PRIVATE KEY----- http://git-wip-us.apache.org/repos/asf/karaf/blob/4a5ce232/itests/src/test/resources/etc/test.pem.pub ---------------------------------------------------------------------- diff --git a/itests/src/test/resources/etc/test.pem.pub b/itests/src/test/resources/etc/test.pem.pub new file mode 100644 index 0000000..dd950c4 --- /dev/null +++ b/itests/src/test/resources/etc/test.pem.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8cWAYQqNKCDnfzZkzDgNRp8eZZ5Binuee9qj0wT07XpzPIAMGx2bJMf2t8p1nXgKTMLjQsQBDmS/9l4MPj/wuxV9SkTGG6H2DzqHIbjMr2rcZ8aAh5XboaVR4OUFX1bnElF0ltuPgKnQ7OTFfT4GaBL5/SpQPFQadOWM6VmWdUuAlxsNhnmfEedDiC3Ee2SaaSQjDPiwyJY51wigMhXU5Dp2pmhGrA6Sl9z6N2wQSdAlnM/HgEuQP19w1bmDe5om6kPiJ0cNO0uFh5PH1zwq89W6s2gXxPaG9ZnP160B7PR+ZPp+2+n/1M+uh+slBMLckl5McG4h+WN+RInx5wnBN [email protected] http://git-wip-us.apache.org/repos/asf/karaf/blob/4a5ce232/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a2ebc87..7f4b2a0 100644 --- a/pom.xml +++ b/pom.xml @@ -2125,6 +2125,7 @@ <reportFile>${project.build.directory}/${project.build.finalName}.rat</reportFile> <excludeSubProjects>false</excludeSubProjects> <excludes> + <exclude>**/*.pub</exclude> <exclude>**/target/**/*</exclude> <!-- GIT files --> <exclude>**/.git/**/*</exclude> http://git-wip-us.apache.org/repos/asf/karaf/blob/4a5ce232/shell/ssh/src/test/resources/org/apache/karaf/shell/ssh/test.pem ---------------------------------------------------------------------- diff --git a/shell/ssh/src/test/resources/org/apache/karaf/shell/ssh/test.pem b/shell/ssh/src/test/resources/org/apache/karaf/shell/ssh/test.pem deleted file mode 100644 index 64c6eb4..0000000 --- a/shell/ssh/src/test/resources/org/apache/karaf/shell/ssh/test.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAvHFgGEKjSgg5382ZMw4DUafHmWeQYp7nnvao9ME9O16czyAD -BsdmyTH9rfKdZ14CkzC40LEAQ5kv/ZeDD4/8LsVfUpExhuh9g86hyG4zK9q3GfGg -IeV26GlUeDlBV9W5xJRdJbbj4Cp0OzkxX0+BmgS+f0qUDxUGnTljOlZlnVLgJcbD -YZ5nxHnQ4gtxHtkmmkkIwz4sMiWOdcIoDIV1OQ6dqZoRqwOkpfc+jdsEEnQJZzPx -4BLkD9fcNW5g3uaJupD4idHDTtLhYeTx9c8KvPVurNoF8T2hvWZz9etAez0fmT6f -tvp/9TProfrJQTC3JJeTHBuIfljfkSJ8ecJwTQIDAQABAoIBAQCAdEBvCS3KD2V0 -G/BsjwbQKLC075XKxEtbXwS5IuicidgWkNm/SznTuFIWuyV1Cu5ya2nwSFfHvKqs -ERX0C9B6CWz7GaJLNjwpFzfNKuGS6VqbQsxHjuXJc9NyyIS0XSpuyDves5cOfaIR -pOD0+Xt9A/LfTnUy+sAxeKcdYzuNS35Whi+VmYJZ+UgXc91O9YK0W9bNOQaHtxbW -TO3kZxMwd5MmoiU817Fr3Xo1LFMytQrG2E0l3774NdHs7WALV3gA3uehGND/4UcO -3PTJQpdJXc11sS+bB9qIp0sd/e7LJgUdXDBQhqewO43vlO/1r+u27IF7YYCxN9Wn -h5/jbac5AoGBAPGWa8PG6JoRHioBYBOJyOzSBtTBHuO/kHbUqMlO4U75NbkbdmlU -D3xpH6hS1poP5YvXjwKLiHryrbVCtmh4HSfolFLJXOOeINn8BnFi3RkD+oGzhk0V -DIoI6XoEVHKSmH7oL6sxpkH1ozPmdjmDbcUrTEArJL6dpY4yr8i7/CGzAoGBAMev -UQ+yUCtcfLo1MW4AOop6gWFCy+g0+5VHEHmzTzoo0W8ajLVDBJ/1syQckBW1uNRj -iXOwqFGHIHGuA96iLeiY7gg2KA0slcup1OZsyMA/HHd7DFY3OmDbP+cszREV90Ui -g06fHy1rv4i8lxLE4R0M1Wmz/KUG8TCSXqBJSiX/AoGBAMDlQhaH86FQma0ge/4d -vfiZmiq2KFvg0RCQrFRQT0YnZeXvL5TaMaM8rLJRslhA6R/HdcCqeMbyjhB0vACe -J2l+IzAW57w2vjRPLzXJopAexR5aoZlafTCZ/RIX8vWoZ2qtKaKfegiggTcnhK5X -aoZMFA4IZMZuSYpInmLA9ohRAoGADSHUfOnHJ/LfKQfShl9xeiXwWEsiSdUiLoEL -7lUCgtqoW1wtoMYViceIznkqaKMY0q7xHTCjASmX0qIVExErX76e+N9G5wblmw1C -OR0yXqJH5vuqpgjfx/rjSvrBSbxeFKfeZs9EJ6KMaBuu+8cC3vw3FMqHdPrt5bna -i0QGolUCgYAi7fZAo3BhS8GgAMAcg/Uu9rxNuupW+GHiQNaP53Quq+I9T2RyCvEn -gUiOSRyqW+y7P7nqrL4NQe+PHSJQqWZypQZIoDdNvvIZvpHERjcOKKxPuPhdi0/j -fPJkMBCIbjoRJoQDbiqZoQ7v2YCpYhT85MXX8PMtCeW1OWRKwpepMA== ------END RSA PRIVATE KEY----- http://git-wip-us.apache.org/repos/asf/karaf/blob/4a5ce232/shell/ssh/src/test/resources/org/apache/karaf/shell/ssh/test.pem.pub ---------------------------------------------------------------------- diff --git a/shell/ssh/src/test/resources/org/apache/karaf/shell/ssh/test.pem.pub b/shell/ssh/src/test/resources/org/apache/karaf/shell/ssh/test.pem.pub deleted file mode 100644 index dd950c4..0000000 --- a/shell/ssh/src/test/resources/org/apache/karaf/shell/ssh/test.pem.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8cWAYQqNKCDnfzZkzDgNRp8eZZ5Binuee9qj0wT07XpzPIAMGx2bJMf2t8p1nXgKTMLjQsQBDmS/9l4MPj/wuxV9SkTGG6H2DzqHIbjMr2rcZ8aAh5XboaVR4OUFX1bnElF0ltuPgKnQ7OTFfT4GaBL5/SpQPFQadOWM6VmWdUuAlxsNhnmfEedDiC3Ee2SaaSQjDPiwyJY51wigMhXU5Dp2pmhGrA6Sl9z6N2wQSdAlnM/HgEuQP19w1bmDe5om6kPiJ0cNO0uFh5PH1zwq89W6s2gXxPaG9ZnP160B7PR+ZPp+2+n/1M+uh+slBMLckl5McG4h+WN+RInx5wnBN [email protected]
