You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/07/07 06:11:28 UTC
[camel] branch main updated: CAMEL-19438: added missing knownHostsFile parameter (#10611)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new ad0db522ae3 CAMEL-19438: added missing knownHostsFile parameter (#10611)
ad0db522ae3 is described below
commit ad0db522ae39d4d5e3ba4d2f22d65c5a9ec19f78
Author: Arin <13...@users.noreply.github.com>
AuthorDate: Fri Jul 7 11:41:22 2023 +0530
CAMEL-19438: added missing knownHostsFile parameter (#10611)
---
.../sftp/integration/SftpChangedReadLockIT.java | 3 ++-
.../sftp/integration/SftpChmodDirectoryIT.java | 3 ++-
.../file/remote/sftp/integration/SftpChmodIT.java | 3 ++-
.../sftp/integration/SftpConsumeTemplateIT.java | 4 +++-
.../sftp/integration/SftpConsumerAutoCreateIT.java | 3 ++-
.../sftp/integration/SftpConsumerDisconnectIT.java | 3 ++-
.../integration/SftpConsumerProcessStrategyIT.java | 3 ++-
.../integration/SftpConsumerWithCharsetIT.java | 3 ++-
.../integration/SftpMoveWithOutMessageTest.java | 8 ++++++--
.../sftp/integration/SftpProduceTempFileIT.java | 3 ++-
.../integration/SftpProducerFileWithPathIT.java | 3 ++-
.../SftpProducerFileWithPathNoStepwiseIT.java | 3 ++-
.../integration/SftpProducerMoveExistingIT.java | 3 ++-
.../integration/SftpProducerWithCharsetIT.java | 2 +-
.../remote/sftp/integration/SftpSetCipherIT.java | 2 +-
.../sftp/integration/SftpSetOperationsIT.java | 3 ++-
.../sftp/integration/SftpSimpleConsumeIT.java | 3 ++-
.../SftpSimpleConsumeNoStartingDirIT.java | 3 ++-
.../SftpSimpleConsumeNotStepwiseIT.java | 3 ++-
.../integration/SftpSimpleConsumeRecursiveIT.java | 3 ++-
.../SftpSimpleConsumeRecursiveNotStepwiseIT.java | 3 ++-
.../integration/SftpSimpleConsumeStreamingIT.java | 3 ++-
.../SftpSimpleConsumeStreamingPartialReadIT.java | 23 +++++++++++-----------
...pSimpleConsumeStreamingWithMultipleFilesIT.java | 3 ++-
.../SftpSimpleConsumeThroughProxyIT.java | 3 ++-
.../sftp/integration/SftpSimpleIPV6ConsumeIT.java | 3 ++-
.../integration/SftpSimpleProduceDisconnectIT.java | 6 ++++--
.../sftp/integration/SftpSimpleProduceIT.java | 12 ++++++-----
.../SftpSimpleProduceThroughProxyIT.java | 6 ++++--
.../sftp/integration/SftpUseListFalseIT.java | 3 ++-
30 files changed, 82 insertions(+), 47 deletions(-)
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpChangedReadLockIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpChangedReadLockIT.java
index c8620330ca9..1e6c5df5406 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpChangedReadLockIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpChangedReadLockIT.java
@@ -41,7 +41,8 @@ public class SftpChangedReadLockIT extends SftpServerTestSupport {
protected String getFtpUrl() {
return "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}/changed" +
- "?username=admin&password=admin&readLock=changed&readLockCheckInterval=1000&delete=true";
+ "?username=admin&password=admin&readLock=changed&readLockCheckInterval=1000&delete=true&knownHostsFile="
+ + service.getKnownHostsFile();
}
@Test
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpChmodDirectoryIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpChmodDirectoryIT.java
index 275929c7042..d32bbfda9d1 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpChmodDirectoryIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpChmodDirectoryIT.java
@@ -31,7 +31,8 @@ public class SftpChmodDirectoryIT extends SftpServerTestSupport {
public void testSftpChmodDirectoryWriteable() {
template.sendBodyAndHeader(
"sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}/folder" +
- "?username=admin&password=admin&chmod=777&chmodDirectory=770",
+ "?username=admin&password=admin&chmod=777&chmodDirectory=770&knownHostsFile="
+ + service.getKnownHostsFile(),
"Hello World", Exchange.FILE_NAME,
"hello.txt");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpChmodIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpChmodIT.java
index 9bbeb788618..b61adb2130d 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpChmodIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpChmodIT.java
@@ -31,7 +31,8 @@ public class SftpChmodIT extends SftpServerTestSupport {
@Test
public void testSftpChmod() {
template.sendBodyAndHeader(
- "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin&chmod=777",
+ "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin&chmod=777&knownHostsFile="
+ + service.getKnownHostsFile(),
"Hello World", Exchange.FILE_NAME,
"hello.txt");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumeTemplateIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumeTemplateIT.java
index a95c226a2c9..dddb126c7a2 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumeTemplateIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumeTemplateIT.java
@@ -32,7 +32,9 @@ public class SftpConsumeTemplateIT extends SftpServerTestSupport {
template.sendBodyAndHeader("file://" + service.getFtpRootDir(), "Hello World", Exchange.FILE_NAME, "hello.txt");
String out = consumer.receiveBody(
- "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin", 5000,
+ "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin&knownHostsFile="
+ + service.getKnownHostsFile(),
+ 5000,
String.class);
assertNotNull(out);
// Apache SSHD appends \u0000 at last byte in retrieved file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerAutoCreateIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerAutoCreateIT.java
index da9d73333f0..e69fd80a754 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerAutoCreateIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerAutoCreateIT.java
@@ -32,7 +32,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@EnabledIf(value = "org.apache.camel.test.infra.ftp.services.embedded.SftpUtil#hasRequiredAlgorithms('src/test/resources/hostkey.pem')")
public class SftpConsumerAutoCreateIT extends SftpServerTestSupport {
protected String getFtpUrl() {
- return "sftp://admin@localhost:{{ftp.server.port}}/{{ftp.root.dir}}/foo/bar/baz/xxx?password=admin";
+ return "sftp://admin@localhost:{{ftp.server.port}}/{{ftp.root.dir}}/foo/bar/baz/xxx?password=admin&knownHostsFile="
+ + service.getKnownHostsFile();
}
@AfterEach
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerDisconnectIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerDisconnectIT.java
index 4c511fdbcbf..55d20c5097b 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerDisconnectIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerDisconnectIT.java
@@ -88,7 +88,8 @@ public class SftpConsumerDisconnectIT extends SftpServerTestSupport {
@Override
public void configure() {
from("sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
- + "?username=admin&password=admin&delete=true")
+ + "?username=admin&password=admin&delete=true&knownHostsFile="
+ + service.getKnownHostsFile())
.routeId("foo").noAutoStartup().process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerProcessStrategyIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerProcessStrategyIT.java
index 526baba173d..79f6a1af1a6 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerProcessStrategyIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerProcessStrategyIT.java
@@ -44,7 +44,8 @@ public class SftpConsumerProcessStrategyIT extends SftpServerTestSupport {
template.sendBodyAndHeader("file://" + service.getFtpRootDir(), "Hello World", Exchange.FILE_NAME, "hello.txt");
String out = consumer.receiveBody("sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
- + "?username=admin&password=admin&processStrategy=#myStrategy",
+ + "?username=admin&password=admin&processStrategy=#myStrategy&knownHostsFile="
+ + service.getKnownHostsFile(),
5000, String.class);
assertNotNull(out);
// Apache SSHD appends \u0000 at last byte in retrieved file
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerWithCharsetIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerWithCharsetIT.java
index 0a1b31355ab..44902af0278 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerWithCharsetIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpConsumerWithCharsetIT.java
@@ -74,7 +74,8 @@ public class SftpConsumerWithCharsetIT extends SftpServerTestSupport {
public void configure() {
from("sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
+ "?username=admin&password=admin&charset="
- + SAMPLE_FILE_CHARSET).routeId("foo").noAutoStartup()
+ + SAMPLE_FILE_CHARSET + "&knownHostsFile="
+ + service.getKnownHostsFile()).routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpMoveWithOutMessageTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpMoveWithOutMessageTest.java
index 58f356ea57e..1f01c1d386a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpMoveWithOutMessageTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpMoveWithOutMessageTest.java
@@ -75,9 +75,13 @@ public class SftpMoveWithOutMessageTest extends SftpServerTestSupport {
public void configure() {
from("seda:trigger")
.pollEnrich(
- "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin&delay=10000&disconnect=true&move=archive")
+ "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin&delay="
+ + "10000&disconnect=true&move=archive&knownHostsFile="
+ + service.getKnownHostsFile())
.pollEnrich(
- "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin&delay=10000&disconnect=true&move=archive")
+ "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin&delay="
+ + "10000&disconnect=true&move=archive&knownHostsFile="
+ + service.getKnownHostsFile())
.process(processor);
}
} };
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProduceTempFileIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProduceTempFileIT.java
index 9b20eac7086..57ca1a23ecc 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProduceTempFileIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProduceTempFileIT.java
@@ -44,7 +44,8 @@ public class SftpProduceTempFileIT extends SftpServerTestSupport {
@Test
public void testSftpTempFileNoStartingPath() {
template.sendBodyAndHeader(
- "sftp://localhost:{{ftp.server.port}}/?username=admin&password=admin&tempFileName=temp-${file:name}",
+ "sftp://localhost:{{ftp.server.port}}/?username=admin&password=admin&tempFileName=temp-${file:name}"
+ + "&knownHostsFile=" + service.getKnownHostsFile(),
"Hello World", Exchange.FILE_NAME,
"hello.txt");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerFileWithPathIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerFileWithPathIT.java
index b2d6e07b03e..ad47f72f71e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerFileWithPathIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerFileWithPathIT.java
@@ -30,7 +30,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class SftpProducerFileWithPathIT extends SftpServerTestSupport {
private String getFtpUrl() {
- return "sftp://admin@localhost:{{ftp.server.port}}/{{ftp.root.dir}}?password=admin";
+ return "sftp://admin@localhost:{{ftp.server.port}}/{{ftp.root.dir}}?password=admin&knownHostsFile="
+ + service.getKnownHostsFile();
}
@Test
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerFileWithPathNoStepwiseIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerFileWithPathNoStepwiseIT.java
index 22bf3fb4251..1c095736be5 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerFileWithPathNoStepwiseIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerFileWithPathNoStepwiseIT.java
@@ -30,7 +30,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class SftpProducerFileWithPathNoStepwiseIT extends SftpServerTestSupport {
private String getFtpUrl() {
- return "sftp://admin@localhost:{{ftp.server.port}}/{{ftp.root.dir}}?password=admin&stepwise=false";
+ return "sftp://admin@localhost:{{ftp.server.port}}/{{ftp.root.dir}}?password=admin&stepwise=false&knownHostsFile="
+ + service.getKnownHostsFile();
}
@Test
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerMoveExistingIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerMoveExistingIT.java
index f36adc1fbdb..3b3bd8b4503 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerMoveExistingIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerMoveExistingIT.java
@@ -37,7 +37,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class SftpProducerMoveExistingIT extends SftpServerTestSupport {
private String getFtpUrl() {
- return "sftp://admin@localhost:{{ftp.server.port}}/{{ftp.root.dir}}/move?password=admin&fileExist=Move";
+ return "sftp://admin@localhost:{{ftp.server.port}}/{{ftp.root.dir}}/move?password=admin&fileExist=Move&knownHostsFile="
+ + service.getKnownHostsFile();
}
@BeforeEach
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerWithCharsetIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerWithCharsetIT.java
index 509e2f49f95..a32a063702b 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerWithCharsetIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpProducerWithCharsetIT.java
@@ -53,6 +53,6 @@ public class SftpProducerWithCharsetIT extends SftpServerTestSupport {
private String getSftpUri() {
return "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin&charset="
- + SAMPLE_FILE_CHARSET;
+ + SAMPLE_FILE_CHARSET + "&knownHostsFile=" + service.getKnownHostsFile();
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSetCipherIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSetCipherIT.java
index 4431af43bf4..246c708edcd 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSetCipherIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSetCipherIT.java
@@ -34,7 +34,7 @@ public class SftpSetCipherIT extends SftpServerTestSupport {
String cipher = "aes256-ctr";
String uri
= "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin&ciphers="
- + cipher;
+ + cipher + "&knownHostsFile=" + service.getKnownHostsFile();
template.sendBodyAndHeader(uri, "Hello World", Exchange.FILE_NAME, "hello.txt");
// test setting the cipher doesn't interfere with message payload
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSetOperationsIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSetOperationsIT.java
index e7b2d3d612e..469a42e4bbe 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSetOperationsIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSetOperationsIT.java
@@ -33,7 +33,8 @@ public class SftpSetOperationsIT extends SftpServerTestSupport {
public void testSftpSetOperations() {
String preferredAuthentications = "password,publickey";
String uri = "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
- + "?username=admin&password=admin&ciphers=aes256-ctr" + "&preferredAuthentications=password,publickey";
+ + "?username=admin&password=admin&ciphers=aes256-ctr&knownHostsFile="
+ + service.getKnownHostsFile() + "&preferredAuthentications=password,publickey";
template.sendBodyAndHeader(uri, "Hello World", Exchange.FILE_NAME, "hello.txt");
// test setting the cipher doesn't interfere with message payload
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeIT.java
index 33cc695a2fe..89f23cf445f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeIT.java
@@ -48,7 +48,8 @@ public class SftpSimpleConsumeIT extends SftpServerTestSupport {
@Override
public void configure() {
from("sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
- + "?username=admin&password=admin&delay=10000&disconnect=true").routeId("foo").noAutoStartup()
+ + "?username=admin&password=admin&delay=10000&disconnect=true&knownHostsFile="
+ + service.getKnownHostsFile()).routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeNoStartingDirIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeNoStartingDirIT.java
index 605d95a4223..e69b6201604 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeNoStartingDirIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeNoStartingDirIT.java
@@ -52,7 +52,8 @@ public class SftpSimpleConsumeNoStartingDirIT extends SftpServerTestSupport {
@Override
public void configure() {
from("sftp://localhost:{{ftp.server.port}}/"
- + "?fileName=a.txt&username=admin&password=admin&delay=10000&disconnect=true").routeId("foo")
+ + "?fileName=a.txt&username=admin&password=admin&delay=10000&disconnect=true&knownHostsFile="
+ + service.getKnownHostsFile()).routeId("foo")
.noAutoStartup().to("log:result", "mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeNotStepwiseIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeNotStepwiseIT.java
index ad042a6f1d8..6939fd86e69 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeNotStepwiseIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeNotStepwiseIT.java
@@ -28,7 +28,8 @@ public class SftpSimpleConsumeNotStepwiseIT extends SftpSimpleConsumeIT {
@Override
public void configure() {
from("sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
- + "?username=admin&password=admin&delay=10000&disconnect=true&stepwise=false").routeId("foo")
+ + "?username=admin&password=admin&delay=10000&disconnect=true&stepwise=false&knownHostsFile="
+ + service.getKnownHostsFile()).routeId("foo")
.noAutoStartup().to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeRecursiveIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeRecursiveIT.java
index c4accb8a22e..4ae0d0c7e01 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeRecursiveIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeRecursiveIT.java
@@ -47,7 +47,8 @@ public class SftpSimpleConsumeRecursiveIT extends SftpServerTestSupport {
@Override
public void configure() {
from("sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
- + "?username=admin&password=admin&delay=10000&disconnect=true&recursive=true").routeId("foo")
+ + "?username=admin&password=admin&delay=10000&disconnect=true&recursive=true&knownHostsFile="
+ + service.getKnownHostsFile()).routeId("foo")
.noAutoStartup().to("log:result", "mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeRecursiveNotStepwiseIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeRecursiveNotStepwiseIT.java
index ccc936f7a2d..20a6ed674c0 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeRecursiveNotStepwiseIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeRecursiveNotStepwiseIT.java
@@ -26,7 +26,8 @@ public class SftpSimpleConsumeRecursiveNotStepwiseIT extends SftpSimpleConsumeRe
@Override
public void configure() {
from("sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
- + "?username=admin&password=admin&delay=10000&disconnect=true&recursive=true&stepwise=false")
+ + "?username=admin&password=admin&delay=10000&disconnect=true&recursive=true&stepwise=false&knownHostsFile="
+ + service.getKnownHostsFile())
.routeId("foo")
.noAutoStartup().to("log:result", "mock:result");
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeStreamingIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeStreamingIT.java
index 8c8fa82fb45..0ef85bd9ae6 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeStreamingIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeStreamingIT.java
@@ -55,7 +55,8 @@ public class SftpSimpleConsumeStreamingIT extends SftpServerTestSupport {
@Override
public void configure() {
from("sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
- + "?username=admin&password=admin&delay=10000&disconnect=true&streamDownload=true").routeId("foo")
+ + "?username=admin&password=admin&delay=10000&disconnect=true&streamDownload=true&knownHostsFile="
+ + service.getKnownHostsFile()).routeId("foo")
.noAutoStartup().to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeStreamingPartialReadIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeStreamingPartialReadIT.java
index 68d6b2af128..bf7b79290e2 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeStreamingPartialReadIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeStreamingPartialReadIT.java
@@ -69,19 +69,20 @@ public class SftpSimpleConsumeStreamingPartialReadIT extends SftpServerTestSuppo
public void configure() {
from("sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
+ "?username=admin&password=admin&delay=10000&disconnect=true&streamDownload=true"
- + "&move=done&moveFailed=failed").routeId("foo").noAutoStartup().process(new Processor() {
+ + "&move=done&moveFailed=failed&knownHostsFile=" + service.getKnownHostsFile())
+ .routeId("foo").noAutoStartup().process(new Processor() {
- @Override
- public void process(Exchange exchange) throws Exception {
- exchange.getIn().getBody(InputStream.class).read();
- }
- }).to("mock:result").process(new Processor() {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().getBody(InputStream.class).read();
+ }
+ }).to("mock:result").process(new Processor() {
- @Override
- public void process(Exchange exchange) throws Exception {
- throw new Exception("INTENTIONAL ERROR");
- }
- });
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ throw new Exception("INTENTIONAL ERROR");
+ }
+ });
}
};
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeStreamingWithMultipleFilesIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeStreamingWithMultipleFilesIT.java
index 8b44112a1de..3613f614833 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeStreamingWithMultipleFilesIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeStreamingWithMultipleFilesIT.java
@@ -58,7 +58,8 @@ public class SftpSimpleConsumeStreamingWithMultipleFilesIT extends SftpServerTes
@Override
public void configure() {
from("sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
- + "?username=admin&password=admin&delay=10000&disconnect=true&streamDownload=true").routeId("foo")
+ + "?username=admin&password=admin&delay=10000&disconnect=true&streamDownload=true&knownHostsFile="
+ + service.getKnownHostsFile()).routeId("foo")
.noAutoStartup().to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeThroughProxyIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeThroughProxyIT.java
index 34b7377b7d1..be31a5c86ec 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeThroughProxyIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleConsumeThroughProxyIT.java
@@ -82,7 +82,8 @@ public class SftpSimpleConsumeThroughProxyIT extends SftpServerTestSupport {
@Override
public void configure() {
from("sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
- + "?username=admin&password=admin&delay=10000&disconnect=true&proxy=#proxy").routeId("foo").noAutoStartup()
+ + "?username=admin&password=admin&delay=10000&disconnect=true&proxy=#proxy&knownHostsFile="
+ + service.getKnownHostsFile()).routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleIPV6ConsumeIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleIPV6ConsumeIT.java
index 987e5039958..1ae976646d0 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleIPV6ConsumeIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleIPV6ConsumeIT.java
@@ -50,7 +50,8 @@ public class SftpSimpleIPV6ConsumeIT extends SftpServerTestSupport {
@Override
public void configure() {
from("sftp://[::1]:{{ftp.server.port}}/{{ftp.root.dir}}"
- + "?username=admin&password=admin&delay=10000&disconnect=true").routeId("foo").noAutoStartup()
+ + "?username=admin&password=admin&delay=10000&disconnect=true" +
+ "&knownHostsFile=" + service.getKnownHostsFile()).routeId("foo").noAutoStartup()
.to("mock:result");
}
};
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleProduceDisconnectIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleProduceDisconnectIT.java
index 4b04493720e..aacc601cb3f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleProduceDisconnectIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleProduceDisconnectIT.java
@@ -31,7 +31,8 @@ public class SftpSimpleProduceDisconnectIT extends SftpServerTestSupport {
@Test
public void testSftpSimpleProduce() throws Exception {
template.sendBodyAndHeader(
- "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin",
+ "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin&knownHostsFile="
+ + service.getKnownHostsFile(),
"Hello World", Exchange.FILE_NAME, "hello.txt");
File file = ftpFile("hello.txt").toFile();
@@ -43,7 +44,8 @@ public class SftpSimpleProduceDisconnectIT extends SftpServerTestSupport {
service.setUpServer();
template.sendBodyAndHeader(
- "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin",
+ "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin&knownHostsFile="
+ + service.getKnownHostsFile(),
"Hello World", Exchange.FILE_NAME, "hello1.txt");
file = ftpFile("hello1.txt").toFile();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleProduceIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleProduceIT.java
index cc1aab09ae4..69fd0702514 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleProduceIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleProduceIT.java
@@ -31,7 +31,8 @@ public class SftpSimpleProduceIT extends SftpServerTestSupport {
@Test
public void testSftpSimpleProduce() {
template.sendBodyAndHeader(
- "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin",
+ "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}?username=admin&password=admin&knownHostsFile="
+ + service.getKnownHostsFile(),
"Hello World", Exchange.FILE_NAME, "hello.txt");
File file = ftpFile("hello.txt").toFile();
@@ -42,9 +43,9 @@ public class SftpSimpleProduceIT extends SftpServerTestSupport {
@Test
public void testSftpSimpleSubPathProduce() {
template.sendBodyAndHeader(
- "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}/mysub?username=admin&password=admin",
- "Bye World",
- Exchange.FILE_NAME, "bye.txt");
+ "sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}/mysub?username=admin&password=admin&knownHostsFile="
+ + service.getKnownHostsFile(),
+ "Bye World", Exchange.FILE_NAME, "bye.txt");
File file = ftpFile("mysub/bye.txt").toFile();
assertTrue(file.exists(), "File should exist: " + file);
@@ -55,7 +56,8 @@ public class SftpSimpleProduceIT extends SftpServerTestSupport {
public void testSftpSimpleTwoSubPathProduce() {
template.sendBodyAndHeader(
"sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
- + "/mysub/myother?username=admin&password=admin",
+ + "/mysub/myother?username=admin&password=admin&knownHostsFile="
+ + service.getKnownHostsFile(),
"Farewell World", Exchange.FILE_NAME,
"farewell.txt");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleProduceThroughProxyIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleProduceThroughProxyIT.java
index 398fe923804..a06531ad7df 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleProduceThroughProxyIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpSimpleProduceThroughProxyIT.java
@@ -80,7 +80,8 @@ public class SftpSimpleProduceThroughProxyIT extends SftpServerTestSupport {
public void testSftpSimpleSubPathProduceThroughProxy() {
template.sendBodyAndHeader(
"sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
- + "/mysub?username=admin&password=admin&proxy=#proxy",
+ + "/mysub?username=admin&password=admin&proxy=#proxy&knownHostsFile="
+ + service.getKnownHostsFile(),
"Bye World", Exchange.FILE_NAME,
"bye.txt");
@@ -92,7 +93,8 @@ public class SftpSimpleProduceThroughProxyIT extends SftpServerTestSupport {
@Test
public void testSftpSimpleTwoSubPathProduceThroughProxy() {
template.sendBodyAndHeader("sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
- + "/mysub/myother?username=admin&password=admin&proxy=#proxy",
+ + "/mysub/myother?username=admin&password=admin&proxy=#proxy&knownHostsFile="
+ + service.getKnownHostsFile(),
"Farewell World",
Exchange.FILE_NAME, "farewell.txt");
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpUseListFalseIT.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpUseListFalseIT.java
index 755840fb8aa..1eb538e16d8 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpUseListFalseIT.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/sftp/integration/SftpUseListFalseIT.java
@@ -48,7 +48,8 @@ public class SftpUseListFalseIT extends SftpServerTestSupport {
@Override
public void configure() {
from("sftp://localhost:{{ftp.server.port}}/{{ftp.root.dir}}"
- + "?username=admin&password=admin&delay=10000&disconnect=true&stepwise=false&useList=false&fileName=report.txt&delete=true")
+ + "?username=admin&password=admin&delay=10000&disconnect=true&stepwise=false&useList="
+ + "false&fileName=report.txt&delete=true&knownHostsFile=" + service.getKnownHostsFile())
.routeId("foo").noAutoStartup()
.to("mock:result");
}