GH-3572: Migrate SFTP from jsch to sshd-sftp
#3892
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This is huge breaking change for SFTP module, but it is still justified with today's trends. |
garyrussell
suggested changes
Sep 26, 2022
| this.comparator = comparator; | ||
| @SuppressWarnings("unchecked") | ||
| public void setComparator(@Nullable Comparator<? extends F> comparator) { | ||
| this.comparator = (Comparator<F>) comparator; |
There was a problem hiding this comment.
Why not change the field (and FileUtils) too? (Instead of casting here).
| @@ -10,6 +10,12 @@ The SFTP protocol requires a secure channel, such as SSH, and visibility to a cl | |||
| Spring Integration supports sending and receiving files over SFTP by providing three client side endpoints: inbound channel adapter, outbound channel adapter, and outbound gateway. | |||
| It also provides convenient namespace configuration to define these client components. | |||
|
|
|||
| NOTE: Starting with version 6.0, an outdated JCraft JSch client has been replaced with modern https://mina.apache.org/sshd-project/index.html[Apache MINA SSHD] framework. | |||
There was a problem hiding this comment.
Suggested change
| NOTE: Starting with version 6.0, an outdated JCraft JSch client has been replaced with modern https://mina.apache.org/sshd-project/index.html[Apache MINA SSHD] framework. | |
| NOTE: Starting with version 6.0, the outdated JCraft JSch client has been replaced with the https://mina.apache.org/sshd-project/index.html[Apache MINA SSHD] framework. |
garyrussell
approved these changes
Sep 27, 2022
|
Please rebase to address what's new conflct. |
Fixes spring-projects#3572 * Rework SFTP module from the JSch API to more modern `sshd-sftp` * Migrate generics of most API from `ChannelSftp.LsEntry` to the `SftpClient.DirEntry` * Rework `DefaultSftpSessionFactory` to deal with an `SshClient` and create `SftpClient` wrapped to the `SftpSession` * Implement a `ResourceKnownHostsServerKeyVerifier` to load `known-hosts` from any possible resource * Implement an expected `SftpSession.list()` with just file name to take or pattern matching * Remove some unused tests and their config * Remove tests for custom `UserInfo` since we don't provide any custom out-of-the-box * Test a new `ResourceKnownHostsServerKeyVerifier` against default `known-hosts` file
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3572
sshd-sftpChannelSftp.LsEntryto theSftpClient.DirEntryDefaultSftpSessionFactoryto deal with anSshClientand createSftpClientwrapped to theSftpSessionResourceKnownHostsServerKeyVerifierto loadknown-hostsfrom any possible resourceSftpSession.list()with just file name to take or pattern matchingUserInfosince we don't provide any custom out-of-the-boxResourceKnownHostsServerKeyVerifieragainst defaultknown-hostsfile