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 2026/07/16 15:23:55 UTC
(camel) branch fix/CAMEL-24088 created (now 5c8f319695c0)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch fix/CAMEL-24088
in repository https://gitbox.apache.org/repos/asf/camel.git
at 5c8f319695c0 CAMEL-24088: camel-ftp - streamDownload treats refused RETR as success
This branch includes the following new commits:
new 5c8f319695c0 CAMEL-24088: camel-ftp - streamDownload treats refused RETR as success
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(camel) 01/01: CAMEL-24088: camel-ftp - streamDownload treats refused RETR as success
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch fix/CAMEL-24088
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5c8f319695c0adc9f8a339215f290f2b5e890165
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jul 16 17:23:40 2026 +0200
CAMEL-24088: camel-ftp - streamDownload treats refused RETR as success
Co-Authored-By: Claude Opus 4.6 <no...@anthropic.com>
Signed-off-by: Claus Ibsen <cl...@gmail.com>
---
.../camel/component/file/remote/FtpOperations.java | 14 ++-
.../remote/FtpOperationsStreamDownloadTest.java | 136 +++++++++++++++++++++
2 files changed, 146 insertions(+), 4 deletions(-)
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
index 0b942b47248a..b25f13eed9c9 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
@@ -442,7 +442,11 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
if (is != null) {
try {
IOHelper.close(is);
- client.completePendingCommand();
+ boolean ok = client.completePendingCommand();
+ if (!ok) {
+ throw new GenericFileOperationFailedException(
+ client.getReplyCode(), client.getReplyString());
+ }
} catch (IOException e) {
throw new GenericFileOperationFailedException(e.getMessage(), e);
}
@@ -482,9 +486,11 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
log.trace("Client retrieveFile: {}", remoteName);
if (endpoint.getConfiguration().isStreamDownload()) {
InputStream is = client.retrieveFileStream(remoteName);
- target.setBody(is);
- exchange.getIn().setHeader(FtpConstants.REMOTE_FILE_INPUT_STREAM, is);
- result = true;
+ if (is != null) {
+ target.setBody(is);
+ exchange.getIn().setHeader(FtpConstants.REMOTE_FILE_INPUT_STREAM, is);
+ }
+ result = is != null;
} else {
// read the entire file into memory in the byte array
ByteArrayOutputStream bos = new ByteArrayOutputStream();
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpOperationsStreamDownloadTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpOperationsStreamDownloadTest.java
new file mode 100644
index 000000000000..ee06ab43aec5
--- /dev/null
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpOperationsStreamDownloadTest.java
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.file.remote;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.component.file.FileComponent;
+import org.apache.camel.component.file.GenericFile;
+import org.apache.camel.component.file.GenericFileOperationFailedException;
+import org.apache.commons.net.ftp.FTPClient;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class FtpOperationsStreamDownloadTest {
+
+ @Mock
+ private FTPClient ftpClient;
+
+ @Mock
+ private FtpEndpoint endpoint;
+
+ @Mock
+ private FtpConfiguration configuration;
+
+ @Mock
+ private Exchange exchange;
+
+ @Mock
+ private Message message;
+
+ @Mock
+ private FtpClientActivityListener activityListener;
+
+ private FtpOperations ftpOperations;
+
+ @BeforeEach
+ void setUp() {
+ when(endpoint.getConfiguration()).thenReturn(configuration);
+ when(configuration.remoteServerInformation()).thenReturn("localhost");
+
+ ftpOperations = new FtpOperations(ftpClient, null);
+ ftpOperations.setEndpoint(endpoint);
+ ftpOperations.setClientActivityListener(activityListener);
+
+ when(exchange.getIn()).thenReturn(message);
+ }
+
+ private void setUpStreamDownload() {
+ when(configuration.isStreamDownload()).thenReturn(true);
+ when(exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE)).thenReturn(new GenericFile<>());
+ }
+
+ @Test
+ void testRetrieveFileStreamReturnsNullOnServerError() throws IOException {
+ setUpStreamDownload();
+ when(ftpClient.retrieveFileStream(anyString())).thenReturn(null);
+ when(ftpClient.getReplyCode()).thenReturn(550);
+ when(ftpClient.getReplyString()).thenReturn("550 File not found");
+
+ boolean result = ftpOperations.retrieveFile("test.txt", exchange, -1);
+
+ assertFalse(result, "retrieveFile should return false when server refuses RETR");
+ verify(message, never()).setHeader(FtpConstants.REMOTE_FILE_INPUT_STREAM, null);
+ }
+
+ @Test
+ void testRetrieveFileStreamSuccessReturnsTrue() throws IOException {
+ setUpStreamDownload();
+ InputStream stream = new ByteArrayInputStream("content".getBytes());
+ when(ftpClient.retrieveFileStream(anyString())).thenReturn(stream);
+ when(ftpClient.getReplyCode()).thenReturn(150);
+ when(ftpClient.getReplyString()).thenReturn("150 Opening data connection");
+
+ boolean result = ftpOperations.retrieveFile("test.txt", exchange, -1);
+
+ assertTrue(result, "retrieveFile should return true when stream is available");
+ }
+
+ @Test
+ void testReleaseResourcesThrowsOnFailedCompletion() throws IOException {
+ InputStream stream = new ByteArrayInputStream("content".getBytes());
+ when(message.getHeader(FtpConstants.REMOTE_FILE_INPUT_STREAM, InputStream.class)).thenReturn(stream);
+ when(ftpClient.completePendingCommand()).thenReturn(false);
+ when(ftpClient.getReplyCode()).thenReturn(426);
+ when(ftpClient.getReplyString()).thenReturn("426 Transfer aborted");
+
+ assertThrows(GenericFileOperationFailedException.class,
+ () -> ftpOperations.releaseRetrievedFileResources(exchange));
+ }
+
+ @Test
+ void testReleaseResourcesSucceedsOnCompletedTransfer() throws IOException {
+ InputStream stream = new ByteArrayInputStream("content".getBytes());
+ when(message.getHeader(FtpConstants.REMOTE_FILE_INPUT_STREAM, InputStream.class)).thenReturn(stream);
+ when(ftpClient.completePendingCommand()).thenReturn(true);
+
+ ftpOperations.releaseRetrievedFileResources(exchange);
+ }
+
+ @Test
+ void testReleaseResourcesSkipsWhenNoStream() {
+ when(message.getHeader(FtpConstants.REMOTE_FILE_INPUT_STREAM, InputStream.class)).thenReturn(null);
+
+ ftpOperations.releaseRetrievedFileResources(exchange);
+ }
+}