Skip to content

GH-9294: Set permissions to target file on rename #9300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 8, 2024
Merged

GH-9294: Set permissions to target file on rename #9300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c1d6f4
GH-9294: Set permissions to target file on rename
artembilan Jul 3, 2024
dfbdd7f
* Set only `OWNER_READ` permission for file in unit test
artembilan Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...on-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,7 @@ private File handleFileMessage(File sourceFile, File tempFile, File resultFile,

if (!FileExistsMode.APPEND.equals(this.fileExistsMode) && this.deleteSourceFiles) {
rename(sourceFile, resultFile);
setPermissions(resultFile);
return resultFile;
}
else {
Expand Down
19 changes: 19 additions & 0 deletions ...le/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
import org.junit.jupiter.api.io.TempDir;

import org.springframework.beans.DirectFieldAccessor;
Expand Down Expand Up @@ -301,6 +303,23 @@ public void deleteFilesTrueWithFilePayload() throws Exception {
assertThat(sourceFile.exists()).isFalse();
}

@Test
@DisabledOnOs(OS.WINDOWS)
public void deleteFilesWithChmod() throws Exception {
QueueChannel output = new QueueChannel();
handler.setDeleteSourceFiles(true);
handler.setOutputChannel(output);
handler.setChmod(0400);
Message<?> message = MessageBuilder.withPayload(sourceFile).build();
handler.handleMessage(message);
Message<?> result = output.receive(0);
assertFileContentIsMatching(result);
File resultFile = messageToFile(result);
Set<PosixFilePermission> posixFilePermissions = Files.getPosixFilePermissions(resultFile.toPath());
assertThat(posixFilePermissions).containsOnly(PosixFilePermission.OWNER_READ);
assertThat(sourceFile.exists()).isFalse();
}

@Test
public void deleteSourceFileWithStringPayloadAndFileInstanceHeader() throws Exception {
QueueChannel output = new QueueChannel();
Expand Down