Repository: mina-sshd Updated Branches: refs/heads/master 2529a4c3d -> 693fa5d90
Activated Checkstyle's EmptyLineSeparator rule Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/55ca8818 Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/55ca8818 Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/55ca8818 Branch: refs/heads/master Commit: 55ca88185e90c04dc554a9b87abd67a392461219 Parents: 0e99597 Author: Lyor Goldstein <lyor.goldst...@gmail.com> Authored: Wed Oct 11 19:12:08 2017 +0300 Committer: Lyor Goldstein <lyor.goldst...@gmail.com> Committed: Wed Oct 11 20:35:15 2017 +0300 ---------------------------------------------------------------------- sshd-checkstyle.xml | 6 ++++++ .../sshd/client/ClientAuthenticationManager.java | 8 ++++++++ .../apache/sshd/client/ClientFactoryManager.java | 3 +++ .../apache/sshd/client/auth/AbstractUserAuth.java | 1 + .../client/session/ClientProxyConnectorHolder.java | 1 + .../sshd/client/simple/AbstractSimpleClient.java | 1 + .../client/subsystem/sftp/DefaultSftpClient.java | 5 +++-- .../sshd/client/subsystem/sftp/SftpClient.java | 8 ++++++-- .../sshd/client/subsystem/sftp/SftpFileSystem.java | 4 ++-- .../apache/sshd/common/PropertyResolverUtils.java | 2 ++ .../org/apache/sshd/common/channel/Channel.java | 2 ++ .../keys/loader/PrivateKeyEncryptionContext.java | 5 +++-- .../pem/AbstractPEMResourceKeyPairParser.java | 1 - .../org/apache/sshd/common/digest/BaseDigest.java | 1 - .../common/forward/DefaultForwardingFilter.java | 1 - .../sshd/common/forward/ForwardingFilter.java | 1 - .../PortForwardingEventListenerManagerHolder.java | 1 + .../sshd/common/forward/TcpipClientChannel.java | 5 ++--- .../apache/sshd/common/future/DefaultSshFuture.java | 8 +++++++- .../apache/sshd/common/kex/KexFactoryManager.java | 16 ++++++++++++++++ .../common/keyprovider/KeyPairProviderHolder.java | 1 + .../java/org/apache/sshd/common/scp/ScpHelper.java | 1 - .../sshd/common/session/ConnectionService.java | 1 + .../org/apache/sshd/common/session/Session.java | 1 + .../common/signature/SignatureFactoriesManager.java | 5 +++++ .../sshd/common/subsystem/sftp/SftpHelper.java | 1 - .../org/apache/sshd/common/util/GenericUtils.java | 2 ++ .../apache/sshd/common/util/io/der/DERWriter.java | 1 - .../sshd/server/ServerAuthenticationManager.java | 10 ++++++++++ .../org/apache/sshd/server/kex/DHGEXServer.java | 1 - .../server/session/ServerProxyAcceptorHolder.java | 1 + .../sftp/AbstractSftpEventListenerManager.java | 1 - .../sftp/SftpFileSystemAccessorManager.java | 1 + .../client/config/hosts/HostConfigEntryTest.java | 1 + .../java/org/apache/sshd/client/kex/KexTest.java | 1 - .../channel/ChannelPipedOutputStreamTest.java | 6 +++--- .../file/root/RootedFileSystemProviderTest.java | 1 + .../java/org/apache/sshd/common/mac/MacTest.java | 1 - .../sshd/server/auth/WelcomeBannerPhaseTest.java | 1 - .../server/jaas/JaasPasswordAuthenticatorTest.java | 2 -- 40 files changed, 91 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-checkstyle.xml ---------------------------------------------------------------------- diff --git a/sshd-checkstyle.xml b/sshd-checkstyle.xml index 3a9f72e..0f5c66f 100644 --- a/sshd-checkstyle.xml +++ b/sshd-checkstyle.xml @@ -111,6 +111,12 @@ <module name="NoWhitespaceAfter"> <property name="tokens" value="ARRAY_INIT,BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS" /> </module> + <module name="EmptyLineSeparator"> + <property name="tokens" value="IMPORT,CLASS_DEF,INTERFACE_DEF,STATIC_INIT,INSTANCE_INIT,METHOD_DEF,CTOR_DEF" /> + <property name="allowMultipleEmptyLines" value="false" /> + <property name="allowNoEmptyLineBetweenFields" value="true" /> + <property name="allowMultipleEmptyLinesInsideClassMembers" value="false" /> + </module> <module name="NoWhitespaceBefore" /> <module name="GenericWhitespace"/> <module name="OperatorWrap" /> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/client/ClientAuthenticationManager.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/ClientAuthenticationManager.java b/sshd-core/src/main/java/org/apache/sshd/client/ClientAuthenticationManager.java index c495c68..a9ae68c 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/ClientAuthenticationManager.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/ClientAuthenticationManager.java @@ -77,6 +77,7 @@ public interface ClientAuthenticationManager extends KeyPairProviderHolder { * (i.e., no passwords available) */ PasswordIdentityProvider getPasswordIdentityProvider(); + void setPasswordIdentityProvider(PasswordIdentityProvider provider); /** @@ -116,6 +117,7 @@ public interface ClientAuthenticationManager extends KeyPairProviderHolder { * @return the {@link ServerKeyVerifier} to use - never {@code null} */ ServerKeyVerifier getServerKeyVerifier(); + void setServerKeyVerifier(ServerKeyVerifier serverKeyVerifier); /** @@ -123,6 +125,7 @@ public interface ClientAuthenticationManager extends KeyPairProviderHolder { * (may be {@code null} to indicate that no such communication is allowed) */ UserInteraction getUserInteraction(); + void setUserInteraction(UserInteraction userInteraction); /** @@ -130,20 +133,25 @@ public interface ClientAuthenticationManager extends KeyPairProviderHolder { * {@code null}/empty */ List<NamedFactory<UserAuth>> getUserAuthFactories(); + default String getUserAuthFactoriesNameList() { return NamedResource.getNames(getUserAuthFactories()); } + default List<String> getUserAuthFactoriesNames() { return NamedResource.getNameList(getUserAuthFactories()); } void setUserAuthFactories(List<NamedFactory<UserAuth>> userAuthFactories); + default void setUserAuthFactoriesNameList(String names) { setUserAuthFactoriesNames(GenericUtils.split(names, ',')); } + default void setUserAuthFactoriesNames(String... names) { setUserAuthFactoriesNames(GenericUtils.isEmpty((Object[]) names) ? Collections.emptyList() : Arrays.asList(names)); } + default void setUserAuthFactoriesNames(Collection<String> names) { BuiltinUserAuthFactories.ParseResult result = BuiltinUserAuthFactories.parseFactoriesList(names); @SuppressWarnings({ "rawtypes", "unchecked" }) http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java b/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java index 7d4a07b..31b2a22 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java @@ -83,6 +83,7 @@ public interface ClientFactoryManager * effective session parameters - never {@code null} */ HostConfigEntryResolver getHostConfigEntryResolver(); + void setHostConfigEntryResolver(HostConfigEntryResolver resolver); /** @@ -90,6 +91,7 @@ public interface ClientFactoryManager * key pair identities - never {@code null} */ ClientIdentityLoader getClientIdentityLoader(); + void setClientIdentityLoader(ClientIdentityLoader loader); /** @@ -98,5 +100,6 @@ public interface ClientFactoryManager * @see FilePasswordProvider#EMPTY */ FilePasswordProvider getFilePasswordProvider(); + void setFilePasswordProvider(FilePasswordProvider provider); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/client/auth/AbstractUserAuth.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/auth/AbstractUserAuth.java b/sshd-core/src/main/java/org/apache/sshd/client/auth/AbstractUserAuth.java index 11c26a4..a1f9d18 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/auth/AbstractUserAuth.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/auth/AbstractUserAuth.java @@ -75,6 +75,7 @@ public abstract class AbstractUserAuth extends AbstractLoggingBean implements Us } protected abstract boolean sendAuthDataRequest(ClientSession session, String service) throws Exception; + protected abstract boolean processAuthDataRequest(ClientSession session, String service, Buffer buffer) throws Exception; @Override http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/client/session/ClientProxyConnectorHolder.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientProxyConnectorHolder.java b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientProxyConnectorHolder.java index ea98499..6de3bc3 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientProxyConnectorHolder.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientProxyConnectorHolder.java @@ -24,5 +24,6 @@ package org.apache.sshd.client.session; */ public interface ClientProxyConnectorHolder { ClientProxyConnector getClientProxyConnector(); + void setClientProxyConnector(ClientProxyConnector proxyConnector); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/client/simple/AbstractSimpleClient.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/simple/AbstractSimpleClient.java b/sshd-core/src/main/java/org/apache/sshd/client/simple/AbstractSimpleClient.java index 475c9d4..a5420c7 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/simple/AbstractSimpleClient.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/simple/AbstractSimpleClient.java @@ -141,6 +141,7 @@ public abstract class AbstractSimpleClient extends AbstractLoggingBean implement return result; }); } + @Override public CloseableScpClient scpLogin(String host, String username, String password) throws IOException { return scpLogin(host, DEFAULT_PORT, username, password); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/DefaultSftpClient.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/DefaultSftpClient.java b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/DefaultSftpClient.java index 35400ae..8a72a3f 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/DefaultSftpClient.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/DefaultSftpClient.java @@ -32,6 +32,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.NavigableMap; import java.util.Objects; import java.util.Set; import java.util.TreeMap; @@ -64,8 +65,8 @@ public class DefaultSftpClient extends AbstractSftpClient { private final byte[] workBuf = new byte[Integer.BYTES]; private final AtomicInteger versionHolder = new AtomicInteger(0); private final AtomicBoolean closing = new AtomicBoolean(false); - private final Map<String, byte[]> extensions = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); - private final Map<String, byte[]> exposedExtensions = Collections.unmodifiableMap(extensions); + private final NavigableMap<String, byte[]> extensions = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); + private final NavigableMap<String, byte[]> exposedExtensions = Collections.unmodifiableNavigableMap(extensions); public DefaultSftpClient(ClientSession clientSession) throws IOException { this.clientSession = Objects.requireNonNull(clientSession, "No client session"); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpClient.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpClient.java b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpClient.java index eb22451..410fa22 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpClient.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpClient.java @@ -34,6 +34,7 @@ import java.util.Comparator; import java.util.EnumSet; import java.util.List; import java.util.Map; +import java.util.NavigableMap; import java.util.Objects; import java.util.Set; import java.util.concurrent.TimeUnit; @@ -537,10 +538,12 @@ public interface SftpClient extends SubsystemClient { default String getName() { return SftpConstants.SFTP_SUBSYSTEM_NAME; } + /** - * @return An (unmodifiable) {@link Map} of the reported server extensions. + * @return An (unmodifiable) {@link NavigableMap} of the reported server extensions. + * where key=extension name (case <U>insensitive</U>) */ - Map<String, byte[]> getServerExtensions(); + NavigableMap<String, byte[]> getServerExtensions(); boolean isClosing(); @@ -835,6 +838,7 @@ public interface SftpClient extends SubsystemClient { // see SSH_FXP_BLOCK / SSH_FXP_UNBLOCK for byte range locks void lock(Handle handle, long offset, long length, int mask) throws IOException; + void unlock(Handle handle, long offset, long length) throws IOException; // http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpFileSystem.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpFileSystem.java b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpFileSystem.java index d006d26..cd41691 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpFileSystem.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpFileSystem.java @@ -30,7 +30,7 @@ import java.nio.file.attribute.UserPrincipalLookupService; import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.Map; +import java.util.NavigableMap; import java.util.Objects; import java.util.Queue; import java.util.Set; @@ -236,7 +236,7 @@ public class SftpFileSystem extends BaseFileSystem<SftpPath> implements ClientSe } @Override - public Map<String, byte[]> getServerExtensions() { + public NavigableMap<String, byte[]> getServerExtensions() { return delegate.getServerExtensions(); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/PropertyResolverUtils.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/PropertyResolverUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/PropertyResolverUtils.java index 78ebea6..6677685 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/PropertyResolverUtils.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/PropertyResolverUtils.java @@ -196,6 +196,7 @@ public final class PropertyResolverUtils { throw new IllegalArgumentException("Bad value type for enum conversion: " + value.getClass().getSimpleName()); } } + public static Object updateProperty(PropertyResolver resolver, String name, long value) { return updateProperty(resolver.getProperties(), name, value); } @@ -306,6 +307,7 @@ public final class PropertyResolverUtils { return value; } } + public static String getStringProperty(Map<String, ?> props, String name, String defaultValue) { Object value = resolvePropertyValue(props, name); if (value == null) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/channel/Channel.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/Channel.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/Channel.java index 2061d26..9aa0b0f 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/channel/Channel.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/Channel.java @@ -73,11 +73,13 @@ public interface Channel List<RequestHandler<Channel>> getRequestHandlers(); void addRequestHandler(RequestHandler<Channel> handler); + default void addRequestHandlers(Collection<? extends RequestHandler<Channel>> handlers) { GenericUtils.forEach(handlers, this::addRequestHandler); } void removeRequestHandler(RequestHandler<Channel> handler); + default void removeRequestHandlers(Collection<? extends RequestHandler<Channel>> handlers) { GenericUtils.forEach(handlers, this::removeRequestHandler); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/PrivateKeyEncryptionContext.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/PrivateKeyEncryptionContext.java b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/PrivateKeyEncryptionContext.java index b935460..9d5eedc 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/PrivateKeyEncryptionContext.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/PrivateKeyEncryptionContext.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.Map; +import java.util.NavigableMap; import java.util.Objects; import java.util.SortedSet; import java.util.TreeMap; @@ -37,7 +37,7 @@ import org.apache.sshd.common.util.ValidateUtils; public class PrivateKeyEncryptionContext implements Cloneable { public static final String DEFAULT_CIPHER_MODE = "CBC"; - private static final Map<String, PrivateKeyObfuscator> OBFUSCATORS = + private static final NavigableMap<String, PrivateKeyObfuscator> OBFUSCATORS = new TreeMap<String, PrivateKeyObfuscator>(String.CASE_INSENSITIVE_ORDER) { private static final long serialVersionUID = 1L; // no serialization expected @@ -211,6 +211,7 @@ public class PrivateKeyEncryptionContext implements Cloneable { throw new RuntimeException("Failed to clone: " + toString()); } } + @Override public int hashCode() { return GenericUtils.hashCode(getCipherName(), Boolean.TRUE) http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/pem/AbstractPEMResourceKeyPairParser.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/pem/AbstractPEMResourceKeyPairParser.java b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/pem/AbstractPEMResourceKeyPairParser.java index 8c8d082..bee13d6 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/pem/AbstractPEMResourceKeyPairParser.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/pem/AbstractPEMResourceKeyPairParser.java @@ -134,7 +134,6 @@ public abstract class AbstractPEMResourceKeyPairParser throw new FailedLoginException("No password data for encrypted resource=" + resourceKey); } - PrivateKeyEncryptionContext encContext = new PrivateKeyEncryptionContext(algInfo); encContext.setPassword(password); encContext.setInitVector(initVector); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/digest/BaseDigest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/digest/BaseDigest.java b/sshd-core/src/main/java/org/apache/sshd/common/digest/BaseDigest.java index baa64ee..a5ef6f9 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/digest/BaseDigest.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/digest/BaseDigest.java @@ -104,7 +104,6 @@ public class BaseDigest implements Digest { return h; } - @Override public int compareTo(Digest that) { if (that == null) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwardingFilter.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwardingFilter.java b/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwardingFilter.java index 64f37db..b2403dd 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwardingFilter.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/forward/DefaultForwardingFilter.java @@ -789,7 +789,6 @@ public class DefaultForwardingFilter err = GenericUtils.accumulateException(err, e); } - if (err != null) { throw err; } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/forward/ForwardingFilter.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/forward/ForwardingFilter.java b/sshd-core/src/main/java/org/apache/sshd/common/forward/ForwardingFilter.java index 5c3583b..bb66562 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/forward/ForwardingFilter.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/forward/ForwardingFilter.java @@ -18,7 +18,6 @@ */ package org.apache.sshd.common.forward; - import java.io.IOException; import org.apache.sshd.common.Closeable; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/forward/PortForwardingEventListenerManagerHolder.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/forward/PortForwardingEventListenerManagerHolder.java b/sshd-core/src/main/java/org/apache/sshd/common/forward/PortForwardingEventListenerManagerHolder.java index 71a607b..dadcf85 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/forward/PortForwardingEventListenerManagerHolder.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/forward/PortForwardingEventListenerManagerHolder.java @@ -34,5 +34,6 @@ public interface PortForwardingEventListenerManagerHolder { Collection<PortForwardingEventListenerManager> getRegisteredManagers(); boolean addPortForwardingEventListenerManager(PortForwardingEventListenerManager manager); + boolean removePortForwardingEventListenerManager(PortForwardingEventListenerManager manager); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipClientChannel.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipClientChannel.java b/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipClientChannel.java index 1f73590..673114e 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipClientChannel.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/forward/TcpipClientChannel.java @@ -63,15 +63,14 @@ public class TcpipClientChannel extends AbstractClientChannel { this.remote = remote; } - public OpenFuture getOpenFuture() { return openFuture; } @Override public synchronized OpenFuture open() throws IOException { - final InetSocketAddress src; - final InetSocketAddress dst; + InetSocketAddress src; + InetSocketAddress dst; switch (typeEnum) { case Direct: src = (InetSocketAddress) serverSession.getRemoteAddress(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java b/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java index cb34411..db380c2 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultSshFuture.java @@ -46,7 +46,7 @@ public class DefaultSshFuture<T extends SshFuture> extends AbstractSshFuture<T> * then synchronization occurs on {@code this} instance */ public DefaultSshFuture(Object lock) { - this.lock = lock != null ? lock : this; + this.lock = (lock != null) ? lock : this; } @Override @@ -159,6 +159,7 @@ public class DefaultSshFuture<T extends SshFuture> extends AbstractSshFuture<T> if (notifyNow) { notifyListener(listener); } + return asT(); } @@ -220,4 +221,9 @@ public class DefaultSshFuture<T extends SshFuture> extends AbstractSshFuture<T> public void cancel() { setValue(CANCELED); } + + @Override + public String toString() { + return getClass().getSimpleName() + "[value=" + result + "]"; + } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/kex/KexFactoryManager.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/kex/KexFactoryManager.java b/sshd-core/src/main/java/org/apache/sshd/common/kex/KexFactoryManager.java index 898b5c5..7aa8cba 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/kex/KexFactoryManager.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/kex/KexFactoryManager.java @@ -48,6 +48,7 @@ public interface KexFactoryManager extends KeyPairProviderHolder, SignatureFacto * @return a list of named <code>KeyExchange</code> factories, never {@code null} */ List<NamedFactory<KeyExchange>> getKeyExchangeFactories(); + void setKeyExchangeFactories(List<NamedFactory<KeyExchange>> keyExchangeFactories); /** @@ -56,20 +57,25 @@ public interface KexFactoryManager extends KeyPairProviderHolder, SignatureFacto * @return a list of named <code>Cipher</code> factories, never {@code null} */ List<NamedFactory<Cipher>> getCipherFactories(); + default String getCipherFactoriesNameList() { return NamedResource.getNames(getCipherFactories()); } + default List<String> getCipherFactoriesNames() { return NamedResource.getNameList(getCipherFactories()); } void setCipherFactories(List<NamedFactory<Cipher>> cipherFactories); + default void setCipherFactoriesNameList(String names) { setCipherFactoriesNames(GenericUtils.split(names, ',')); } + default void setCipherFactoriesNames(String... names) { setCipherFactoriesNames(GenericUtils.isEmpty((Object[]) names) ? Collections.emptyList() : Arrays.asList(names)); } + default void setCipherFactoriesNames(Collection<String> names) { BuiltinCiphers.ParseResult result = BuiltinCiphers.parseCiphersList(names); @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -86,20 +92,25 @@ public interface KexFactoryManager extends KeyPairProviderHolder, SignatureFacto * @return a list of named <code>Compression</code> factories, never {@code null} */ List<NamedFactory<Compression>> getCompressionFactories(); + default String getCompressionFactoriesNameList() { return NamedResource.getNames(getCompressionFactories()); } + default List<String> getCompressionFactoriesNames() { return NamedResource.getNameList(getCompressionFactories()); } void setCompressionFactories(List<NamedFactory<Compression>> compressionFactories); + default void setCompressionFactoriesNameList(String names) { setCompressionFactoriesNames(GenericUtils.split(names, ',')); } + default void setCompressionFactoriesNames(String... names) { setCompressionFactoriesNames(GenericUtils.isEmpty((Object[]) names) ? Collections.emptyList() : Arrays.asList(names)); } + default void setCompressionFactoriesNames(Collection<String> names) { BuiltinCompressions.ParseResult result = BuiltinCompressions.parseCompressionsList(names); @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -116,20 +127,25 @@ public interface KexFactoryManager extends KeyPairProviderHolder, SignatureFacto * @return a list of named <code>Mac</code> factories, never {@code null} */ List<NamedFactory<Mac>> getMacFactories(); + default String getMacFactoriesNameList() { return NamedResource.getNames(getMacFactories()); } + default List<String> getMacFactoriesNames() { return NamedResource.getNameList(getMacFactories()); } void setMacFactories(List<NamedFactory<Mac>> macFactories); + default void setMacFactoriesNameList(String names) { setMacFactoriesNames(GenericUtils.split(names, ',')); } + default void setMacFactoriesNames(String... names) { setMacFactoriesNames(GenericUtils.isEmpty((Object[]) names) ? Collections.emptyList() : Arrays.asList(names)); } + default void setMacFactoriesNames(Collection<String> names) { BuiltinMacs.ParseResult result = BuiltinMacs.parseMacsList(names); @SuppressWarnings({ "rawtypes", "unchecked" }) http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyPairProviderHolder.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyPairProviderHolder.java b/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyPairProviderHolder.java index b5826f6..553d553 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyPairProviderHolder.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyPairProviderHolder.java @@ -30,5 +30,6 @@ public interface KeyPairProviderHolder { * @return the <code>KeyPairProvider</code>, never {@code null} */ KeyPairProvider getKeyPairProvider(); + void setKeyPairProvider(KeyPairProvider keyPairProvider); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpHelper.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpHelper.java b/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpHelper.java index 6631832..9918e02 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpHelper.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpHelper.java @@ -741,7 +741,6 @@ public class ScpHelper extends AbstractLoggingBean implements SessionHolder<Sess out.write("E\n".getBytes(StandardCharsets.UTF_8)); out.flush(); - readyCode = readAck(false); if (log.isDebugEnabled()) { log.debug("sendDir({})[{}] 'E' command reply code=", this, path, readyCode); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/session/ConnectionService.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/session/ConnectionService.java b/sshd-core/src/main/java/org/apache/sshd/common/session/ConnectionService.java index 7c4aa22..823f800 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/session/ConnectionService.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/session/ConnectionService.java @@ -64,5 +64,6 @@ public interface ConnectionService extends Service, PortForwardingEventListenerM X11ForwardSupport getX11ForwardSupport(); boolean isAllowMoreSessions(); + void setAllowMoreSessions(boolean allow); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/session/Session.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/session/Session.java b/sshd-core/src/main/java/org/apache/sshd/common/session/Session.java index 6e00e26..6216188 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/session/Session.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/session/Session.java @@ -287,6 +287,7 @@ public interface Session long getIdleTimeout(); boolean isAuthenticated(); + void setAuthenticated() throws IOException; /** http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/signature/SignatureFactoriesManager.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/signature/SignatureFactoriesManager.java b/sshd-core/src/main/java/org/apache/sshd/common/signature/SignatureFactoriesManager.java index 3b2d712..c9d876a 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/signature/SignatureFactoriesManager.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/signature/SignatureFactoriesManager.java @@ -39,20 +39,25 @@ public interface SignatureFactoriesManager { * @return The list of named <code>Signature</code> factories */ List<NamedFactory<Signature>> getSignatureFactories(); + default String getSignatureFactoriesNameList() { return NamedResource.getNames(getSignatureFactories()); } + default List<String> getSignatureFactoriesNames() { return NamedResource.getNameList(getSignatureFactories()); } void setSignatureFactories(List<NamedFactory<Signature>> factories); + default void setSignatureFactoriesNameList(String names) { setSignatureFactoriesNames(GenericUtils.split(names, ',')); } + default void setSignatureFactoriesNames(String... names) { setSignatureFactoriesNames(GenericUtils.isEmpty((Object[]) names) ? Collections.emptyList() : Arrays.asList(names)); } + default void setSignatureFactoriesNames(Collection<String> names) { BuiltinSignatures.ParseResult result = BuiltinSignatures.parseSignatureList(names); @SuppressWarnings({ "rawtypes", "unchecked" }) http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpHelper.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpHelper.java b/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpHelper.java index ead2764..7b06e11 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpHelper.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpHelper.java @@ -121,7 +121,6 @@ public final class SftpHelper { } }); - private SftpHelper() { throw new UnsupportedOperationException("No instance allowed"); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java index 6bf6d20..99a0768 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java @@ -416,6 +416,7 @@ public final class GenericUtils { return false; } + public static <T> void forEach(Iterable<T> values, Consumer<T> consumer) { if (isNotEmpty(values)) { values.forEach(consumer); @@ -842,6 +843,7 @@ public final class GenericUtils { public boolean hasNext() { return iterator.hasNext(); } + @Override public V next() { return mapper.apply(iterator.next()); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/common/util/io/der/DERWriter.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/io/der/DERWriter.java b/sshd-core/src/main/java/org/apache/sshd/common/util/io/der/DERWriter.java index a001e0e..bc603ee 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/io/der/DERWriter.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/io/der/DERWriter.java @@ -118,7 +118,6 @@ public class DERWriter extends FilterOutputStream { return (b & 0x80) == 0; } - public void writeObject(ASN1Object obj) throws IOException { Objects.requireNonNull(obj, "No ASN.1 object"); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/server/ServerAuthenticationManager.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/ServerAuthenticationManager.java b/sshd-core/src/main/java/org/apache/sshd/server/ServerAuthenticationManager.java index 87e7fcd..1d3a96d 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/ServerAuthenticationManager.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/ServerAuthenticationManager.java @@ -157,20 +157,25 @@ public interface ServerAuthenticationManager { * @return a list of named <code>UserAuth</code> factories, never {@code null}/empty */ List<NamedFactory<UserAuth>> getUserAuthFactories(); + default String getUserAuthFactoriesNameList() { return NamedResource.getNames(getUserAuthFactories()); } + default List<String> getUserAuthFactoriesNames() { return NamedResource.getNameList(getUserAuthFactories()); } void setUserAuthFactories(List<NamedFactory<UserAuth>> userAuthFactories); + default void setUserAuthFactoriesNameList(String names) { setUserAuthFactoriesNames(GenericUtils.split(names, ',')); } + default void setUserAuthFactoriesNames(String... names) { setUserAuthFactoriesNames(GenericUtils.isEmpty((Object[]) names) ? Collections.emptyList() : Arrays.asList(names)); } + default void setUserAuthFactoriesNames(Collection<String> names) { BuiltinUserAuthFactories.ParseResult result = BuiltinUserAuthFactories.parseFactoriesList(names); @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -190,6 +195,7 @@ public interface ServerAuthenticationManager { * @return the {@link PublickeyAuthenticator} or {@code null} */ PublickeyAuthenticator getPublickeyAuthenticator(); + void setPasswordAuthenticator(PasswordAuthenticator passwordAuthenticator); /** @@ -201,6 +207,7 @@ public interface ServerAuthenticationManager { * @return the {@link PasswordAuthenticator} or {@code null} */ PasswordAuthenticator getPasswordAuthenticator(); + void setPublickeyAuthenticator(PublickeyAuthenticator publickeyAuthenticator); /** @@ -212,6 +219,7 @@ public interface ServerAuthenticationManager { * @return The {@link KeyboardInteractiveAuthenticator} or {@code null} */ KeyboardInteractiveAuthenticator getKeyboardInteractiveAuthenticator(); + void setKeyboardInteractiveAuthenticator(KeyboardInteractiveAuthenticator interactiveAuthenticator); /** @@ -223,6 +231,7 @@ public interface ServerAuthenticationManager { * @return the {@link GSSAuthenticator} or {@code null} */ GSSAuthenticator getGSSAuthenticator(); + void setGSSAuthenticator(GSSAuthenticator gssAuthenticator); /** @@ -233,6 +242,7 @@ public interface ServerAuthenticationManager { * @return the {@link HostBasedAuthenticator} or {@code null} */ HostBasedAuthenticator getHostBasedAuthenticator(); + void setHostBasedAuthenticator(HostBasedAuthenticator hostBasedAuthenticator); /** http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGEXServer.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGEXServer.java b/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGEXServer.java index d6fed30..39e93ca 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGEXServer.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGEXServer.java @@ -171,7 +171,6 @@ public class DHGEXServer extends AbstractDHServerKeyExchange { dh.setF(e); k = dh.getK(); - byte[] k_s; KeyPair kp = Objects.requireNonNull(session.getHostKey(), "No server key pair available"); String algo = session.getNegotiatedKexParameter(KexProposalOption.SERVERKEYS); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/server/session/ServerProxyAcceptorHolder.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerProxyAcceptorHolder.java b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerProxyAcceptorHolder.java index ec519f5..ef7cf8d 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerProxyAcceptorHolder.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerProxyAcceptorHolder.java @@ -24,5 +24,6 @@ package org.apache.sshd.server.session; */ public interface ServerProxyAcceptorHolder { ServerProxyAcceptor getServerProxyAcceptor(); + void setServerProxyAcceptor(ServerProxyAcceptor proxyAcceptor); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/AbstractSftpEventListenerManager.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/AbstractSftpEventListenerManager.java b/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/AbstractSftpEventListenerManager.java index 9289458..11508b3 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/AbstractSftpEventListenerManager.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/AbstractSftpEventListenerManager.java @@ -44,7 +44,6 @@ public abstract class AbstractSftpEventListenerManager implements SftpEventListe return sftpEventListenerProxy; } - @Override public boolean addSftpEventListener(SftpEventListener listener) { return sftpEventListeners.add(SftpEventListener.validateListener(listener)); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpFileSystemAccessorManager.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpFileSystemAccessorManager.java b/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpFileSystemAccessorManager.java index 9619794..616f9ce 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpFileSystemAccessorManager.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpFileSystemAccessorManager.java @@ -24,5 +24,6 @@ package org.apache.sshd.server.subsystem.sftp; */ public interface SftpFileSystemAccessorManager { SftpFileSystemAccessor getFileSystemAccessor(); + void setFileSystemAccessor(SftpFileSystemAccessor accessor); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/test/java/org/apache/sshd/client/config/hosts/HostConfigEntryTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/client/config/hosts/HostConfigEntryTest.java b/sshd-core/src/test/java/org/apache/sshd/client/config/hosts/HostConfigEntryTest.java index 3eeb6d4..05a32da 100644 --- a/sshd-core/src/test/java/org/apache/sshd/client/config/hosts/HostConfigEntryTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/client/config/hosts/HostConfigEntryTest.java @@ -309,6 +309,7 @@ public class HostConfigEntryTest extends BaseTestSupport { assertNotNull("Missing resource " + resourceName, url); return HostConfigEntry.readHostConfigEntries(url); } + private static void testCaseInsensitivePatternMatching(String value, Pattern pattern, boolean expected) { for (int index = 0; index < value.length(); index++) { boolean actual = HostPatternsHolder.isHostMatch(value, pattern); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/test/java/org/apache/sshd/client/kex/KexTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/client/kex/KexTest.java b/sshd-core/src/test/java/org/apache/sshd/client/kex/KexTest.java index 5509799..9fe1aff 100644 --- a/sshd-core/src/test/java/org/apache/sshd/client/kex/KexTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/client/kex/KexTest.java @@ -79,7 +79,6 @@ public class KexTest extends BaseTestSupport { return parameterize(BuiltinDHFactories.VALUES); } - @BeforeClass public static void setupClientAndServer() throws Exception { sshd = Utils.setupTestServer(KexTest.class); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/test/java/org/apache/sshd/common/channel/ChannelPipedOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/channel/ChannelPipedOutputStreamTest.java b/sshd-core/src/test/java/org/apache/sshd/common/channel/ChannelPipedOutputStreamTest.java index e8d3df8..eb2d61f 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/channel/ChannelPipedOutputStreamTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/channel/ChannelPipedOutputStreamTest.java @@ -43,19 +43,19 @@ public class ChannelPipedOutputStreamTest extends BaseTestSupport { @Test public void testNioChannelImplementation() throws IOException { ChannelPipedSink sink = Mockito.mock(ChannelPipedSink.class); - final AtomicBoolean eofCalled = new AtomicBoolean(false); + AtomicBoolean eofCalled = new AtomicBoolean(false); Mockito.doAnswer(invocation -> { assertFalse("Multiple EOF calls", eofCalled.getAndSet(true)); return null; }).when(sink).eof(); - - final AtomicInteger receiveCount = new AtomicInteger(0); + AtomicInteger receiveCount = new AtomicInteger(0); Mockito.doAnswer(invocation -> { Number len = invocation.getArgumentAt(2, Number.class); receiveCount.addAndGet(len.intValue()); return null; }).when(sink).receive(Matchers.any(byte[].class), Matchers.anyInt(), Matchers.anyInt()); + try (ChannelPipedOutputStream stream = new ChannelPipedOutputStream(sink)) { assertTrue("Stream not marked as initially open", stream.isOpen()); assertEquals("Unexpected initial receive count", 0, receiveCount.intValue()); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/test/java/org/apache/sshd/common/file/root/RootedFileSystemProviderTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/file/root/RootedFileSystemProviderTest.java b/sshd-core/src/test/java/org/apache/sshd/common/file/root/RootedFileSystemProviderTest.java index 410e1f6..e63db36 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/file/root/RootedFileSystemProviderTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/file/root/RootedFileSystemProviderTest.java @@ -214,6 +214,7 @@ public class RootedFileSystemProviderTest extends AssertableFile { Path link = FileHelper.createLink(fileSystem.getPath("../" + getCurrentTestName() + "link"), existing); fail(String.format("Unexpected success in linking file %s", link.toString())); } + @Test public void testNewByteChannelProviderMismatchException() throws IOException { RootedFileSystemProvider provider = new RootedFileSystemProvider(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java b/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java index e92a5c5..5e24eb5 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java @@ -111,7 +111,6 @@ public class MacTest extends BaseTestSupport { return ret; } - @BeforeClass public static void setupClientAndServer() throws Exception { JSchLogger.init(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/test/java/org/apache/sshd/server/auth/WelcomeBannerPhaseTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/auth/WelcomeBannerPhaseTest.java b/sshd-core/src/test/java/org/apache/sshd/server/auth/WelcomeBannerPhaseTest.java index bc5b2b2..35f032b 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/auth/WelcomeBannerPhaseTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/auth/WelcomeBannerPhaseTest.java @@ -121,7 +121,6 @@ public class WelcomeBannerPhaseTest extends BaseTestSupport { } }); - try (ClientSession session = client.connect(getCurrentTestName(), TEST_LOCALHOST, port).verify(7L, TimeUnit.SECONDS).getSession()) { session.addPasswordIdentity(getCurrentTestName()); session.auth().verify(5L, TimeUnit.SECONDS); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/55ca8818/sshd-core/src/test/java/org/apache/sshd/server/jaas/JaasPasswordAuthenticatorTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/jaas/JaasPasswordAuthenticatorTest.java b/sshd-core/src/test/java/org/apache/sshd/server/jaas/JaasPasswordAuthenticatorTest.java index a37ab85..d147f2d 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/jaas/JaasPasswordAuthenticatorTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/jaas/JaasPasswordAuthenticatorTest.java @@ -86,9 +86,7 @@ public class JaasPasswordAuthenticatorTest extends BaseTestSupport { assertFalse(auth.authenticate("sshd", "dummy")); } - protected static class DummyLoginModule implements LoginModule { - private Subject subject; private CallbackHandler callbackHandler;
