Skip to content

Feature: Flush cipherChannel before persisting lastModifed #209

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
Feb 16, 2024
Merged

Feature: Flush cipherChannel before persisting lastModifed #209

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
d16f84b
fixes #205
infeo Feb 12, 2024
35f63e0
add unit test
infeo Feb 12, 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
5 changes: 4 additions & 1 deletion src/main/java/org/cryptomator/cryptofs/ch/CleartextFileChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.cryptomator.cryptofs.ch;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import org.cryptomator.cryptofs.CryptoFileSystemStats;
import org.cryptomator.cryptofs.EffectiveOpenOptions;
Expand Down Expand Up @@ -245,7 +246,8 @@ private void flush() throws IOException {
*
* @throws IOException
*/
private void persistLastModified() throws IOException {
@VisibleForTesting
void persistLastModified() throws IOException {
FileTime lastModifiedTime = isWritable() ? FileTime.from(lastModified.get()) : null;
FileTime lastAccessTime = FileTime.from(Instant.now());
var p = currentFilePath.get();
Expand Down Expand Up @@ -322,6 +324,7 @@ long beginOfChunk(long cleartextPos) {
protected void implCloseChannel() throws IOException {
try {
flush();
ciphertextFileChannel.force(true);
try {
persistLastModified();
} catch (NoSuchFileException nsfe) {
Expand Down
13 changes: 13 additions & 0 deletions src/test/java/org/cryptomator/cryptofs/ch/CleartextFileChannelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -240,6 +242,17 @@ public void testCloseTriggersCloseListener() throws IOException {
verify(closeListener).closed(inTest);
}

@Test
@DisplayName("On close, first flush channel, then persist lastModified")
public void testCloseFlushBeforePersist() throws IOException {
var inSpy = spy(inTest);
inSpy.implCloseChannel();

var ordering = inOrder(inSpy, ciphertextFileChannel);
ordering.verify(ciphertextFileChannel).force(true);
ordering.verify(inSpy).persistLastModified();
}

@Test
public void testCloseUpdatesLastModifiedTimeIfWriteable() throws IOException {
when(options.writable()).thenReturn(true);
Expand Down