http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/java/org/apache/sshd/util/test/BaseTestSupport.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/BaseTestSupport.java b/sshd-core/src/test/java/org/apache/sshd/util/test/BaseTestSupport.java index ba58c5e..589ab2f 100644 --- a/sshd-core/src/test/java/org/apache/sshd/util/test/BaseTestSupport.java +++ b/sshd-core/src/test/java/org/apache/sshd/util/test/BaseTestSupport.java @@ -18,76 +18,23 @@ */ package org.apache.sshd.util.test; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.file.Files; -import java.nio.file.LinkOption; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.security.Key; -import java.security.KeyPair; -import java.security.interfaces.DSAParams; -import java.security.interfaces.DSAPrivateKey; -import java.security.interfaces.DSAPublicKey; -import java.security.interfaces.ECKey; -import java.security.interfaces.ECPrivateKey; -import java.security.interfaces.ECPublicKey; -import java.security.interfaces.RSAPrivateKey; -import java.security.interfaces.RSAPublicKey; -import java.security.spec.ECField; -import java.security.spec.ECParameterSpec; -import java.security.spec.ECPoint; -import java.security.spec.EllipticCurve; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.TimeUnit; - import org.apache.sshd.client.SshClient; import org.apache.sshd.common.io.DefaultIoServiceFactoryFactory; import org.apache.sshd.common.io.IoServiceFactoryFactory; -import org.apache.sshd.common.keyprovider.KeyPairProvider; -import org.apache.sshd.common.util.GenericUtils; -import org.apache.sshd.common.util.io.IoUtils; import org.apache.sshd.common.util.net.SshdSocketAddress; import org.apache.sshd.server.SshServer; -import org.junit.Assert; import org.junit.Rule; -import org.junit.rules.TestName; import org.junit.rules.TestWatcher; import org.junit.runner.Description; -import org.junit.runner.RunWith; /** * Helper used as base class for all test classes * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ -@RunWith(JUnit4SingleInstanceClassRunner.class) -public abstract class BaseTestSupport extends Assert { - public static final String TEMP_SUBFOLDER_NAME = "temp"; +public abstract class BaseTestSupport extends JUnitTestSupport { // can be used to override the 'localhost' with an address other than 127.0.0.1 in case it is required public static final String TEST_LOCALHOST = System.getProperty("org.apache.sshd.test.localhost", SshdSocketAddress.LOCALHOST_IPV4); - public static final boolean OUTPUT_DEBUG_MESSAGES = Boolean.parseBoolean(System.getProperty("org.apache.sshd.test.outputDebugMessages", "false")); - public static final String MAIN_SUBFOLDER = "main"; - public static final String TEST_SUBFOLDER = "test"; - public static final String RESOURCES_SUBFOLDER = "resources"; - - // useful test sizes for keys - public static final List<Integer> DSS_SIZES = - Collections.unmodifiableList(Arrays.asList(512, 768, 1024)); - public static final List<Integer> RSA_SIZES = - Collections.unmodifiableList(Arrays.asList(1024, 2048, 3072, 4096)); - public static final List<Integer> ED25519_SIZES = - Collections.unmodifiableList(Arrays.asList(256)); @Rule public final TestWatcher rule = new TestWatcher() { @@ -115,503 +62,21 @@ public abstract class BaseTestSupport extends Assert { } }; - @Rule - public final TestName testNameHolder = new TestName(); - private Path targetFolder; - private Path tempFolder; - protected BaseTestSupport() { super(); } - public final String getCurrentTestName() { - return testNameHolder.getMethodName(); - } - protected SshServer setupTestServer() { - return Utils.setupTestServer(getClass()); + return CoreTestSupportUtils.setupTestServer(getClass()); } protected SshClient setupTestClient() { - return Utils.setupTestClient(getClass()); - } - - protected KeyPairProvider createTestHostKeyProvider() { - return Utils.createTestHostKeyProvider(getClass()); - } - - /** - * Attempts to build a <U>relative</U> path whose root is the location - * of the TEMP sub-folder of the Maven "target" folder associated - * with the project - * - * @param comps The path components - ignored if {@code null}/empty - * @return The {@link Path} representing the result - same as target folder if no components - * @see #TEMP_SUBFOLDER_NAME - * @see #getTargetRelativeFile(Collection) - */ - protected Path getTempTargetRelativeFile(String... comps) { - return getTempTargetRelativeFile(GenericUtils.isEmpty(comps) ? Collections.emptyList() : Arrays.asList(comps)); - } - - /** - * Attempts to build a <U>relative</U> path whose root is the location - * of the TEMP sub-folder of the Maven "target" folder associated - * with the project - * - * @param comps The path components - ignored if {@code null}/empty - * @return The {@link Path} representing the result - same as target folder if no components - * @see #TEMP_SUBFOLDER_NAME - * @see #getTempTargetFolder() - */ - protected Path getTempTargetRelativeFile(Collection<String> comps) { - return Utils.resolve(getTempTargetFolder(), comps); - } - - /** - * @return The TEMP sub-folder {@link Path} of the Maven "target" folder - * associated with the project - never {@code null} - */ - protected Path getTempTargetFolder() { - synchronized (TEMP_SUBFOLDER_NAME) { - if (tempFolder == null) { - tempFolder = Objects.requireNonNull(detectTargetFolder(), "No target folder detected").resolve(TEMP_SUBFOLDER_NAME); - } - } - - return tempFolder; - } - - /** - * Attempts to build a <U>relative</U> path whose root is the location - * of the Maven "target" folder associated with the project - * - * @param comps The path components - ignored if {@code null}/empty - * @return The {@link Path} representing the result - same as target folder if no components - */ - protected Path getTargetRelativeFile(String... comps) { - return getTargetRelativeFile(GenericUtils.isEmpty(comps) ? Collections.emptyList() : Arrays.asList(comps)); - } - - /** - * Attempts to build a <U>relative</U> path whose root is the location - * of the Maven "target" folder associated with the project - * - * @param comps The path components - ignored if {@code null}/empty - * @return The {@link Path} representing the result - same as target folder if no components - * @see #detectTargetFolder() - */ - protected Path getTargetRelativeFile(Collection<String> comps) { - return Utils.resolve(detectTargetFolder(), comps); - } - - /** - * Attempts to detect the location of the Maven "target" folder - * associated with the project that contains the actual class extending this - * base class - * - * @return The {@link File} representing the location of the "target" folder - * @throws IllegalArgumentException If failed to detect the folder - */ - protected Path detectTargetFolder() throws IllegalArgumentException { - synchronized (TEMP_SUBFOLDER_NAME) { - if (targetFolder == null) { - targetFolder = Objects.requireNonNull(Utils.detectTargetFolder(getClass()), "Failed to detect target folder").toPath(); - } - } - - return targetFolder; - } - - /** - * Creates a folder bearing the class's simple name under the project's target temporary folder - * - * @return The created folder {@link Path} - * @throws IOException If failed to detect or create the folder's location - * @see #detectTargetFolder() detectTargetFolder - * @see #assertHierarchyTargetFolderExists(Path, LinkOption...) assertHierarchyTargetFolderExists - */ - protected Path createTempClassFolder() throws IOException { - Path tmpDir = detectTargetFolder(); - return assertHierarchyTargetFolderExists(tmpDir.resolve(getClass().getSimpleName())); - } - - protected Path detectSourcesFolder() throws IllegalStateException { - Path target = detectTargetFolder(); - Path parent = target.getParent(); - return parent.resolve("src"); - } - - protected Path getTestResourcesFolder() { - try { - URL url = getClass().getResource(getClass().getSimpleName() + ".class"); - return Paths.get(url.toURI()).getParent(); - } catch (URISyntaxException e) { - throw new RuntimeException(e); - } - } - - protected Path getClassResourcesFolder(String resType /* test or main */) { - return getClassResourcesFolder(resType, getClass()); - } - - protected Path getClassResourcesFolder(String resType /* test or main */, Class<?> clazz) { - return getPackageResourcesFolder(resType, clazz.getPackage()); - } - - protected Path getPackageResourcesFolder(String resType /* test or main */, Package pkg) { - return getPackageResourcesFolder(resType, pkg.getName()); - } - - protected Path getPackageResourcesFolder(String resType /* test or main */, String pkgName) { - Path src = detectSourcesFolder(); - Path root = src.resolve(resType); - Path resources = root.resolve(RESOURCES_SUBFOLDER); - return resources.resolve(pkgName.replace('.', File.separatorChar)); - } - - /* ------------------- Useful extra test helpers ---------------------- */ - - public static String shuffleCase(CharSequence cs) { - if (GenericUtils.isEmpty(cs)) { - return ""; - } - - StringBuilder sb = new StringBuilder(cs.length()); - for (int index = 0; index < cs.length(); index++) { - char ch = cs.charAt(index); - double v = Math.random(); - if (Double.compare(v, 0.3d) < 0) { - ch = Character.toUpperCase(ch); - } else if ((Double.compare(v, 0.3d) >= 0) && (Double.compare(v, 0.6d) < 0)) { - ch = Character.toLowerCase(ch); - } - sb.append(ch); - } - - return sb.toString(); - } - - public static String repeat(CharSequence csq, int nTimes) { - if (GenericUtils.isEmpty(csq) || (nTimes <= 0)) { - return ""; - } - - StringBuilder sb = new StringBuilder(nTimes * csq.length()); - for (int index = 0; index < nTimes; index++) { - sb.append(csq); - } - - return sb.toString(); - } - - public static List<Object[]> parameterize(Collection<?> params) { - if (GenericUtils.isEmpty(params)) { - return Collections.emptyList(); - } - - List<Object[]> result = new ArrayList<>(params.size()); - for (Object p : params) { - result.add(new Object[]{p}); - } - - return result; - } - - /* ----------------------- Useful extra assertions --------------------- */ - - public static void assertEquals(String message, boolean expected, boolean actual) { - assertEquals(message, Boolean.valueOf(expected), Boolean.valueOf(actual)); - } - - public static <T> void assertEquals(String message, Iterable<? extends T> expected, Iterable<? extends T> actual) { - if (expected != actual) { - assertEquals(message, expected.iterator(), actual.iterator()); - } - } - - public static <T> void assertEquals(String message, Iterator<? extends T> expected, Iterator<? extends T> actual) { - if (expected == actual) { - return; - } - - for (int index = 0; expected.hasNext(); index++) { - assertTrue(message + "[next actual index=" + index + "]", actual.hasNext()); - - T expValue = expected.next(); - T actValue = actual.next(); - assertEquals(message + "[iterator index=" + index + "]", expValue, actValue); - } - - // once expected is exhausted make sure no more actual items left - assertFalse(message + "[non-empty-actual]", actual.hasNext()); - } - - public static Path assertHierarchyTargetFolderExists(Path folder, LinkOption... options) throws IOException { - if (Files.exists(folder, options)) { - assertTrue("Target is an existing file instead of a folder: " + folder, Files.isDirectory(folder, options)); - } else { - Files.createDirectories(folder); - } - - return folder; - } - - public static void assertFileContentsEquals(String prefix, Path expected, Path actual) throws IOException { - long cmpSize = Files.size(expected); - assertEquals(prefix + ": Mismatched file size", cmpSize, Files.size(expected)); - - try (InputStream expStream = Files.newInputStream(expected); - InputStream actStream = Files.newInputStream(actual)) { - byte[] expData = new byte[IoUtils.DEFAULT_COPY_SIZE]; - byte[] actData = new byte[expData.length]; - - for (long offset = 0L; offset < cmpSize;) { - Arrays.fill(expData, (byte) 0); - int expLen = expStream.read(expData); - Arrays.fill(actData, (byte) 0); - int actLen = actStream.read(actData); - assertEquals(prefix + ": Mismatched read size at offset=" + offset, expLen, actLen); - assertArrayEquals(prefix + ": Mismatched data at offset=" + offset, expData, actData); - - offset += expLen; - } - } - } - - public static File assertHierarchyTargetFolderExists(File folder) { - if (folder.exists()) { - assertTrue("Target is an existing file instead of a folder: " + folder.getAbsolutePath(), folder.isDirectory()); - } else { - assertTrue("Failed to create hierarchy of " + folder.getAbsolutePath(), folder.mkdirs()); - } - - return folder; - } - - public static void assertObjectInstanceOf(String message, Class<?> expected, Object obj) { - assertNotNull(message + " - no actual object", obj); - - Class<?> actual = obj.getClass(); - if (!expected.isAssignableFrom(actual)) { - fail(message + " - actual object type (" + actual.getName() + ") incompatible with expected (" + expected.getName() + ")"); - } - } - - public static <E> void assertListEquals(String message, List<? extends E> expected, List<? extends E> actual) { - int expSize = GenericUtils.size(expected); - int actSize = GenericUtils.size(actual); - assertEquals(message + "[size]", expSize, actSize); - - for (int index = 0; index < expSize; index++) { - E expValue = expected.get(index); - E actValue = actual.get(index); - assertEquals(message + "[" + index + "]", expValue, actValue); - } - } - - public static <K, V> void assertMapEquals(String message, Map<? extends K, ? extends V> expected, Map<? super K, ? extends V> actual) { - int numItems = GenericUtils.size(expected); - assertEquals(message + "[size]", numItems, GenericUtils.size(actual)); - - if (numItems > 0) { - expected.forEach((key, expValue) -> { - V actValue = actual.get(key); - assertEquals(message + "[" + key + "]", expValue, actValue); - }); - } - } - - public static void assertKeyPairEquals(String message, KeyPair expected, KeyPair actual) { - assertKeyEquals(message + "[public]", expected.getPublic(), actual.getPublic()); - assertKeyEquals(message + "[private]", expected.getPrivate(), actual.getPrivate()); - } - - public static <T extends Key> void assertKeyEquals(String message, T expected, T actual) { - if (expected == actual) { - return; - } - - assertEquals(message + "[algorithm]", expected.getAlgorithm(), actual.getAlgorithm()); - - if (expected instanceof RSAPublicKey) { - assertRSAPublicKeyEquals(message, RSAPublicKey.class.cast(expected), RSAPublicKey.class.cast(actual)); - } else if (expected instanceof DSAPublicKey) { - assertDSAPublicKeyEquals(message, DSAPublicKey.class.cast(expected), DSAPublicKey.class.cast(actual)); - } else if (expected instanceof ECPublicKey) { - assertECPublicKeyEquals(message, ECPublicKey.class.cast(expected), ECPublicKey.class.cast(actual)); - } else if (expected instanceof RSAPrivateKey) { - assertRSAPrivateKeyEquals(message, RSAPrivateKey.class.cast(expected), RSAPrivateKey.class.cast(actual)); - } else if (expected instanceof ECPrivateKey) { - assertECPrivateKeyEquals(message, ECPrivateKey.class.cast(expected), ECPrivateKey.class.cast(actual)); - } - assertArrayEquals(message + "[encdoded-data]", expected.getEncoded(), actual.getEncoded()); - } - - public static void assertRSAPublicKeyEquals(String message, RSAPublicKey expected, RSAPublicKey actual) { - if (expected == actual) { - return; - } - - assertEquals(message + "[e]", expected.getPublicExponent(), actual.getPublicExponent()); - assertEquals(message + "[n]", expected.getModulus(), actual.getModulus()); - } - - public static void assertDSAPublicKeyEquals(String message, DSAPublicKey expected, DSAPublicKey actual) { - if (expected == actual) { - return; - } - - assertEquals(message + "[y]", expected.getY(), actual.getY()); - assertDSAParamsEquals(message + "[params]", expected.getParams(), actual.getParams()); - } - - public static void assertECPublicKeyEquals(String message, ECPublicKey expected, ECPublicKey actual) { - if (expected == actual) { - return; - } - - assertECPointEquals(message + "[W]", expected.getW(), actual.getW()); - assertECParameterSpecEquals(message, expected, actual); - } - - public static void assertRSAPrivateKeyEquals(String message, RSAPrivateKey expected, RSAPrivateKey actual) { - if (expected == actual) { - return; - } - - assertEquals(message + "[d]", expected.getPrivateExponent(), actual.getPrivateExponent()); - assertEquals(message + "[n]", expected.getModulus(), actual.getModulus()); - } - - public static void assertDSAPrivateKeyEquals(String message, DSAPrivateKey expected, DSAPrivateKey actual) { - if (expected == actual) { - return; - } - - assertEquals(message + "[x]", expected.getX(), actual.getX()); - assertDSAParamsEquals(message + "[params]", expected.getParams(), actual.getParams()); - } - - public static void assertDSAParamsEquals(String message, DSAParams expected, DSAParams actual) { - if (expected == actual) { - return; - } - - assertEquals(message + "[g]", expected.getG(), actual.getG()); - assertEquals(message + "[p]", expected.getP(), actual.getP()); - assertEquals(message + "[q]", expected.getQ(), actual.getQ()); - } - - public static void assertECPrivateKeyEquals(String message, ECPrivateKey expected, ECPrivateKey actual) { - if (expected == actual) { - return; - } - - assertEquals(message + "[S]", expected.getS(), actual.getS()); - assertECParameterSpecEquals(message, expected, actual); - } - - public static void assertECParameterSpecEquals(String message, ECKey expected, ECKey actual) { - if (expected == actual) { - return; - } - assertECParameterSpecEquals(message, expected.getParams(), actual.getParams()); - } - - public static void assertECParameterSpecEquals(String message, ECParameterSpec expected, ECParameterSpec actual) { - if (expected == actual) { - return; - } - - assertEquals(message + "[order]", expected.getOrder(), actual.getOrder()); - assertEquals(message + "[cofactor]", expected.getCofactor(), actual.getCofactor()); - assertECPointEquals(message + "[generator]", expected.getGenerator(), actual.getGenerator()); - assertCurveEquals(message + "[curve]", expected.getCurve(), actual.getCurve()); - } - - public static void assertCurveEquals(String message, EllipticCurve expected, EllipticCurve actual) { - if (expected == actual) { - return; - } - - assertEquals(message + "[A]", expected.getA(), actual.getA()); - assertEquals(message + "[B]", expected.getB(), actual.getB()); - assertArrayEquals(message + "[seed]", expected.getSeed(), actual.getSeed()); - assertECFieldEquals(message + "[field]", expected.getField(), actual.getField()); - } - - public static void assertECFieldEquals(String message, ECField expected, ECField actual) { - if (expected == actual) { - return; - } - - assertEquals(message + "[size]", expected.getFieldSize(), actual.getFieldSize()); - } - - public static void assertECPointEquals(String message, ECPoint expected, ECPoint actual) { - if (expected == actual) { - return; - } - - assertEquals(message + "[x]", expected.getAffineX(), actual.getAffineX()); - assertEquals(message + "[y]", expected.getAffineY(), actual.getAffineY()); - } - - public static void assertFileLength(File file, long length, long timeout) throws Exception { - assertFileLength(file.toPath(), length, timeout); - } - - /** - * Waits the specified timeout for the file to exist and have the required length - * - * @param file The file {@link Path} to check - * @param length Expected length - * @param timeout Timeout (msec.) to wait for satisfying the requirements - * @throws Exception If failed to access the file - */ - public static void assertFileLength(Path file, long length, long timeout) throws Exception { - if (waitForFile(file, length, timeout)) { - return; - } - assertTrue("File not found: " + file, Files.exists(file)); - assertEquals("Mismatched file size for " + file, length, Files.size(file)); - } - - public static boolean waitForFile(Path file, long length, long timeout) throws Exception { - while (timeout > 0L) { - long sleepTime = Math.min(timeout, 100L); - if (Files.exists(file) && (Files.size(file) == length)) { - return true; - } - - long sleepStart = System.nanoTime(); - Thread.sleep(sleepTime); - long sleepEnd = System.nanoTime(); - long nanoSleep = sleepEnd - sleepStart; - - sleepTime = TimeUnit.NANOSECONDS.toMillis(nanoSleep); - timeout -= sleepTime; - } - - return false; - } - - public static void outputDebugMessage(String format, Object... args) { - if (OUTPUT_DEBUG_MESSAGES) { - outputDebugMessage(String.format(format, args)); - } - } - - public static void outputDebugMessage(Object message) { - if (OUTPUT_DEBUG_MESSAGES) { - System.out.append("===[DEBUG]=== ").println(message); - } + return CoreTestSupportUtils.setupTestClient(getClass()); } public static IoServiceFactoryFactory getIoServiceProvider() { DefaultIoServiceFactoryFactory factory = - DefaultIoServiceFactoryFactory.getDefaultIoServiceFactoryFactoryInstance(); + DefaultIoServiceFactoryFactory.getDefaultIoServiceFactoryFactoryInstance(); return factory.getIoServiceProvider(); } }
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/java/org/apache/sshd/util/test/CoreTestSupportUtils.java ---------------------------------------------------------------------- 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 new file mode 100644 index 0000000..e6bb6cb --- /dev/null +++ b/sshd-core/src/test/java/org/apache/sshd/util/test/CoreTestSupportUtils.java @@ -0,0 +1,63 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.sshd.util.test; + +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.ServerSocket; + +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.keyprovider.KeyPairProvider; +import org.apache.sshd.server.SshServer; +import org.apache.sshd.server.auth.pubkey.AcceptAllPublickeyAuthenticator; +import org.apache.sshd.server.shell.UnknownCommandFactory; + +public final class CoreTestSupportUtils { + private CoreTestSupportUtils() { + throw new UnsupportedOperationException("No instance"); + } + + public static int getFreePort() throws Exception { + try (ServerSocket s = new ServerSocket()) { + s.setReuseAddress(true); + s.bind(new InetSocketAddress((InetAddress) null, 0)); + return s.getLocalPort(); + } + } + + public static SshClient setupTestClient(Class<?> anchor) { + SshClient client = SshClient.setUpDefaultClient(); + client.setServerKeyVerifier(AcceptAllServerKeyVerifier.INSTANCE); + client.setHostConfigEntryResolver(HostConfigEntryResolver.EMPTY); + client.setKeyPairProvider(KeyPairProvider.EMPTY_KEYPAIR_PROVIDER); + return client; + } + + public static SshServer setupTestServer(Class<?> anchor) { + SshServer sshd = SshServer.setUpDefaultServer(); + sshd.setKeyPairProvider(CommonTestSupportUtils.createTestHostKeyProvider(anchor)); + sshd.setPasswordAuthenticator(BogusPasswordAuthenticator.INSTANCE); + sshd.setPublickeyAuthenticator(AcceptAllPublickeyAuthenticator.INSTANCE); + sshd.setShellFactory(EchoShellFactory.INSTANCE); + sshd.setCommandFactory(UnknownCommandFactory.INSTANCE); + return sshd; + } +} http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4ClassRunnerWithParameters.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4ClassRunnerWithParameters.java b/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4ClassRunnerWithParameters.java deleted file mode 100644 index acf44a5..0000000 --- a/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4ClassRunnerWithParameters.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.sshd.util.test; - -import org.junit.runners.model.InitializationError; -import org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters; -import org.junit.runners.parameterized.TestWithParameters; - -/** - * Uses a cached created instance instead of a new one on every call of {@code #createTest()} - * - * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> - */ -public class JUnit4ClassRunnerWithParameters extends BlockJUnit4ClassRunnerWithParameters { - private volatile Object testInstance; - - public JUnit4ClassRunnerWithParameters(TestWithParameters test) throws InitializationError { - super(test); - } - - @Override - public Object createTest() throws Exception { - synchronized (this) { - if (testInstance == null) { - testInstance = super.createTest(); - } - } - - return testInstance; - } -} http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4ClassRunnerWithParametersFactory.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4ClassRunnerWithParametersFactory.java b/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4ClassRunnerWithParametersFactory.java deleted file mode 100644 index 12ab252..0000000 --- a/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4ClassRunnerWithParametersFactory.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.sshd.util.test; - -import org.junit.runner.Runner; -import org.junit.runners.model.InitializationError; -import org.junit.runners.parameterized.ParametersRunnerFactory; -import org.junit.runners.parameterized.TestWithParameters; - -/** - * Avoids re-creating a test class instance for each parameterized test method. Usage: - * - * <PRE><code> - * @FixMethodOrder(MethodSorters.NAME_ASCENDING) - * @RunWith(Parameterized.class) - * @UseParametersRunnerFactory(JUnit4ClassRunnerWithParametersFactory.class) - * public class MyParameterizedTest { - * public MyParameterizedTest(...params...) { - * .... - * } - * - * @Parameters(...) - * public static List<Object[]> parameters() { - * ... - * } - * } - * </code></PRE> - * - * @see JUnit4ClassRunnerWithParameters - * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> - */ -public class JUnit4ClassRunnerWithParametersFactory implements ParametersRunnerFactory { - public JUnit4ClassRunnerWithParametersFactory() { - super(); - } - - @Override - public Runner createRunnerForTestWithParameters(TestWithParameters test) throws InitializationError { - return new JUnit4ClassRunnerWithParameters(test); - } -} http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4SingleInstanceClassRunner.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4SingleInstanceClassRunner.java b/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4SingleInstanceClassRunner.java deleted file mode 100644 index a8f11ce..0000000 --- a/sshd-core/src/test/java/org/apache/sshd/util/test/JUnit4SingleInstanceClassRunner.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.sshd.util.test; - -import java.util.AbstractMap.SimpleImmutableEntry; -import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; - -import org.junit.runners.BlockJUnit4ClassRunner; -import org.junit.runners.model.InitializationError; -import org.junit.runners.model.TestClass; - -/** - * @see <A HREF="https://issues.apache.org/jira/browse/SSHD-764";>SSHD-764</A> - * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> - */ -public class JUnit4SingleInstanceClassRunner extends BlockJUnit4ClassRunner { - private final AtomicReference<Map.Entry<Class<?>, ?>> testHolder = new AtomicReference<>(); - - public JUnit4SingleInstanceClassRunner(Class<?> klass) throws InitializationError { - super(klass); - } - - @Override - protected Object createTest() throws Exception { - Map.Entry<Class<?>, ?> lastTest = testHolder.get(); - Class<?> lastTestClass = (lastTest == null) ? null : lastTest.getKey(); - TestClass curTest = getTestClass(); - Class<?> curTestClass = curTest.getJavaClass(); - if (curTestClass == lastTestClass) { - return lastTest.getValue(); - } - - Object instance = super.createTest(); - testHolder.set(new SimpleImmutableEntry<>(curTestClass, instance)); - return instance; - } -} http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/java/org/apache/sshd/util/test/NoIoTestCase.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/NoIoTestCase.java b/sshd-core/src/test/java/org/apache/sshd/util/test/NoIoTestCase.java deleted file mode 100644 index 7d52892..0000000 --- a/sshd-core/src/test/java/org/apache/sshd/util/test/NoIoTestCase.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.sshd.util.test; - -/** - * Marker interface used as <A HREF="https://github.com/junit-team/junit4/wiki/categories";>jUnit category</A> - * to indicate a test that does not require real client/server interaction. - * - * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> - */ -public interface NoIoTestCase { - // Marker interface -} http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/java/org/apache/sshd/util/test/OutputCountTrackingOutputStream.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/OutputCountTrackingOutputStream.java b/sshd-core/src/test/java/org/apache/sshd/util/test/OutputCountTrackingOutputStream.java deleted file mode 100644 index b4eb84c..0000000 --- a/sshd-core/src/test/java/org/apache/sshd/util/test/OutputCountTrackingOutputStream.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.sshd.util.test; - -import java.io.FilterOutputStream; -import java.io.IOException; -import java.io.OutputStream; - -/** - * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> - */ -public class OutputCountTrackingOutputStream extends FilterOutputStream { - protected long writeCount; - - public OutputCountTrackingOutputStream(OutputStream out) { - super(out); - } - - @Override - public void write(int b) throws IOException { - out.write(b); - updateWriteCount(1L); - } - - @Override - public void write(byte[] b, int off, int len) throws IOException { - out.write(b, off, len); // don't call super since it calls the single 'write' - updateWriteCount(len); - } - - public long getWriteCount() { - return writeCount; - } - - protected long updateWriteCount(long delta) { - writeCount += delta; - return writeCount; - } -} http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/java/org/apache/sshd/util/test/TeeOutputStream.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/TeeOutputStream.java b/sshd-core/src/test/java/org/apache/sshd/util/test/TeeOutputStream.java deleted file mode 100644 index 4cd6014..0000000 --- a/sshd-core/src/test/java/org/apache/sshd/util/test/TeeOutputStream.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.sshd.util.test; - -import java.io.IOException; -import java.io.OutputStream; - -/** - * TODO Add javadoc - * - * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> - */ -public class TeeOutputStream extends OutputStream { - - private OutputStream[] tees; - - public TeeOutputStream(OutputStream... tees) { - this.tees = tees; - } - - @Override - public void write(int b) throws IOException { - for (OutputStream s : tees) { - s.write(b); - } - } - - @Override - public void write(byte[] b, int off, int len) throws IOException { - for (OutputStream s : tees) { - s.write(b, off, len); - } - } - - @Override - public void flush() throws IOException { - for (OutputStream s : tees) { - s.flush(); - } - } - - @Override - public void close() throws IOException { - for (OutputStream s : tees) { - s.close(); - } - } -} http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/java/org/apache/sshd/util/test/Utils.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/Utils.java b/sshd-core/src/test/java/org/apache/sshd/util/test/Utils.java deleted file mode 100644 index a007239..0000000 --- a/sshd-core/src/test/java/org/apache/sshd/util/test/Utils.java +++ /dev/null @@ -1,652 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.sshd.util.test; - -import java.io.File; -import java.io.IOException; -import java.io.OutputStream; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.MalformedURLException; -import java.net.ServerSocket; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.nio.file.DirectoryStream; -import java.nio.file.Files; -import java.nio.file.LinkOption; -import java.nio.file.Path; -import java.security.CodeSource; -import java.security.GeneralSecurityException; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.ProtectionDomain; -import java.security.spec.InvalidKeySpecException; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicReference; - -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.Factory; -import org.apache.sshd.common.cipher.ECCurves; -import org.apache.sshd.common.config.keys.KeyUtils; -import org.apache.sshd.common.keyprovider.FileKeyPairProvider; -import org.apache.sshd.common.keyprovider.KeyIdentityProvider; -import org.apache.sshd.common.keyprovider.KeyPairProvider; -import org.apache.sshd.common.keyprovider.KeyPairProviderHolder; -import org.apache.sshd.common.random.Random; -import org.apache.sshd.common.util.GenericUtils; -import org.apache.sshd.common.util.ValidateUtils; -import org.apache.sshd.common.util.io.IoUtils; -import org.apache.sshd.common.util.security.SecurityUtils; -import org.apache.sshd.server.SshServer; -import org.apache.sshd.server.auth.pubkey.AcceptAllPublickeyAuthenticator; -import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; -import org.apache.sshd.server.shell.UnknownCommandFactory; - -public final class Utils { - /** - * URL/URI scheme that refers to a file - */ - public static final String FILE_URL_SCHEME = "file"; - /** - * Prefix used in URL(s) that reference a file resource - */ - public static final String FILE_URL_PREFIX = FILE_URL_SCHEME + ":"; - - /** - * Separator used in URL(s) that reference a resource inside a JAR - * to denote the sub-path inside the JAR - */ - public static final char RESOURCE_SUBPATH_SEPARATOR = '!'; - - /** - * Suffix of JAR files - */ - public static final String JAR_FILE_SUFFIX = ".jar"; - - /** - * URL/URI scheme that refers to a JAR - */ - public static final String JAR_URL_SCHEME = "jar"; - - /** - * Prefix used in URL(s) that reference a resource inside a JAR - */ - public static final String JAR_URL_PREFIX = JAR_URL_SCHEME + ":"; - - /** - * Suffix of compile Java class files - */ - public static final String CLASS_FILE_SUFFIX = ".class"; - - public static final List<String> TARGET_FOLDER_NAMES = // NOTE: order is important - Collections.unmodifiableList( - Arrays.asList("target" /* Maven */, "build" /* Gradle */)); - - public static final String DEFAULT_TEST_HOST_KEY_PROVIDER_ALGORITHM = KeyUtils.RSA_ALGORITHM; - // 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 - private static final Map<String, FileKeyPairProvider> PROVIDERS_MAP = new ConcurrentHashMap<>(); - - private Utils() { - throw new UnsupportedOperationException("No instance"); - } - - public static KeyPairProvider createTestHostKeyProvider(Class<?> anchor) { - KeyPairProvider provider = KEYPAIR_PROVIDER_HOLDER.get(); - if (provider != null) { - return provider; - } - - File targetFolder = Objects.requireNonNull(detectTargetFolder(anchor), "Failed to detect target folder"); - File file = new File(targetFolder, "hostkey." + DEFAULT_TEST_HOST_KEY_PROVIDER_ALGORITHM.toLowerCase()); - provider = createTestHostKeyProvider(file); - - KeyPairProvider prev = KEYPAIR_PROVIDER_HOLDER.getAndSet(provider); - if (prev != null) { // check if somebody else beat us to it - return prev; - } else { - return provider; - } - } - - public static KeyPairProvider createTestHostKeyProvider(File file) { - return createTestHostKeyProvider(Objects.requireNonNull(file, "No file").toPath()); - } - - public static KeyPairProvider createTestHostKeyProvider(Path path) { - SimpleGeneratorHostKeyProvider keyProvider = new SimpleGeneratorHostKeyProvider(); - keyProvider.setPath(Objects.requireNonNull(path, "No path")); - keyProvider.setAlgorithm(DEFAULT_TEST_HOST_KEY_PROVIDER_ALGORITHM); - return validateKeyPairProvider(keyProvider); - } - - public static KeyPair getFirstKeyPair(KeyPairProviderHolder holder) { - return getFirstKeyPair(Objects.requireNonNull(holder, "No holder").getKeyPairProvider()); - } - - public static KeyPair getFirstKeyPair(KeyIdentityProvider provider) { - Objects.requireNonNull(provider, "No key pair provider"); - Iterable<? extends KeyPair> pairs = Objects.requireNonNull(provider.loadKeys(), "No loaded keys"); - Iterator<? extends KeyPair> iter = Objects.requireNonNull(pairs.iterator(), "No keys iterator"); - ValidateUtils.checkTrue(iter.hasNext(), "Empty loaded kyes iterator"); - return Objects.requireNonNull(iter.next(), "No key pair in iterator"); - } - - public static KeyPair generateKeyPair(String algorithm, int keySize) throws GeneralSecurityException { - KeyPairGenerator gen = SecurityUtils.getKeyPairGenerator(algorithm); - if (KeyUtils.EC_ALGORITHM.equalsIgnoreCase(algorithm)) { - ECCurves curve = ECCurves.fromCurveSize(keySize); - if (curve == null) { - throw new InvalidKeySpecException("Unknown curve for key size=" + keySize); - } - gen.initialize(curve.getParameters()); - } else { - gen.initialize(keySize); - } - - return gen.generateKeyPair(); - } - - public static FileKeyPairProvider createTestKeyPairProvider(String resource) { - File file = getFile(resource); - String filePath = file.getAbsolutePath(); - FileKeyPairProvider provider = PROVIDERS_MAP.get(filePath); - if (provider != null) { - return provider; - } - - provider = new FileKeyPairProvider(); - provider.setFiles(Collections.singletonList(file)); - provider = validateKeyPairProvider(provider); - - FileKeyPairProvider prev = PROVIDERS_MAP.put(filePath, provider); - if (prev != null) { // check if somebody else beat us to it - return prev; - } else { - return provider; - } - } - - private static <P extends KeyIdentityProvider> P validateKeyPairProvider(P provider) { - Objects.requireNonNull(provider, "No provider"); - - // get the I/O out of the way - Iterable<KeyPair> keys = Objects.requireNonNull(provider.loadKeys(), "No keys loaded"); - if (keys instanceof Collection<?>) { - ValidateUtils.checkNotNullAndNotEmpty((Collection<?>) keys, "Empty keys loaded"); - } - - return provider; - } - - public static Random getRandomizerInstance() { - Factory<Random> factory = SecurityUtils.getRandomFactory(); - return factory.create(); - } - - public static int getFreePort() throws Exception { - try (ServerSocket s = new ServerSocket()) { - s.setReuseAddress(true); - s.bind(new InetSocketAddress((InetAddress) null, 0)); - return s.getLocalPort(); - } - } - - private static File getFile(String resource) { - URL url = Utils.class.getClassLoader().getResource(resource); - try { - return new File(url.toURI()); - } catch (URISyntaxException e) { - return new File(url.getPath()); - } - } - - public static Path resolve(Path root, String... children) { - if (GenericUtils.isEmpty(children)) { - return root; - } else { - return resolve(root, Arrays.asList(children)); - } - } - - public static Path resolve(Path root, Collection<String> children) { - Path path = root; - if (!GenericUtils.isEmpty(children)) { - for (String child : children) { - path = path.resolve(child); - } - } - - return path; - } - - public static File resolve(File root, String... children) { - if (GenericUtils.isEmpty(children)) { - return root; - } else { - return resolve(root, Arrays.asList(children)); - } - } - - public static File resolve(File root, Collection<String> children) { - File path = root; - if (!GenericUtils.isEmpty(children)) { - for (String child : children) { - path = new File(path, child); - } - } - - return path; - } - - /** - * Removes the specified file - if it is a directory, then its children - * are deleted recursively and then the directory itself. <B>Note:</B> - * no attempt is made to make sure that {@link File#delete()} was successful - * - * @param file The {@link File} to be deleted - ignored if {@code null} - * or does not exist anymore - * @return The <tt>file</tt> argument - */ - public static File deleteRecursive(File file) { - if ((file == null) || (!file.exists())) { - return file; - } - - if (file.isDirectory()) { - File[] children = file.listFiles(); - if (!GenericUtils.isEmpty(children)) { - for (File child : children) { - deleteRecursive(child); - } - } - } - - // seems that if a file is not writable it cannot be deleted - if (!file.canWrite()) { - file.setWritable(true, false); - } - - if (!file.delete()) { - System.err.append("Failed to delete ").println(file.getAbsolutePath()); - } - - return file; - } - - /** - * Removes the specified file - if it is a directory, then its children - * are deleted recursively and then the directory itself. - * - * @param path The file {@link Path} to be deleted - ignored if {@code null} - * or does not exist anymore - * @param options The {@link LinkOption}s to use - * @return The <tt>path</tt> argument - * @throws IOException If failed to access/remove some file(s) - */ - public static Path deleteRecursive(Path path, LinkOption... options) throws IOException { - if ((path == null) || (!Files.exists(path))) { - return path; - } - - if (Files.isDirectory(path)) { - try (DirectoryStream<Path> ds = Files.newDirectoryStream(path)) { - for (Path child : ds) { - deleteRecursive(child, options); - } - } - } - - try { - // seems that if a file is not writable it cannot be deleted - if (!Files.isWritable(path)) { - path.toFile().setWritable(true, false); - } - Files.delete(path); - } catch (IOException e) { - // same logic as deleteRecursive(File) which does not check if deletion succeeded - System.err.append("Failed (").append(e.getClass().getSimpleName()).append(")") - .append(" to delete ").append(path.toString()) - .append(": ").println(e.getMessage()); - } - - return path; - } - - /** - * @param anchor An anchor {@link Class} whose container we want to use - * as the starting point for the "target" folder lookup up the - * hierarchy - * @return The "target" <U>folder</U> - {@code null} if not found - * @see #detectTargetFolder(File) - */ - public static File detectTargetFolder(Class<?> anchor) { - return detectTargetFolder(getClassContainerLocationFile(anchor)); - } - - /** - * @param clazz A {@link Class} object - * @return A {@link File} of the location of the class bytes container - * - e.g., the root folder, the containing JAR, etc.. Returns - * {@code null} if location could not be resolved - * @throws IllegalArgumentException If location is not a valid - * {@link File} location - * @see #getClassContainerLocationURI(Class) - * @see #toFileSource(URI) - */ - public static File getClassContainerLocationFile(Class<?> clazz) - throws IllegalArgumentException { - try { - URI uri = getClassContainerLocationURI(clazz); - return toFileSource(uri); - } catch (URISyntaxException | MalformedURLException e) { - throw new IllegalArgumentException(e.getClass().getSimpleName() + ": " + e.getMessage(), e); - } - } - - /** - * @param clazz A {@link Class} object - * @return A {@link URI} to the location of the class bytes container - * - e.g., the root folder, the containing JAR, etc.. Returns - * {@code null} if location could not be resolved - * @throws URISyntaxException if location is not a valid URI - * @see #getClassContainerLocationURL(Class) - */ - public static URI getClassContainerLocationURI(Class<?> clazz) throws URISyntaxException { - URL url = getClassContainerLocationURL(clazz); - return (url == null) ? null : url.toURI(); - } - - /** - * @param clazz A {@link Class} object - * @return A {@link URL} to the location of the class bytes container - * - e.g., the root folder, the containing JAR, etc.. Returns - * {@code null} if location could not be resolved - */ - public static URL getClassContainerLocationURL(Class<?> clazz) { - ProtectionDomain pd = clazz.getProtectionDomain(); - CodeSource cs = (pd == null) ? null : pd.getCodeSource(); - URL url = (cs == null) ? null : cs.getLocation(); - if (url == null) { - url = getClassBytesURL(clazz); - if (url == null) { - return null; - } - - String srcForm = getURLSource(url); - if (GenericUtils.isEmpty(srcForm)) { - return null; - } - - try { - url = new URL(srcForm); - } catch (MalformedURLException e) { - throw new IllegalArgumentException("getClassContainerLocationURL(" + clazz.getName() + ")" - + " Failed to create URL=" + srcForm + " from " + url.toExternalForm() - + ": " + e.getMessage()); - } - } - - return url; - } - - /** - * Converts a {@link URL} that may refer to an internal resource to - * a {@link File} representing is "source" container (e.g., - * if it is a resource in a JAR, then the result is the JAR's path) - * - * @param url The {@link URL} - ignored if {@code null} - * @return The matching {@link File} - * @throws MalformedURLException If source URL does not refer to a - * file location - * @see #toFileSource(URI) - */ - public static File toFileSource(URL url) throws MalformedURLException { - if (url == null) { - return null; - } - - try { - return toFileSource(url.toURI()); - } catch (URISyntaxException e) { - throw new MalformedURLException("toFileSource(" + url.toExternalForm() + ")" - + " cannot (" + e.getClass().getSimpleName() + ")" - + " convert to URI: " + e.getMessage()); - } - } - - /** - * Converts a {@link URI} that may refer to an internal resource to - * a {@link File} representing is "source" container (e.g., - * if it is a resource in a JAR, then the result is the JAR's path) - * - * @param uri The {@link URI} - ignored if {@code null} - * @return The matching {@link File} - * @throws MalformedURLException If source URI does not refer to a - * file location - * @see #getURLSource(URI) - */ - public static File toFileSource(URI uri) throws MalformedURLException { - String src = getURLSource(uri); - if (GenericUtils.isEmpty(src)) { - return null; - } - - if (!src.startsWith(FILE_URL_PREFIX)) { - throw new MalformedURLException("toFileSource(" + src + ") not a '" + FILE_URL_SCHEME + "' scheme"); - } - - try { - return new File(new URI(src)); - } catch (URISyntaxException e) { - throw new MalformedURLException("toFileSource(" + src + ")" - + " cannot (" + e.getClass().getSimpleName() + ")" - + " convert to URI: " + e.getMessage()); - } - } - - /** - * @param uri The {@link URI} value - ignored if {@code null} - * @return The URI(s) source path where {@link #JAR_URL_PREFIX} and - * any sub-resource are stripped - * @see #getURLSource(String) - */ - public static String getURLSource(URI uri) { - return getURLSource((uri == null) ? null : uri.toString()); - } - - /** - * @param url The {@link URL} value - ignored if {@code null} - * @return The URL(s) source path where {@link #JAR_URL_PREFIX} and - * any sub-resource are stripped - * @see #getURLSource(String) - */ - public static String getURLSource(URL url) { - return getURLSource((url == null) ? null : url.toExternalForm()); - } - - /** - * @param externalForm The {@link URL#toExternalForm()} string - ignored if - * {@code null}/empty - * @return The URL(s) source path where {@link #JAR_URL_PREFIX} and - * any sub-resource are stripped - */ - public static String getURLSource(String externalForm) { - String url = externalForm; - if (GenericUtils.isEmpty(url)) { - return url; - } - - url = stripJarURLPrefix(externalForm); - if (GenericUtils.isEmpty(url)) { - return url; - } - - int sepPos = url.indexOf(RESOURCE_SUBPATH_SEPARATOR); - if (sepPos < 0) { - return adjustURLPathValue(url); - } else { - return adjustURLPathValue(url.substring(0, sepPos)); - } - } - - /** - * @param url A {@link URL} - ignored if {@code null} - * @return The path after stripping any trailing '/' provided the path - * is not '/' itself - * @see #adjustURLPathValue(String) - */ - public static String adjustURLPathValue(URL url) { - return adjustURLPathValue((url == null) ? null : url.getPath()); - } - - /** - * @param path A URL path value - ignored if {@code null}/empty - * @return The path after stripping any trailing '/' provided the path - * is not '/' itself - */ - public static String adjustURLPathValue(final String path) { - final int pathLen = (path == null) ? 0 : path.length(); - if ((pathLen <= 1) || (path.charAt(pathLen - 1) != '/')) { - return path; - } - - return path.substring(0, pathLen - 1); - } - - public static String stripJarURLPrefix(String externalForm) { - String url = externalForm; - if (GenericUtils.isEmpty(url)) { - return url; - } - - if (url.startsWith(JAR_URL_PREFIX)) { - return url.substring(JAR_URL_PREFIX.length()); - } - - return url; - } - - /** - * @param clazz The request {@link Class} - * @return A {@link URL} to the location of the <code>.class</code> file - * - {@code null} if location could not be resolved - */ - public static URL getClassBytesURL(Class<?> clazz) { - String className = clazz.getName(); - int sepPos = className.indexOf('$'); - // if this is an internal class, then need to use its parent as well - if (sepPos > 0) { - sepPos = className.lastIndexOf('.'); - if (sepPos > 0) { - className = className.substring(sepPos + 1); - } - } else { - className = clazz.getSimpleName(); - } - - return clazz.getResource(className + CLASS_FILE_SUFFIX); - } - - public static String getClassBytesResourceName(Class<?> clazz) { - return getClassBytesResourceName((clazz == null) ? null : clazz.getName()); - } - - /** - * @param name The fully qualified class name - ignored if {@code null}/empty - * @return The relative path of the class file byte-code resource - */ - public static String getClassBytesResourceName(String name) { - if (GenericUtils.isEmpty(name)) { - return name; - } else { - return name.replace('.', '/') + CLASS_FILE_SUFFIX; - } - } - - /** - * @param anchorFile An anchor {@link File} we want to use - * as the starting point for the "target" or "build" folder - * lookup up the hierarchy - * @return The "target" <U>folder</U> - {@code null} if not found - */ - public static File detectTargetFolder(File anchorFile) { - for (File file = anchorFile; file != null; file = file.getParentFile()) { - if (!file.isDirectory()) { - continue; - } - - String name = file.getName(); - if (TARGET_FOLDER_NAMES.contains(name)) { - return file; - } - } - - return null; - } - - public static String resolveRelativeRemotePath(Path root, Path file) { - Path relPath = root.relativize(file); - return relPath.toString().replace(File.separatorChar, '/'); - } - - public static SshClient setupTestClient(Class<?> anchor) { - SshClient client = SshClient.setUpDefaultClient(); - client.setServerKeyVerifier(AcceptAllServerKeyVerifier.INSTANCE); - client.setHostConfigEntryResolver(HostConfigEntryResolver.EMPTY); - client.setKeyPairProvider(KeyPairProvider.EMPTY_KEYPAIR_PROVIDER); - return client; - } - - public static SshServer setupTestServer(Class<?> anchor) { - SshServer sshd = SshServer.setUpDefaultServer(); - sshd.setKeyPairProvider(createTestHostKeyProvider(anchor)); - sshd.setPasswordAuthenticator(BogusPasswordAuthenticator.INSTANCE); - sshd.setPublickeyAuthenticator(AcceptAllPublickeyAuthenticator.INSTANCE); - sshd.setShellFactory(EchoShellFactory.INSTANCE); - sshd.setCommandFactory(UnknownCommandFactory.INSTANCE); - return sshd; - } - - /** - * @param path The {@link Path} to write the data to - * @param data The data to write (as UTF-8) - * @return The UTF-8 data bytes - * @throws IOException If failed to write - */ - public static byte[] writeFile(Path path, String data) throws IOException { - try (OutputStream fos = Files.newOutputStream(path, IoUtils.EMPTY_OPEN_OPTIONS)) { - byte[] bytes = data.getBytes(StandardCharsets.UTF_8); - fos.write(bytes); - return bytes; - } - } -} http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/resources/org/apache/sshd/client/config/hosts/testReadGlobalHostsConfigEntries.config.txt ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/resources/org/apache/sshd/client/config/hosts/testReadGlobalHostsConfigEntries.config.txt b/sshd-core/src/test/resources/org/apache/sshd/client/config/hosts/testReadGlobalHostsConfigEntries.config.txt deleted file mode 100644 index 5f772cd..0000000 --- a/sshd-core/src/test/resources/org/apache/sshd/client/config/hosts/testReadGlobalHostsConfigEntries.config.txt +++ /dev/null @@ -1,22 +0,0 @@ -# Global section first - - User global - Port 7365 - IdentityFile ~/.ssh/github.key - HostName 37.77.34.7 - -# User override -Host *.apache.org - User mina-sshd - -# Port override -Host *.github.com - Port 443 - -# Host name override -Host 10.*.*.* - HostName 7.3.6.5 - -# Identity override -Host 192.168.*.* - IdentityFile ~/.ssh/internal.key http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/resources/org/apache/sshd/client/config/hosts/testReadMultipleHostPatterns.config.txt ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/resources/org/apache/sshd/client/config/hosts/testReadMultipleHostPatterns.config.txt b/sshd-core/src/test/resources/org/apache/sshd/client/config/hosts/testReadMultipleHostPatterns.config.txt deleted file mode 100644 index 0f5edcb..0000000 --- a/sshd-core/src/test/resources/org/apache/sshd/client/config/hosts/testReadMultipleHostPatterns.config.txt +++ /dev/null @@ -1,5 +0,0 @@ -# Same configuration duplicated in multiple configuration entries -Host *.github.com *.apache.org 10.*.*.* - User mina-sshd - Port 443 - HostName 7.3.6.5 http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/resources/org/apache/sshd/client/config/hosts/testReadSimpleHostsConfigEntries.config.txt ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/resources/org/apache/sshd/client/config/hosts/testReadSimpleHostsConfigEntries.config.txt b/sshd-core/src/test/resources/org/apache/sshd/client/config/hosts/testReadSimpleHostsConfigEntries.config.txt deleted file mode 100644 index 1058777..0000000 --- a/sshd-core/src/test/resources/org/apache/sshd/client/config/hosts/testReadSimpleHostsConfigEntries.config.txt +++ /dev/null @@ -1,8 +0,0 @@ -# Simple configuration file -Host *.github.com - User mina-sshd - Port 443 - IdentityFile ~/.ssh/github.key - -Host *.apache.org - User mina-sshd http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/resources/org/apache/sshd/client/config/keys/id_dsa ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/resources/org/apache/sshd/client/config/keys/id_dsa b/sshd-core/src/test/resources/org/apache/sshd/client/config/keys/id_dsa deleted file mode 100644 index 1d3ef24..0000000 --- a/sshd-core/src/test/resources/org/apache/sshd/client/config/keys/id_dsa +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN DSA PRIVATE KEY----- -MIIBvAIBAAKBgQDIPyMbBuQcZxeYDOyCqqkdK37cWQvp+RpWzvieB/oiG/ykfDQX -oZMRtwqwWTBfejNitbBBmC6G/t5OK+9aFmj7pfJ+a7fZKXfiUquIg9soDsoOindf -2AwR6MZ3os8uiP2xrC8IQAClnETa15mFShs4a4b2VjddgCQ6tphnY97MywIVAPtr -YyW11RIXsVTf/9KlbhYaNlt5AoGAX9JzbHykC/0xDKOyKU6xDIOVdEZ0ooAl9Psl -BEUuNhlv2XgmQScO6C9l2W7gbbut7zIw4FaZ2/dgXa3D4IyexBVug5XMnrssErZo -NcoF5g0dgEAsb9Hl9gkIK3VHM5kWteeUg1VE700JTtSMisdL8CgIdR+xN8iVH5Ew -CbLWxmECgYEAtv+cdRfNevYFkp55jVqazc8zRLvfb64jzgc5oSJVc64kFs4yx+ab -YpGX9WxNxDlG6g2WiY8voDBB0YnUJsn0kVRjBKX9OceROxrfT4K4dVbQZsdt+SLa -XWL4lGJFrFZL3LZqvySvq6xfhJfakQDDivW4hUOhFPXPHrE5/Ia3T7ACFQCE6flG -nmVCAbzo9YsbdJWBnxMnBA== ------END DSA PRIVATE KEY----- \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/resources/org/apache/sshd/client/config/keys/id_ecdsa ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/resources/org/apache/sshd/client/config/keys/id_ecdsa b/sshd-core/src/test/resources/org/apache/sshd/client/config/keys/id_ecdsa deleted file mode 100644 index 31b1268..0000000 --- a/sshd-core/src/test/resources/org/apache/sshd/client/config/keys/id_ecdsa +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN EC PRIVATE KEY----- -MHcCAQEEIPKmiQzAASg656IP4PuuElLdLdO/MIXrGxQG6tGkKZ1HoAoGCCqGSM49 -AwEHoUQDQgAEobHtw9wkL332ep9fi8Gw5g8sEGwslNonPUCDR6YUZ9mjOehliLpF -DLHLxlIFafrVM+LIpagjpRKZcnpGPWQDnA== ------END EC PRIVATE KEY----- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/resources/org/apache/sshd/client/config/keys/id_rsa_key ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/resources/org/apache/sshd/client/config/keys/id_rsa_key b/sshd-core/src/test/resources/org/apache/sshd/client/config/keys/id_rsa_key deleted file mode 100644 index afc6aa8..0000000 --- a/sshd-core/src/test/resources/org/apache/sshd/client/config/keys/id_rsa_key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEoQIBAAKCAQEAxr3N5fkt966xJINl0hH7Q6lLDRR1D0yMjcXCE5roE9VFut2c -tGFuo90TCOxkPOMnwzwConeyScVF4ConZeWsxbG9VtRh61IeZ6R5P5ZTvE9xPdZB -gIEWvU1bRfrrOfSMihqF98pODspE6NoTtND2eglwSGwxcYFmpdTAmu+8qgxgGxlE -aaCjqwdiNPZhygrH81Mv2ruolNeZkn4Bj+wFFmZTD/waN1pQaMf+SO1+kEYIYFNl -5+8JRGuUcr8MhHHJB+gwqMTF2BSBVITJzZUiQR0TMtkK6Vbs7yt1F9hhzDzAFDwh -V+rsfNQaOHpl3zP07qH+/99A0XG1CVcEdHqVMwIBIwKCAQALW02YHN4OJz1Siypj -xoNi87slUaBKBF/NlkWauGUIcpZFMTwnkIn6vCz5MhRbQC4oadRDzFNUrC/g7HdH -prlqYe2P7uEGIfMb3YNFdk3tgOHmRsHqFgFMpVWsOjlTxNTUsQ74N3Isuxnha4wY -9f90sBULc+WRdRvO9jbkSDaqoYVKAqCFWtocL+ZWwBXWrIrsQW4PElgZ/duc5DX7 -eeJ5DXCSj9dO+1KxsWEOKaoeABEegrRVys1/shcDNPhf/p0QShKIdPcpnDUc8cny -1bq8GSt6jEQ+tuRoSnYrY+RD+mlkHrx373Xc1a9woV+QKTThmd9TQ8gzHMHNqq0a -7kR7AoGBAOuPOTRiKaDtQyMTEX7eeHsPNE24EgvONjNpxyQ6gKGthG5SiB0IO7mP -r7EggbR2EY8eMCY5HjvxzxgH86n2Pqbzsr6UlQq7YTPupCm/7fPgRknu917GA20f -1cuY8B04Jp4FIGryBmCcScX6usXXhjfAvYCWWfkSytA8gX9+b1TNAoGBANf8shbp -wRnQfgAzw2S+xs29pdwa6Jb/xuLvHSyklmgidrK4nsVI8G+zeCqwkqkNM02sM+vR -c8EX7+myrGf+S2V3JS3AMNXEhavrWVH0CuqFHlBjSwHZ0uKuPpWHlCnud+23AdQz -Bf1H7tYKt5es3J/B37o4YxhAL6U9qq+ewZH/AoGBAOTURjLjA94oT9jt870SoOyS -bVLQEYfPol3UeE8UQnEsN4Ec+UDGK2PNaNfzsTL2WjNB5aF5UJIA184znD60seQC -raMxQFORdF5ViYekgMEFwJ+XrnlSpD4e7PGqgtqOUWZOH33VKsRADSa5DTU3xDYo -8porp9wDoHKD64MqXYWTAoGADFeVJeF4v6WDivukw+2k9dBSntz3WRXuG5iilNY0 -evqnsnDzITdeMkTFCcDycA9iBHA9ezCKRYxW2id3kOn1rgbO7KvliI7jESNkMJGa -OUlvck7RFgxyc1pp+ep9fr0rbKtfMLJ1Xu4q56jXSn7oCSEFeFr+WSg9PKRwJ0rm -fV8CgYAkYOiNY8jH5lwwoPWOIPJg62zdzmRQktrU3z7Nzk5udN6JnG3g57QjkozX -AgHARKQ2MuXW9OfOnYNhbGeavcBQmg5XUx3eL4PRFw8mFZdjpBD/kM/dfCEwEta3 -FpRlVGn0RNqVV5xxClObD/CikkDqKZG4MSj3CrO3JK33gl1Lgg== ------END RSA PRIVATE KEY----- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-DSA-KeyPair ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-DSA-KeyPair b/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-DSA-KeyPair deleted file mode 100644 index 217d508..0000000 --- a/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-DSA-KeyPair +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABsQAAAAdzc2gtZH -NzAAAAgQD3axy1MBdh4TJC+T22DKKDe7sXnDrgJRs1jBcDl/qPdQDoLlvvTd8oHggXkIzI -6Tx2ldiJ3KADMkDg1sBSU5zenIr9wisfEQOLNqfIOOirR9Z8jULGVlDO+pPwps0P9bcOka -JCAfABNth6Oaz3NJjfFD8ZmmWDVaN2rSi1J3mjnwAAABUA5be00MaSti06Hor265V8Ggtj -i/0AAACAa9MU8kBJ4Z1+UsrWruVr72eckEwjOPcRFeA6MoSM70GGdYVkLyQ78MMjKAFZcb -seYT3lsja+c4LQ7yErROHSGFo+ImQnYGY3Cos2mS8tRBHtZ4YmKsBmS3Zrb4lEfauA1pgD -pcGrUAavniKIAB/C9cpvj+IpZ36+rHpap4JKJ7kAAACAQP4NRzjtauzrDJvs73c0DPczAk -LAan+90ouvIuI0CmMxFrSqLIIEaX3cB/P4dkKtBsMh0CxwJpoXfn+TO+1j7i08GuMONeqB -3lOHn1/MB2qUAZh/kdU8RUsxWkrG80JMeP1kew1sHaoRfOUZ8+Xw/RL7nNmhhmHJR3rkgR -8EoWEAAAHoMgIkejICJHoAAAAHc3NoLWRzcwAAAIEA92sctTAXYeEyQvk9tgyig3u7F5w6 -4CUbNYwXA5f6j3UA6C5b703fKB4IF5CMyOk8dpXYidygAzJA4NbAUlOc3pyK/cIrHxEDiz -anyDjoq0fWfI1CxlZQzvqT8KbND/W3DpGiQgHwATbYejms9zSY3xQ/GZplg1Wjdq0otSd5 -o58AAAAVAOW3tNDGkrYtOh6K9uuVfBoLY4v9AAAAgGvTFPJASeGdflLK1q7la+9nnJBMIz -j3ERXgOjKEjO9BhnWFZC8kO/DDIygBWXG7HmE95bI2vnOC0O8hK0Th0hhaPiJkJ2BmNwqL -NpkvLUQR7WeGJirAZkt2a2+JRH2rgNaYA6XBq1AGr54iiAAfwvXKb4/iKWd+vqx6WqeCSi -e5AAAAgED+DUc47Wrs6wyb7O93NAz3MwJCwGp/vdKLryLiNApjMRa0qiyCBGl93Afz+HZC -rQbDIdAscCaaF35/kzvtY+4tPBrjDjXqgd5Th59fzAdqlAGYf5HVPEVLMVpKxvNCTHj9ZH -sNbB2qEXzlGfPl8P0S+5zZoYZhyUd65IEfBKFhAAAAFGL9BNpShiQnNZ1noW8Woxyq1GuH -AAAADnJvb3RAdWJ1bnR1LTE1AQIDBAU= ------END OPENSSH PRIVATE KEY----- \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-DSA-KeyPair.pub ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-DSA-KeyPair.pub b/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-DSA-KeyPair.pub deleted file mode 100644 index c3feece..0000000 --- a/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-DSA-KeyPair.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-dss AAAAB3NzaC1kc3MAAACBAPdrHLUwF2HhMkL5PbYMooN7uxecOuAlGzWMFwOX+o91AOguW+9N3ygeCBeQjMjpPHaV2IncoAMyQODWwFJTnN6civ3CKx8RA4s2p8g46KtH1nyNQsZWUM76k/CmzQ/1tw6RokIB8AE22Ho5rPc0mN8UPxmaZYNVo3atKLUneaOfAAAAFQDlt7TQxpK2LToeivbrlXwaC2OL/QAAAIBr0xTyQEnhnX5Sytau5WvvZ5yQTCM49xEV4DoyhIzvQYZ1hWQvJDvwwyMoAVlxux5hPeWyNr5zgtDvIStE4dIYWj4iZCdgZjcKizaZLy1EEe1nhiYqwGZLdmtviUR9q4DWmAOlwatQBq+eIogAH8L1ym+P4ilnfr6selqngkonuQAAAIBA/g1HOO1q7OsMm+zvdzQM9zMCQsBqf73Si68i4jQKYzEWtKosggRpfdwH8/h2Qq0GwyHQLHAmmhd+f5M77WPuLTwa4w416oHeU4efX8wHapQBmH+R1TxFSzFaSsbzQkx4/WR7DWwdqhF85Rnz5fD9Evuc2aGGYclHeuSBHwShYQ== root@ubuntu-15 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-ECDSA-KeyPair ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-ECDSA-KeyPair b/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-ECDSA-KeyPair deleted file mode 100644 index 403ff40..0000000 --- a/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-ECDSA-KeyPair +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAArAAAABNlY2RzYS -1zaGEyLW5pc3RwNTIxAAAACG5pc3RwNTIxAAAAhQQAGRPv5eCmd3jFTCWrioWVHgQhHn/d -ir8nriiEonZDPP+hEjX1AiYyahfvFWoqKI4lKRzoEmF5Wk6ct+9LM0JFGcEAck7Z3J/NXt -CnHeEvnusHMoANjhKLExBURROOOTGziyHMuGBMBIgRFnf4rBhiTzduexJnaMglyqxIrDpG -hOxwhQAAAAEQxPcsaMT3LGgAAAATZWNkc2Etc2hhMi1uaXN0cDUyMQAAAAhuaXN0cDUyMQ -AAAIUEABkT7+Xgpnd4xUwlq4qFlR4EIR5/3Yq/J64ohKJ2Qzz/oRI19QImMmoX7xVqKiiO -JSkc6BJheVpOnLfvSzNCRRnBAHJO2dyfzV7Qpx3hL57rBzKADY4SixMQVEUTjjkxs4shzL -hgTASIERZ3+KwYYk83bnsSZ2jIJcqsSKw6RoTscIUAAAAAQQ+HCwVtvFlnRydGXZ+xpyKM -KxDp5h7YMg5/dpRFrp3qNonm5/RHoT2Hw9i5GZtrXT2xPiR69wLOzTb4pnIWlENfAAAADn -Jvb3RAdWJ1bnR1LTE1AQIDBAU= ------END OPENSSH PRIVATE KEY----- \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-ECDSA-KeyPair.pub ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-ECDSA-KeyPair.pub b/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-ECDSA-KeyPair.pub deleted file mode 100644 index bd43737..0000000 --- a/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-ECDSA-KeyPair.pub +++ /dev/null @@ -1 +0,0 @@ -ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAAZE+/l4KZ3eMVMJauKhZUeBCEef92KvyeuKISidkM8/6ESNfUCJjJqF+8VaioojiUpHOgSYXlaTpy370szQkUZwQByTtncn81e0Kcd4S+e6wcygA2OEosTEFRFE445MbOLIcy4YEwEiBEWd/isGGJPN257EmdoyCXKrEisOkaE7HCFAA== root@ubuntu-15 http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-ED25519-KeyPair ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-ED25519-KeyPair b/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-ED25519-KeyPair deleted file mode 100644 index 3176f3b..0000000 --- a/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-ED25519-KeyPair +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW -QyNTUxOQAAACB0Tsaj0scs8fYKMlnz2Mncky545NoICP9eGMGIpo5G3QAAAJjCVtyJwlbc -iQAAAAtzc2gtZWQyNTUxOQAAACB0Tsaj0scs8fYKMlnz2Mncky545NoICP9eGMGIpo5G3Q -AAAEDjQpuV2OWHZVy7R09w6bw2DnBa1UdZrsAmQ7dPyxasx3ROxqPSxyzx9goyWfPYydyT -Lnjk2ggI/14YwYimjkbdAAAADnJvb3RAdWJ1bnR1LTE1AQIDBAUGBw== ------END OPENSSH PRIVATE KEY----- \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-ED25519-KeyPair.pub ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-ED25519-KeyPair.pub b/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-ED25519-KeyPair.pub deleted file mode 100644 index 128e883..0000000 --- a/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-ED25519-KeyPair.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHROxqPSxyzx9goyWfPYydyTLnjk2ggI/14YwYimjkbd root@ubuntu-15 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-RSA-KeyPair ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-RSA-KeyPair b/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-RSA-KeyPair deleted file mode 100644 index 84ee354..0000000 --- a/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-RSA-KeyPair +++ /dev/null @@ -1,49 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -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 ------END OPENSSH PRIVATE KEY----- \ No newline at end of file http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-RSA-KeyPair.pub ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-RSA-KeyPair.pub b/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-RSA-KeyPair.pub deleted file mode 100644 index c59321c..0000000 --- a/sshd-core/src/test/resources/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserTest-RSA-KeyPair.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCuxjvYVRScrzIuppjdaSi28wWbZqvKhVU9toeJcyqYpNNA8EWyHB5GT7AQkETu2Hh8irYy5O76EzERDz6hgnjsprX4X3pATUXS67VO55z9ml64SJexMEClZnlJoAypDeAx+V+qCn3qKlXdI6kvIQb0YipUwlg0T+CDAhXtRzjJsLbVnLcjtA58eGjwF5oyNX/vTeuW7ZRazxPCOjtUxYu+cYxSM0zM0aqX1ai4sTMeyGaRRkFF0q+dOOxP2/HWrk7Jxof+AeizbcRs3OfnStuIib3c9xn+i0YGON9sdyxGaPFmGoLMuyzk2v3c8sh483wJ7P3VLtouMLBGLi6ArErQRnA0ecc+LTJHR4jV4x8ku211ies5mJLERVsKxmIN9PJu4FhQNofYS2CbMf03bkhl4k6OuMTrw1mGLBedoige9+mQ9ORYxIYuwtjcqDR1jBRsDL0SuqRL8wQyY3vQ7EjGpMiEVJnRu/cUFtlNmeX8YARaZX4pKNREq4mVL0QFgThm/NiEaLoruDchAlnCtyrLqzy7bivm6oBAKKF+5YVpuridJgHXNzNDtCr5XzB6ZqTqWCgUarh/nyTcVSGQlvBBEUmhBi9owjrd2Wz2rrtuShyPJywY+9YNTsgT11WzfrPsV6+VCOygfACvj7RPU8Wyoef74onSncCWikhXs5tLRw== root@ubuntu-15 http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/resources/org/apache/sshd/common/util/EDDSAProviderTest-EDDSA-OpenSSH-KeyPair ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/resources/org/apache/sshd/common/util/EDDSAProviderTest-EDDSA-OpenSSH-KeyPair b/sshd-core/src/test/resources/org/apache/sshd/common/util/EDDSAProviderTest-EDDSA-OpenSSH-KeyPair deleted file mode 100644 index 59af379..0000000 --- a/sshd-core/src/test/resources/org/apache/sshd/common/util/EDDSAProviderTest-EDDSA-OpenSSH-KeyPair +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN OPENSSH PRIVATE KEY----- -b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW -QyNTUxOQAAACB0Tsaj0scs8fYKMlnz2Mncky545NoICP9eGMGIpo5G3QAAAJjCVtyJwlbc -iQAAAAtzc2gtZWQyNTUxOQAAACB0Tsaj0scs8fYKMlnz2Mncky545NoICP9eGMGIpo5G3Q -AAAEDjQpuV2OWHZVy7R09w6bw2DnBa1UdZrsAmQ7dPyxasx3ROxqPSxyzx9goyWfPYydyT -Lnjk2ggI/14YwYimjkbdAAAADnJvb3RAdWJ1bnR1LTE1AQIDBAUGBw== ------END OPENSSH PRIVATE KEY----- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/10de190e/sshd-core/src/test/resources/org/apache/sshd/common/util/EDDSAProviderTest-EDDSA-OpenSSH-KeyPair.pub ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/resources/org/apache/sshd/common/util/EDDSAProviderTest-EDDSA-OpenSSH-KeyPair.pub b/sshd-core/src/test/resources/org/apache/sshd/common/util/EDDSAProviderTest-EDDSA-OpenSSH-KeyPair.pub deleted file mode 100644 index 128e883..0000000 --- a/sshd-core/src/test/resources/org/apache/sshd/common/util/EDDSAProviderTest-EDDSA-OpenSSH-KeyPair.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHROxqPSxyzx9goyWfPYydyTLnjk2ggI/14YwYimjkbd root@ubuntu-15 \ No newline at end of file
