This is an automated email from the ASF dual-hosted git repository. lgoldstein pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git.
from e88c1a7 [SSHD-1125] Added option to require immediate close of channel in command ExitCallback invocation new 80c5e16 [SSHD-1133] Re-factored locations and names of ServerSession and server-side ChannelSession related classes new 0dc159a [SSHD-1133] Added capability to specify a custom charset for parsing incoming commands to the ScpShell new 88aa312 [SSHD-1133] Added capability to specify a custom charset for returning environment variables related data from the ScpShell new da23f55 [SSHD-1133] Added capability to specify a custom charset for handling the SCP protocol textual commands and responses new 73883a5 Moved some helper methods and classes to more natural locations new 11c0049 Fixed SftpCommandMain handling of 'put' command in case of single argument provided new b627015 Added SftpCommandMain 'lls' (local-LS) command support The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.md | 8 + docs/scp.md | 28 +++ .../apache/sshd/cli/client/SftpCommandMain.java | 64 +++++- .../sshd/cli/client/SshClientCliSupport.java | 11 +- .../org/apache/sshd/cli/client/SshKeyScanMain.java | 14 +- .../org/apache/sshd/cli/server/SshFsMounter.java | 4 +- .../sshd/client/config/hosts/HostConfigEntry.java | 15 +- .../apache/sshd/common/AttributeRepository.java | 6 +- .../org/apache/sshd/common/PropertyResolver.java | 14 ++ .../apache/sshd/common/PropertyResolverUtils.java | 7 +- .../org/apache/sshd/common/channel/PtyMode.java | 11 +- .../apache/sshd/common/config/TimeValueConfig.java | 3 +- .../common/config/keys/AuthorizedKeyEntry.java | 5 +- .../sshd/common/config/keys/IdentityUtils.java | 7 +- .../apache/sshd/common/config/keys/KeyUtils.java | 4 +- .../keys/impl/AbstractPublicKeyEntryDecoder.java | 4 +- .../keys/impl/SkECDSAPublicKeyEntryDecoder.java | 2 +- .../keys/impl/SkED25519PublicKeyEntryDecoder.java | 2 +- .../keys/loader/PrivateKeyEncryptionContext.java | 3 +- .../keys/loader/openssh/kdf/BCryptKdfOptions.java | 6 +- .../pem/AbstractPEMResourceKeyPairParser.java | 8 +- .../keys}/u2f/SecurityKeyPublicKey.java | 2 +- .../{ => config/keys}/u2f/SkED25519PublicKey.java | 2 +- .../{ => config/keys}/u2f/SkEcdsaPublicKey.java | 2 +- .../sshd/common/future/AbstractSshFuture.java | 6 +- .../sshd/common/kex/extension/KexExtensions.java | 3 +- .../common/keyprovider/KeyIdentityProvider.java | 5 +- .../signature/AbstractSecurityKeySignature.java | 2 +- .../sshd/common/signature/SignatureFactory.java | 3 +- .../sshd/common/util/EventListenerUtils.java | 4 +- .../apache/sshd/common/util/ExceptionUtils.java | 162 +++++++++++++ .../org/apache/sshd/common/util/GenericUtils.java | 251 +-------------------- .../org/apache/sshd/common/util/MapEntryUtils.java | 113 ++++++++++ .../org/apache/sshd/common/util/ValidateUtils.java | 2 +- .../buffer/keys/SkECBufferPublicKeyParser.java | 2 +- .../keys/SkED25519BufferPublicKeyParser.java | 2 +- .../AutoCloseableDelegateInvocationHandler.java | 3 +- .../util/{ => functors}/Int2IntFunction.java | 4 +- .../sshd/common/util/functors/UnaryEquator.java | 12 +- .../org/apache/sshd/common/util/io/IoUtils.java | 3 +- .../org/apache/sshd/common/util/io/PathUtils.java | 2 +- .../common/util/{ => io/functors}/Invoker.java | 7 +- .../sshd/common/util/net/SshdSocketAddress.java | 3 +- .../util/security/SecurityEntityFactory.java | 8 +- .../sshd/common/util/security/SecurityUtils.java | 5 +- .../BouncyCastleSecurityProviderRegistrar.java | 3 +- .../eddsa/EdDSASecurityProviderRegistrar.java | 4 +- .../main/java/org/apache/sshd/server/Signal.java | 9 +- .../client/config/hosts/HostConfigEntryTest.java | 5 +- .../client/config/keys/ClientIdentityTest.java | 3 +- .../apache/sshd/common/VersionPropertiesTest.java | 3 +- .../apache/sshd/common/channel/PtyModeTest.java | 4 +- .../common/config/keys/BuiltinIdentitiesTest.java | 3 +- .../common/keyprovider/KeyPairProviderTest.java | 3 +- .../apache/sshd/common/util/GenericUtilsTest.java | 8 +- .../sshd/common/util/Int2IntFunctionTest.java | 1 + .../apache/sshd/util/test/JUnitTestSupport.java | 5 +- .../InteractivePasswordIdentityProvider.java | 5 +- .../common/compression/DeflatingInputStream.java | 10 +- .../sshd/agent/local/ChannelAgentForwarding.java | 4 +- .../sshd/agent/unix/ChannelAgentForwarding.java | 3 +- .../java/org/apache/sshd/client/SshClient.java | 12 +- .../sshd/client/channel/AbstractClientChannel.java | 4 +- .../client/channel/PtyCapableChannelSession.java | 9 +- .../client/config/SshClientConfigFileReader.java | 3 +- .../sshd/client/session/AbstractClientSession.java | 3 +- .../simple/AbstractSimpleClientSessionCreator.java | 6 +- .../sshd/common/channel/AbstractChannel.java | 15 +- .../common/channel/BufferedIoOutputStream.java | 4 +- .../sshd/common/forward/DefaultForwarder.java | 23 +- .../apache/sshd/common/io/nio2/Nio2Connector.java | 6 +- .../apache/sshd/common/io/nio2/Nio2Session.java | 4 +- .../DefaultClientKexExtensionHandler.java | 10 +- .../session/helpers/AbstractConnectionService.java | 2 +- .../common/session/helpers/AbstractSession.java | 5 +- .../sshd/common/session/helpers/SessionHelper.java | 34 +-- ...AuthorizedKeyEntriesPublickeyAuthenticator.java | 3 +- .../sshd/server/channel/AbstractServerChannel.java | 4 +- .../sshd/server/channel/ChannelDataReceiver.java | 4 +- .../apache/sshd/server/channel/ChannelSession.java | 7 +- .../server/{ => channel}/ChannelSessionAware.java | 3 +- .../sshd/server/channel/PuttyRequestHandler.java | 3 +- .../server/channel/ServerChannelSessionHolder.java | 6 +- .../server/command/AbstractCommandSupport.java | 4 +- .../command/AbstractDelegatingCommandFactory.java | 15 +- .../server/config/SshServerConfigFileReader.java | 5 +- .../sshd/server/config/keys/ServerIdentity.java | 3 +- .../sshd/server/forward/TcpipServerChannel.java | 8 +- .../server/global/CancelTcpipForwardHandler.java | 2 +- .../sshd/server/global/TcpipForwardHandler.java | 2 +- .../sshd/server/session/AbstractServerSession.java | 3 +- .../ServerSessionAware.java} | 6 +- .../apache/sshd/server/shell/InvertedShell.java | 14 +- .../sshd/server/shell/InvertedShellWrapper.java | 11 +- .../org/apache/sshd/server/shell/ProcessShell.java | 11 +- .../KnownHostsServerKeyVerifierTest.java | 3 +- .../sshd/common/PropertyResolverUtilsTest.java | 4 +- .../KeyboardInteractiveAuthenticationTest.java | 3 +- .../java/org/apache/sshd/server/ServerTest.java | 3 +- .../server/config/keys/ServerIdentityTest.java | 3 +- .../server/shell/InvertedShellWrapperTest.java | 8 +- .../sshd/util/test/AsyncEchoShellFactory.java | 2 +- .../apache/sshd/util/test/BogusInvertedShell.java | 2 +- .../apache/sshd/git/AbstractGitCommandFactory.java | 7 +- .../sshd/git/transport/GitSshdSessionFactory.java | 6 +- .../sshd/ldap/LdapPasswordAuthenticatorTest.java | 4 +- .../sshd/ldap/LdapPublickeyAuthenticatorTest.java | 4 +- .../java/org/apache/sshd/mina/MinaService.java | 4 +- .../java/org/apache/sshd/mina/MinaSession.java | 4 +- .../java/org/apache/sshd/netty/NettyIoSession.java | 3 +- .../sshd/openpgp/PGPAuthorizedEntriesTracker.java | 3 +- .../openpgp/PGPAuthorizedKeyEntriesLoader.java | 3 +- .../apache/sshd/openpgp/PGPPublicRingWatcher.java | 10 +- .../sshd/openpgp/PGPPublicRingWatcherTest.java | 8 +- .../org/apache/sshd/putty/PuttyKeyUtilsTest.java | 3 +- .../org/apache/sshd/scp/ScpModuleProperties.java | 34 ++- .../scp/client/ScpRemote2RemoteTransferHelper.java | 25 +- .../sshd/scp/client/SimpleScpClientImpl.java | 4 +- .../java/org/apache/sshd/scp/common/ScpHelper.java | 38 +++- .../apache/sshd/scp/common/helpers/ScpAckInfo.java | 28 ++- .../apache/sshd/scp/common/helpers/ScpIoUtils.java | 27 ++- .../org/apache/sshd/scp/server/ScpCommand.java | 19 +- .../apache/sshd/scp/server/ScpCommandFactory.java | 6 +- .../java/org/apache/sshd/scp/server/ScpShell.java | 52 +++-- .../java/org/apache/sshd/scp/client/ScpTest.java | 38 ++-- .../org/apache/sshd/sftp/client/SftpClient.java | 5 +- .../helpers/AbstractSftpClientExtension.java | 3 +- .../sftp/client/fs/SftpFileSystemProvider.java | 11 +- .../sshd/sftp/client/impl/DefaultSftpClient.java | 3 +- .../sftp/client/impl/SimpleSftpClientImpl.java | 10 +- .../org/apache/sshd/sftp/common/SftpHelper.java | 9 +- .../sftp/common/extensions/AclSupportedParser.java | 5 +- .../sshd/sftp/common/extensions/ParserUtils.java | 7 +- .../server/AbstractSftpEventListenerAdapter.java | 4 +- .../sftp/server/AbstractSftpSubsystemHelper.java | 27 ++- .../org/apache/sshd/sftp/server/FileHandle.java | 3 +- .../org/apache/sshd/sftp/server/SftpSubsystem.java | 110 +++++---- .../sshd/sftp/server/SftpSubsystemEnvironment.java | 3 +- .../sshd/sftp/server/SftpSubsystemFactory.java | 2 +- .../java/org/apache/sshd/sftp/client/SftpTest.java | 3 +- .../apache/sshd/sftp/client/SftpVersionsTest.java | 17 +- .../helpers/SpaceAvailableExtensionImplTest.java | 2 +- .../openssh/helpers/OpenSSHExtensionsTest.java | 2 +- .../sshd/sftp/client/fs/SftpFileSystemTest.java | 3 +- .../integration/ApacheSshdSftpSessionFactory.java | 6 +- .../sftp/spring/integration/SpringSftpSession.java | 7 +- 146 files changed, 1032 insertions(+), 729 deletions(-) rename sshd-common/src/main/java/org/apache/sshd/common/{ => config/keys}/u2f/SecurityKeyPublicKey.java (95%) rename sshd-common/src/main/java/org/apache/sshd/common/{ => config/keys}/u2f/SkED25519PublicKey.java (97%) rename sshd-common/src/main/java/org/apache/sshd/common/{ => config/keys}/u2f/SkEcdsaPublicKey.java (97%) create mode 100644 sshd-common/src/main/java/org/apache/sshd/common/util/ExceptionUtils.java rename sshd-common/src/main/java/org/apache/sshd/common/util/{ => functors}/Int2IntFunction.java (95%) rename sshd-common/src/main/java/org/apache/sshd/common/util/{ => io/functors}/Invoker.java (95%) rename sshd-core/src/main/java/org/apache/sshd/server/{ => channel}/ChannelSessionAware.java (93%) copy sshd-common/src/main/java/org/apache/sshd/common/auth/PasswordHolder.java => sshd-core/src/main/java/org/apache/sshd/server/channel/ServerChannelSessionHolder.java (87%) rename sshd-core/src/main/java/org/apache/sshd/server/{SessionAware.java => session/ServerSessionAware.java} (90%)