Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ public Path mkdir(final Write<Reply> writer, final Path folder, final TransferSt
final Path decrypt = vault.decrypt(session, vault.encrypt(session, target, true));
decrypt.attributes().setFileId(directoryMetadataFolder.attributes().getFileId());
decrypt.attributes().setVersionId(directoryMetadataFolder.attributes().getVersionId());
decrypt.attributes().setVaultVersion(vault.getVersion());
return decrypt;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public TransferStatus setResponse(final PathAttributes attributes) {
}
});
final Path decrypt = vault.decrypt(session, target);
decrypt.attributes().setVersionId(target.attributes().getVersionId());
decrypt.attributes().setVersionId(target.attributes().getVersionId()).setVaultVersion(vault.getVersion());
return decrypt;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import java.util.Arrays;
import java.util.EnumSet;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

@Category(IntegrationTest.class)
Expand All @@ -54,13 +55,13 @@ public class DAVDirectoryFeatureTest extends AbstractDAVTest {
public void testMakeDirectoryEncrypted() throws Exception {
final Path home = new DefaultHomeFinderService(session).find();
final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory));
final Path test = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory));
final DefaultVaultProvider provider = new DefaultVaultProvider(session);
provider.create(session, null, vault, new VaultVersion(vaultVersion), new VaultCredentials("test"));
final AbstractVault cryptomator = provider.load(session, vault, new VaultVersion(vaultVersion), new VaultCredentials("test"));
session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator));
cryptomator.getFeature(session, Directory.class, new DAVDirectoryFeature(session)).mkdir(
cryptomator.getFeature(session, Write.class, new DAVWriteFeature(session)), test, new TransferStatus());
final Path test = cryptomator.getFeature(session, Directory.class, new DAVDirectoryFeature(session)).mkdir(
cryptomator.getFeature(session, Write.class, new DAVWriteFeature(session)), new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus());
assertEquals(cryptomator.getVersion(), test.attributes().getVaultVersion());
assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test));
Comment thread
dkocher marked this conversation as resolved.
cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,20 @@ public void testTouchDeleteTouchLongFilename() throws Exception {
assertTrue(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(test));
cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback());
}

@Test
public void testTouchEncrypted() throws Exception {
final Path home = new DefaultHomeFinderService(session).find();
final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory));
final DefaultVaultProvider provider = new DefaultVaultProvider(session);
provider.create(session, null, vault, new VaultVersion(vaultVersion), new VaultCredentials("test"));
final AbstractVault cryptomator = provider.load(session, vault, new VaultVersion(vaultVersion), new VaultCredentials("test"));
session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator));
final Path template = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file));
final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature<Void>(
session), cryptomator).touch(new CryptoWriteFeature<>(session, new DAVWriteFeature(session), cryptomator), template, new TransferStatus());
assertEquals(test.attributes().getVaultVersion(), cryptomator.getVersion());
Comment thread
dkocher marked this conversation as resolved.
assertTrue(cryptomator.getFeature(session, Find.class, new DAVFindFeature(session)).find(test));
cryptomator.getFeature(session, Delete.class, new DAVDeleteFeature(session)).delete(Arrays.asList(test, vault), LoginCallback.noop, new Delete.DisabledCallback());
}
}
Loading