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

INT-4183: Add SSL Handshake Timeout for TCP

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

Previously, this was hard-coded to 30 seconds.

* Fix typos according PR comments

Conflicts:
	spring-integration-ip/src/main/java/org/springframework/integration/ip/config/IpAdapterParserUtils.java
	spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SocketSupportTests.java

* Resolve conflicts for the  `SocketSupportTests` where `ApplicationEventPublisher` isn't `@FunctionalInterface` yet in SF-4.3.x
This commit is contained in:
Gary Russell
2016-12-13 14:55:53 -05:00
committed by Artem Bilan
parent e7f93b9e0b
commit e8eecc7d8f
12 changed files with 181 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/reference/asciidoc/ip.adoc
View File

@@ -907,6 +907,9 @@ The `DefaulTcpSSLContextSupport` class also has an optional 'protocol' property,
The keystore file names (first two constructor arguments) use the Spring `Resource` abstraction; by default the files will be located on the classpath, but this can be overridden by using the `file:` prefix, to find the files on the filesystem instead.
Starting with _version 4.3.6_, when using NIO, you can specify an `ssl-handshake-timeout` (seconds) on the connection factory.
This timeout (default 30) is used during SSL handshake when waiting for data; if the timeout is exceeded, the process is aborted and the socket closed.
==== Advanced Techniques
In many cases, the configuration described above is all that is needed to enable secure communication over TCP/IP.