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

GH-3482: (S)FTP: Fix Recursive LS (ARFOG)

Browse Source 
Resolves https://github.com/spring-projects/spring-integration/issues/3482

`.` and `..` should be ignored when recursing.

**cherry-pick to 5.4.x, 5.3.x**

* Fix checkstyle.

* Fix test in `file` module - test was incorrect; it would have detected this problem.
This commit is contained in:
Gary Russell
2021-02-01 16:04:08 -05:00
committed by GitHub
parent 98fbf62db2
commit d7740706bb
4 changed files with 116 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java
View File

@@ -974,18 +974,23 @@ public abstract class AbstractRemoteFileOutboundGateway<F> extends AbstractReply
private void processFile(Session<F> session, String directory, String subDirectory, List<F> lsFiles,
boolean recursion, F file) throws IOException {
String fileName = getFilename(file);
String fileSep = this.remoteFileTemplate.getRemoteFileSeparator();
boolean isDots = ".".equals(fileName)
|| "..".equals(fileName)
|| fileName.endsWith(fileSep + ".")
|| fileName.endsWith(fileSep + "..");
if (this.options.contains(Option.SUBDIRS) || !isDirectory(file)) {
if (recursion && StringUtils.hasText(subDirectory)) {
if (recursion && StringUtils.hasText(subDirectory) && (!isDots || this.options.contains(Option.ALL))) {
lsFiles.add(enhanceNameWithSubDirectory(file, subDirectory));
}
else {
else if (this.options.contains(Option.ALL) || !isDots) {
lsFiles.add(file);
}
}
String fileName = getFilename(file);
if (recursion && isDirectory(file) && !(".".equals(fileName)) && !("..".equals(fileName))) {
if (recursion && isDirectory(file) && !isDots) {
lsFiles.addAll(listFilesInRemoteDir(session, directory,
subDirectory + fileName + this.remoteFileTemplate.getRemoteFileSeparator()));
subDirectory + fileName + fileSep));
}
}

7
spring-integration-file/src/test/java/org/springframework/integration/file/remote/gateway/RemoteFileOutboundGatewayTests.java
View File

@@ -406,12 +406,13 @@ public class RemoteFileOutboundGatewayTests {
MessageBuilder<List<TestLsEntry>> out = (MessageBuilder<List<TestLsEntry>>) gw
.handleRequestMessage(new GenericMessage<>("testremote/x"));
assertThat(out).isNotNull();
assertThat(out.getPayload()).hasSize(5);
assertThat(out.getPayload()).hasSize(6);
assertThat(out.getPayload().get(0).getFilename()).isEqualTo("f1");
assertThat(out.getPayload().get(1).getFilename()).isEqualTo("d1");
assertThat(out.getPayload().get(2).getFilename()).isEqualTo("d1/d2");
assertThat(out.getPayload().get(3).getFilename()).isEqualTo("d1/f3");
assertThat(out.getPayload().get(4).getFilename()).isEqualTo("f2");
assertThat(out.getPayload().get(3).getFilename()).isEqualTo("d1/d2/f4");
assertThat(out.getPayload().get(4).getFilename()).isEqualTo("d1/f3");
assertThat(out.getPayload().get(5).getFilename()).isEqualTo("f2");
assertThat(out.getHeaders().get(FileHeaders.REMOTE_DIRECTORY)).isEqualTo("testremote/x/");
}