Skip to content

Use truncate() of CleartextChannel when opening new Channel with TRUNCATE_EXISTING #270

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
infeo merged 6 commits into from
Jan 16, 2025
Merged

Use truncate() of CleartextChannel when opening new Channel with TRUNCATE_EXISTING #270

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1aab041
fixes #269
infeo Jan 10, 2025
9d93701
replace Thead.sleep()
infeo Jan 13, 2025
38135c9
renamed test
infeo Jan 13, 2025
f753b72
clean up
infeo Jan 13, 2025
e2e7e72
adjust tests to new constructor
infeo Jan 13, 2025
5363d4b
provoke error using CDL instead of timer
overheadhunter Jan 16, 2025
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
8 changes: 3 additions & 5 deletions src/main/java/org/cryptomator/cryptofs/fh/OpenCryptoFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,13 @@ public synchronized FileChannel newFileChannel(EffectiveOpenOptions options, Fil
try {
ciphertextFileChannel = path.getFileSystem().provider().newFileChannel(path, options.createOpenOptionsForEncryptedFile(), attrs);
initFileHeader(options, ciphertextFileChannel);
if (options.truncateExisting()) {
chunkCache.invalidateStale();
ciphertextFileChannel.truncate(cryptor.fileHeaderCryptor().headerSize());
fileSize.set(0);
}
initFileSize(ciphertextFileChannel);
cleartextFileChannel = component.newChannelComponent() //
.create(ciphertextFileChannel, options, this::cleartextChannelClosed) //
.channel();
if (options.truncateExisting()) {
cleartextFileChannel.truncate(0);
}
} finally {
if (cleartextFileChannel == null) { // i.e. something didn't work
cleartextChannelClosed(ciphertextFileChannel);
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/org/cryptomator/cryptofs/CryptoFileChannelWriteReadIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,8 +616,8 @@ public void testWriteThenDeleteThenRead() throws IOException {
Assertions.assertEquals(-1, bytesRead);
}

@RepeatedTest(50)
public void testConcurrentWriteAndTruncate() throws IOException {
@RepeatedTest(15)
public void testConcurrentWriteAndTruncate() throws IOException, InterruptedException {
AtomicBoolean keepWriting = new AtomicBoolean(true);
ByteBuffer buf = ByteBuffer.wrap("the quick brown fox jumps over the lazy dog".getBytes(StandardCharsets.UTF_8));
var executor = Executors.newCachedThreadPool();
Expand All @@ -632,6 +632,7 @@ public void testConcurrentWriteAndTruncate() throws IOException {
buf.flip();
}
});
Thread.sleep(1000);
try (FileChannel truncatingChannel = FileChannel.open(file, WRITE, TRUNCATE_EXISTING)) {
keepWriting.set(false);
}
Expand Down
20 changes: 4 additions & 16 deletions src/test/java/org/cryptomator/cryptofs/fh/OpenCryptoFileTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,20 @@ public void testCloseImmediatelyIfOpeningFirstChannelFails() {
}

@Test
@DisplayName("Opening a file channel with TRUNCATE_EXISTING sets the file size to 0")
@DisplayName("Opening a file channel with TRUNCATE_EXISTING calls truncate(0) on the cleartextChannel")
public void testFileSizeZerodOnTruncateExisting() throws IOException {
EffectiveOpenOptions options = EffectiveOpenOptions.from(EnumSet.of(StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING), readonlyFlag);
var cleartextChannel = mock(CleartextFileChannel.class);
Mockito.when(headerHolder.get()).thenReturn(Mockito.mock(FileHeader.class));
Mockito.when(cryptor.fileHeaderCryptor()).thenReturn(fileHeaderCryptor);
Mockito.when(fileHeaderCryptor.headerSize()).thenReturn(42);
Mockito.when(openCryptoFileComponent.newChannelComponent()).thenReturn(channelComponentFactory);
Mockito.when(channelComponentFactory.create(any(), any(), any())).thenReturn(channelComponent);
Mockito.when(channelComponent.channel()).thenReturn(mock(CleartextFileChannel.class));
Mockito.when(channelComponent.channel()).thenReturn(cleartextChannel);
OpenCryptoFile openCryptoFile = new OpenCryptoFile(closeListener, chunkCache, cryptor, headerHolder, chunkIO, CURRENT_FILE_PATH, fileSize, lastModified, openCryptoFileComponent);

openCryptoFile.newFileChannel(options);
verify(fileSize).set(0L);
verify(cleartextChannel).truncate(0L);
}

@Nested
Expand Down Expand Up @@ -260,19 +261,6 @@ public void testGetSizeAfterCreatingSecondFileChannel() {
Assertions.assertEquals(0l, openCryptoFile.size().get());
}


@Test
@Order(20)
@DisplayName("TRUNCATE_EXISTING leads to chunk cache invalidation")
public void testTruncateExistingInvalidatesChunkCache() throws IOException {
Mockito.when(cryptor.fileHeaderCryptor()).thenReturn(fileHeaderCryptor);
Mockito.when(fileHeaderCryptor.headerSize()).thenReturn(43);
Files.write(CURRENT_FILE_PATH.get(), new byte[0]);
EffectiveOpenOptions options = EffectiveOpenOptions.from(EnumSet.of(StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE), readonlyFlag);
openCryptoFile.newFileChannel(options);
verify(chunkCache).invalidateStale();
}

@Test
@Order(100)
@DisplayName("closeListener triggers chunkIO.unregisterChannel()")
Expand Down
Loading