This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git.
from 7ebb469 [SSHD-660] Added some code improvements and logging for certificates handling code new 1f1b88b [SSHD-978] Autoformat source code instead of using checkstyle new 808cdea [SSHD-978] Autoformat code The 2 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: pom.xml | 39 +- sshd-checkstyle.xml | 15 +- .../main/java/org/apache/sshd/cli/CliSupport.java | 109 ++- .../org/apache/sshd/cli/client/ScpCommandMain.java | 27 +- .../sshd/cli/client/SftpCommandExecutor.java | 2 +- .../apache/sshd/cli/client/SftpCommandMain.java | 140 ++-- .../sshd/cli/client/SshClientCliSupport.java | 145 ++-- .../org/apache/sshd/cli/client/SshClientMain.java | 34 +- .../org/apache/sshd/cli/client/SshKeyScanMain.java | 51 +- .../SftpFileTransferProgressOutputStream.java | 5 +- .../sshd/cli/server/SshServerCliSupport.java | 40 +- .../org/apache/sshd/cli/server/SshServerMain.java | 25 +- .../server/helper/ServerEventListenerHelper.java | 4 +- .../helper/ServerPortForwardingEventListener.java | 30 +- .../helper/SftpServerSubSystemEventListener.java | 14 +- .../apache/sshd/cli/client/ChannelExecMain.java | 8 +- .../sshd/cli/client/ScpCommandMainDevelopment.java | 4 +- .../cli/client/SftpCommandMainDevelopment.java | 4 +- .../sshd/cli/client/SshClientMainDevelopment.java | 4 +- .../sshd/cli/client/SshKeyScanMainDevelopment.java | 4 +- .../org/apache/sshd/cli/server/SshFsMounter.java | 19 +- .../sshd/cli/server/SshServerMainDevelopment.java | 4 +- .../auth/AuthenticationIdentitiesProvider.java | 12 +- .../auth/hostbased/HostKeyIdentityProvider.java | 3 +- .../auth/password/PasswordIdentityProvider.java | 81 +- .../sshd/client/auth/pubkey/PublicKeyIdentity.java | 10 +- .../config/hosts/ConfigFileHostEntryResolver.java | 18 +- .../hosts/DefaultConfigFileHostEntryResolver.java | 24 +- .../sshd/client/config/hosts/HostConfigEntry.java | 355 ++++---- .../config/hosts/HostConfigEntryResolver.java | 35 +- .../sshd/client/config/hosts/HostPatternValue.java | 12 +- .../client/config/hosts/HostPatternsHolder.java | 100 +-- .../sshd/client/config/hosts/KnownHostDigest.java | 3 +- .../sshd/client/config/hosts/KnownHostEntry.java | 25 +- .../client/config/hosts/KnownHostHashValue.java | 39 +- .../keys/BuiltinClientIdentitiesWatcher.java | 16 +- .../config/keys/ClientIdentitiesWatcher.java | 10 +- .../sshd/client/config/keys/ClientIdentity.java | 186 ++--- .../config/keys/ClientIdentityFileWatcher.java | 16 +- .../client/config/keys/ClientIdentityLoader.java | 60 +- .../config/keys/ClientIdentityLoaderHolder.java | 3 +- .../client/config/keys/ClientIdentityProvider.java | 77 +- .../keys/DefaultClientIdentitiesWatcher.java | 9 +- .../config/keys/LazyClientIdentityIterator.java | 25 +- .../config/keys/LazyClientKeyIdentityProvider.java | 13 +- .../apache/sshd/common/AttributeRepository.java | 41 +- .../org/apache/sshd/common/AttributeStore.java | 33 +- .../org/apache/sshd/common/BuiltinFactory.java | 4 +- .../java/org/apache/sshd/common/Closeable.java | 45 +- .../main/java/org/apache/sshd/common/Factory.java | 4 +- .../java/org/apache/sshd/common/NamedFactory.java | 32 +- .../java/org/apache/sshd/common/NamedResource.java | 56 +- .../org/apache/sshd/common/PropertyResolver.java | 44 +- .../apache/sshd/common/PropertyResolverUtils.java | 241 +++--- .../java/org/apache/sshd/common/SshConstants.java | 69 +- .../org/apache/sshd/common/SyspropsMapWrapper.java | 57 +- .../sshd/common/auth/BasicCredentialsImpl.java | 2 +- .../sshd/common/auth/UserAuthFactoriesManager.java | 17 +- .../apache/sshd/common/auth/UserAuthInstance.java | 9 +- .../sshd/common/auth/UserAuthMethodFactory.java | 62 +- .../apache/sshd/common/auth/UsernameHolder.java | 3 +- .../common/channel/PtyChannelConfiguration.java | 14 +- .../channel/PtyChannelConfigurationHolder.java | 3 +- .../channel/PtyChannelConfigurationMutator.java | 8 +- .../org/apache/sshd/common/channel/PtyMode.java | 149 ++-- .../apache/sshd/common/channel/SttySupport.java | 68 +- .../org/apache/sshd/common/cipher/BaseCipher.java | 14 +- .../apache/sshd/common/cipher/BaseRC4Cipher.java | 10 +- .../apache/sshd/common/cipher/BuiltinCiphers.java | 81 +- .../java/org/apache/sshd/common/cipher/Cipher.java | 37 +- .../sshd/common/cipher/CipherInformation.java | 7 +- .../org/apache/sshd/common/cipher/CipherNone.java | 12 +- .../org/apache/sshd/common/cipher/ECCurves.java | 226 +++--- .../org/apache/sshd/common/cipher/package.html | 18 +- .../common/compression/BuiltinCompressions.java | 41 +- .../sshd/common/compression/Compression.java | 21 +- .../common/compression/CompressionDelayedZlib.java | 2 +- .../common/compression/CompressionInformation.java | 9 +- .../sshd/common/compression/CompressionZlib.java | 4 +- .../apache/sshd/common/compression/package.html | 17 +- .../sshd/common/config/CompressionConfigValue.java | 8 +- .../common/config/ConfigFileReaderSupport.java | 76 +- .../common/config/FactoriesListParseResult.java | 15 +- .../apache/sshd/common/config/ListParseResult.java | 20 +- .../apache/sshd/common/config/LogLevelValue.java | 10 +- .../config/NamedFactoriesListParseResult.java | 10 +- .../config/NamedResourceListParseResult.java | 13 +- .../sshd/common/config/SyslogFacilityValue.java | 6 +- .../apache/sshd/common/config/TimeValueConfig.java | 30 +- .../sshd/common/config/VersionProperties.java | 7 +- .../common/config/keys/AuthorizedKeyEntry.java | 155 ++-- .../sshd/common/config/keys/BuiltinIdentities.java | 83 +- .../common/config/keys/FilePasswordProvider.java | 49 +- .../config/keys/FilePasswordProviderHolder.java | 5 +- .../apache/sshd/common/config/keys/Identity.java | 4 +- .../common/config/keys/IdentityResourceLoader.java | 15 +- .../sshd/common/config/keys/IdentityUtils.java | 59 +- .../sshd/common/config/keys/KeyEntryResolver.java | 105 +-- .../sshd/common/config/keys/KeyRandomArt.java | 111 ++- .../common/config/keys/KeyTypeNamesSupport.java | 35 +- .../apache/sshd/common/config/keys/KeyUtils.java | 509 ++++++------ .../common/config/keys/OpenSshCertificateImpl.java | 12 +- .../common/config/keys/PrivateKeyEntryDecoder.java | 66 +- .../config/keys/PrivateKeyEntryResolver.java | 14 +- .../sshd/common/config/keys/PublicKeyEntry.java | 235 +++--- .../config/keys/PublicKeyEntryDataResolver.java | 16 +- .../common/config/keys/PublicKeyEntryDecoder.java | 20 +- .../common/config/keys/PublicKeyEntryResolver.java | 16 +- .../config/keys/PublicKeyRawDataDecoder.java | 40 +- .../common/config/keys/PublicKeyRawDataReader.java | 25 +- .../keys/impl/AbstractIdentityResourceLoader.java | 12 +- .../config/keys/impl/AbstractKeyEntryResolver.java | 10 +- .../keys/impl/AbstractPrivateKeyEntryDecoder.java | 10 +- .../keys/impl/AbstractPublicKeyEntryDecoder.java | 10 +- .../config/keys/impl/DSSPublicKeyEntryDecoder.java | 5 +- .../keys/impl/ECDSAPublicKeyEntryDecoder.java | 16 +- .../keys/impl/OpenSSHCertificateDecoder.java | 19 +- .../config/keys/impl/RSAPublicKeyDecoder.java | 30 +- .../keys/impl/SkECDSAPublicKeyEntryDecoder.java | 6 +- .../keys/impl/SkED25519PublicKeyEntryDecoder.java | 8 +- .../keys/loader/AESPrivateKeyObfuscator.java | 19 +- .../keys/loader/AbstractKeyPairResourceParser.java | 113 ++- .../keys/loader/AbstractPrivateKeyObfuscator.java | 22 +- .../keys/loader/DESPrivateKeyObfuscator.java | 9 +- .../loader/FileWatcherKeyPairResourceLoader.java | 18 +- .../config/keys/loader/KeyPairResourceLoader.java | 80 +- .../config/keys/loader/KeyPairResourceParser.java | 58 +- .../keys/loader/PrivateKeyEncryptionContext.java | 49 +- .../config/keys/loader/PrivateKeyObfuscator.java | 32 +- .../openssh/OpenSSHDSSPrivateKeyEntryDecoder.java | 7 +- .../OpenSSHECDSAPrivateKeyEntryDecoder.java | 7 +- .../keys/loader/openssh/OpenSSHKeyDecryptor.java | 2 +- .../openssh/OpenSSHKeyPairResourceParser.java | 132 +-- .../keys/loader/openssh/OpenSSHParserContext.java | 8 +- .../openssh/OpenSSHRSAPrivateKeyDecoder.java | 5 +- .../config/keys/loader/openssh/kdf/BCrypt.java | 9 +- .../keys/loader/openssh/kdf/BCryptKdfOptions.java | 25 +- .../keys/loader/openssh/kdf/RawKdfOptions.java | 6 +- .../pem/AbstractPEMResourceKeyPairParser.java | 27 +- .../loader/pem/DSSPEMResourceKeyPairParser.java | 32 +- .../loader/pem/ECDSAPEMResourceKeyPairParser.java | 64 +- .../keys/loader/pem/PEMResourceParserUtils.java | 8 +- .../loader/pem/PKCS8PEMResourceKeyPairParser.java | 27 +- .../loader/pem/RSAPEMResourceKeyPairParser.java | 32 +- .../loader/ssh2/Ssh2PublicKeyEntryDecoder.java | 54 +- .../org/apache/sshd/common/digest/BaseDigest.java | 11 +- .../apache/sshd/common/digest/BuiltinDigests.java | 40 +- .../java/org/apache/sshd/common/digest/Digest.java | 5 +- .../org/apache/sshd/common/digest/DigestUtils.java | 116 +-- .../org/apache/sshd/common/digest/package.html | 17 +- .../apache/sshd/common/file/FileSystemAware.java | 4 +- .../common/file/root/RootedFileSystemProvider.java | 45 +- .../sshd/common/file/util/BaseFileSystem.java | 5 +- .../org/apache/sshd/common/file/util/BasePath.java | 9 +- .../sshd/common/file/util/MockFileSystem.java | 2 +- .../org/apache/sshd/common/file/util/MockPath.java | 2 +- .../sshd/common/future/AbstractSshFuture.java | 114 +-- .../org/apache/sshd/common/future/CloseFuture.java | 5 +- .../sshd/common/future/DefaultCloseFuture.java | 6 +- .../sshd/common/future/DefaultSshFuture.java | 34 +- .../common/future/DefaultVerifiableSshFuture.java | 4 +- .../org/apache/sshd/common/future/SshFuture.java | 25 +- .../sshd/common/future/SshFutureListener.java | 14 +- .../sshd/common/future/VerifiableFuture.java | 34 +- .../apache/sshd/common/future/WaitableFuture.java | 84 +- .../sshd/common/io/AbstractIoWriteFuture.java | 6 +- .../org/apache/sshd/common/io/IoConnectFuture.java | 27 +- .../org/apache/sshd/common/io/IoConnector.java | 14 +- .../org/apache/sshd/common/io/IoInputStream.java | 4 +- .../org/apache/sshd/common/io/IoReadFuture.java | 5 +- .../java/org/apache/sshd/common/io/IoService.java | 8 +- .../sshd/common/io/IoServiceEventListener.java | 74 +- .../java/org/apache/sshd/common/io/IoSession.java | 40 +- .../org/apache/sshd/common/io/IoWriteFuture.java | 6 +- .../org/apache/sshd/common/io/PacketWriter.java | 45 +- .../apache/sshd/common/kex/KexProposalOption.java | 38 +- .../java/org/apache/sshd/common/kex/KexState.java | 3 +- .../common/kex/extension/KexExtensionParser.java | 8 +- .../sshd/common/kex/extension/KexExtensions.java | 68 +- .../parser/AbstractKexExtensionParser.java | 4 +- .../kex/extension/parser/DelayCompression.java | 4 +- .../parser/DelayedCompressionAlgorithms.java | 14 +- .../common/kex/extension/parser/Elevation.java | 2 +- .../common/kex/extension/parser/NoFlowControl.java | 2 +- .../parser/ServerSignatureAlgorithms.java | 2 +- .../AbstractResourceKeyPairProvider.java | 33 +- .../ClassLoadableResourceKeyPairProvider.java | 9 +- .../FileHostKeyCertificateProvider.java | 6 +- .../common/keyprovider/FileKeyPairProvider.java | 7 +- .../common/keyprovider/KeyIdentityProvider.java | 84 +- .../keyprovider/KeyIdentityProviderHolder.java | 3 +- .../sshd/common/keyprovider/KeyPairProvider.java | 87 +- .../common/keyprovider/KeyPairProviderHolder.java | 4 +- .../sshd/common/keyprovider/KeyTypeIndicator.java | 17 +- .../common/keyprovider/MappedKeyPairProvider.java | 12 +- .../keyprovider/MultiKeyIdentityIterator.java | 9 +- .../keyprovider/MultiKeyIdentityProvider.java | 4 +- .../org/apache/sshd/common/mac/BuiltinMacs.java | 70 +- .../main/java/org/apache/sshd/common/mac/Mac.java | 3 +- .../org/apache/sshd/common/mac/MacInformation.java | 3 +- .../java/org/apache/sshd/common/mac/package.html | 17 +- .../sshd/common/random/JceRandomFactory.java | 2 +- .../java/org/apache/sshd/common/random/Random.java | 9 +- .../sshd/common/random/SingletonRandomFactory.java | 3 +- .../org/apache/sshd/common/random/package.html | 17 +- .../apache/sshd/common/session/SessionContext.java | 97 ++- .../common/session/SessionHeartbeatController.java | 20 +- .../common/session/helpers/TimeoutIndicator.java | 12 +- .../signature/AbstractSecurityKeySignature.java | 2 +- .../sshd/common/signature/AbstractSignature.java | 45 +- .../sshd/common/signature/BuiltinSignatures.java | 68 +- .../apache/sshd/common/signature/Signature.java | 49 +- .../apache/sshd/common/signature/SignatureDSA.java | 23 +- .../sshd/common/signature/SignatureECDSA.java | 17 +- .../signature/SignatureFactoriesManager.java | 22 +- .../sshd/common/signature/SignatureFactory.java | 56 +- .../apache/sshd/common/signature/SignatureRSA.java | 16 +- .../org/apache/sshd/common/signature/package.html | 17 +- .../apache/sshd/common/u2f/SkED25519PublicKey.java | 8 +- .../apache/sshd/common/u2f/SkEcdsaPublicKey.java | 8 +- .../sshd/common/util/EventListenerUtils.java | 151 ++-- .../org/apache/sshd/common/util/EventNotifier.java | 6 +- .../org/apache/sshd/common/util/GenericUtils.java | 290 ++++--- .../apache/sshd/common/util/IgnoringEmptyMap.java | 6 +- .../java/org/apache/sshd/common/util/Invoker.java | 69 +- .../org/apache/sshd/common/util/MapEntryUtils.java | 11 +- .../org/apache/sshd/common/util/NumberUtils.java | 27 +- .../org/apache/sshd/common/util/ObjectBuilder.java | 4 +- .../java/org/apache/sshd/common/util/OsUtils.java | 64 +- .../java/org/apache/sshd/common/util/Readable.java | 4 +- .../org/apache/sshd/common/util/SelectorUtils.java | 295 ++++--- .../apache/sshd/common/util/SshdEventListener.java | 8 +- .../org/apache/sshd/common/util/VersionInfo.java | 15 +- .../org/apache/sshd/common/util/buffer/Buffer.java | 209 +++-- .../sshd/common/util/buffer/BufferException.java | 2 +- .../sshd/common/util/buffer/BufferUtils.java | 248 +++--- .../sshd/common/util/buffer/ByteArrayBuffer.java | 52 +- .../buffer/keys/AbstractBufferPublicKeyParser.java | 14 +- .../util/buffer/keys/BufferPublicKeyParser.java | 17 +- .../util/buffer/keys/ECBufferPublicKeyParser.java | 13 +- .../buffer/keys/ED25519BufferPublicKeyParser.java | 1 + .../buffer/keys/OpenSSHCertPublicKeyParser.java | 21 +- .../buffer/keys/SkECBufferPublicKeyParser.java | 3 +- .../keys/SkED25519BufferPublicKeyParser.java | 6 +- .../common/util/closeable/AbstractCloseable.java | 17 +- .../util/closeable/AbstractInnerCloseable.java | 2 +- .../apache/sshd/common/util/closeable/Builder.java | 2 +- .../common/util/closeable/FuturesCloseable.java | 6 +- .../common/util/closeable/IoBaseCloseable.java | 2 +- .../common/util/closeable/ParallelCloseable.java | 10 +- .../common/util/closeable/SequentialCloseable.java | 6 +- .../common/util/closeable/SimpleCloseable.java | 2 +- .../sshd/common/util/functors/UnaryEquator.java | 61 +- .../util/helper/LazyIterablesConcatenator.java | 25 +- .../util/helper/LazyMatchingTypeIterable.java | 26 +- .../util/helper/LazyMatchingTypeIterator.java | 26 +- .../common/util/io/CloseableEmptyInputStream.java | 6 +- .../sshd/common/util/io/DirectoryScanner.java | 252 +++--- .../sshd/common/util/io/EmptyInputStream.java | 3 +- .../sshd/common/util/io/FileInfoExtractor.java | 4 +- .../org/apache/sshd/common/util/io/IoUtils.java | 239 +++--- .../sshd/common/util/io/LimitInputStream.java | 4 +- .../common/util/io/LoggingFilterOutputStream.java | 4 +- .../sshd/common/util/io/ModifiableFileWatcher.java | 68 +- .../sshd/common/util/io/NullInputStream.java | 3 +- .../sshd/common/util/io/NullOutputStream.java | 3 +- .../apache/sshd/common/util/io/der/ASN1Class.java | 21 +- .../apache/sshd/common/util/io/der/ASN1Object.java | 50 +- .../apache/sshd/common/util/io/der/ASN1Type.java | 21 +- .../apache/sshd/common/util/io/der/DERParser.java | 47 +- .../apache/sshd/common/util/io/der/DERWriter.java | 22 +- .../sshd/common/util/io/functors/IOFunction.java | 52 +- .../util/io/resource/AbstractIoResource.java | 4 +- .../sshd/common/util/io/resource/IoResource.java | 11 +- .../util/io/resource/ResourceStreamProvider.java | 2 +- .../common/util/logging/AbstractLoggingBean.java | 12 +- .../sshd/common/util/logging/LoggingUtils.java | 296 +++---- .../sshd/common/util/net/NetworkConnector.java | 4 +- .../sshd/common/util/net/SshdSocketAddress.java | 195 ++--- .../AbstractSecurityProviderRegistrar.java | 27 +- .../util/security/SecurityEntityFactory.java | 45 +- .../util/security/SecurityProviderChoice.java | 13 +- .../util/security/SecurityProviderRegistrar.java | 163 ++-- .../sshd/common/util/security/SecurityUtils.java | 177 ++-- .../BouncyCastleGeneratorHostKeyProvider.java | 4 +- .../BouncyCastleKeyPairResourceParser.java | 34 +- .../security/bouncycastle/BouncyCastleRandom.java | 11 +- .../bouncycastle/BouncyCastleRandomFactory.java | 2 +- .../BouncyCastleSecurityProviderRegistrar.java | 2 +- .../security/eddsa/Ed25519PublicKeyDecoder.java | 21 +- .../eddsa/EdDSASecurityProviderRegistrar.java | 2 +- .../security/eddsa/EdDSASecurityProviderUtils.java | 27 +- .../OpenSSHEd25519PrivateKeyEntryDecoder.java | 28 +- .../util/security/eddsa/SignatureEd25519.java | 7 +- .../util/threads/ExecutorServiceProvider.java | 5 +- .../threads/ManagedExecutorServiceSupplier.java | 5 +- .../sshd/common/util/threads/NoCloseExecutor.java | 6 +- .../common/util/threads/SshThreadPoolExecutor.java | 12 +- .../common/util/threads/SshdThreadFactory.java | 9 +- .../sshd/common/util/threads/ThreadUtils.java | 73 +- .../main/java/org/apache/sshd/server/Signal.java | 21 +- .../AbstractGeneratorHostKeyProvider.java | 29 +- .../sshd/server/shell/TtyFilterInputStream.java | 15 +- .../sshd/server/shell/TtyFilterOutputStream.java | 17 +- .../password/PasswordIdentityProviderTest.java | 6 +- .../hosts/ConfigFileHostEntryResolverTest.java | 12 +- .../client/config/hosts/HostConfigEntryTest.java | 58 +- .../config/hosts/KnownHostHashEntryTest.java | 32 +- .../config/hosts/KnownHostHashValueTest.java | 32 +- .../keys/BuiltinClientIdentitiesWatcherTest.java | 9 +- .../config/keys/ClientIdentityFileWatcherTest.java | 6 +- .../client/config/keys/ClientIdentityTest.java | 4 +- .../keys/LazyClientIdentityIteratorTest.java | 18 +- .../common/PropertyResolverCommonValuesTest.java | 4 +- .../common/PropertyResolverParseBooleanTest.java | 10 +- .../org/apache/sshd/common/SshConstantsTest.java | 13 +- .../sshd/common/channel/PtyModeValueTest.java | 4 +- .../sshd/common/channel/SttySupportTest.java | 2 +- .../apache/sshd/common/cipher/BaseCipherTest.java | 27 +- .../compression/BuiltinCompressionsTest.java | 3 +- .../sshd/common/config/TimeValueConfigTest.java | 10 +- .../AuthorizedKeyEntryLoginOptionsParseTest.java | 7 +- .../common/config/keys/BuiltinIdentitiesTest.java | 8 +- .../keys/EcdsaPublicKeyEntryDecoderTest.java | 16 +- .../sshd/common/config/keys/KeyRandomArtTest.java | 13 +- .../sshd/common/config/keys/KeyUtilsCloneTest.java | 4 +- .../KeyUtilsFingerprintCaseSensitivityTest.java | 23 +- .../keys/KeyUtilsFingerprintGenerationTest.java | 94 +-- .../sshd/common/config/keys/KeyUtilsTest.java | 26 +- .../common/config/keys/PublicKeyEntryTest.java | 12 +- .../keys/loader/AESPrivateKeyObfuscatorTest.java | 2 +- .../OpenSSHKeyPairResourceParserDecodingTest.java | 7 +- .../OpenSSHKeyPairResourceParserPasswordTest.java | 18 +- .../OpenSSHKeyPairResourceParserTestSupport.java | 4 +- .../openssh/OpenSSHMaxBCryptRoundsSettingTest.java | 8 +- .../pem/PKCS8PEMResourceKeyPairParserTest.java | 8 +- .../Ssh2PublicKeyEntryDecoderByKeyTypeTest.java | 10 +- .../sshd/common/file/root/AssertableFile.java | 1 + .../file/root/RootedFileSystemProviderTest.java | 25 +- .../apache/sshd/common/file/util/BasePathTest.java | 62 +- .../sshd/common/kex/KexProposalOptionTest.java | 7 +- .../KeyIdentityProviderResolutionTest.java | 22 +- .../common/keyprovider/KeyPairProviderTest.java | 12 +- .../keyprovider/MultiKeyIdentityProviderTest.java | 2 +- .../apache/sshd/common/mac/BuiltinMacsTest.java | 3 +- .../org/apache/sshd/common/mac/MacVectorsTest.java | 333 ++++---- .../sshd/common/random/RandomFactoryTest.java | 2 +- .../common/signature/BuiltinSignaturesTest.java | 3 +- .../common/signature/RSASignatureVariantsTest.java | 10 +- .../sshd/common/signature/SignatureDSATest.java | 70 +- .../common/signature/SignatureRSASHA1Test.java | 25 +- .../common/signature/SignatureSkECDSATest.java | 16 +- .../common/signature/SignatureSkED25519Test.java | 16 +- .../signature/SignatureVariantTestSupport.java | 5 +- .../common/signature/SignaturesDevelopment.java | 6 +- .../sshd/common/util/EventListenerUtilsTest.java | 21 +- .../apache/sshd/common/util/GenericUtilsTest.java | 36 +- .../apache/sshd/common/util/NumberUtilsTest.java | 10 +- .../org/apache/sshd/common/util/OsUtilsTest.java | 12 +- .../apache/sshd/common/util/SelectorUtilsTest.java | 24 +- .../apache/sshd/common/util/ThreadUtilsTest.java | 9 +- .../apache/sshd/common/util/buffer/BufferTest.java | 2 +- .../sshd/common/util/buffer/BufferUtilsTest.java | 2 +- .../common/util/closeable/CloseableUtilsTest.java | 4 +- .../util/helper/LazyIterablesConcatenatorTest.java | 12 +- .../util/helper/LazyMatchingTypeIteratorTest.java | 46 +- .../sshd/common/util/io/DirectoryScannerTest.java | 4 +- .../common/util/io/ModifiableFileWatcherTest.java | 22 +- .../common/util/io/NoCloseInputStreamTest.java | 3 +- .../sshd/common/util/io/NoCloseWriterTest.java | 2 +- .../sshd/common/util/io/der/ASN1ClassTest.java | 2 +- .../sshd/common/util/io/der/ASN1TypeTest.java | 2 +- .../sshd/common/util/io/der/DERWriterTest.java | 4 +- .../common/util/net/SshdSocketIpv6AddressTest.java | 31 +- .../SecurityProviderRegistrarCipherNameTest.java | 4 +- .../SecurityProviderRegistrarTestSupport.java | 6 +- .../common/util/security/SecurityUtilsTest.java | 41 +- .../BouncyCastleGeneratorHostKeyProviderTest.java | 18 +- .../util/security/eddsa/EDDSAProviderTest.java | 3 +- .../util/security/eddsa/Ed25519VectorsTest.java | 222 ++--- .../eddsa/EdDSASecurityProviderRegistrarTest.java | 9 +- .../AbstractGeneratorHostKeyProviderTest.java | 4 +- .../PEMGeneratorHostKeyProviderTest.java | 19 +- .../SimpleGeneratorHostKeyProviderTest.java | 15 +- .../server/shell/TtyFilterInputStreamTest.java | 13 +- .../server/shell/TtyFilterOutputStreamTest.java | 24 +- .../sshd/util/test/CommonTestSupportUtils.java | 174 ++-- .../JUnit4ClassRunnerWithParametersFactory.java | 16 +- .../util/test/JUnit4SingleInstanceClassRunner.java | 2 +- .../apache/sshd/util/test/JUnitTestSupport.java | 91 +-- .../org/apache/sshd/util/test/NoIoTestCase.java | 4 +- .../InteractivePasswordIdentityProvider.java | 25 +- .../channel/throttle/ThrottlingPacketWriter.java | 32 +- .../common/compression/DeflatingInputStream.java | 2 +- ...elIdTrackingUnknownChannelReferenceHandler.java | 24 +- .../sshd/common/signature/LegacyDSASigner.java | 22 +- .../io/ExposedBufferByteArrayOutputStream.java | 1 + .../sshd/common/util/io/LineOutputStream.java | 4 +- .../AndroidOpenSSLSecurityProviderRegistrar.java | 10 +- .../scp/SimpleAccessControlScpEventListener.java | 42 +- .../proxyprotocol/ProxyProtocolAcceptor.java | 17 +- .../sftp/DetailedSftpErrorStatusDataHandler.java | 13 +- .../sftp/SimpleAccessControlSftpEventListener.java | 75 +- .../InteractivePasswordIdentityProviderTest.java | 40 +- .../throttle/ThrottlingPacketWriterTest.java | 9 +- .../sshd/common/signature/LegacyDSASignerTest.java | 19 +- .../sshd/common/util/io/LineOutputStreamTest.java | 6 +- .../SimpleAccessControlScpEventListenerTest.java | 6 +- .../SimpleAccessControlSftpEventListenerTest.java | 17 +- .../org/apache/sshd/agent/SshAgentConstants.java | 20 +- .../org/apache/sshd/agent/SshAgentFactory.java | 30 +- .../java/org/apache/sshd/agent/SshAgentServer.java | 10 +- .../sshd/agent/common/AbstractAgentClient.java | 4 +- .../sshd/agent/common/AbstractAgentProxy.java | 18 +- .../sshd/agent/common/AgentForwardSupport.java | 11 +- .../agent/common/DefaultAgentForwardSupport.java | 2 +- .../sshd/agent/local/AgentForwardedChannel.java | 12 +- .../apache/sshd/agent/local/AgentServerProxy.java | 7 +- .../sshd/agent/local/ChannelAgentForwarding.java | 20 +- .../agent/local/ChannelAgentForwardingFactory.java | 2 +- .../apache/sshd/agent/local/LocalAgentFactory.java | 7 +- .../apache/sshd/agent/local/ProxyAgentFactory.java | 4 +- .../org/apache/sshd/agent/unix/AgentClient.java | 11 +- .../sshd/agent/unix/AgentForwardedChannel.java | 9 +- .../org/apache/sshd/agent/unix/AgentServer.java | 8 +- .../apache/sshd/agent/unix/AgentServerProxy.java | 28 +- .../org/apache/sshd/agent/unix/AprLibrary.java | 25 +- .../sshd/agent/unix/ChannelAgentForwarding.java | 24 +- .../agent/unix/ChannelAgentForwardingFactory.java | 5 +- .../apache/sshd/agent/unix/UnixAgentFactory.java | 11 +- .../sshd/client/ClientAuthenticationManager.java | 65 +- .../java/org/apache/sshd/client/ClientBuilder.java | 107 ++- .../apache/sshd/client/ClientFactoryManager.java | 45 +- .../java/org/apache/sshd/client/SshClient.java | 273 +++---- .../sshd/client/auth/BuiltinUserAuthFactories.java | 18 +- .../java/org/apache/sshd/client/auth/UserAuth.java | 14 +- .../client/auth/hostbased/UserAuthHostBased.java | 51 +- .../auth/keyboard/UserAuthKeyboardInteractive.java | 130 ++- .../UserAuthKeyboardInteractiveFactory.java | 2 +- .../sshd/client/auth/keyboard/UserInteraction.java | 83 +- .../client/auth/password/UserAuthPassword.java | 55 +- .../auth/password/UserAuthPasswordFactory.java | 2 +- .../auth/pubkey/AbstractKeyPairIterator.java | 4 +- .../sshd/client/auth/pubkey/KeyAgentIdentity.java | 6 +- .../sshd/client/auth/pubkey/KeyPairIdentity.java | 12 +- .../client/auth/pubkey/SessionKeyPairIterator.java | 4 +- .../sshd/client/auth/pubkey/UserAuthPublicKey.java | 57 +- .../auth/pubkey/UserAuthPublicKeyFactory.java | 2 +- .../auth/pubkey/UserAuthPublicKeyIterator.java | 15 +- .../sshd/client/channel/AbstractClientChannel.java | 68 +- .../sshd/client/channel/ChannelDirectTcpip.java | 9 +- .../apache/sshd/client/channel/ChannelExec.java | 1 + .../apache/sshd/client/channel/ChannelSession.java | 26 +- .../apache/sshd/client/channel/ChannelShell.java | 1 + .../sshd/client/channel/ChannelSubsystem.java | 5 +- .../apache/sshd/client/channel/ClientChannel.java | 52 +- .../sshd/client/channel/ClientChannelEvent.java | 11 +- .../channel/ClientChannelPendingMessagesQueue.java | 70 +- .../client/channel/PtyCapableChannelSession.java | 54 +- .../exit/AbstractChannelExitRequestHandler.java | 58 +- .../exit/ExitSignalChannelRequestHandler.java | 9 +- .../exit/ExitStatusChannelRequestHandler.java | 4 +- .../client/config/SshClientConfigFileReader.java | 6 +- .../org/apache/sshd/client/future/AuthFuture.java | 36 +- .../apache/sshd/client/future/ConnectFuture.java | 21 +- .../sshd/client/future/DefaultAuthFuture.java | 6 +- .../sshd/client/future/DefaultOpenFuture.java | 6 +- .../org/apache/sshd/client/future/OpenFuture.java | 21 +- .../sshd/client/global/OpenSshHostKeysHandler.java | 12 +- .../client/kex/AbstractDHClientKeyExchange.java | 6 +- .../java/org/apache/sshd/client/kex/DHGClient.java | 90 ++- .../org/apache/sshd/client/kex/DHGEXClient.java | 46 +- .../DefaultKnownHostsServerKeyVerifier.java | 12 +- .../keyverifier/DelegatingServerKeyVerifier.java | 7 +- .../keyverifier/KnownHostsServerKeyVerifier.java | 362 +++++---- .../keyverifier/ModifiedServerKeyAcceptor.java | 22 +- .../sshd/client/keyverifier/ServerKeyVerifier.java | 11 +- .../keyverifier/StaticServerKeyVerifier.java | 4 +- .../sshd/client/session/AbstractClientSession.java | 31 +- .../client/session/ClientConnectionService.java | 18 +- .../session/ClientConnectionServiceFactory.java | 9 +- .../sshd/client/session/ClientProxyConnector.java | 25 +- .../apache/sshd/client/session/ClientSession.java | 306 ++++--- .../sshd/client/session/ClientSessionCreator.java | 185 ++--- .../sshd/client/session/ClientSessionImpl.java | 37 +- .../sshd/client/session/ClientUserAuthService.java | 49 +- .../session/ClientUserAuthServiceFactory.java | 2 +- .../apache/sshd/client/session/SessionFactory.java | 5 +- .../forward/DynamicPortForwardingTracker.java | 2 +- .../forward/ExplicitPortForwardingTracker.java | 9 +- .../session/forward/PortForwardingTracker.java | 12 +- .../simple/AbstractSimpleClientSessionCreator.java | 16 +- .../apache/sshd/client/simple/SimpleClient.java | 10 +- .../client/simple/SimpleClientConfigurator.java | 4 +- .../sshd/client/simple/SimpleSessionClient.java | 94 +-- .../client/subsystem/AbstractSubsystemClient.java | 6 +- .../sshd/client/subsystem/SubsystemClient.java | 8 +- .../java/org/apache/sshd/common/BaseBuilder.java | 147 ++-- .../org/apache/sshd/common/FactoryManager.java | 185 ++--- .../main/java/org/apache/sshd/common/Service.java | 8 +- .../org/apache/sshd/common/ServiceFactory.java | 13 +- .../common/auth/AbstractUserAuthMethodFactory.java | 6 +- .../sshd/common/channel/AbstractChannel.java | 160 ++-- .../common/channel/AbstractRequestHandler.java | 4 +- .../common/channel/BufferedIoOutputStream.java | 28 +- .../org/apache/sshd/common/channel/Channel.java | 95 +-- .../common/channel/ChannelAsyncInputStream.java | 6 +- .../common/channel/ChannelAsyncOutputStream.java | 12 +- .../apache/sshd/common/channel/ChannelFactory.java | 14 +- .../sshd/common/channel/ChannelListener.java | 43 +- .../common/channel/ChannelListenerManager.java | 5 +- .../sshd/common/channel/ChannelOutputStream.java | 42 +- .../common/channel/ChannelPipedInputStream.java | 9 +- .../sshd/common/channel/ChannelPipedSink.java | 6 +- .../sshd/common/channel/IoWriteFutureImpl.java | 2 +- .../apache/sshd/common/channel/RequestHandler.java | 32 +- .../org/apache/sshd/common/channel/Window.java | 88 +- .../ChannelStreamPacketWriterResolver.java | 14 +- .../sshd/common/config/SshConfigFileReader.java | 222 +++-- .../apache/sshd/common/file/FileSystemFactory.java | 4 +- .../file/nativefs/NativeFileSystemFactory.java | 7 +- .../file/virtualfs/VirtualFileSystemFactory.java | 4 +- .../common/forward/DefaultForwarderFactory.java | 3 +- .../common/forward/DefaultForwardingFilter.java | 227 +++--- .../sshd/common/forward/ForwardingFilter.java | 16 +- .../common/forward/ForwardingFilterFactory.java | 5 +- .../sshd/common/forward/LocalForwardingEntry.java | 19 +- .../forward/PortForwardingEventListener.java | 107 ++- .../PortForwardingEventListenerManager.java | 13 +- .../PortForwardingEventListenerManagerHolder.java | 7 +- .../forward/PortForwardingInformationProvider.java | 46 +- .../sshd/common/forward/PortForwardingManager.java | 36 +- .../org/apache/sshd/common/forward/SocksProxy.java | 34 +- .../sshd/common/forward/TcpipClientChannel.java | 22 +- .../forward/TcpipForwardingExceptionMarker.java | 4 +- .../common/future/DefaultKeyExchangeFuture.java | 6 +- .../sshd/common/future/KeyExchangeFuture.java | 5 +- .../global/AbstractOpenSshHostKeysHandler.java | 8 +- .../common/helpers/AbstractFactoryManager.java | 18 +- .../sshd/common/io/AbstractIoServiceFactory.java | 4 +- .../common/io/AbstractIoServiceFactoryFactory.java | 4 +- .../io/BuiltinIoServiceFactoryFactories.java | 4 +- .../common/io/DefaultIoServiceFactoryFactory.java | 12 +- .../apache/sshd/common/io/nio2/Nio2Acceptor.java | 60 +- .../sshd/common/io/nio2/Nio2CompletionHandler.java | 6 +- .../apache/sshd/common/io/nio2/Nio2Connector.java | 27 +- .../common/io/nio2/Nio2DefaultIoWriteFuture.java | 2 +- .../apache/sshd/common/io/nio2/Nio2Service.java | 17 +- .../common/io/nio2/Nio2ServiceFactoryFactory.java | 5 +- .../apache/sshd/common/io/nio2/Nio2Session.java | 73 +- .../org/apache/sshd/common/kex/AbstractDH.java | 42 +- .../sshd/common/kex/AbstractKexFactoryManager.java | 16 +- .../apache/sshd/common/kex/BuiltinDHFactories.java | 68 +- .../main/java/org/apache/sshd/common/kex/DHG.java | 16 +- .../org/apache/sshd/common/kex/DHGroupData.java | 160 ++-- .../main/java/org/apache/sshd/common/kex/ECDH.java | 6 +- .../apache/sshd/common/kex/KexFactoryManager.java | 13 +- .../org/apache/sshd/common/kex/KeyExchange.java | 20 +- .../apache/sshd/common/kex/KeyExchangeFactory.java | 5 +- .../DefaultClientKexExtensionHandler.java | 86 +- .../common/kex/extension/KexExtensionHandler.java | 128 ++- .../session/AbstractConnectionServiceFactory.java | 3 +- .../sshd/common/session/ConnectionService.java | 4 +- .../session/ReservedSessionMessagesHandler.java | 48 +- .../org/apache/sshd/common/session/Session.java | 211 +++-- .../common/session/SessionDisconnectHandler.java | 133 ++- .../apache/sshd/common/session/SessionHolder.java | 4 +- .../sshd/common/session/SessionListener.java | 60 +- .../common/session/SessionListenerManager.java | 15 +- .../session/UnknownChannelReferenceHandler.java | 19 +- .../UnknownChannelReferenceHandlerManager.java | 12 +- .../session/helpers/AbstractConnectionService.java | 134 ++- .../AbstractConnectionServiceRequestHandler.java | 3 +- .../common/session/helpers/AbstractSession.java | 496 ++++++------ .../session/helpers/AbstractSessionFactory.java | 9 +- .../session/helpers/AbstractSessionIoHandler.java | 5 +- .../DefaultUnknownChannelReferenceHandler.java | 27 +- .../helpers/MissingAttachedSessionException.java | 4 +- .../helpers/MultipleAttachedSessionException.java | 5 +- .../common/session/helpers/PendingWriteFuture.java | 2 +- .../ReservedSessionMessagesHandlerAdapter.java | 7 +- .../sshd/common/session/helpers/SessionHelper.java | 299 ++++--- .../session/helpers/SessionTimeoutListener.java | 10 +- .../apache/sshd/server/ChannelSessionAware.java | 3 +- .../java/org/apache/sshd/server/Environment.java | 18 +- .../sshd/server/ServerAuthenticationManager.java | 146 ++-- .../java/org/apache/sshd/server/ServerBuilder.java | 114 ++- .../apache/sshd/server/ServerFactoryManager.java | 52 +- .../java/org/apache/sshd/server/SessionAware.java | 4 +- .../org/apache/sshd/server/SignalListener.java | 2 +- .../java/org/apache/sshd/server/SshServer.java | 85 +- .../apache/sshd/server/StandardEnvironment.java | 22 +- .../sshd/server/auth/AsyncAuthException.java | 2 +- .../sshd/server/auth/BuiltinUserAuthFactories.java | 18 +- .../java/org/apache/sshd/server/auth/UserAuth.java | 27 +- .../sshd/server/auth/UserAuthNoneFactory.java | 2 +- .../sshd/server/auth/WelcomeBannerPhase.java | 13 +- .../sshd/server/auth/gss/CredentialHelper.java | 9 +- .../sshd/server/auth/gss/GSSAuthenticator.java | 30 +- .../apache/sshd/server/auth/gss/UserAuthGSS.java | 21 +- .../sshd/server/auth/gss/UserAuthGSSFactory.java | 2 +- .../auth/hostbased/HostBasedAuthenticator.java | 20 +- .../hostbased/StaticHostBasedAuthenticator.java | 19 +- .../server/auth/hostbased/UserAuthHostBased.java | 37 +- .../auth/hostbased/UserAuthHostBasedFactory.java | 2 +- .../DefaultKeyboardInteractiveAuthenticator.java | 7 +- .../server/auth/keyboard/InteractiveChallenge.java | 9 +- .../keyboard/KeyboardInteractiveAuthenticator.java | 39 +- .../auth/keyboard/UserAuthKeyboardInteractive.java | 25 +- .../UserAuthKeyboardInteractiveFactory.java | 2 +- .../password/AcceptAllPasswordAuthenticator.java | 2 +- .../auth/password/PasswordAuthenticator.java | 34 +- .../password/PasswordChangeRequiredException.java | 7 +- .../password/RejectAllPasswordAuthenticator.java | 2 +- .../auth/password/StaticPasswordAuthenticator.java | 2 +- .../server/auth/password/UserAuthPassword.java | 77 +- .../auth/password/UserAuthPasswordFactory.java | 2 +- .../pubkey/AcceptAllPublickeyAuthenticator.java | 2 +- .../auth/pubkey/CachingPublicKeyAuthenticator.java | 19 +- .../auth/pubkey/KeySetPublickeyAuthenticator.java | 2 +- .../server/auth/pubkey/PublickeyAuthenticator.java | 31 +- .../pubkey/RejectAllPublickeyAuthenticator.java | 2 +- .../auth/pubkey/StaticPublickeyAuthenticator.java | 8 +- .../sshd/server/auth/pubkey/UserAuthPublicKey.java | 37 +- .../auth/pubkey/UserAuthPublicKeyFactory.java | 2 +- .../sshd/server/channel/AbstractServerChannel.java | 15 +- .../sshd/server/channel/ChannelDataReceiver.java | 76 +- .../apache/sshd/server/channel/ChannelSession.java | 186 ++--- .../sshd/server/channel/ChannelSessionFactory.java | 2 +- .../sshd/server/channel/PipeDataReceiver.java | 7 +- .../sshd/server/channel/PuttyRequestHandler.java | 39 +- .../server/command/AbstractCommandSupport.java | 17 +- .../command/AbstractDelegatingCommandFactory.java | 13 +- .../server/command/AbstractFileSystemCommand.java | 4 +- .../apache/sshd/server/command/AsyncCommand.java | 3 +- .../org/apache/sshd/server/command/Command.java | 8 +- .../apache/sshd/server/command/CommandFactory.java | 21 +- .../sshd/server/command/CommandLifecycle.java | 17 +- .../server/config/AllowTcpForwardingValue.java | 6 +- .../server/config/SshServerConfigFileReader.java | 15 +- .../config/keys/AuthorizedKeysAuthenticator.java | 46 +- .../keys/DefaultAuthorizedKeysAuthenticator.java | 29 +- .../sshd/server/config/keys/ServerIdentity.java | 110 ++- .../server/forward/AcceptAllForwardingFilter.java | 2 +- .../sshd/server/forward/AgentForwardingFilter.java | 11 +- .../sshd/server/forward/DirectTcpipFactory.java | 2 +- .../sshd/server/forward/ForwardedTcpipFactory.java | 2 +- .../sshd/server/forward/ForwardingFilter.java | 8 +- .../server/forward/RejectAllForwardingFilter.java | 2 +- .../forward/StaticDecisionForwardingFilter.java | 14 +- .../sshd/server/forward/TcpForwardingFilter.java | 58 +- .../sshd/server/forward/TcpipServerChannel.java | 122 +-- .../sshd/server/forward/X11ForwardingFilter.java | 11 +- .../server/global/CancelTcpipForwardHandler.java | 4 +- .../sshd/server/global/KeepAliveHandler.java | 2 +- .../sshd/server/global/NoMoreSessionsHandler.java | 4 +- .../sshd/server/global/OpenSshHostKeysHandler.java | 13 +- .../sshd/server/global/TcpipForwardHandler.java | 6 +- .../server/jaas/JaasPasswordAuthenticator.java | 2 +- .../server/kex/AbstractDHServerKeyExchange.java | 4 +- .../org/apache/sshd/server/kex/DHGEXServer.java | 61 +- .../java/org/apache/sshd/server/kex/DHGServer.java | 15 +- .../java/org/apache/sshd/server/kex/Moduli.java | 6 +- .../sshd/server/session/AbstractServerSession.java | 136 ++-- .../session/ServerConnectionServiceFactory.java | 8 +- .../sshd/server/session/ServerProxyAcceptor.java | 40 +- .../apache/sshd/server/session/ServerSession.java | 50 +- .../sshd/server/session/ServerSessionImpl.java | 2 +- .../sshd/server/session/ServerUserAuthService.java | 144 ++-- .../session/ServerUserAuthServiceFactory.java | 2 +- .../apache/sshd/server/session/SessionFactory.java | 5 +- .../shell/InteractiveProcessShellFactory.java | 2 +- .../apache/sshd/server/shell/InvertedShell.java | 15 +- .../sshd/server/shell/InvertedShellWrapper.java | 44 +- .../org/apache/sshd/server/shell/ProcessShell.java | 19 +- .../sshd/server/shell/ProcessShellFactory.java | 5 +- .../org/apache/sshd/server/shell/ShellFactory.java | 8 +- .../apache/sshd/server/shell/UnknownCommand.java | 5 +- .../sshd/server/subsystem/SubsystemFactory.java | 26 +- .../sshd/server/x11/ChannelForwardedX11.java | 10 +- .../sshd/server/x11/DefaultX11ForwardSupport.java | 27 +- .../apache/sshd/server/x11/X11ForwardSupport.java | 27 +- .../server/x11/X11ForwardingExceptionMarker.java | 4 +- .../test/java/org/apache/sshd/KeepAliveTest.java | 77 +- .../java/org/apache/sshd/KeyReExchangeTest.java | 61 +- .../src/test/java/org/apache/sshd/LoadTest.java | 7 +- .../src/test/java/org/apache/sshd/ProxyTest.java | 97 ++- .../java/org/apache/sshd/WindowAdjustTest.java | 27 +- .../test/java/org/apache/sshd/agent/AgentTest.java | 6 +- .../client/ClientAuthenticationManagerTest.java | 14 +- .../org/apache/sshd/client/ClientDeadlockTest.java | 3 +- .../sshd/client/ClientSessionListenerTest.java | 9 +- .../java/org/apache/sshd/client/ClientTest.java | 316 ++++---- .../client/auth/BuiltinUserAuthFactoriesTest.java | 7 +- .../sshd/client/channel/ChannelExecTest.java | 2 +- .../config/hosts/HostConfigEntryResolverTest.java | 20 +- .../java/org/apache/sshd/client/kex/KexTest.java | 14 +- .../KnownHostsServerKeyVerifierTest.java | 32 +- .../keyverifier/StaticServerKeyVerifierTest.java | 5 +- .../sshd/client/session/ClientSessionTest.java | 20 +- .../client/simple/SimpleSessionClientTest.java | 4 +- .../apache/sshd/common/ForwardingFilterTest.java | 9 +- .../sshd/common/PropertyResolverUtilsTest.java | 14 +- .../org/apache/sshd/common/SshBuilderTest.java | 26 +- .../sshd/common/auth/AuthenticationTest.java | 221 ++--- .../sshd/common/auth/SinglePublicKeyAuthTest.java | 8 +- .../apache/sshd/common/channel/WindowInitTest.java | 14 +- .../org/apache/sshd/common/channel/WindowTest.java | 40 +- .../sshd/common/channel/WindowTimeoutTest.java | 2 +- .../sshd/common/cipher/BuiltinCiphersTest.java | 15 +- .../org/apache/sshd/common/cipher/CipherTest.java | 58 +- .../sshd/common/compression/CompressionTest.java | 9 +- .../common/config/SshConfigFileReaderTest.java | 54 +- .../common/config/keys/AuthorizedKeyEntryTest.java | 18 +- .../config/keys/AuthorizedKeysTestSupport.java | 12 +- .../forward/AbstractServerCloseTestSupport.java | 19 +- .../forward/ApacheServerApacheClientTest.java | 2 +- .../common/forward/ApacheServerJSchClientTest.java | 7 +- .../common/forward/ConcurrentConnectionTest.java | 13 +- .../common/forward/LocalForwardingEntryTest.java | 8 +- .../sshd/common/forward/NoServerNoClientTest.java | 2 +- .../common/forward/PortForwardingLoadTest.java | 77 +- .../sshd/common/forward/PortForwardingTest.java | 190 +++-- .../io/BuiltinIoServiceFactoryFactoriesTest.java | 2 +- .../io/DefaultIoServiceFactoryFactoryTest.java | 7 +- .../sshd/common/io/nio2/Nio2ServiceTest.java | 11 +- .../org/apache/sshd/common/kex/AbstractDHTest.java | 5 +- .../sshd/common/kex/BuiltinDHFactoriesTest.java | 3 +- .../sshd/common/kex/DHGroupDataParseTest.java | 6 +- .../apache/sshd/common/kex/KeyExchangeTest.java | 3 +- .../kex/extension/KexExtensionHandlerTest.java | 22 +- .../apache/sshd/common/mac/EncryptThenMacTest.java | 6 +- .../sshd/common/mac/MacCompatibilityTest.java | 21 +- .../ReservedSessionMessagesHandlerTest.java | 9 +- .../session/helpers/AbstractSessionTest.java | 43 +- .../common/signature/OpenSSHCertificateTest.java | 20 +- .../common/signature/SignatureFactoriesTest.java | 23 +- .../sshd/server/PasswordAuthenticatorTest.java | 2 +- .../sshd/server/PublickeyAuthenticatorTest.java | 20 +- .../server/ServerAuthenticationManagerTest.java | 5 +- .../sshd/server/ServerProxyAcceptorTest.java | 20 +- .../sshd/server/ServerSessionListenerTest.java | 18 +- .../java/org/apache/sshd/server/ServerTest.java | 141 ++-- .../sshd/server/auth/AsyncAuthInteractiveTest.java | 7 +- .../org/apache/sshd/server/auth/AsyncAuthTest.java | 7 +- .../apache/sshd/server/auth/AsyncAuthTestBase.java | 6 +- .../server/auth/BuiltinUserAuthFactoriesTest.java | 7 +- .../sshd/server/auth/WelcomeBannerPhaseTest.java | 5 +- .../apache/sshd/server/auth/WelcomeBannerTest.java | 11 +- .../sshd/server/channel/ChannelSessionTest.java | 33 +- .../server/command/CommandFactorySplitterTest.java | 18 +- .../keys/AuthorizedKeysAuthenticatorTest.java | 24 +- .../DefaultAuthorizedKeysAuthenticatorTest.java | 5 +- .../server/jaas/JaasPasswordAuthenticatorTest.java | 9 +- .../server/shell/InvertedShellWrapperTest.java | 8 +- .../org/apache/sshd/spring/SpringConfigTest.java | 8 +- .../org/apache/sshd/util/test/BaseTestSupport.java | 33 +- .../sshd/util/test/BogusPasswordAuthenticator.java | 6 +- .../sshd/util/test/CommandExecutionHelper.java | 6 +- .../java/org/apache/sshd/util/test/EchoShell.java | 2 +- .../java/org/apache/sshd/util/test/JSchLogger.java | 7 +- .../org/apache/sshd/util/test/SimpleUserInfo.java | 2 +- .../apache/sshd/util/test/TestChannelListener.java | 2 +- sshd-eclipse-formatter-config.xml | 383 +++++++++ .../org/apache/sshd/git/AbstractGitCommand.java | 16 +- .../apache/sshd/git/AbstractGitCommandFactory.java | 14 +- .../org/apache/sshd/git/GitLocationResolver.java | 21 +- .../org/apache/sshd/git/pack/GitPackCommand.java | 10 +- .../apache/sshd/git/pgm/EmbeddedCommandRunner.java | 39 +- .../org/apache/sshd/git/pgm/GitPgmCommand.java | 12 +- .../apache/sshd/git/transport/GitSshdSession.java | 29 +- .../sshd/git/transport/GitSshdSessionFactory.java | 16 +- .../sshd/git/transport/GitSshdSessionProcess.java | 10 +- .../apache/sshd/git/pack/GitPackCommandTest.java | 9 +- .../org/apache/sshd/git/pgm/GitPgmCommandTest.java | 7 +- .../sshd/common/util/net/LdapNetworkConnector.java | 165 ++-- .../auth/password/LdapPasswordAuthenticator.java | 43 +- .../auth/pubkey/LdapPublickeyAuthenticator.java | 96 +-- .../sshd/server/auth/BaseAuthenticatorTest.java | 6 +- .../password/LdapPasswordAuthenticatorTest.java | 8 +- .../pubkey/LdapPublickeyAuthenticatorTest.java | 12 +- .../apache/sshd/common/io/mina/MinaAcceptor.java | 8 +- .../apache/sshd/common/io/mina/MinaConnector.java | 23 +- .../apache/sshd/common/io/mina/MinaService.java | 13 +- .../sshd/common/io/mina/MinaServiceFactory.java | 3 +- .../common/io/mina/MinaServiceFactoryFactory.java | 4 +- .../apache/sshd/common/io/mina/MinaSession.java | 41 +- .../sshd/common/io/mina/MinaSessionTest.java | 2 +- .../org/apache/sshd/netty/NettyIoAcceptor.java | 87 +- .../org/apache/sshd/netty/NettyIoConnector.java | 95 +-- .../java/org/apache/sshd/netty/NettyIoService.java | 13 +- .../apache/sshd/netty/NettyIoServiceFactory.java | 7 +- .../sshd/netty/NettyIoServiceFactoryFactory.java | 3 +- .../java/org/apache/sshd/netty/NettyIoSession.java | 45 +- .../java/org/apache/sshd/netty/NettySupport.java | 3 +- .../openpgp/PGPAuthorizedEntriesTracker.java | 36 +- .../openpgp/PGPAuthorizedKeyEntriesLoader.java | 29 +- .../keys/loader/openpgp/PGPKeyFileWatcher.java | 4 +- .../config/keys/loader/openpgp/PGPKeyLoader.java | 8 +- .../loader/openpgp/PGPKeyPairResourceParser.java | 44 +- .../loader/openpgp/PGPPrivateKeyExtractor.java | 12 +- .../openpgp/PGPPublicKeyEntryDataResolver.java | 19 +- .../keys/loader/openpgp/PGPPublicKeyExtractor.java | 14 +- .../loader/openpgp/PGPPublicKeyFileWatcher.java | 8 +- .../keys/loader/openpgp/PGPPublicRingWatcher.java | 85 +- .../config/keys/loader/openpgp/PGPUtils.java | 69 +- .../openpgp/PGPKeyPairResourceParserTest.java | 20 +- .../loader/openpgp/PGPPublicRingWatcherTest.java | 10 +- .../loader/openpgp/PGPUtilsKeyFingerprintTest.java | 30 +- .../keys/loader/putty/AbstractPuttyKeyDecoder.java | 50 +- .../keys/loader/putty/DSSPuttyKeyDecoder.java | 4 +- .../keys/loader/putty/ECDSAPuttyKeyDecoder.java | 21 +- .../keys/loader/putty/EdDSAPuttyKeyDecoder.java | 11 +- .../loader/putty/PuttyKeyPairResourceParser.java | 46 +- .../config/keys/loader/putty/PuttyKeyReader.java | 8 +- .../keys/loader/putty/RSAPuttyKeyDecoder.java | 6 +- .../keys/loader/putty/PuttyKeyUtilsTest.java | 22 +- .../apache/sshd/client/scp/AbstractScpClient.java | 75 +- .../apache/sshd/client/scp/CloseableScpClient.java | 3 +- .../apache/sshd/client/scp/DefaultScpClient.java | 22 +- .../sshd/client/scp/DefaultScpStreamResolver.java | 8 +- .../java/org/apache/sshd/client/scp/ScpClient.java | 33 +- .../apache/sshd/client/scp/ScpClientCreator.java | 62 +- .../apache/sshd/client/scp/SimpleScpClient.java | 114 +-- .../sshd/client/scp/SimpleScpClientImpl.java | 11 +- .../AbstractScpTransferEventListenerAdapter.java | 22 +- .../org/apache/sshd/common/scp/ScpFileOpener.java | 183 +++-- .../sshd/common/scp/ScpFileOpenerHolder.java | 6 +- .../java/org/apache/sshd/common/scp/ScpHelper.java | 115 +-- .../org/apache/sshd/common/scp/ScpLocation.java | 49 +- .../sshd/common/scp/ScpReceiveLineHandler.java | 8 +- .../sshd/common/scp/ScpSourceStreamResolver.java | 42 +- .../sshd/common/scp/ScpTargetStreamResolver.java | 50 +- .../org/apache/sshd/common/scp/ScpTimestamp.java | 21 +- .../sshd/common/scp/ScpTransferEventListener.java | 56 +- .../common/scp/helpers/DefaultScpFileOpener.java | 20 +- .../helpers/LocalFileScpSourceStreamResolver.java | 4 +- .../helpers/LocalFileScpTargetStreamResolver.java | 19 +- .../org/apache/sshd/server/scp/ScpCommand.java | 47 +- .../apache/sshd/server/scp/ScpCommandFactory.java | 40 +- .../java/org/apache/sshd/client/scp/ScpTest.java | 219 ++--- .../sshd/client/scp/SimpleScpClientTest.java | 4 +- .../sshd/server/scp/ScpCommandFactoryTest.java | 16 +- .../sshd/client/subsystem/sftp/RawSftpClient.java | 10 +- .../sshd/client/subsystem/sftp/SftpClient.java | 328 ++++---- .../client/subsystem/sftp/SftpClientFactory.java | 45 +- .../subsystem/sftp/SftpDirEntryIterator.java | 32 +- .../subsystem/sftp/SftpInputStreamWithChannel.java | 5 +- .../subsystem/sftp/SftpIterableDirEntry.java | 7 +- .../sftp/SftpOutputStreamWithChannel.java | 5 +- .../subsystem/sftp/SftpRemotePathChannel.java | 95 +-- .../client/subsystem/sftp/SftpVersionSelector.java | 69 +- .../client/subsystem/sftp/SimpleSftpClient.java | 114 +-- .../extensions/BuiltinSftpClientExtensions.java | 54 +- .../sftp/extensions/CheckFileHandleExtension.java | 23 +- .../sftp/extensions/CheckFileNameExtension.java | 23 +- .../sftp/extensions/CopyDataExtension.java | 2 +- .../sftp/extensions/CopyFileExtension.java | 11 +- .../sftp/extensions/MD5FileExtension.java | 17 +- .../sftp/extensions/MD5HandleExtension.java | 17 +- .../sftp/extensions/SpaceAvailableExtension.java | 3 +- .../helpers/AbstractCheckFileExtension.java | 13 +- .../helpers/AbstractMD5HashExtension.java | 10 +- .../helpers/AbstractSftpClientExtension.java | 48 +- .../helpers/CheckFileHandleExtensionImpl.java | 5 +- .../helpers/CheckFileNameExtensionImpl.java | 5 +- .../extensions/helpers/CopyDataExtensionImpl.java | 9 +- .../extensions/helpers/CopyFileExtensionImpl.java | 6 +- .../extensions/helpers/MD5FileExtensionImpl.java | 3 +- .../extensions/helpers/MD5HandleExtensionImpl.java | 3 +- .../helpers/SpaceAvailableExtensionImpl.java | 3 +- .../extensions/openssh/OpenSSHFsyncExtension.java | 2 +- .../openssh/OpenSSHStatExtensionInfo.java | 27 +- .../openssh/OpenSSHStatPathExtension.java | 4 +- .../AbstractOpenSSHStatCommandExtension.java | 6 +- .../subsystem/sftp/fs/SftpDirectoryStream.java | 4 +- .../client/subsystem/sftp/fs/SftpFileStore.java | 8 +- .../client/subsystem/sftp/fs/SftpFileSystem.java | 39 +- .../subsystem/sftp/fs/SftpFileSystemChannel.java | 3 +- .../fs/SftpFileSystemClientSessionInitializer.java | 43 +- .../fs/SftpFileSystemInitializationContext.java | 5 +- .../subsystem/sftp/fs/SftpFileSystemProvider.java | 142 ++-- .../client/subsystem/sftp/fs/SftpPathIterator.java | 2 +- .../sftp/fs/SftpPosixFileAttributeView.java | 2 +- .../subsystem/sftp/fs/SftpPosixFileAttributes.java | 2 +- .../subsystem/sftp/impl/AbstractSftpClient.java | 255 +++--- .../sftp/impl/AbstractSftpFileAttributeView.java | 3 +- .../sftp/impl/DefaultCloseableHandle.java | 4 +- .../subsystem/sftp/impl/DefaultSftpClient.java | 75 +- .../sftp/impl/DefaultSftpClientFactory.java | 7 +- .../subsystem/sftp/impl/SimpleSftpClientImpl.java | 15 +- .../sshd/common/subsystem/sftp/SftpConstants.java | 48 +- .../sshd/common/subsystem/sftp/SftpHelper.java | 252 +++--- .../subsystem/sftp/SftpUniversalOwnerAndGroup.java | 27 +- .../subsystem/sftp/extensions/AbstractParser.java | 4 +- .../sftp/extensions/AclSupportedParser.java | 19 +- .../subsystem/sftp/extensions/ExtensionParser.java | 4 +- .../subsystem/sftp/extensions/NewlineParser.java | 3 +- .../subsystem/sftp/extensions/ParserUtils.java | 75 +- .../extensions/SpaceAvailableExtensionInfo.java | 19 +- .../sftp/extensions/Supported2Parser.java | 18 +- .../subsystem/sftp/extensions/SupportedParser.java | 16 +- .../subsystem/sftp/extensions/VendorIdParser.java | 3 +- .../subsystem/sftp/extensions/VersionsParser.java | 13 +- .../openssh/AbstractOpenSSHExtensionParser.java | 2 +- .../extensions/openssh/FsyncExtensionParser.java | 2 +- .../openssh/HardLinkExtensionParser.java | 2 +- .../openssh/LSetStatExtensionParser.java | 5 +- .../openssh/PosixRenameExtensionParser.java | 2 +- .../extensions/openssh/StatVfsExtensionParser.java | 2 +- .../sftp/AbstractSftpEventListenerAdapter.java | 80 +- .../sftp/AbstractSftpSubsystemHelper.java | 897 ++++++++++----------- .../server/subsystem/sftp/DirectoryHandle.java | 2 +- .../sshd/server/subsystem/sftp/FileHandle.java | 24 +- .../apache/sshd/server/subsystem/sftp/Handle.java | 5 +- .../subsystem/sftp/SftpErrorStatusDataHandler.java | 56 +- .../server/subsystem/sftp/SftpEventListener.java | 330 ++++---- .../subsystem/sftp/SftpEventListenerManager.java | 13 +- .../subsystem/sftp/SftpFileSystemAccessor.java | 154 ++-- .../sshd/server/subsystem/sftp/SftpSubsystem.java | 204 ++--- .../subsystem/sftp/SftpSubsystemEnvironment.java | 8 +- .../subsystem/sftp/SftpSubsystemFactory.java | 8 +- .../sshd/server/subsystem/sftp/UnixDateFormat.java | 12 +- .../subsystem/sftp/UnsupportedAttributePolicy.java | 6 +- .../sshd/client/subsystem/sftp/ClientTest.java | 22 +- .../subsystem/sftp/DefaultCloseableHandleTest.java | 3 +- .../subsystem/sftp/SftpRemotePathChannelTest.java | 35 +- .../sshd/client/subsystem/sftp/SftpTest.java | 255 +++--- .../subsystem/sftp/SftpVersionSelectorTest.java | 38 +- .../client/subsystem/sftp/SftpVersionsTest.java | 129 +-- .../subsystem/sftp/SimpleSftpClientTest.java | 9 +- .../BuiltinSftpClientExtensionsTest.java | 6 +- .../sftp/extensions/UnsupportedExtensionTest.java | 8 +- .../sftp/extensions/VersionParserTest.java | 8 +- .../helpers/AbstractCheckFileExtensionTest.java | 61 +- .../helpers/AbstractMD5HashExtensionTest.java | 37 +- .../helpers/CopyDataExtensionImplTest.java | 67 +- .../helpers/CopyFileExtensionImplTest.java | 2 +- .../helpers/SpaceAvailableExtensionImplTest.java | 12 +- .../openssh/helpers/OpenSSHExtensionsTest.java | 19 +- .../subsystem/sftp/fs/SftpFileSystemTest.java | 52 +- .../subsystem/sftp/fs/SftpFileSystemURITest.java | 41 +- .../common/subsystem/sftp/SftpConstantsTest.java | 8 +- .../sftp/SftpUniversalOwnerAndGroupTest.java | 2 +- .../subsystem/sftp/SftpSubsystemFactoryTest.java | 22 +- .../sftp/ApacheSshdSftpSessionFactory.java | 71 +- .../spring/integration/sftp/SpringSftpSession.java | 3 +- .../sftp/ApacheSshdSftpSessionFactoryTest.java | 34 +- 948 files changed, 17043 insertions(+), 16677 deletions(-) create mode 100644 sshd-eclipse-formatter-config.xml