You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by th...@apache.org on 2022/06/03 23:13:47 UTC
[nifi] branch main updated: NIFI-10088 Set SSH Transport Timeout using SFTP Data Timeout property
This is an automated email from the ASF dual-hosted git repository.
thenatog pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 4aa0d31d9f NIFI-10088 Set SSH Transport Timeout using SFTP Data Timeout property
4aa0d31d9f is described below
commit 4aa0d31d9f43848714463eda2c4d3539825b73d6
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Fri Jun 3 10:50:42 2022 -0500
NIFI-10088 Set SSH Transport Timeout using SFTP Data Timeout property
Signed-off-by: Nathan Gough <th...@gmail.com>
This closes #6097.
---
.../nifi/processors/standard/ssh/StandardSSHClientProvider.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/StandardSSHClientProvider.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/StandardSSHClientProvider.java
index 2924934a4a..1a612c9292 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/StandardSSHClientProvider.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ssh/StandardSSHClientProvider.java
@@ -20,6 +20,7 @@ import net.schmizz.keepalive.KeepAlive;
import net.schmizz.sshj.Config;
import net.schmizz.sshj.SSHClient;
import net.schmizz.sshj.connection.Connection;
+import net.schmizz.sshj.transport.Transport;
import net.schmizz.sshj.transport.TransportException;
import net.schmizz.sshj.transport.verification.PromiscuousVerifier;
import net.schmizz.sshj.userauth.keyprovider.KeyFormat;
@@ -146,6 +147,12 @@ public class StandardSSHClientProvider implements SSHClientProvider {
final int dataTimeout = context.getProperty(DATA_TIMEOUT).asTimePeriod(TimeUnit.MILLISECONDS).intValue();
client.setTimeout(dataTimeout);
+ // Set Transport and Connection timeouts using Socket Data Timeout property
+ final Transport transport = client.getTransport();
+ transport.setTimeoutMs(dataTimeout);
+ final Connection connection = client.getConnection();
+ connection.setTimeoutMs(dataTimeout);
+
final boolean strictHostKeyChecking = context.getProperty(STRICT_HOST_KEY_CHECKING).asBoolean();
final String hostKeyFilePath = context.getProperty(HOST_KEY_FILE).getValue();
if (StringUtils.isNotBlank(hostKeyFilePath)) {