This is an automated email from the ASF dual-hosted git repository.
lgoldstein pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 54ebb1ad1bf8ad77697293cdd83ef8bfa093ac56
Author: Lyor Goldstein <lgoldst...@apache.org>
AuthorDate: Fri Jul 31 22:26:23 2020 +0300
[SSHD-1004] Deprecated SHA-1 based signatures from default setup
---
README.md | 15 ++++++-
.../AbstractGeneratorHostKeyProvider.java | 20 ++++++---
.../sshd/util/test/CommonTestSupportUtils.java | 6 ++-
sshd-core/pom.xml | 6 +++
.../java/org/apache/sshd/client/ClientBuilder.java | 35 ----------------
.../java/org/apache/sshd/common/BaseBuilder.java | 23 +++++++++++
.../java/org/apache/sshd/server/ServerBuilder.java | 27 ------------
.../org/apache/sshd/DefaultSetupTestSupport.java | 17 ++++++++
.../src/test/java/org/apache/sshd/LoadTest.java | 12 +++++-
.../java/org/apache/sshd/client/ClientTest.java | 19 ++++++---
.../org/apache/sshd/common/SshBuilderTest.java | 11 -----
.../sshd/common/auth/AuthenticationTest.java | 24 +++++++----
.../sshd/common/auth/SinglePublicKeyAuthTest.java | 48 ++++++++++++++--------
.../common/config/SshConfigFileReaderTest.java | 3 +-
.../common/forward/PortForwardingLoadTest.java | 4 ++
.../sshd/common/mac/MacCompatibilityTest.java | 19 ++++++++-
.../common/signature/OpenSSHCertificateTest.java | 7 +++-
.../common/signature/SignatureFactoriesTest.java | 4 +-
.../sshd/util/test/CoreTestSupportUtils.java | 10 +++++
.../auth/super-secret-passphrase-RSA-AES-128-key | 30 --------------
.../super-secret-passphrase-RSA-AES-128-key.pub | 1 -
.../common/auth/super-secret-passphrase-ec256-key | 10 +++++
.../auth/super-secret-passphrase-ec256-key.pub | 1 +
.../java/org/apache/sshd/scp/client/ScpTest.java | 19 ++++++++-
24 files changed, 218 insertions(+), 153 deletions(-)
diff --git a/README.md b/README.md
index 2369fb7..69eaa25 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ aes128-...@openssh.com, aes256-...@openssh.com
, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521
* **Compressions**: none, zlib, z...@openssh.com
* **Signatures/Keys**: ssh-dss, ssh-rsa, rsa-sha2-256, rsa-sha2-512, nistp256,
nistp384, nistp521
-, ed25519 (requires `eddsa` optional module),
sk-ecdsa-sha2-nistp...@openssh.com, sk-ssh-ed25...@openssh.com
+, ssh-ed25519 (requires `eddsa` optional module),
sk-ecdsa-sha2-nistp...@openssh.com, sk-ssh-ed25...@openssh.com
, ssh-rsa-cert-...@openssh.com, ssh-dss-cert-...@openssh.com,
ssh-ed25519-cert-...@openssh.com
, ecdsa-sha2-nistp256-cert-...@openssh.com,
ecdsa-sha2-nistp384-cert-...@openssh.com,
ecdsa-sha2-nistp521-cert-...@openssh.com
@@ -78,6 +78,19 @@ the unsafe settings must do so **explicitly**. The following
settings have been
* [OpenSSH release notes](https://www.openssh.com/releasenotes.html) - usually
a good indicator of de-facto practices
* SHA-1 based key exchanges and signatures
+**Caveat:**: According to [RFC 8332 - section
3.31](https://tools.ietf.org/html/rfc8332#section-3.3)
+>>
+>> Implementation experience has shown that there are servers that apply
authentication penalties to clients
+>> attempting public key algorithms that the SSH server does not support.
+>>
+>> When authenticating with an RSA key against a server that does not
implement the "server-sig-algs" extension,
+>> clients MAY default to an "ssh-rsa" signature to avoid authentication
penalties. When the new rsa-sha2-*
+>> algorithms have been sufficiently widely adopted to warrant disabling
"ssh-rsa", clients MAY default to one of
+>> the new algorithms.
+
+This means that users that encounter this problem must modify the supported
security settings **explicitly** in
+order to avoid the issue.
+
# [Release notes](./CHANGES.md)
# Core requirements
diff --git
a/sshd-common/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java
b/sshd-common/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java
index b431052..dbd9204 100644
---
a/sshd-common/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java
+++
b/sshd-common/src/main/java/org/apache/sshd/server/keyprovider/AbstractGeneratorHostKeyProvider.java
@@ -26,6 +26,7 @@ import java.nio.file.LinkOption;
import java.nio.file.OpenOption;
import java.nio.file.Path;
import java.security.GeneralSecurityException;
+import java.security.InvalidKeyException;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.PublicKey;
@@ -303,14 +304,23 @@ public abstract class AbstractGeneratorHostKeyProvider
if (keySpec != null) {
generator.initialize(keySpec);
log.info("generateKeyPair(" + algorithm + ") generating host key -
spec=" + keySpec.getClass().getSimpleName());
- } else if (keySize != 0) {
- generator.initialize(keySize);
- log.info("generateKeyPair(" + algorithm + ") generating host key -
size=" + keySize);
} else if (KeyUtils.EC_ALGORITHM.equals(algorithm)) {
+ ECCurves curve;
// If left to our own devices choose the biggest key size possible
- int numCurves = ECCurves.SORTED_KEY_SIZE.size();
- ECCurves curve = ECCurves.SORTED_KEY_SIZE.get(numCurves - 1);
+ if (keySize == 0) {
+ int numCurves = ECCurves.SORTED_KEY_SIZE.size();
+ curve = ECCurves.SORTED_KEY_SIZE.get(numCurves - 1);
+ } else {
+ curve = ECCurves.fromCurveSize(keySize);
+ if (curve == null) {
+ throw new InvalidKeyException("No match found for curve
with key size=" + keySize);
+ }
+ }
generator.initialize(curve.getParameters());
+ log.info("generateKeyPair(" + algorithm + ") generating host key="
+ curve);
+ } else if (keySize != 0) {
+ generator.initialize(keySize);
+ log.info("generateKeyPair(" + algorithm + ") generating host key -
size=" + keySize);
}
return generator.generateKeyPair();
diff --git
a/sshd-common/src/test/java/org/apache/sshd/util/test/CommonTestSupportUtils.java
b/sshd-common/src/test/java/org/apache/sshd/util/test/CommonTestSupportUtils.java
index 6f352af..d85e7d8 100644
---
a/sshd-common/src/test/java/org/apache/sshd/util/test/CommonTestSupportUtils.java
+++
b/sshd-common/src/test/java/org/apache/sshd/util/test/CommonTestSupportUtils.java
@@ -120,7 +120,10 @@ public final class CommonTestSupportUtils {
"target" /* Maven */,
"build" /* Gradle */));
- public static final String DEFAULT_TEST_HOST_KEY_PROVIDER_ALGORITHM =
KeyUtils.RSA_ALGORITHM;
+ public static final String DEFAULT_TEST_HOST_KEY_PROVIDER_ALGORITHM =
KeyUtils.EC_ALGORITHM;
+ public static final int DEFAULT_TEST_HOST_KEY_SIZE = 256;
+ public static final String DEFAULT_TEST_HOST_KEY_TYPE =
ECCurves.fromCurveSize(DEFAULT_TEST_HOST_KEY_SIZE).getKeyType();
+
// uses a cached instance to avoid re-creating the keys as it is a
time-consuming effort
private static final AtomicReference<KeyPairProvider>
KEYPAIR_PROVIDER_HOLDER = new AtomicReference<>();
// uses a cached instance to avoid re-creating the keys as it is a
time-consuming effort
@@ -452,6 +455,7 @@ public final class CommonTestSupportUtils {
SimpleGeneratorHostKeyProvider keyProvider = new
SimpleGeneratorHostKeyProvider();
keyProvider.setPath(Objects.requireNonNull(path, "No path"));
keyProvider.setAlgorithm(DEFAULT_TEST_HOST_KEY_PROVIDER_ALGORITHM);
+ keyProvider.setKeySize(DEFAULT_TEST_HOST_KEY_SIZE);
return validateKeyPairProvider(keyProvider);
}
diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml
index fa3b5f6..dd05c51 100644
--- a/sshd-core/pom.xml
+++ b/sshd-core/pom.xml
@@ -225,6 +225,12 @@
<!-- deprecated -->
<org.apache.sshd.registerBouncyCastle>false</org.apache.sshd.registerBouncyCastle>
</systemProperties>
+ <excludes>
+ <!-- These tests fail inexplicably
without Bouncycastle -->
+ <exclude>**/*LoadTest.java</exclude>
+
<exclude>**/SinglePublicKeyAuthTest.java</exclude>
+ <exclude>**/ClientTest.java</exclude>
+ </excludes>
</configuration>
</execution>
</executions>
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/ClientBuilder.java
b/sshd-core/src/main/java/org/apache/sshd/client/ClientBuilder.java
index 1e5b20a..4c9dc79 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/ClientBuilder.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/ClientBuilder.java
@@ -19,7 +19,6 @@
package org.apache.sshd.client;
-import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.function.Function;
@@ -44,7 +43,6 @@ import org.apache.sshd.common.kex.DHFactory;
import org.apache.sshd.common.kex.KeyExchange;
import org.apache.sshd.common.kex.KeyExchangeFactory;
import org.apache.sshd.common.session.ConnectionService;
-import org.apache.sshd.common.signature.BuiltinSignatures;
import org.apache.sshd.common.signature.Signature;
import org.apache.sshd.server.forward.ForwardedTcpipFactory;
@@ -52,39 +50,6 @@ import org.apache.sshd.server.forward.ForwardedTcpipFactory;
* SshClient builder
*/
public class ClientBuilder extends BaseBuilder<SshClient, ClientBuilder> {
- /**
- * Preferred {@link BuiltinSignatures} according to
- * <A
HREF="https://www.freebsd.org/cgi/man.cgi?query=ssh_config&sektion=5";>sshd_config(5)</A>
- * {@code HostKeyAlgorithms} recommendation
- */
- public static final List<BuiltinSignatures> DEFAULT_SIGNATURE_PREFERENCE =
- /*
- * According to https://tools.ietf.org/html/rfc8332#section-3.3:
- *
- * Implementation experience has shown that there are servers that apply
authentication penalties to clients
- * attempting public key algorithms that the SSH server does not support.
- *
- * When authenticating with an RSA key against a server that does not
implement the "server-sig-algs" extension,
- * clients MAY default to an "ssh-rsa" signature to avoid authentication
penalties. When the new rsa-sha2-*
- * algorithms have been sufficiently widely adopted to warrant disabling
"ssh-rsa", clients MAY default to one of
- * the new algorithms.
- *
- * Therefore we do not include by default the "rsa-sha-*" signatures.
- */
- Collections.unmodifiableList(
- Arrays.asList(
- BuiltinSignatures.nistp256_cert,
- BuiltinSignatures.nistp384_cert,
- BuiltinSignatures.nistp521_cert,
- BuiltinSignatures.ed25519_cert,
- BuiltinSignatures.rsa_cert,
- BuiltinSignatures.dsa_cert,
- BuiltinSignatures.nistp256,
- BuiltinSignatures.nistp384,
- BuiltinSignatures.nistp521,
- BuiltinSignatures.ed25519,
- BuiltinSignatures.rsa,
- BuiltinSignatures.dsa));
@SuppressWarnings("checkstyle:Indentation")
public static final Function<DHFactory, KeyExchangeFactory> DH2KEX =
factory -> factory == null
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java
b/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java
index 80b8a1b..d89cadd 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java
@@ -43,6 +43,7 @@ import org.apache.sshd.common.random.SingletonRandomFactory;
import org.apache.sshd.common.session.ConnectionService;
import org.apache.sshd.common.session.UnknownChannelReferenceHandler;
import
org.apache.sshd.common.session.helpers.DefaultUnknownChannelReferenceHandler;
+import org.apache.sshd.common.signature.BuiltinSignatures;
import org.apache.sshd.common.signature.Signature;
import org.apache.sshd.common.util.ObjectBuilder;
import org.apache.sshd.common.util.security.SecurityUtils;
@@ -112,6 +113,28 @@ public class BaseBuilder<T extends AbstractFactoryManager,
S extends BaseBuilder
BuiltinMacs.hmacsha196,
BuiltinMacs.hmacmd596));
+ /**
+ * Preferred {@link BuiltinSignatures} according to
+ * <A
HREF="http://man7.org/linux/man-pages/man5/sshd_config.5.html";>sshd_config(5) -
HostKeyAlgorithms</A>
+ * {@code HostKeyAlgorithms} recommendation
+ */
+ public static final List<BuiltinSignatures> DEFAULT_SIGNATURE_PREFERENCE =
Collections.unmodifiableList(
+ Arrays.asList(
+ BuiltinSignatures.nistp256_cert,
+ BuiltinSignatures.nistp384_cert,
+ BuiltinSignatures.nistp521_cert,
+ BuiltinSignatures.ed25519_cert,
+ BuiltinSignatures.rsaSHA512_cert,
+ BuiltinSignatures.rsaSHA256_cert,
+ BuiltinSignatures.nistp256,
+ BuiltinSignatures.nistp384,
+ BuiltinSignatures.nistp521,
+ BuiltinSignatures.sk_ecdsa_sha2_nistp256,
+ BuiltinSignatures.ed25519,
+ BuiltinSignatures.sk_ssh_ed25519,
+ BuiltinSignatures.rsaSHA512,
+ BuiltinSignatures.rsaSHA256));
+
public static final UnknownChannelReferenceHandler
DEFAULT_UNKNOWN_CHANNEL_REFERENCE_HANDLER
= DefaultUnknownChannelReferenceHandler.INSTANCE;
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/ServerBuilder.java
b/sshd-core/src/main/java/org/apache/sshd/server/ServerBuilder.java
index 31acc1f..8f6478c 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/ServerBuilder.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/ServerBuilder.java
@@ -35,7 +35,6 @@ import org.apache.sshd.common.kex.DHFactory;
import org.apache.sshd.common.kex.KeyExchange;
import org.apache.sshd.common.kex.KeyExchangeFactory;
import org.apache.sshd.common.session.ConnectionService;
-import org.apache.sshd.common.signature.BuiltinSignatures;
import org.apache.sshd.common.signature.Signature;
import
org.apache.sshd.server.auth.keyboard.DefaultKeyboardInteractiveAuthenticator;
import org.apache.sshd.server.auth.keyboard.KeyboardInteractiveAuthenticator;
@@ -84,32 +83,6 @@ public class ServerBuilder extends BaseBuilder<SshServer,
ServerBuilder> {
BuiltinCompressions.zlib,
BuiltinCompressions.delayedZlib));
- /**
- * Preferred {@link BuiltinSignatures} according to
- * <A
HREF="http://man7.org/linux/man-pages/man5/sshd_config.5.html";>sshd_config(5) -
HostKeyAlgorithms</A>
- * {@code HostKeyAlgorithms} recommendation
- */
- public static final List<BuiltinSignatures> DEFAULT_SIGNATURE_PREFERENCE =
Collections.unmodifiableList(
- Arrays.asList(
- BuiltinSignatures.nistp256_cert,
- BuiltinSignatures.nistp384_cert,
- BuiltinSignatures.nistp521_cert,
- BuiltinSignatures.ed25519_cert,
- BuiltinSignatures.rsaSHA512_cert,
- BuiltinSignatures.rsaSHA256_cert,
- BuiltinSignatures.rsa_cert,
- BuiltinSignatures.dsa_cert,
- BuiltinSignatures.nistp256,
- BuiltinSignatures.nistp384,
- BuiltinSignatures.nistp521,
- BuiltinSignatures.sk_ecdsa_sha2_nistp256,
- BuiltinSignatures.ed25519,
- BuiltinSignatures.sk_ssh_ed25519,
- BuiltinSignatures.rsaSHA512,
- BuiltinSignatures.rsaSHA256,
- BuiltinSignatures.rsa,
- BuiltinSignatures.dsa));
-
protected PublickeyAuthenticator pubkeyAuthenticator;
protected KeyboardInteractiveAuthenticator interactiveAuthenticator;
diff --git
a/sshd-core/src/test/java/org/apache/sshd/DefaultSetupTestSupport.java
b/sshd-core/src/test/java/org/apache/sshd/DefaultSetupTestSupport.java
index fa3b891..6c393f6 100644
--- a/sshd-core/src/test/java/org/apache/sshd/DefaultSetupTestSupport.java
+++ b/sshd-core/src/test/java/org/apache/sshd/DefaultSetupTestSupport.java
@@ -33,6 +33,8 @@ import org.apache.sshd.common.cipher.Cipher;
import org.apache.sshd.common.helpers.AbstractFactoryManager;
import org.apache.sshd.common.kex.BuiltinDHFactories;
import org.apache.sshd.common.kex.KeyExchange;
+import org.apache.sshd.common.signature.BuiltinSignatures;
+import org.apache.sshd.common.signature.Signature;
import org.apache.sshd.common.util.GenericUtils;
import org.apache.sshd.util.test.BaseTestSupport;
import org.apache.sshd.util.test.NoIoTestCase;
@@ -82,6 +84,21 @@ public abstract class DefaultSetupTestSupport<M extends
AbstractFactoryManager>
KeyExchange.class.getSimpleName(), disallowed,
factory.getKeyExchangeFactories());
}
+ @Test
+ public void testDefaultSignaturesList() {
+ assertSameNamedFactoriesListInstances(
+ Signature.class.getSimpleName(),
BaseBuilder.DEFAULT_SIGNATURE_PREFERENCE, factory.getSignatureFactories());
+ }
+
+ @Test // SSHD-1004
+ public void testNoDeprecatedSignatures() {
+ assertNoDeprecatedFactoryInstanceNames(Cipher.class.getSimpleName(),
+ EnumSet.of(BuiltinSignatures.rsa, BuiltinSignatures.rsa_cert,
BuiltinSignatures.dsa,
+ BuiltinSignatures.dsa_cert),
+ factory.getSignatureFactories());
+
+ }
+
protected static void assertSameNamedResourceListNames(
String hint, List<? extends NamedResource> expected, List<?
extends NamedResource> actual) {
int len = GenericUtils.size(expected);
diff --git a/sshd-core/src/test/java/org/apache/sshd/LoadTest.java
b/sshd-core/src/test/java/org/apache/sshd/LoadTest.java
index cacf0dd..4948fe0 100644
--- a/sshd-core/src/test/java/org/apache/sshd/LoadTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/LoadTest.java
@@ -37,11 +37,14 @@ import org.apache.sshd.client.session.ClientSession;
import org.apache.sshd.common.channel.Channel;
import org.apache.sshd.common.cipher.BuiltinCiphers;
import org.apache.sshd.common.kex.BuiltinDHFactories;
+import org.apache.sshd.common.util.security.SecurityUtils;
import org.apache.sshd.core.CoreModuleProperties;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.util.test.BaseTestSupport;
import org.junit.After;
+import org.junit.Assume;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runners.MethodSorters;
@@ -56,9 +59,14 @@ public class LoadTest extends BaseTestSupport {
super();
}
+ @BeforeClass // FIXME inexplicably these tests fail without BC since
SSHD-1004
+ public static void ensureBouncycastleRegistered() {
+ Assume.assumeTrue("Requires BC security provider",
SecurityUtils.isBouncyCastleRegistered());
+ }
+
@Before
public void setUp() throws Exception {
- sshd = setupTestServer();
+ sshd = setupTestFullSupportServer();
sshd.start();
port = sshd.getPort();
}
@@ -116,7 +124,7 @@ public class LoadTest extends BaseTestSupport {
@SuppressWarnings("checkstyle:nestedtrydepth")
protected void runClient(String msg) throws Exception {
- try (SshClient client = setupTestClient()) {
+ try (SshClient client = setupTestFullSupportClient()) {
CoreModuleProperties.MAX_PACKET_SIZE.set(client, 1024L * 16);
CoreModuleProperties.WINDOW_SIZE.set(client, 1024L * 8);
client.setKeyExchangeFactories(Collections.singletonList(ClientBuilder.DH2KEX.apply(BuiltinDHFactories.dhg1)));
diff --git a/sshd-core/src/test/java/org/apache/sshd/client/ClientTest.java
b/sshd-core/src/test/java/org/apache/sshd/client/ClientTest.java
index 30c6030..c7487f6 100644
--- a/sshd-core/src/test/java/org/apache/sshd/client/ClientTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/client/ClientTest.java
@@ -74,7 +74,6 @@ import org.apache.sshd.common.SshException;
import org.apache.sshd.common.channel.Channel;
import org.apache.sshd.common.channel.ChannelListener;
import org.apache.sshd.common.channel.exception.SshChannelClosedException;
-import org.apache.sshd.common.config.keys.KeyUtils;
import org.apache.sshd.common.future.CloseFuture;
import org.apache.sshd.common.future.SshFutureListener;
import org.apache.sshd.common.io.IoInputStream;
@@ -92,6 +91,7 @@ import org.apache.sshd.common.util.buffer.Buffer;
import org.apache.sshd.common.util.buffer.ByteArrayBuffer;
import org.apache.sshd.common.util.io.NoCloseOutputStream;
import org.apache.sshd.common.util.net.SshdSocketAddress;
+import org.apache.sshd.common.util.security.SecurityUtils;
import org.apache.sshd.core.CoreModuleProperties;
import org.apache.sshd.server.SshServer;
import
org.apache.sshd.server.auth.keyboard.DefaultKeyboardInteractiveAuthenticator;
@@ -108,11 +108,14 @@ import
org.apache.sshd.server.session.ServerUserAuthService;
import org.apache.sshd.server.session.ServerUserAuthServiceFactory;
import org.apache.sshd.util.test.AsyncEchoShellFactory;
import org.apache.sshd.util.test.BaseTestSupport;
+import org.apache.sshd.util.test.CommonTestSupportUtils;
import org.apache.sshd.util.test.EchoShell;
import org.apache.sshd.util.test.EchoShellFactory;
import org.apache.sshd.util.test.TeeOutputStream;
import org.junit.After;
+import org.junit.Assume;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.FixMethodOrder;
import org.junit.Ignore;
import org.junit.Test;
@@ -170,6 +173,11 @@ public class ClientTest extends BaseTestSupport {
super();
}
+ @BeforeClass // FIXME inexplicably these tests fail without BC since
SSHD-1004
+ public static void ensureBouncycastleRegistered() {
+ Assume.assumeTrue("Requires BC security provider",
SecurityUtils.isBouncyCastleRegistered());
+ }
+
@Before
public void setUp() throws Exception {
authLatch = new CountDownLatch(0);
@@ -1038,7 +1046,7 @@ public class ClientTest extends BaseTestSupport {
.verify(CONNECT_TIMEOUT).getSession()) {
assertNotNull("Client session creation not signalled",
clientSessionHolder.get());
KeyPairProvider keys = createTestHostKeyProvider();
- session.addPublicKeyIdentity(keys.loadKey(session,
KeyPairProvider.SSH_RSA));
+ session.addPublicKeyIdentity(keys.loadKey(session,
CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_TYPE));
session.auth().verify(AUTH_TIMEOUT);
} finally {
client.stop();
@@ -1049,10 +1057,11 @@ public class ClientTest extends BaseTestSupport {
@Test
public void testPublicKeyAuthNewWithFailureOnFirstIdentity() throws
Exception {
SimpleGeneratorHostKeyProvider provider = new
SimpleGeneratorHostKeyProvider();
- provider.setAlgorithm(KeyUtils.RSA_ALGORITHM);
+
provider.setAlgorithm(CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_PROVIDER_ALGORITHM);
+ provider.setKeySize(CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_SIZE);
KeyPairProvider keys = createTestHostKeyProvider();
- KeyPair pair = keys.loadKey(null, KeyPairProvider.SSH_RSA);
+ KeyPair pair = keys.loadKey(null,
CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_TYPE);
sshd.setPublickeyAuthenticator((username, key, session) ->
key.equals(pair.getPublic()));
client.setUserAuthFactories(Collections.singletonList(UserAuthPublicKeyFactory.INSTANCE));
client.start();
@@ -1060,7 +1069,7 @@ public class ClientTest extends BaseTestSupport {
try (ClientSession session = client.connect(getCurrentTestName(),
TEST_LOCALHOST, port)
.verify(CONNECT_TIMEOUT).getSession()) {
assertNotNull("Client session creation not signalled",
clientSessionHolder.get());
- session.addPublicKeyIdentity(provider.loadKey(session,
KeyPairProvider.SSH_RSA));
+ session.addPublicKeyIdentity(provider.loadKey(session,
CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_TYPE));
session.addPublicKeyIdentity(pair);
session.auth().verify(AUTH_TIMEOUT);
} finally {
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/SshBuilderTest.java
b/sshd-core/src/test/java/org/apache/sshd/common/SshBuilderTest.java
index 4de6a13..736a94a 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/SshBuilderTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/common/SshBuilderTest.java
@@ -26,9 +26,7 @@ import java.util.Set;
import org.apache.sshd.common.cipher.BuiltinCiphers;
import org.apache.sshd.common.cipher.Cipher;
import org.apache.sshd.common.mac.BuiltinMacs;
-import org.apache.sshd.common.signature.BuiltinSignatures;
import org.apache.sshd.common.util.GenericUtils;
-import org.apache.sshd.server.ServerBuilder;
import org.apache.sshd.util.test.BaseTestSupport;
import org.apache.sshd.util.test.NoIoTestCase;
import org.junit.FixMethodOrder;
@@ -54,15 +52,6 @@ public class SshBuilderTest extends BaseTestSupport {
testAllInstancesListed(BuiltinMacs.VALUES,
BaseBuilder.DEFAULT_MAC_PREFERENCE);
}
- /**
- * Make sure that all values in {@link BuiltinSignatures} are listed in
- * {@link ServerBuilder#DEFAULT_SIGNATURE_PREFERENCE}
- */
- @Test
- public void testAllBuiltinSignaturesListed() {
- testAllInstancesListed(BuiltinSignatures.VALUES,
ServerBuilder.DEFAULT_SIGNATURE_PREFERENCE);
- }
-
private static <
E extends Enum<E>> void testAllInstancesListed(Set<? extends E>
expValues, Collection<? extends E> actValues) {
assertEquals("Mismatched actual values size", expValues.size(),
actValues.size());
diff --git
a/sshd-core/src/test/java/org/apache/sshd/common/auth/AuthenticationTest.java
b/sshd-core/src/test/java/org/apache/sshd/common/auth/AuthenticationTest.java
index 04149dd..0e748d8 100644
---
a/sshd-core/src/test/java/org/apache/sshd/common/auth/AuthenticationTest.java
+++
b/sshd-core/src/test/java/org/apache/sshd/common/auth/AuthenticationTest.java
@@ -85,6 +85,7 @@ import org.apache.sshd.server.session.ServerSessionImpl;
import org.apache.sshd.server.session.SessionFactory;
import org.apache.sshd.util.test.BaseTestSupport;
import org.apache.sshd.util.test.CommonTestSupportUtils;
+import org.apache.sshd.util.test.CoreTestSupportUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.FixMethodOrder;
@@ -310,7 +311,7 @@ public class AuthenticationTest extends BaseTestSupport {
assertFalse("Timeout while waiting for session",
result.contains(ClientSession.ClientSessionEvent.TIMEOUT));
KeyPairProvider provider = createTestHostKeyProvider();
- KeyPair pair = provider.loadKey(s, KeyPairProvider.SSH_RSA);
+ KeyPair pair = provider.loadKey(s,
CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_TYPE);
try {
assertAuthenticationResult(UserAuthMethodFactory.PUBLIC_KEY,
authPublicKey(s, getCurrentTestName(), pair),
false);
@@ -382,7 +383,7 @@ public class AuthenticationTest extends BaseTestSupport {
assertFalse("Timeout while waiting for session",
result.contains(ClientSession.ClientSessionEvent.TIMEOUT));
KeyPairProvider provider = createTestHostKeyProvider();
- KeyPair pair = provider.loadKey(s, KeyPairProvider.SSH_RSA);
+ KeyPair pair = provider.loadKey(s,
CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_TYPE);
try {
assertAuthenticationResult(UserAuthMethodFactory.PUBLIC_KEY,
authPublicKey(s, getCurrentTestName(), pair),
false);
@@ -656,8 +657,10 @@ public class AuthenticationTest extends BaseTestSupport {
return true;
});
+ // since we need to use RSA
+ CoreTestSupportUtils.setupFullSignaturesSupport(sshd);
try (SshClient client = setupTestClient()) {
- // force server to use only the RSA key
+ // force server to use only RSA
NamedFactory<Signature> kexSignature = BuiltinSignatures.rsa;
client.setSignatureFactories(Collections.singletonList(kexSignature));
client.setServerKeyVerifier((sshClientSession, remoteAddress,
serverKey) -> {
@@ -738,7 +741,9 @@ public class AuthenticationTest extends BaseTestSupport {
}));
try (SshClient client = setupTestClient()) {
- KeyPair clientIdentity =
CommonTestSupportUtils.generateKeyPair(KeyUtils.RSA_ALGORITHM, 1024);
+ KeyPair clientIdentity = CommonTestSupportUtils.generateKeyPair(
+
CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_PROVIDER_ALGORITHM,
+ CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_SIZE);
client.start();
try {
@@ -767,7 +772,9 @@ public class AuthenticationTest extends BaseTestSupport {
public void testHostBasedAuthentication() throws Exception {
String hostClienUser = getClass().getSimpleName();
String hostClientName =
SshdSocketAddress.toAddressString(SshdSocketAddress.getFirstExternalNetwork4Address());
- KeyPair hostClientKey =
CommonTestSupportUtils.generateKeyPair(KeyUtils.RSA_ALGORITHM, 1024);
+ KeyPair hostClientKey = CommonTestSupportUtils.generateKeyPair(
+
CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_PROVIDER_ALGORITHM,
+ CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_SIZE);
AtomicInteger invocationCount = new AtomicInteger(0);
sshd.setHostBasedAuthenticator((session, username, clientHostKey,
clientHostName, clientUsername, certificates) -> {
invocationCount.incrementAndGet();
@@ -827,8 +834,11 @@ public class AuthenticationTest extends BaseTestSupport {
sshd.setKeyboardInteractiveAuthenticator(KeyboardInteractiveAuthenticator.NONE);
try (SshClient client = setupTestClient()) {
- KeyPair kp =
CommonTestSupportUtils.generateKeyPair(KeyUtils.RSA_ALGORITHM, 1024);
+ KeyPair kp = CommonTestSupportUtils.generateKeyPair(
+
CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_PROVIDER_ALGORITHM,
+ CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_SIZE);
client.start();
+
try {
for (int index = 1; index < 3; index++) {
try (ClientSession s =
client.connect(getCurrentTestName(), TEST_LOCALHOST, port)
@@ -894,7 +904,7 @@ public class AuthenticationTest extends BaseTestSupport {
try (ClientSession s = client.connect(getCurrentTestName(),
TEST_LOCALHOST, port)
.verify(CONNECT_TIMEOUT)
.getSession()) {
- String keyLocation = "super-secret-passphrase-RSA-AES-128-key";
+ String keyLocation = "super-secret-passphrase-ec256-key";
FilePasswordProvider passwordProvider = new
FilePasswordProvider() {
@Override
@SuppressWarnings("synthetic-access")
diff --git
a/sshd-core/src/test/java/org/apache/sshd/common/auth/SinglePublicKeyAuthTest.java
b/sshd-core/src/test/java/org/apache/sshd/common/auth/SinglePublicKeyAuthTest.java
index 7bf784a..45678e1 100644
---
a/sshd-core/src/test/java/org/apache/sshd/common/auth/SinglePublicKeyAuthTest.java
+++
b/sshd-core/src/test/java/org/apache/sshd/common/auth/SinglePublicKeyAuthTest.java
@@ -32,6 +32,7 @@ import org.apache.sshd.client.session.ClientSession;
import org.apache.sshd.common.config.keys.KeyUtils;
import org.apache.sshd.common.keyprovider.KeyPairProvider;
import org.apache.sshd.common.session.Session;
+import org.apache.sshd.common.util.security.SecurityUtils;
import org.apache.sshd.core.CoreModuleProperties;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.server.auth.pubkey.CachingPublicKeyAuthenticator;
@@ -40,8 +41,11 @@ import
org.apache.sshd.server.auth.pubkey.UserAuthPublicKeyFactory;
import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
import org.apache.sshd.server.session.ServerSession;
import org.apache.sshd.util.test.BaseTestSupport;
+import org.apache.sshd.util.test.CommonTestSupportUtils;
import org.junit.After;
+import org.junit.Assume;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runners.MethodSorters;
@@ -53,21 +57,29 @@ import org.junit.runners.MethodSorters;
public class SinglePublicKeyAuthTest extends BaseTestSupport {
private SshServer sshd;
private int port;
- private final KeyPair pairRsaGood;
- private KeyPair pairRsaBad;
+ private final KeyPair kpGood;
+ private final KeyPair kpBad;
private PublickeyAuthenticator delegate;
public SinglePublicKeyAuthTest() throws IOException,
GeneralSecurityException {
SimpleGeneratorHostKeyProvider provider = new
SimpleGeneratorHostKeyProvider();
- provider.setAlgorithm(KeyUtils.RSA_ALGORITHM);
- pairRsaBad = provider.loadKey(null, KeyPairProvider.SSH_RSA);
+
provider.setAlgorithm(CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_PROVIDER_ALGORITHM);
+ provider.setKeySize(CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_SIZE);
+
provider.setPath(detectTargetFolder().resolve(getClass().getSimpleName() +
"-key"));
+
+ kpBad = provider.loadKey(null,
CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_TYPE);
KeyPairProvider badKeys = createTestHostKeyProvider();
- pairRsaGood = badKeys.loadKey(null, KeyPairProvider.SSH_RSA);
+ kpGood = badKeys.loadKey(null,
CommonTestSupportUtils.DEFAULT_TEST_HOST_KEY_TYPE);
+ }
+
+ @BeforeClass // FIXME inexplicably these tests fail without BC since
SSHD-1004
+ public static void ensureBouncycastleRegistered() {
+ Assume.assumeTrue("Requires BC security provider",
SecurityUtils.isBouncyCastleRegistered());
}
@Before
public void setUp() throws Exception {
- sshd = setupTestServer();
+ sshd = setupTestFullSupportServer();
CoreModuleProperties.AUTH_METHODS.set(sshd,
UserAuthPublicKeyFactory.NAME);
sshd.setPublickeyAuthenticator((username, key, session) ->
delegate.authenticate(username, key, session));
sshd.start();
@@ -88,7 +100,7 @@ public class SinglePublicKeyAuthTest extends BaseTestSupport
{
String fp = KeyUtils.getFingerPrint(key);
AtomicInteger counter = count.computeIfAbsent(fp, k -> new
AtomicInteger());
counter.incrementAndGet();
- return key.equals(pairRsaGood.getPublic());
+ return key.equals(kpGood.getPublic());
});
delegate = auth;
@@ -97,8 +109,8 @@ public class SinglePublicKeyAuthTest extends BaseTestSupport
{
try (ClientSession session
= client.connect(getCurrentTestName(), TEST_LOCALHOST,
port).verify(CONNECT_TIMEOUT).getSession()) {
- session.addPublicKeyIdentity(pairRsaBad);
- session.addPublicKeyIdentity(pairRsaGood);
+ session.addPublicKeyIdentity(kpBad);
+ session.addPublicKeyIdentity(kpGood);
session.auth().verify(AUTH_TIMEOUT);
assertEquals("Mismatched authentication invocations count", 2,
count.size());
@@ -106,12 +118,12 @@ public class SinglePublicKeyAuthTest extends
BaseTestSupport {
Map<Session, Map<PublicKey, Boolean>> cache = auth.getCache();
assertEquals("Mismatched cache size", 1, cache.size());
- String fpBad = KeyUtils.getFingerPrint(pairRsaBad.getPublic());
+ String fpBad = KeyUtils.getFingerPrint(kpBad.getPublic());
AtomicInteger badCounter = count.get(fpBad);
assertNotNull("Missing bad public key", badCounter);
assertEquals("Mismatched bad key authentication attempts", 1,
badCounter.get());
- String fpGood =
KeyUtils.getFingerPrint(pairRsaGood.getPublic());
+ String fpGood = KeyUtils.getFingerPrint(kpGood.getPublic());
AtomicInteger goodCounter = count.get(fpGood);
assertNotNull("Missing good public key", goodCounter);
assertEquals("Mismatched good key authentication attempts", 1,
goodCounter.get());
@@ -128,7 +140,7 @@ public class SinglePublicKeyAuthTest extends
BaseTestSupport {
String fp = KeyUtils.getFingerPrint(key);
AtomicInteger counter = count.computeIfAbsent(fp, k -> new
AtomicInteger());
counter.incrementAndGet();
- return key.equals(pairRsaGood.getPublic());
+ return key.equals(kpGood.getPublic());
};
try (SshClient client = setupTestClient()) {
@@ -136,8 +148,8 @@ public class SinglePublicKeyAuthTest extends
BaseTestSupport {
try (ClientSession session
= client.connect(getCurrentTestName(), TEST_LOCALHOST,
port).verify(CONNECT_TIMEOUT).getSession()) {
- session.addPublicKeyIdentity(pairRsaBad);
- session.addPublicKeyIdentity(pairRsaGood);
+ session.addPublicKeyIdentity(kpBad);
+ session.addPublicKeyIdentity(kpGood);
AuthFuture auth = session.auth();
assertTrue("Failed to authenticate on time",
auth.await(AUTH_TIMEOUT));
@@ -149,14 +161,14 @@ public class SinglePublicKeyAuthTest extends
BaseTestSupport {
assertEquals("Mismatched attempted keys count", 2, count.size());
- String badFingerPrint =
KeyUtils.getFingerPrint(pairRsaBad.getPublic());
+ String badFingerPrint = KeyUtils.getFingerPrint(kpBad.getPublic());
Number badIndex = count.get(badFingerPrint);
- assertNotNull("Missing bad RSA key", badIndex);
+ assertNotNull("Missing bad key", badIndex);
assertEquals("Mismatched attempt index for bad key", 1,
badIndex.intValue());
- String goodFingerPrint =
KeyUtils.getFingerPrint(pairRsaGood.getPublic());
+ String goodFingerPrint = KeyUtils.getFingerPrint(kpGood.getPublic());
Number goodIndex = count.get(goodFingerPrint);
- assertNotNull("Missing good RSA key", goodIndex);
+ assertNotNull("Missing good key", goodIndex);
assertEquals("Mismatched attempt index for good key", 2,
goodIndex.intValue());
}
diff --git
a/sshd-core/src/test/java/org/apache/sshd/common/config/SshConfigFileReaderTest.java
b/sshd-core/src/test/java/org/apache/sshd/common/config/SshConfigFileReaderTest.java
index 62c55c8..c137b8d 100644
---
a/sshd-core/src/test/java/org/apache/sshd/common/config/SshConfigFileReaderTest.java
+++
b/sshd-core/src/test/java/org/apache/sshd/common/config/SshConfigFileReaderTest.java
@@ -30,7 +30,6 @@ import java.util.List;
import java.util.Properties;
import java.util.function.Function;
-import org.apache.sshd.client.ClientBuilder;
import org.apache.sshd.common.BaseBuilder;
import org.apache.sshd.common.Closeable;
import org.apache.sshd.common.FactoryManager;
@@ -102,7 +101,7 @@ public class SshConfigFileReaderTest extends
BaseTestSupport {
@Test
public void testParseSignaturesList() {
- List<? extends NamedResource> expected =
ClientBuilder.DEFAULT_SIGNATURE_PREFERENCE;
+ List<? extends NamedResource> expected =
BaseBuilder.DEFAULT_SIGNATURE_PREFERENCE;
Properties props =
initNamedResourceProperties(ConfigFileReaderSupport.HOST_KEY_ALGORITHMS_CONFIG_PROP,
expected);
BuiltinSignatures.ParseResult result
=
SshConfigFileReader.getSignatures(PropertyResolverUtils.toPropertyResolver(props));
diff --git
a/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingLoadTest.java
b/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingLoadTest.java
index 8b1e535..65d51a5 100644
---
a/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingLoadTest.java
+++
b/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingLoadTest.java
@@ -50,6 +50,7 @@ import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.sshd.common.util.net.SshdSocketAddress;
+import org.apache.sshd.common.util.security.SecurityUtils;
import org.apache.sshd.core.CoreModuleProperties;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.server.forward.AcceptAllForwardingFilter;
@@ -58,6 +59,7 @@ import org.apache.sshd.util.test.CoreTestSupportUtils;
import org.apache.sshd.util.test.JSchLogger;
import org.apache.sshd.util.test.SimpleUserInfo;
import org.junit.After;
+import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.FixMethodOrder;
@@ -151,6 +153,8 @@ public class PortForwardingLoadTest extends BaseTestSupport
{
@BeforeClass
public static void jschInit() {
+ // FIXME inexplicably these tests fail without BC since SSHD-1004
+ Assume.assumeTrue("Requires BC security provider",
SecurityUtils.isBouncyCastleRegistered());
JSchLogger.init();
}
diff --git
a/sshd-core/src/test/java/org/apache/sshd/common/mac/MacCompatibilityTest.java
b/sshd-core/src/test/java/org/apache/sshd/common/mac/MacCompatibilityTest.java
index 31d6b42..692a229 100644
---
a/sshd-core/src/test/java/org/apache/sshd/common/mac/MacCompatibilityTest.java
+++
b/sshd-core/src/test/java/org/apache/sshd/common/mac/MacCompatibilityTest.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -32,8 +33,10 @@ import ch.ethz.ssh2.Connection;
import ch.ethz.ssh2.ConnectionInfo;
import com.jcraft.jsch.JSch;
import org.apache.sshd.common.channel.Channel;
+import org.apache.sshd.common.config.keys.KeyUtils;
import org.apache.sshd.common.util.GenericUtils;
import org.apache.sshd.server.SshServer;
+import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
import org.apache.sshd.util.test.BaseTestSupport;
import org.apache.sshd.util.test.CommonTestSupportUtils;
import org.apache.sshd.util.test.CoreTestSupportUtils;
@@ -118,9 +121,21 @@ public class MacCompatibilityTest extends BaseTestSupport {
@BeforeClass
public static void setupClientAndServer() throws Exception {
JSchLogger.init();
+ setupClientAndServer(MacCompatibilityTest.class);
+ }
+
+ private static void setupClientAndServer(Class<?> anchor) throws Exception
{
+ sshd = CoreTestSupportUtils.setupTestFullSupportServer(anchor);
+
+ // Need to use RSA since Ganymede does not support EC
+ SimpleGeneratorHostKeyProvider provider = new
SimpleGeneratorHostKeyProvider();
+ provider.setAlgorithm(KeyUtils.RSA_ALGORITHM);
+ provider.setKeySize(1024);
+
+ Path targetDir = CommonTestSupportUtils.detectTargetFolder(anchor);
+ provider.setPath(targetDir.resolve(anchor.getSimpleName() + "-key"));
- sshd =
CoreTestSupportUtils.setupTestFullSupportServer(MacCompatibilityTest.class);
-
sshd.setKeyPairProvider(CommonTestSupportUtils.createTestHostKeyProvider(MacCompatibilityTest.class));
+ sshd.setKeyPairProvider(provider);
sshd.start();
port = sshd.getPort();
}
diff --git
a/sshd-core/src/test/java/org/apache/sshd/common/signature/OpenSSHCertificateTest.java
b/sshd-core/src/test/java/org/apache/sshd/common/signature/OpenSSHCertificateTest.java
index 0609692..2c5ce16 100644
---
a/sshd-core/src/test/java/org/apache/sshd/common/signature/OpenSSHCertificateTest.java
+++
b/sshd-core/src/test/java/org/apache/sshd/common/signature/OpenSSHCertificateTest.java
@@ -38,6 +38,7 @@ import org.apache.sshd.util.test.BaseTestSupport;
import org.apache.sshd.util.test.CoreTestSupportUtils;
import org.apache.sshd.util.test.JUnit4ClassRunnerWithParametersFactory;
import org.junit.AfterClass;
+import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.FixMethodOrder;
@@ -70,11 +71,11 @@ public class OpenSSHCertificateTest extends BaseTestSupport
{
@BeforeClass
public static void setupClientAndServer() throws Exception {
- sshd =
CoreTestSupportUtils.setupTestServer(OpenSSHCertificateTest.class);
+ sshd =
CoreTestSupportUtils.setupTestFullSupportServer(OpenSSHCertificateTest.class);
sshd.start();
port = sshd.getPort();
- client =
CoreTestSupportUtils.setupTestClient(OpenSSHCertificateTest.class);
+ client =
CoreTestSupportUtils.setupTestFullSupportClient(OpenSSHCertificateTest.class);
client.start();
defaultSignatureFactories = client.getSignatureFactories();
}
@@ -158,6 +159,8 @@ public class OpenSSHCertificateTest extends BaseTestSupport
{
@Test // invalid principal, abort
public void testAbortOnInvalidPrincipal() throws Exception {
+ Assume.assumeTrue("Have signature factory", signatureFactory != null);
+
CoreModuleProperties.ABORT_ON_INVALID_CERTIFICATE.set(client, true);
try (ClientSession s = client.connect(getCurrentTestName(),
"localhost", port)
.verify(CONNECT_TIMEOUT)
diff --git
a/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java
b/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java
index a9e76ed..2809bcd 100644
---
a/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java
+++
b/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java
@@ -121,11 +121,11 @@ public class SignatureFactoriesTest extends
BaseTestSupport implements KeyTypeIn
@BeforeClass
public static void setupClientAndServer() throws Exception {
- sshd =
CoreTestSupportUtils.setupTestServer(SignatureFactoriesTest.class);
+ sshd =
CoreTestSupportUtils.setupTestFullSupportServer(SignatureFactoriesTest.class);
sshd.start();
port = sshd.getPort();
- client =
CoreTestSupportUtils.setupTestClient(SignatureFactoriesTest.class);
+ client =
CoreTestSupportUtils.setupTestFullSupportClient(SignatureFactoriesTest.class);
client.start();
}
diff --git
a/sshd-core/src/test/java/org/apache/sshd/util/test/CoreTestSupportUtils.java
b/sshd-core/src/test/java/org/apache/sshd/util/test/CoreTestSupportUtils.java
index 1621405..4ad8967 100644
---
a/sshd-core/src/test/java/org/apache/sshd/util/test/CoreTestSupportUtils.java
+++
b/sshd-core/src/test/java/org/apache/sshd/util/test/CoreTestSupportUtils.java
@@ -21,14 +21,17 @@ package org.apache.sshd.util.test;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.ServerSocket;
+import java.util.ArrayList;
import org.apache.sshd.client.ClientBuilder;
import org.apache.sshd.client.SshClient;
import org.apache.sshd.client.config.hosts.HostConfigEntryResolver;
import org.apache.sshd.client.keyverifier.AcceptAllServerKeyVerifier;
import org.apache.sshd.common.NamedFactory;
+import org.apache.sshd.common.helpers.AbstractFactoryManager;
import org.apache.sshd.common.kex.BuiltinDHFactories;
import org.apache.sshd.common.keyprovider.KeyIdentityProvider;
+import org.apache.sshd.common.signature.BuiltinSignatures;
import org.apache.sshd.server.ServerBuilder;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.server.auth.pubkey.AcceptAllPublickeyAuthenticator;
@@ -63,6 +66,7 @@ public final class CoreTestSupportUtils {
public static SshClient setupTestFullSupportClient(SshClient client) {
client.setKeyExchangeFactories(
NamedFactory.setUpTransformedFactories(false,
BuiltinDHFactories.VALUES, ClientBuilder.DH2KEX));
+ setupFullSignaturesSupport(client);
return client;
}
@@ -85,6 +89,12 @@ public final class CoreTestSupportUtils {
public static SshServer setupTestFullSupportServer(SshServer sshd) {
sshd.setKeyExchangeFactories(
NamedFactory.setUpTransformedFactories(false,
BuiltinDHFactories.VALUES, ServerBuilder.DH2KEX));
+ setupFullSignaturesSupport(sshd);
return sshd;
}
+
+ public static <M extends AbstractFactoryManager> M
setupFullSignaturesSupport(M manager) {
+ manager.setSignatureFactories(new
ArrayList<>(BuiltinSignatures.VALUES));
+ return manager;
+ }
}
diff --git
a/sshd-core/src/test/resources/org/apache/sshd/common/auth/super-secret-passphrase-RSA-AES-128-key
b/sshd-core/src/test/resources/org/apache/sshd/common/auth/super-secret-passphrase-RSA-AES-128-key
deleted file mode 100644
index 2b93a42..0000000
---
a/sshd-core/src/test/resources/org/apache/sshd/common/auth/super-secret-passphrase-RSA-AES-128-key
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,D41AC063160FCC09B1E1931FB43BCEAA
-
-V218dGT2pUpimnwEVn+2ljvK6mvm2aNLlaakMunlHfIswrakJ1WTs8a61pYILOn9
-MGHrCiqe6ZI7FBJ2wXpSxhcuM3fzk6/dW4Ghh4EHG1Y94w97EizxNfyz/iI2XQw0
-i6ttaDLVzP8UcSRElqG+Zpe1A7EE/DkdkXD3f/DaGHtu1zirVeaEIggMLjfTdwnR
-sH9VnUZhe74VdPV0x16h7JjLt5fcbIjqJ6NWW4QvQpPBv3k0oiUy/nP4FXg1b7VW
-7SowuCPi+mF821hj4xSO8ETlAU1eZdtgXqtejtKm0iDtsjnTBZPvDDrq5ephBlxO
-k7JBJG1LFUiDIGnpxos5nCsKEo8UAw9a5/D4xE3C6UTocXon28XGzVCbkZBN6jcd
-UbpjCVwKMJmFL97487u9S57xrGTmJdi1AtF9Rei8juTTQY4+r3l2c7JtdtcbLUhj
-iLvdYnbh6kUEyE19/+omJaWGQlFhYp7ZMRRQSiz6TD8lhSIBPpXzs+uMfhkrifVk
-3WpjRoikmPOOFLtecee5Rp+SpGd700XgLnxwZ47l0FNfrKKqd3+nZX4JILQ2M0JP
-sBx8gcIew8aUqMzWrwZxbrt9Pd1+2kSNVG9hpLoNoA4WpQnYQMo4L0eTCeMNUOap
-f9H0Hh3QnqXTPHbcYZJCGE2RUxLzn/d7rUxUdEzER+pkhJcw9JbV/izTrpDHs9bM
-cfBLggQvs+UIBww2OFz2BztwoQzsSEuNW/SxG/y6SfRUQq5TZw9NxYnrrqfBXKtx
-svB1JVbn2fKq2Lvi8AZ1fF3tyrNot/tptDf0yDHejWDUvVx5cXsKVK2BbVjbZ88k
-mBtUbw7ea9Ev7ZsihNB2EdhPjLhhKlKLIZznPKeXL3GDTXqCgCxTVh4wLvaR8rDU
-C3Isil4WprCeynmZpOe7bxAZDm2QCobnDB8sLQqBI4zgH8X/1iyXJVdSKfK9vxcB
-sJ5pYCcS2q0C+CJkn6HVTlMQ5CyyzvPaDJukJoxwxsZ5hgCsUHFzrvyGnXqGfTBD
-qEW+oA7cj48CfweV5pXHj+mZpCrpn1zRVJRz4h1FZRsttPGtBRAlns5I3kh5BPRs
-4m1BO1jiWyp/7HkUrDRhEf/QeJsP+mTH32pQgnngZ/AGA0PUcKanMUpe1d2ju83V
-EIcTz9ycTHPiOAM6GaVt54fKj9WRBU+7pf14ZdJmfhp6twc0jNtaTh+/I6Pfb0jN
-0d6yKV//pOeJJBNhuOJgm/0vfkOnOojIJchOQCRt5Lg/a4fD/JXtLOed2zOQa+0J
-3d8Y93mQX/iN1wi95/sG79YBYF3FkJYVhjosSKbiIaxIn76zIx4IAlziycDKvgpr
-JgZcVvCDc4flwrf3Cv/uHK7UWOE+16X1CfAy8JzFg5bhiMmhgsJyHmd+zDGrY6NX
-zz+wLmwOenEwC40gpt89OXbgMcwJMtfiSusatRtZ+AAs0jb/8jExVXfcYE3m3r1/
-FqLZ7seTQT2D01YoPlwUtSPxzaZbziAJ/NaGmURnBGVibDCJxwUAiOSIQH4prIfg
-Q2FCJeMTbLV43Lanlby5nrmLkzsw3uo1MO8Of1DbcnVUHNSwrp/nNzrYdxBLIvqS
------END RSA PRIVATE KEY-----
diff --git
a/sshd-core/src/test/resources/org/apache/sshd/common/auth/super-secret-passphrase-RSA-AES-128-key.pub
b/sshd-core/src/test/resources/org/apache/sshd/common/auth/super-secret-passphrase-RSA-AES-128-key.pub
deleted file mode 100644
index b1d66a6..0000000
---
a/sshd-core/src/test/resources/org/apache/sshd/common/auth/super-secret-passphrase-RSA-AES-128-key.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa
AAAAB3NzaC1yc2EAAAADAQABAAABAQC/oDbs/yYxBdT02ldP6JIrcETJQ+TCml1tHYuo8cIQp0DZCgRZiEZ4foucAT8R/vLK01nnjRzrI42MXiCzyAHb1sPRD0Fsbpa4TFJczPBBRM2mp56airnArQUMmg/ZKlOf82hn+u7Kgn+ljyjYG5FrdoUBju62i0H4+oBfX+pTkd5ruUgqLyPUC3qtNLwjS4PIPAda/pfpsi9UawQ4ommWCCLlwK55NiSrPDBwKNuVWROcQps2NZRxzRLQEiiCEVBEdiUqqUQ+dg2beLV/4cCS860ZZRvCfe+ko8TUBJ7SLtcrvOEYJOKIZDVhcnQKN/wyXCHExSYytUconlFn/9YX
root@devenv-aas
\ No newline at end of file
diff --git
a/sshd-core/src/test/resources/org/apache/sshd/common/auth/super-secret-passphrase-ec256-key
b/sshd-core/src/test/resources/org/apache/sshd/common/auth/super-secret-passphrase-ec256-key
new file mode 100644
index 0000000..0e7e94a
--- /dev/null
+++
b/sshd-core/src/test/resources/org/apache/sshd/common/auth/super-secret-passphrase-ec256-key
@@ -0,0 +1,10 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABCBJIf6Vh
+Kbhk1+gmJsv6C6AAAAEAAAAAEAAABoAAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlz
+dHAyNTYAAABBBL01p9qPAsYum1h7HXFpbvwIWyb7CbzbQK5qlo97xbPgYxguslezrgZZZg
+ITFVlzECSiXIpReOFQ0bZW78fo3D0AAADAgtIDr0uiaUbj81kc5vLKhTEKJ7x0uzbDQ0ga
+yKiwkK6gr1kes6k0HBtuBN2hh/Dr5qJ4Tnh3yMXsXiC+gjf+OOVGM7qK6XcxUFFG5LsfbN
+YlB3cOuhdCzgJJm6fyo77V3ZTyXcDIvChPrUWJ+R011SLND11JwCaIUia10QuWrWlHEBdU
+f0Zq5nrcbcCq0jEXtLDSrUDtok/aYeGXU+WLv64CxH2ytG6RRsGIkHcHwXEn5Yun6FwIyG
+ujI82JomIM
+-----END OPENSSH PRIVATE KEY-----
diff --git
a/sshd-core/src/test/resources/org/apache/sshd/common/auth/super-secret-passphrase-ec256-key.pub
b/sshd-core/src/test/resources/org/apache/sshd/common/auth/super-secret-passphrase-ec256-key.pub
new file mode 100644
index 0000000..7ea5d70
--- /dev/null
+++
b/sshd-core/src/test/resources/org/apache/sshd/common/auth/super-secret-passphrase-ec256-key.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp256
AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL01p9qPAsYum1h7HXFpbvwIWyb7CbzbQK5qlo97xbPgYxguslezrgZZZgITFVlzECSiXIpReOFQ0bZW78fo3D0=
lgoldstein@LYORPC-A8133U7
diff --git a/sshd-scp/src/test/java/org/apache/sshd/scp/client/ScpTest.java
b/sshd-scp/src/test/java/org/apache/sshd/scp/client/ScpTest.java
index 2cc5972..5e0ec88 100644
--- a/sshd-scp/src/test/java/org/apache/sshd/scp/client/ScpTest.java
+++ b/sshd-scp/src/test/java/org/apache/sshd/scp/client/ScpTest.java
@@ -50,6 +50,7 @@ import org.apache.sshd.client.SshClient;
import org.apache.sshd.client.session.ClientSession;
import org.apache.sshd.common.Factory;
import org.apache.sshd.common.channel.Channel;
+import org.apache.sshd.common.config.keys.KeyUtils;
import org.apache.sshd.common.file.FileSystemFactory;
import org.apache.sshd.common.file.virtualfs.VirtualFileSystemFactory;
import org.apache.sshd.common.io.BuiltinIoServiceFactoryFactories;
@@ -70,6 +71,7 @@ import org.apache.sshd.scp.server.ScpCommandFactory;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.server.channel.ChannelSession;
import org.apache.sshd.server.command.Command;
+import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
import org.apache.sshd.util.test.BaseTestSupport;
import org.apache.sshd.util.test.CommonTestSupportUtils;
import org.apache.sshd.util.test.CoreTestSupportUtils;
@@ -148,14 +150,27 @@ public class ScpTest extends BaseTestSupport {
@BeforeClass
public static void setupClientAndServer() throws Exception {
JSchLogger.init();
- sshd = CoreTestSupportUtils.setupTestFullSupportServer(ScpTest.class);
+ setupClientAndServer(ScpTest.class);
+ }
+
+ protected static void setupClientAndServer(Class<?> anchor) throws
Exception {
+ // Need to use RSA since Ganymede does not support EC
+ SimpleGeneratorHostKeyProvider provider = new
SimpleGeneratorHostKeyProvider();
+ provider.setAlgorithm(KeyUtils.RSA_ALGORITHM);
+ provider.setKeySize(1024);
+
+ Path targetDir = CommonTestSupportUtils.detectTargetFolder(anchor);
+ provider.setPath(targetDir.resolve(anchor.getSimpleName() + "-key"));
+ sshd = CoreTestSupportUtils.setupTestFullSupportServer(anchor);
+ sshd.setKeyPairProvider(provider);
+
ScpCommandFactory factory = new ScpCommandFactory();
sshd.setCommandFactory(factory);
sshd.setShellFactory(factory);
sshd.start();
port = sshd.getPort();
- client =
CoreTestSupportUtils.setupTestFullSupportClient(ScpTest.class);
+ client = CoreTestSupportUtils.setupTestFullSupportClient(anchor);
client.start();
}
