This is an automated email from the ASF dual-hosted git repository. JiriOndrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ecb57710aa07645750b1362c79909b5f11f86795 Author: jiriOndrusek-agent <[email protected]> AuthorDate: Fri Nov 20 08:35:43 2026 +0000 Fixed ftp test module: FTPS endpoints trust the test server certificate (CAMEL-27229) Co-Authored-By: Claude Opus 5.5 <[email protected]> --- .../quarkus/test/support/certificate/CertificatesUtil.java | 4 ++++ .../apache/camel/quarkus/component/ftps/it/FtpsResource.java | 12 ++++++++---- .../org/apache/camel/quarkus/component/ftps/it/FtpsTest.java | 1 + .../camel/quarkus/component/ftps/it/FtpsTestResource.java | 9 +++++++++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/CertificatesUtil.java b/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/CertificatesUtil.java index d71a791bb48..79f149db140 100644 --- a/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/CertificatesUtil.java +++ b/integration-tests-support/certificate-generator/src/main/java/org/apache/camel/quarkus/test/support/certificate/CertificatesUtil.java @@ -26,6 +26,10 @@ public class CertificatesUtil { return file(name + "-keystore", extension); } + public static String truststoreFile(String name, String extension) { + return file(name + "-truststore", extension); + } + public static String caCrt(String name) { return file(name + "-ca", "crt"); } diff --git a/integration-tests/ftp/src/main/java/org/apache/camel/quarkus/component/ftps/it/FtpsResource.java b/integration-tests/ftp/src/main/java/org/apache/camel/quarkus/component/ftps/it/FtpsResource.java index d79b7954fdc..cf5a65398b8 100644 --- a/integration-tests/ftp/src/main/java/org/apache/camel/quarkus/component/ftps/it/FtpsResource.java +++ b/integration-tests/ftp/src/main/java/org/apache/camel/quarkus/component/ftps/it/FtpsResource.java @@ -39,6 +39,10 @@ import org.apache.camel.ProducerTemplate; public class FtpsResource { private static final long TIMEOUT_MS = 1000; + // the self-signed test server certificate must be trusted explicitly (CAMEL-27229) + private static final String BASE_URI = "ftps://admin@localhost:{{camel.ftps.test-port}}/ftps?password=admin" + + "&ftpClient.trustStore.file={{camel.ftps.test-truststore}}" + + "&ftpClient.trustStore.password=password&ftpClient.trustStore.type=PKCS12"; @Inject ProducerTemplate producerTemplate; @@ -51,7 +55,7 @@ public class FtpsResource { @Produces(MediaType.TEXT_PLAIN) public String getFile(@PathParam("fileName") String fileName) { return consumerTemplate.receiveBody( - "ftps://admin@localhost:{{camel.ftps.test-port}}/ftps?password=admin&fileName=" + fileName, + BASE_URI + "&fileName=" + fileName, TIMEOUT_MS, String.class); } @@ -61,7 +65,7 @@ public class FtpsResource { @Consumes(MediaType.TEXT_PLAIN) public Response createFile(@PathParam("fileName") String fileName, String fileContent) throws Exception { - producerTemplate.sendBodyAndHeader("ftps://admin@localhost:{{camel.ftps.test-port}}/ftps?password=admin", fileContent, + producerTemplate.sendBodyAndHeader(BASE_URI, fileContent, Exchange.FILE_NAME, fileName); return Response .created(new URI("https://camel.apache.org/")) @@ -72,7 +76,7 @@ public class FtpsResource { @DELETE public void deleteFile(@PathParam("fileName") String fileName) { consumerTemplate.receiveBody( - "ftps://admin@localhost:{{camel.ftps.test-port}}/ftps?password=admin&delete=true&fileName=" + fileName, + BASE_URI + "&delete=true&fileName=" + fileName, TIMEOUT_MS, String.class); } @@ -81,7 +85,7 @@ public class FtpsResource { @PUT public void moveToDoneFile(@PathParam("fileName") String fileName) { consumerTemplate.receiveBody( - "ftps://admin@localhost:{{camel.ftps.test-port}}/ftps?password=admin&move=${headers.CamelFileName}.done&fileName=" + BASE_URI + "&move=${headers.CamelFileName}.done&fileName=" + fileName, TIMEOUT_MS, String.class); diff --git a/integration-tests/ftp/src/test/java/org/apache/camel/quarkus/component/ftps/it/FtpsTest.java b/integration-tests/ftp/src/test/java/org/apache/camel/quarkus/component/ftps/it/FtpsTest.java index 5c7394ad510..5efbb127f0b 100644 --- a/integration-tests/ftp/src/test/java/org/apache/camel/quarkus/component/ftps/it/FtpsTest.java +++ b/integration-tests/ftp/src/test/java/org/apache/camel/quarkus/component/ftps/it/FtpsTest.java @@ -35,6 +35,7 @@ import static org.hamcrest.CoreMatchers.is; @QuarkusTestResource(value = FtpsTestResource.class, restrictToAnnotatedClass = true) class FtpsTest { static final String CERTIFICATE_KEYSTORE_FILE = CertificatesUtil.keystoreFile("ftp", "p12"); + static final String CERTIFICATE_TRUSTSTORE_FILE = CertificatesUtil.truststoreFile("ftp", "p12"); @Test public void testFtpsComponent() { diff --git a/integration-tests/ftp/src/test/java/org/apache/camel/quarkus/component/ftps/it/FtpsTestResource.java b/integration-tests/ftp/src/test/java/org/apache/camel/quarkus/component/ftps/it/FtpsTestResource.java index 125c3446943..f5a3489c480 100644 --- a/integration-tests/ftp/src/test/java/org/apache/camel/quarkus/component/ftps/it/FtpsTestResource.java +++ b/integration-tests/ftp/src/test/java/org/apache/camel/quarkus/component/ftps/it/FtpsTestResource.java @@ -17,6 +17,8 @@ package org.apache.camel.quarkus.component.ftps.it; import java.nio.file.Path; +import java.util.HashMap; +import java.util.Map; import org.apache.camel.quarkus.component.ftp.it.FtpTestResource; import org.apache.ftpserver.listener.ListenerFactory; @@ -28,6 +30,13 @@ public class FtpsTestResource extends FtpTestResource { super("ftps"); } + @Override + public Map<String, String> start() { + Map<String, String> config = new HashMap<>(super.start()); + config.put("camel.ftps.test-truststore", Path.of(FtpsTest.CERTIFICATE_TRUSTSTORE_FILE).toAbsolutePath().toString()); + return config; + } + @Override protected ListenerFactory createListenerFactory(int port) {
