Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-3796: More SFTP Refinements

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3796

When a `UserInfo` is provided, use it for the password and passphrase.
Disallow local properies when a `UserInfo` is provided.

Simple polishing and fixing `TestSftpServer` for the `this.server.stop(true);`
to avoid `port is already in use` for other tests which use default SSH port.
This commit is contained in:
Gary Russell
2015-08-08 11:16:00 -04:00
committed by Artem Bilan
parent 56bfe6b0ac
commit e82bfdc9a6
8 changed files with 158 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/reference/asciidoc/sftp.adoc
View File

@@ -108,8 +108,7 @@ The file has the same format as OpenSSH's _known_hosts_ file and is required and
The password to authenticate against the remote host.
If a _password_ is not provided, then the _privateKey_ property is mandatory.
Overrides the password in a custom `UserInfo`.
To use that password, leave this as the default `null`.
Not allowed if `userInfo` is set; the password is obtained from that object.
*port*
@@ -125,6 +124,7 @@ If the _privateKey_ is not provided, then the _password_ property is mandatory.
*privateKeyPassphrase*
The password for the private key.
Not allowed if `userInfo` is set; the passphrase is obtained from that object.
Optional.
*proxy*
@@ -173,8 +173,10 @@ If false, a pre-populated knownHosts file is required.
*userInfo*
Set a custom `UserInfo` used during authentication.
In particular, `promptYesNo()` is invoked when an unknown (or changed) host key is received.
In particular, be aware that `promptYesNo()` is invoked when an unknown (or changed) host key is received.
Also see `allowUnknownHosts`.
When a `UserInfo` is provided, the `password` and private key `passphrase` is obtained from it, and discrete
`password` and `privateKeyPassprase` properties cannot be set.
[[sftp-dsf]]

5
src/reference/asciidoc/whats-new.adoc
View File

@@ -309,9 +309,12 @@ See <<ftp-dsf>> and <<sftp-dsf>> for more information.
===== DefaultSftpSessionFactory
Previously, the `DefaultSftpSessionFactory` allowed connections to unknown hosts.
Previously, the `DefaultSftpSessionFactory` unconditionally allowed connections to unknown hosts.
This is now configurable (default false).
The factory now requires a configured `knownHosts` file unless the `allowUnknownKeys` property is `true` (default
false).
See <<sftp-unk-hosts>> for more information.
==== Websocket Changes