diff --git a/azure/src/test/java/ch/cyberduck/core/azure/AbstractAzureTest.java b/azure/src/test/java/ch/cyberduck/core/azure/AbstractAzureTest.java index 024859b04c..add2390c61 100644 --- a/azure/src/test/java/ch/cyberduck/core/azure/AbstractAzureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/azure/AbstractAzureTest.java @@ -19,8 +19,8 @@ import ch.cyberduck.core.HostKeyCallback; import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginConnectionService; import ch.cyberduck.core.ProgressListener; -import ch.cyberduck.core.vault.VaultMetadata; import ch.cyberduck.core.threading.CancelCallback; +import ch.cyberduck.core.vault.VaultMetadata; import ch.cyberduck.test.VaultTest; import org.junit.After; diff --git a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureDirectoryFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureDirectoryFeatureTest.java index 9893f73741..47e5586fce 100644 --- a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureDirectoryFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureDirectoryFeatureTest.java @@ -29,6 +29,7 @@ import ch.cyberduck.core.features.Find; import ch.cyberduck.core.features.Write; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -53,8 +54,8 @@ public class AzureDirectoryFeatureTest extends AbstractAzureTest { public void testMakeDirectoryEncrypted() throws Exception { final Path home = new Path("cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Path test = cryptomator.getFeature(session, Directory.class, new AzureDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new AzureWriteFeature(session)), new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); @@ -70,8 +71,8 @@ public class AzureDirectoryFeatureTest extends AbstractAzureTest { public void testMakeDirectoryLongFilenameEncrypted() throws Exception { final Path home = new Path("cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Path test = cryptomator.getFeature(session, Directory.class, new AzureDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new AzureWriteFeature(session)), new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); diff --git a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureListServiceTest.java b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureListServiceTest.java index 583948b0f8..3f76e0bc1c 100644 --- a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureListServiceTest.java +++ b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureListServiceTest.java @@ -30,6 +30,7 @@ import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -54,8 +55,8 @@ public class AzureListServiceTest extends AbstractAzureTest { public void testListCryptomator() throws Exception { final Path home = new Path("cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Path test = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); assertTrue(new CryptoListService(session, new AzureObjectListService(session), cryptomator).list(vault, new DisabledListProgressListener()).isEmpty()); diff --git a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureMoveFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureMoveFeatureTest.java index 30b58d6835..447495e304 100644 --- a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureMoveFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureMoveFeatureTest.java @@ -36,6 +36,7 @@ import ch.cyberduck.core.features.Move; import ch.cyberduck.core.features.Write; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -60,8 +61,8 @@ public class AzureMoveFeatureTest extends AbstractAzureTest { public void testMove() throws Exception { final Path home = new Path("cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Path folder = cryptomator.getFeature(session, Directory.class, new AzureDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new AzureWriteFeature(session)), new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); diff --git a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureTouchFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureTouchFeatureTest.java index f0e79e439c..ab603754c0 100644 --- a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureTouchFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureTouchFeatureTest.java @@ -30,6 +30,7 @@ import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Find; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -58,8 +59,8 @@ public class AzureTouchFeatureTest extends AbstractAzureTest { public void testTouchLongFilenameEncrypted() throws Exception { final Path home = new Path("cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus status = new TransferStatus(); final Path test = new CryptoTouchFeature<>(session, new AzureTouchFeature(session), cryptomator).touch( @@ -75,8 +76,8 @@ public class AzureTouchFeatureTest extends AbstractAzureTest { public void testTouchLongFilenameEncryptedDefaultFeature() throws Exception { final Path home = new Path("cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus status = new TransferStatus(); final Path test = new CryptoTouchFeature<>(session, new AzureTouchFeature(session), cryptomator).touch( diff --git a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureWriteFeatureTest.java b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureWriteFeatureTest.java index 70652baa0a..c74627cf76 100644 --- a/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureWriteFeatureTest.java +++ b/azure/src/test/java/ch/cyberduck/core/cryptomator/AzureWriteFeatureTest.java @@ -36,6 +36,7 @@ import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Find; import ch.cyberduck.core.io.StreamCopier; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -68,8 +69,8 @@ public class AzureWriteFeatureTest extends AbstractAzureTest { status.setLength(content.length); final Path home = new Path("cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final CryptoWriteFeature writer = new CryptoWriteFeature<>(session, new AzureWriteFeature(session), cryptomator); final FileHeader header = cryptomator.getFileHeaderCryptor().create(); diff --git a/azure/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/azure/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index 6d43b8cffd..24921a9607 100644 --- a/azure/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/azure/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -45,6 +45,7 @@ import ch.cyberduck.core.shared.DisabledBulkFeature; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -78,8 +79,8 @@ public class CopyWorkerTest extends AbstractAzureTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final byte[] content = RandomUtils.nextBytes(40500); @@ -104,8 +105,8 @@ public class CopyWorkerTest extends AbstractAzureTest { final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( @@ -128,8 +129,8 @@ public class CopyWorkerTest extends AbstractAzureTest { public void testCopyToDifferentFolderLongFilenameCryptomator() throws Exception { final Path home = new Path("cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final Path source = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); @@ -153,8 +154,8 @@ public class CopyWorkerTest extends AbstractAzureTest { public void testCopyFolder() throws Exception { final Path home = new Path("cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); @@ -191,8 +192,8 @@ public class CopyWorkerTest extends AbstractAzureTest { assertTrue(new AzureFindFeature(session).find(cleartextFile)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new AzureDirectoryFeature(session)).mkdir( @@ -220,8 +221,8 @@ public class CopyWorkerTest extends AbstractAzureTest { new AzureTouchFeature(session).touch(new AzureWriteFeature(session), cleartextFile, new TransferStatus()); assertTrue(new AzureFindFeature(session).find(cleartextFolder)); assertTrue(new AzureFindFeature(session).find(cleartextFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -245,8 +246,8 @@ public class CopyWorkerTest extends AbstractAzureTest { new AzureDirectoryFeature(session).mkdir(new AzureWriteFeature(session), clearFolder, new TransferStatus()); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new AzureDirectoryFeature(session)).mkdir( @@ -271,8 +272,8 @@ public class CopyWorkerTest extends AbstractAzureTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new AzureDirectoryFeature(session)).mkdir( diff --git a/azure/src/test/java/ch/cyberduck/core/cryptomator/CryptoAzureSingleTransferWorkerTest.java b/azure/src/test/java/ch/cyberduck/core/cryptomator/CryptoAzureSingleTransferWorkerTest.java index 1a5bbf6c8f..85b6774750 100644 --- a/azure/src/test/java/ch/cyberduck/core/cryptomator/CryptoAzureSingleTransferWorkerTest.java +++ b/azure/src/test/java/ch/cyberduck/core/cryptomator/CryptoAzureSingleTransferWorkerTest.java @@ -50,6 +50,7 @@ import ch.cyberduck.core.transfer.TransferOptions; import ch.cyberduck.core.transfer.TransferSpeedometer; import ch.cyberduck.core.transfer.TransferStatus; import ch.cyberduck.core.transfer.UploadTransfer; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -82,8 +83,8 @@ public class CryptoAzureSingleTransferWorkerTest extends AbstractAzureTest { final Path home = new Path("cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Path dir1 = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory, Path.Type.placeholder)); final Local localDirectory1 = new Local(System.getProperty("java.io.tmpdir"), new AlphanumericRandomStringService().random()); diff --git a/backblaze/src/test/java/ch/cyberduck/core/b2/AbstractB2Test.java b/backblaze/src/test/java/ch/cyberduck/core/b2/AbstractB2Test.java index 8f31d3b166..874f470956 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/b2/AbstractB2Test.java +++ b/backblaze/src/test/java/ch/cyberduck/core/b2/AbstractB2Test.java @@ -27,8 +27,8 @@ import ch.cyberduck.core.ProtocolFactory; import ch.cyberduck.core.serializer.impl.dd.ProfilePlistReader; import ch.cyberduck.core.ssl.DefaultX509KeyManager; import ch.cyberduck.core.ssl.DefaultX509TrustManager; -import ch.cyberduck.core.vault.VaultMetadata; import ch.cyberduck.core.threading.CancelCallback; +import ch.cyberduck.core.vault.VaultMetadata; import ch.cyberduck.test.VaultTest; import org.junit.After; diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2DirectoryFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2DirectoryFeatureTest.java index 0d39fbf307..31cdfa938f 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2DirectoryFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2DirectoryFeatureTest.java @@ -37,6 +37,7 @@ import ch.cyberduck.core.features.Find; import ch.cyberduck.core.features.Write; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -63,8 +64,8 @@ public class B2DirectoryFeatureTest extends AbstractB2Test { public void testMakeDirectoryEncrypted() throws Exception { final Path home = new Path("/test-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final B2VersionIdProvider fileid = new B2VersionIdProvider(session); final Path test = cryptomator.getFeature(session, Directory.class, new B2DirectoryFeature(session, fileid)).mkdir( @@ -87,8 +88,8 @@ public class B2DirectoryFeatureTest extends AbstractB2Test { public void testMakeDirectoryLongFilenameEncrypted() throws Exception { final Path home = new Path("/test-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final B2VersionIdProvider fileid = new B2VersionIdProvider(session); final Path test = cryptomator.getFeature(session, Directory.class, new B2DirectoryFeature(session, fileid)).mkdir( diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadServiceTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadServiceTest.java index 5858d2d186..4fd6604435 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadServiceTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadServiceTest.java @@ -44,6 +44,7 @@ import ch.cyberduck.core.shared.DisabledBulkFeature; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -78,9 +79,8 @@ public class B2LargeUploadServiceTest extends AbstractB2Test { // 5L * 1024L * 1024L final Path home = new Path("/test-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata( - vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final B2VersionIdProvider fileid = new B2VersionIdProvider(session); final CryptoUploadFeature service = new CryptoUploadFeature<>(session, @@ -114,8 +114,8 @@ public class B2LargeUploadServiceTest extends AbstractB2Test { // 5L * 1024L * 1024L final Path home = new Path("/test-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final Path test = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus writeStatus = new TransferStatus(); diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadWriteFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadWriteFeatureTest.java index 96d40252b1..06f8d65b3d 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadWriteFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2LargeUploadWriteFeatureTest.java @@ -33,6 +33,7 @@ import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Find; import ch.cyberduck.core.io.StreamCopier; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -63,8 +64,8 @@ public class B2LargeUploadWriteFeatureTest extends AbstractB2Test { public void testWrite() throws Exception { final Path container = new Path("test-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); final Path vault = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final B2VersionIdProvider fileid = new B2VersionIdProvider(session); final CryptoWriteFeature feature = new CryptoWriteFeature<>(session, new B2LargeUploadWriteFeature(session, fileid), cryptomator); diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2ListServiceTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2ListServiceTest.java index e1ff2b66cf..62e1d2e3e0 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2ListServiceTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2ListServiceTest.java @@ -32,6 +32,7 @@ import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -58,8 +59,8 @@ public class B2ListServiceTest extends AbstractB2Test { public void testListCryptomator() throws Exception { final Path home = new Path("test-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final B2VersionIdProvider fileid = new B2VersionIdProvider(session); assertTrue(new CryptoListService(session, new B2ListService(session, fileid), cryptomator).list(vault, new DisabledListProgressListener()).isEmpty()); diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2TouchFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2TouchFeatureTest.java index c000e70bcd..14aff1cdf5 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2TouchFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2TouchFeatureTest.java @@ -34,6 +34,7 @@ import ch.cyberduck.core.features.Find; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -61,8 +62,8 @@ public class B2TouchFeatureTest extends AbstractB2Test { public void testTouchEncrypted() throws Exception { final Path home = new Path("/test-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final B2VersionIdProvider fileid = new B2VersionIdProvider(session); final TransferStatus status = new TransferStatus(); @@ -81,8 +82,8 @@ public class B2TouchFeatureTest extends AbstractB2Test { public void testTouchLongFilenameEncrypted() throws Exception { final Path home = new Path("/test-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final B2VersionIdProvider fileid = new B2VersionIdProvider(session); final TransferStatus status = new TransferStatus(); @@ -98,8 +99,8 @@ public class B2TouchFeatureTest extends AbstractB2Test { public void testTouchEncryptedDefaultFeature() throws Exception { final Path home = new Path("/test-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final B2VersionIdProvider fileid = new B2VersionIdProvider(session); final TransferStatus status = new TransferStatus(); diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2WriteFeatureTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2WriteFeatureTest.java index 6ee2040bb5..bd7c0f5d8d 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2WriteFeatureTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/B2WriteFeatureTest.java @@ -36,6 +36,7 @@ import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.features.Find; import ch.cyberduck.core.io.StreamCopier; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -71,8 +72,8 @@ public class B2WriteFeatureTest extends AbstractB2Test { status.setLength(content.length); final Path home = new Path("/test-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final Path test = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final B2VersionIdProvider fileid = new B2VersionIdProvider(session); diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index 76c69af7c7..58f4922256 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -44,6 +44,7 @@ import ch.cyberduck.core.shared.DisabledBulkFeature; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -79,8 +80,8 @@ public class CopyWorkerTest extends AbstractB2Test { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final byte[] content = RandomUtils.nextBytes(40500); @@ -106,8 +107,8 @@ public class CopyWorkerTest extends AbstractB2Test { final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final B2VersionIdProvider fileid = new B2VersionIdProvider(session); @@ -133,8 +134,8 @@ public class CopyWorkerTest extends AbstractB2Test { final Path source = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final B2VersionIdProvider fileid = new B2VersionIdProvider(session); @@ -158,8 +159,8 @@ public class CopyWorkerTest extends AbstractB2Test { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final B2VersionIdProvider fileid = new B2VersionIdProvider(session); @@ -195,8 +196,8 @@ public class CopyWorkerTest extends AbstractB2Test { assertTrue(new B2FindFeature(session, fileid).find(cleartextFile)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new B2DirectoryFeature(session, fileid)).mkdir( @@ -222,8 +223,8 @@ public class CopyWorkerTest extends AbstractB2Test { new B2TouchFeature(session, fileid).touch(new B2WriteFeature(session, fileid), cleartextFile, new TransferStatus()); assertTrue(new B2FindFeature(session, fileid).find(cleartextFolder)); assertTrue(new B2FindFeature(session, fileid).find(cleartextFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -248,8 +249,8 @@ public class CopyWorkerTest extends AbstractB2Test { new B2DirectoryFeature(session, fileid).mkdir(new B2WriteFeature(session, fileid), clearFolder, new TransferStatus()); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new B2DirectoryFeature(session, fileid)).mkdir( @@ -274,8 +275,8 @@ public class CopyWorkerTest extends AbstractB2Test { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final B2VersionIdProvider fileid = new B2VersionIdProvider(session); diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/CryptoB2SingleTransferWorkerTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/CryptoB2SingleTransferWorkerTest.java index 3e55064898..160539cf20 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/CryptoB2SingleTransferWorkerTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/CryptoB2SingleTransferWorkerTest.java @@ -49,6 +49,7 @@ import ch.cyberduck.core.transfer.TransferOptions; import ch.cyberduck.core.transfer.TransferSpeedometer; import ch.cyberduck.core.transfer.TransferStatus; import ch.cyberduck.core.transfer.UploadTransfer; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -95,8 +96,8 @@ public class CryptoB2SingleTransferWorkerTest extends AbstractB2Test { final OutputStream out2 = localFile2.getOutputStream(false); IOUtils.write(content, out2); out2.close(); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Transfer t = new UploadTransfer(new Host(new TestProtocol()), Collections.singletonList(new TransferItem(dir1, localDirectory1)), new NullFilter<>()); assertTrue(new SingleTransferWorker(session, session, t, new TransferOptions(), new TransferSpeedometer(t), new DisabledTransferPrompt() { diff --git a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java index a811df513b..8998e0544b 100644 --- a/backblaze/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java +++ b/backblaze/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java @@ -38,6 +38,7 @@ import ch.cyberduck.core.features.Write; import ch.cyberduck.core.pool.SessionPool; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -69,8 +70,8 @@ public class MoveWorkerTest extends AbstractB2Test { assertTrue(new DefaultFindFeature(session).find(clearFile)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new B2DirectoryFeature(session, fileid)).mkdir( @@ -96,8 +97,8 @@ public class MoveWorkerTest extends AbstractB2Test { new B2TouchFeature(session, fileid).touch(new B2WriteFeature(session, fileid), clearFile, new TransferStatus()); assertTrue(new DefaultFindFeature(session).find(clearFolder)); assertTrue(new DefaultFindFeature(session).find(clearFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -122,8 +123,8 @@ public class MoveWorkerTest extends AbstractB2Test { new B2DirectoryFeature(session, fileid).mkdir(new B2WriteFeature(session, fileid), clearFolder, new TransferStatus()); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new B2DirectoryFeature(session, fileid)).mkdir( @@ -149,8 +150,8 @@ public class MoveWorkerTest extends AbstractB2Test { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final B2VersionIdProvider fileid = new B2VersionIdProvider(session); diff --git a/box/src/test/java/ch/cyberduck/core/box/AbstractBoxTest.java b/box/src/test/java/ch/cyberduck/core/box/AbstractBoxTest.java index 44a288fe28..5ebfe6c925 100644 --- a/box/src/test/java/ch/cyberduck/core/box/AbstractBoxTest.java +++ b/box/src/test/java/ch/cyberduck/core/box/AbstractBoxTest.java @@ -24,12 +24,11 @@ import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.ProtocolFactory; -import ch.cyberduck.core.Scheme; import ch.cyberduck.core.serializer.impl.dd.ProfilePlistReader; import ch.cyberduck.core.ssl.DefaultX509KeyManager; import ch.cyberduck.core.ssl.DefaultX509TrustManager; -import ch.cyberduck.core.vault.VaultMetadata; import ch.cyberduck.core.threading.CancelCallback; +import ch.cyberduck.core.vault.VaultMetadata; import ch.cyberduck.test.VaultTest; import org.junit.After; diff --git a/box/src/test/java/ch/cyberduck/core/cryptomator/BoxThresholdUploadServiceTest.java b/box/src/test/java/ch/cyberduck/core/cryptomator/BoxThresholdUploadServiceTest.java index d682d37690..c333c76913 100644 --- a/box/src/test/java/ch/cyberduck/core/cryptomator/BoxThresholdUploadServiceTest.java +++ b/box/src/test/java/ch/cyberduck/core/cryptomator/BoxThresholdUploadServiceTest.java @@ -46,6 +46,7 @@ import ch.cyberduck.core.shared.DisabledBulkFeature; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -79,8 +80,8 @@ public class BoxThresholdUploadServiceTest extends AbstractBoxTest { final Path container = new BoxDirectoryFeature(session, fileid).mkdir(new BoxWriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(AbstractPath.Type.directory)), new TransferStatus().setLength(0L)); final Path vault = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path test = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); registry.add(cryptomator); diff --git a/box/src/test/java/ch/cyberduck/core/cryptomator/BoxWriteFeatureTest.java b/box/src/test/java/ch/cyberduck/core/cryptomator/BoxWriteFeatureTest.java index 655d2a0623..622e32e921 100644 --- a/box/src/test/java/ch/cyberduck/core/cryptomator/BoxWriteFeatureTest.java +++ b/box/src/test/java/ch/cyberduck/core/cryptomator/BoxWriteFeatureTest.java @@ -36,6 +36,7 @@ import ch.cyberduck.core.features.Find; import ch.cyberduck.core.io.StatusOutputStream; import ch.cyberduck.core.io.StreamCopier; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -67,8 +68,8 @@ public class BoxWriteFeatureTest extends AbstractBoxTest { final Path container = new BoxDirectoryFeature(session, fileid).mkdir(new BoxWriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); final Path vault = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path test = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final CryptoWriteFeature feature = new CryptoWriteFeature<>(session, new BoxWriteFeature(session, fileid), cryptomator); final byte[] content = RandomUtils.nextBytes(6 * 1024 * 1024); @@ -100,8 +101,8 @@ public class BoxWriteFeatureTest extends AbstractBoxTest { final Path container = new BoxDirectoryFeature(session, fileid).mkdir(new BoxWriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); final Path vault = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path test = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final CryptoWriteFeature feature = new CryptoWriteFeature<>(session, new BoxWriteFeature(session, fileid), cryptomator); final byte[] content = RandomUtils.nextBytes(6 * 1024 * 1024); diff --git a/box/src/test/java/ch/cyberduck/core/cryptomator/BufferWriteFeatureTest.java b/box/src/test/java/ch/cyberduck/core/cryptomator/BufferWriteFeatureTest.java index 681c2f6f42..4e24672377 100644 --- a/box/src/test/java/ch/cyberduck/core/cryptomator/BufferWriteFeatureTest.java +++ b/box/src/test/java/ch/cyberduck/core/cryptomator/BufferWriteFeatureTest.java @@ -37,6 +37,7 @@ import ch.cyberduck.core.io.StatusOutputStream; import ch.cyberduck.core.io.StreamCopier; import ch.cyberduck.core.shared.BufferWriteFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -67,8 +68,8 @@ public class BufferWriteFeatureTest extends AbstractBoxTest { final Path container = new BoxDirectoryFeature(session, fileid).mkdir(new BoxWriteFeature(session, fileid), new Path(new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); final Path vault = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path test = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final CryptoWriteFeature feature = new CryptoWriteFeature<>(session, new BufferWriteFeature(session), cryptomator); final byte[] content = RandomUtils.nextBytes(1024 * 1024); diff --git a/brick/src/test/java/ch/cyberduck/core/brick/AbstractBrickTest.java b/brick/src/test/java/ch/cyberduck/core/brick/AbstractBrickTest.java index 91b6c51a9e..9fc153f075 100644 --- a/brick/src/test/java/ch/cyberduck/core/brick/AbstractBrickTest.java +++ b/brick/src/test/java/ch/cyberduck/core/brick/AbstractBrickTest.java @@ -27,8 +27,8 @@ import ch.cyberduck.core.ProtocolFactory; import ch.cyberduck.core.serializer.impl.dd.ProfilePlistReader; import ch.cyberduck.core.ssl.DefaultX509KeyManager; import ch.cyberduck.core.ssl.DefaultX509TrustManager; -import ch.cyberduck.core.vault.VaultMetadata; import ch.cyberduck.core.threading.CancelCallback; +import ch.cyberduck.core.vault.VaultMetadata; import ch.cyberduck.test.VaultTest; import org.junit.After; diff --git a/brick/src/test/java/ch/cyberduck/core/brick/cryptomator/BrickListServiceTest.java b/brick/src/test/java/ch/cyberduck/core/brick/cryptomator/BrickListServiceTest.java index 941b67be24..26fb7e47b3 100644 --- a/brick/src/test/java/ch/cyberduck/core/brick/cryptomator/BrickListServiceTest.java +++ b/brick/src/test/java/ch/cyberduck/core/brick/cryptomator/BrickListServiceTest.java @@ -34,6 +34,7 @@ import ch.cyberduck.core.cryptomator.features.CryptoWriteFeature; import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -60,8 +61,8 @@ public class BrickListServiceTest extends AbstractBrickTest { EnumSet.of(Path.Type.directory, Path.Type.volume)), new TransferStatus()); 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); assertTrue(new CryptoListService(session, new BrickListService(session), cryptomator).list(vault, new DisabledListProgressListener()).isEmpty()); new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( diff --git a/brick/src/test/java/ch/cyberduck/core/cryptomator/DefaultTouchFeatureTest.java b/brick/src/test/java/ch/cyberduck/core/cryptomator/DefaultTouchFeatureTest.java index 97bb7f3a5d..894ac4b4e8 100644 --- a/brick/src/test/java/ch/cyberduck/core/cryptomator/DefaultTouchFeatureTest.java +++ b/brick/src/test/java/ch/cyberduck/core/cryptomator/DefaultTouchFeatureTest.java @@ -31,6 +31,7 @@ import ch.cyberduck.core.features.Find; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -59,8 +60,8 @@ public class DefaultTouchFeatureTest extends AbstractBrickTest { public void testTouchLongFilenameEncrypted() throws Exception { final Path home = new Path("/", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus status = new TransferStatus(); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( @@ -75,8 +76,8 @@ public class DefaultTouchFeatureTest extends AbstractBrickTest { public void testTouchLongFilenameEncryptedDefaultFeature() throws Exception { final Path home = new Path("/", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus status = new TransferStatus(); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( diff --git a/core/src/main/java/ch/cyberduck/core/features/Vault.java b/core/src/main/java/ch/cyberduck/core/features/Vault.java index a6fd978c5d..fa64a2221b 100644 --- a/core/src/main/java/ch/cyberduck/core/features/Vault.java +++ b/core/src/main/java/ch/cyberduck/core/features/Vault.java @@ -30,13 +30,12 @@ public interface Vault { /** * Create and open new vault * - * @return Open vault * @throws LoginCanceledException User dismissed passphrase prompt * @throws BackgroundException Failure reading master key from server * @throws NotfoundException No master key file in home */ - Vault create(Session session, String region, VaultMetadataProvider metadata) throws BackgroundException; + void create(Session session, String region, VaultMetadataProvider metadata) throws BackgroundException; /** * Open existing vault @@ -46,7 +45,7 @@ public interface Vault { * @throws BackgroundException Failure reading master key from server * @throws NotfoundException No master key file in home */ - Vault load(Session session, VaultMetadataProvider provider) throws BackgroundException; + void load(Session session, VaultMetadataProvider provider) throws BackgroundException; /** * Close vault diff --git a/core/src/main/java/ch/cyberduck/core/vault/DisabledVault.java b/core/src/main/java/ch/cyberduck/core/vault/DisabledVault.java index 4eb6992c93..7f327b92ee 100644 --- a/core/src/main/java/ch/cyberduck/core/vault/DisabledVault.java +++ b/core/src/main/java/ch/cyberduck/core/vault/DisabledVault.java @@ -36,13 +36,13 @@ public final class DisabledVault implements Vault { } @Override - public Vault create(final Session session, final String region, final VaultMetadataProvider metadata) throws BackgroundException { - return null; + public void create(final Session session, final String region, final VaultMetadataProvider metadata) throws BackgroundException { + // } @Override - public Vault load(final Session session, final VaultMetadataProvider provider) { - return this; + public void load(final Session session, final VaultMetadataProvider provider) { + // } @Override diff --git a/core/src/main/java/ch/cyberduck/core/vault/DisabledVaultProvider.java b/core/src/main/java/ch/cyberduck/core/vault/DisabledVaultProvider.java index 9b5366e0a7..fc60b1d62f 100644 --- a/core/src/main/java/ch/cyberduck/core/vault/DisabledVaultProvider.java +++ b/core/src/main/java/ch/cyberduck/core/vault/DisabledVaultProvider.java @@ -38,9 +38,4 @@ public class DisabledVaultProvider implements VaultProvider { public Vault provide(final Session session, final Path directory, final VaultMetadata metadata) { return Vault.DISABLED; } - - @Override - public Vault create(final Session session, final String region, final Path directory, final VaultCredentials credentials, final VaultMetadata metadata) throws BackgroundException { - return Vault.DISABLED; - } } diff --git a/core/src/main/java/ch/cyberduck/core/vault/LoadingVaultLookupListener.java b/core/src/main/java/ch/cyberduck/core/vault/LoadingVaultLookupListener.java index c0ce730d74..48d2955067 100644 --- a/core/src/main/java/ch/cyberduck/core/vault/LoadingVaultLookupListener.java +++ b/core/src/main/java/ch/cyberduck/core/vault/LoadingVaultLookupListener.java @@ -53,7 +53,8 @@ public class LoadingVaultLookupListener implements VaultLookupListener { throw new VaultUnlockCancelException(Vault.DISABLED, e); } try { - if(registry.add(vault.load(session, new DefaultVaultMetadataCallbackProvider(prompt)))) { + vault.load(session, new DefaultVaultMetadataCallbackProvider(prompt)); + if(registry.add(vault)) { final EnumSet type = directory.getType(); type.add(Path.Type.vault); directory.setType(type); diff --git a/core/src/main/java/ch/cyberduck/core/vault/VaultProvider.java b/core/src/main/java/ch/cyberduck/core/vault/VaultProvider.java index bb3bb5cbdb..47dfe1744e 100644 --- a/core/src/main/java/ch/cyberduck/core/vault/VaultProvider.java +++ b/core/src/main/java/ch/cyberduck/core/vault/VaultProvider.java @@ -55,18 +55,5 @@ public interface VaultProvider { */ Vault provide(Session session, Path directory, VaultMetadata metadata) throws UnsupportedException; - /** - * Creates a new vault in the specified directory with the provided credentials and metadata. - * - * @param session The session used for connecting to the storage backend. - * @param region The region in which the vault should be created. - * @param directory The path to the directory where the vault will be created. - * @param credentials The credentials required to authenticate and secure the vault. - * @param metadata The metadata describing the properties of the vault to be created. - * @return An instance of the newly created vault. - * @throws BackgroundException If an error occurs during the vault creation process. - */ - Vault create(Session session, String region, Path directory, VaultCredentials credentials, VaultMetadata metadata) throws BackgroundException; - VaultProvider DISABLED = new DisabledVaultProvider(); } diff --git a/core/src/main/java/ch/cyberduck/core/worker/CreateVaultWorker.java b/core/src/main/java/ch/cyberduck/core/worker/CreateVaultWorker.java index 760171c745..762c5f50ee 100644 --- a/core/src/main/java/ch/cyberduck/core/worker/CreateVaultWorker.java +++ b/core/src/main/java/ch/cyberduck/core/worker/CreateVaultWorker.java @@ -20,6 +20,7 @@ import ch.cyberduck.core.Path; import ch.cyberduck.core.Session; import ch.cyberduck.core.exception.BackgroundException; import ch.cyberduck.core.features.Vault; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; import ch.cyberduck.core.vault.VaultProviderFactory; @@ -43,7 +44,8 @@ public class CreateVaultWorker extends Worker { @Override public Vault run(final Session session) throws BackgroundException { - final Vault vault = VaultProviderFactory.get(session).create(session, region, directory, passphrase, metadata); + final Vault vault = VaultProviderFactory.get(session).provide(session, directory, metadata); + vault.create(session, region, new DefaultVaultMetadataCredentialsProvider(passphrase)); vault.close(); return vault; } diff --git a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/CryptoVaultProvider.java b/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/CryptoVaultProvider.java index c1506ef1b1..e0d8123452 100644 --- a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/CryptoVaultProvider.java +++ b/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/CryptoVaultProvider.java @@ -18,14 +18,12 @@ package ch.cyberduck.core.cryptomator; import ch.cyberduck.core.ListProgressListener; import ch.cyberduck.core.Path; import ch.cyberduck.core.Session; -import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.cryptomator.impl.uvf.UVFVault; import ch.cyberduck.core.cryptomator.impl.v8.CryptomatorVault; import ch.cyberduck.core.exception.BackgroundException; import ch.cyberduck.core.exception.UnsupportedException; import ch.cyberduck.core.features.Find; import ch.cyberduck.core.preferences.HostPreferencesFactory; -import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; import ch.cyberduck.core.vault.VaultProvider; @@ -86,18 +84,4 @@ public class CryptoVaultProvider implements VaultProvider { throw new UnsupportedException(metadata.type.toString()); } } - - //TODO create methode braucht es glaube ich nicht unbedingt - @Override - public AbstractVault create(final Session session, final String region, final Path directory, final VaultCredentials credentials, final VaultMetadata metadata) throws BackgroundException { - switch(metadata.type) { - case V8: - return new CryptomatorVault(directory).create(session, region, new DefaultVaultMetadataCredentialsProvider(credentials)); - case UVF: - return new UVFVault(directory).create(session, region, new DefaultVaultMetadataCredentialsProvider(credentials)); - default: - log.error("Unknown vault type {}", metadata.type); - throw new UnsupportedException(metadata.type.toString()); - } - } } \ No newline at end of file diff --git a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/uvf/UVFVault.java b/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/uvf/UVFVault.java index d79f5648f9..261f2474d1 100644 --- a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/uvf/UVFVault.java +++ b/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/uvf/UVFVault.java @@ -35,7 +35,6 @@ import ch.cyberduck.core.cryptomator.CryptoFilename; import ch.cyberduck.core.cryptomator.features.CryptoDirectoryFeature; import ch.cyberduck.core.cryptomator.impl.CryptoDirectoryUVFProvider; import ch.cyberduck.core.cryptomator.impl.CryptoFilenameV7Provider; -import ch.cyberduck.core.vault.VaultMetadataCredentialsProvider; import ch.cyberduck.core.cryptomator.random.FastSecureRandomProvider; import ch.cyberduck.core.exception.BackgroundException; import ch.cyberduck.core.exception.UnsupportedException; @@ -50,6 +49,7 @@ import ch.cyberduck.core.transfer.TransferStatus; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultException; import ch.cyberduck.core.vault.VaultMetadata; +import ch.cyberduck.core.vault.VaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.VaultMetadataProvider; import ch.cyberduck.core.vault.VaultMetadataUVFProvider; @@ -131,7 +131,7 @@ public class UVFVault extends AbstractVault { } @Override - public UVFVault create(final Session session, final String region, final VaultMetadataProvider metadata) throws BackgroundException { + public void create(final Session session, final String region, final VaultMetadataProvider metadata) throws BackgroundException { if(metadata instanceof VaultMetadataCredentialsProvider) { // Passphrase based vault creation final VaultMetadataCredentialsProvider credentialsProvider = VaultMetadataCredentialsProvider.cast(metadata); @@ -169,15 +169,15 @@ public class UVFVault extends AbstractVault { catch(JOSEException | JsonProcessingException e) { throw new VaultException("Failure creating vault ", e); } - return this; } - if(metadata instanceof VaultMetadataUVFProvider) { + else if(metadata instanceof VaultMetadataUVFProvider) { // Generic vault creation with provided metadata final VaultMetadataUVFProvider provider = VaultMetadataUVFProvider.cast(metadata); this.uploadTemplate(session, region, provider.getVaultMetadata(), provider.getRootDirectoryMetadata(), provider.getRootDirectoryIdHash()); - return this; } - throw new VaultException("Unsupported metadata provider: " + metadata.getClass().getName()); + else { + throw new VaultException("Unsupported metadata provider: " + metadata.getClass().getName()); + } } /** @@ -237,7 +237,7 @@ public class UVFVault extends AbstractVault { // load -> unlock -> open @Override - public UVFVault load(final Session session, final VaultMetadataProvider metadata) throws BackgroundException { + public void load(final Session session, final VaultMetadataProvider metadata) throws BackgroundException { final Payload payload; if(metadata instanceof VaultMetadataUVFProvider) { final VaultMetadataUVFProvider provider = VaultMetadataUVFProvider.cast(metadata); @@ -259,7 +259,6 @@ public class UVFVault extends AbstractVault { payload = this.unlock(session, metadata, bookmark, passphrase).getPayload(); } this.open(payload); - return this; } private void open(Payload payload) { diff --git a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/v8/CryptomatorVault.java b/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/v8/CryptomatorVault.java index e2b5673375..273559e940 100644 --- a/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/v8/CryptomatorVault.java +++ b/cryptomator/src/main/java/ch/cyberduck/core/cryptomator/impl/v8/CryptomatorVault.java @@ -35,8 +35,6 @@ import ch.cyberduck.core.cryptomator.CryptoDirectory; import ch.cyberduck.core.cryptomator.CryptoFilename; import ch.cyberduck.core.cryptomator.impl.CryptoDirectoryV8Provider; import ch.cyberduck.core.cryptomator.impl.CryptoFilenameV7Provider; -import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; -import ch.cyberduck.core.vault.VaultMetadataCredentialsProvider; import ch.cyberduck.core.cryptomator.random.FastSecureRandomProvider; import ch.cyberduck.core.exception.BackgroundException; import ch.cyberduck.core.exception.LocalAccessDeniedException; @@ -49,9 +47,11 @@ import ch.cyberduck.core.preferences.Preferences; import ch.cyberduck.core.preferences.PreferencesFactory; import ch.cyberduck.core.shared.DefaultUrlProvider; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultException; import ch.cyberduck.core.vault.VaultMetadata; +import ch.cyberduck.core.vault.VaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.VaultMetadataProvider; import org.apache.logging.log4j.LogManager; @@ -208,12 +208,12 @@ public class CryptomatorVault extends AbstractVault { return FILENAME_PATTERN; } - public CryptomatorVault create(final Session session, final String region, final VaultCredentials credentials) throws BackgroundException { - return this.create(session, region, new DefaultVaultMetadataCredentialsProvider(credentials)); + public void create(final Session session, final String region, final VaultCredentials credentials) throws BackgroundException { + this.create(session, region, new DefaultVaultMetadataCredentialsProvider(credentials)); } @Override - public CryptomatorVault create(final Session session, final String region, final VaultMetadataProvider metadata) throws BackgroundException { + public void create(final Session session, final String region, final VaultMetadataProvider metadata) throws BackgroundException { final VaultMetadataCredentialsProvider provider = VaultMetadataCredentialsProvider.cast(metadata); final VaultCredentials credentials = provider.getCredentials(); final Host bookmark = session.getHost(); @@ -266,7 +266,6 @@ public class CryptomatorVault extends AbstractVault { directory.mkdir(session._getFeature(Write.class), dataDir, status); directory.mkdir(session._getFeature(Write.class), firstLevel, status); directory.mkdir(session._getFeature(Write.class), secondLevel, status); - return this; } private static VaultConfig parseVaultConfigFromMasterKey(final MasterkeyFile masterkeyFile) { @@ -275,7 +274,7 @@ public class CryptomatorVault extends AbstractVault { } @Override - public CryptomatorVault load(final Session session, final VaultMetadataProvider provider) throws BackgroundException { + public void load(final Session session, final VaultMetadataProvider provider) throws BackgroundException { final Host bookmark = session.getHost(); String passphrase = keychain.getPassword(String.format("Cryptomator Passphrase (%s)", bookmark.getCredentials().getUsername()), new DefaultUrlProvider(bookmark).toUrl(masterkeyPath, EnumSet.of(DescriptiveUrl.Type.provider)).find(DescriptiveUrl.Type.provider).getUrl()); @@ -284,15 +283,14 @@ public class CryptomatorVault extends AbstractVault { passphrase = keychain.getPassword(String.format("Cryptomator Passphrase %s", bookmark.getHostname()), new DefaultUrlProvider(bookmark).toUrl(masterkeyPath, EnumSet.of(DescriptiveUrl.Type.provider)).find(DescriptiveUrl.Type.provider).getUrl()); } - return this.unlock(session, provider, bookmark, passphrase); + this.unlock(session, provider, bookmark, passphrase); } - public CryptomatorVault unlock(final Session session, final PasswordCallback prompt, final Host bookmark, final String passphrase) throws BackgroundException { + public void unlock(final Session session, final PasswordCallback prompt, final Host bookmark, final String passphrase) throws BackgroundException { final CryptomatorVault.VaultConfig vaultConfig = this.readVaultConfig(session); this.unlock(vaultConfig, passphrase, bookmark, prompt, MessageFormat.format(LocaleFactory.localizedString("Provide your passphrase to unlock the Cryptomator Vault {0}", "Cryptomator"), home.getName()) ); - return this; } public void unlock(final CryptomatorVault.VaultConfig vaultConfig, final String passphrase, final Host bookmark, final PasswordCallback prompt, diff --git a/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/CryptoChecksumComputeTest.java b/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/CryptoChecksumComputeTest.java index 1489a98a36..599d1e2d2e 100644 --- a/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/CryptoChecksumComputeTest.java +++ b/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/CryptoChecksumComputeTest.java @@ -25,6 +25,7 @@ import ch.cyberduck.core.features.Directory; import ch.cyberduck.core.features.Write; import ch.cyberduck.core.io.SHA256ChecksumCompute; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -61,8 +62,8 @@ public class CryptoChecksumComputeTest extends AbstractCryptoTests { return super._getFeature(type); } }; - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final ByteBuffer header = cryptomator.getFileHeaderCryptor().encryptHeader(cryptomator.getFileHeaderCryptor().create()); // DEFAULT_PIPE_SIZE=1024 final SHA256ChecksumCompute sha = new SHA256ChecksumCompute(); diff --git a/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/CryptoOutputStreamTest.java b/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/CryptoOutputStreamTest.java index b88988f13f..03266a7136 100644 --- a/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/CryptoOutputStreamTest.java +++ b/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/CryptoOutputStreamTest.java @@ -23,6 +23,7 @@ import ch.cyberduck.core.cryptomator.random.RandomNonceGenerator; import ch.cyberduck.core.features.Directory; import ch.cyberduck.core.features.Write; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -63,8 +64,8 @@ public class CryptoOutputStreamTest extends AbstractCryptoTests { return super._getFeature(type); } }; - final AbstractVault vault = new CryptoVaultProvider(session).create(session, null, home, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault vault = new CryptoVaultProvider(session).provide(session, home, new VaultMetadata(vaultVersion)); + vault.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); return vault; } diff --git a/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/CryptoWriteFeatureTest.java b/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/CryptoWriteFeatureTest.java index 53e04de1c5..4869b57ebf 100644 --- a/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/CryptoWriteFeatureTest.java +++ b/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/CryptoWriteFeatureTest.java @@ -22,6 +22,7 @@ import ch.cyberduck.core.TestProtocol; import ch.cyberduck.core.features.Directory; import ch.cyberduck.core.features.Write; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -57,8 +58,8 @@ public class CryptoWriteFeatureTest extends AbstractCryptoTests { return super._getFeature(type); } }; - final AbstractVault vault = new CryptoVaultProvider(session).create(session, null, home, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault vault = new CryptoVaultProvider(session).provide(session, home, new VaultMetadata(vaultVersion)); + vault.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); int headerSize = vault.getFileHeaderCryptor().headerSize(); // zero file size assertEquals(headerSize, vault.toCiphertextSize(0L, 0)); diff --git a/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/features/CryptoReadFeatureTest.java b/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/features/CryptoReadFeatureTest.java index b56595abbf..d20b5582b7 100644 --- a/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/features/CryptoReadFeatureTest.java +++ b/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/features/CryptoReadFeatureTest.java @@ -82,11 +82,11 @@ public class CryptoReadFeatureTest { final Path home = new Path("/", EnumSet.of((Path.Type.directory))); final CryptomatorVault vault = new CryptomatorVault(home); - assertEquals(home, vault.load(session, new DefaultVaultMetadataCallbackProvider(new DisabledPasswordCallback() { + vault.load(session, new DefaultVaultMetadataCallbackProvider(new DisabledPasswordCallback() { public Credentials prompt(final Host bookmark, final String title, final String reason, final LoginOptions options) { return new VaultCredentials("vault"); } - })).getHome()); + })); CryptoReadFeature read = new CryptoReadFeature(session, null, vault); { @@ -154,11 +154,11 @@ public class CryptoReadFeatureTest { }; final Path home = new Path("/", EnumSet.of((Path.Type.directory))); final CryptomatorVault vault = new CryptomatorVault(home); - assertEquals(home, vault.load(session, new DefaultVaultMetadataCallbackProvider(new DisabledPasswordCallback() { + vault.load(session, new DefaultVaultMetadataCallbackProvider(new DisabledPasswordCallback() { public Credentials prompt(final Host bookmark, final String title, final String reason, final LoginOptions options) { return new VaultCredentials("vault"); } - })).getHome()); + })); CryptoReadFeature read = new CryptoReadFeature(null, null, vault); { assertEquals(0, read.chunk(0)); diff --git a/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/impl/uvf/CryptoVaultTest.java b/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/impl/uvf/CryptoVaultTest.java index 41a15f5e86..9050db0ab4 100644 --- a/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/impl/uvf/CryptoVaultTest.java +++ b/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/impl/uvf/CryptoVaultTest.java @@ -23,7 +23,6 @@ import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.NullSession; import ch.cyberduck.core.Path; import ch.cyberduck.core.TestProtocol; -import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.exception.BackgroundException; import ch.cyberduck.core.exception.NotfoundException; import ch.cyberduck.core.features.Directory; @@ -32,6 +31,7 @@ import ch.cyberduck.core.features.Vault; import ch.cyberduck.core.features.Write; import ch.cyberduck.core.transfer.TransferStatus; import ch.cyberduck.core.vault.DefaultVaultMetadataCallbackProvider; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; diff --git a/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/impl/v8/CryptoVaultTest.java b/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/impl/v8/CryptoVaultTest.java index db5b241a85..2bbdb707ff 100644 --- a/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/impl/v8/CryptoVaultTest.java +++ b/cryptomator/src/test/java/ch/cyberduck/core/cryptomator/impl/v8/CryptoVaultTest.java @@ -183,11 +183,11 @@ public class CryptoVaultTest { }; final Path home = new Path("/", EnumSet.of((Path.Type.directory))); final CryptomatorVault vault = new CryptomatorVault(home); - assertEquals(home, vault.load(session, new DefaultVaultMetadataCallbackProvider(new DisabledPasswordCallback() { + vault.load(session, new DefaultVaultMetadataCallbackProvider(new DisabledPasswordCallback() { public Credentials prompt(final Host bookmark, final String title, final String reason, final LoginOptions options) { return new VaultCredentials("vault123"); } - })).getHome()); + })); assertTrue(vault.getFileContentCryptor().getClass().getName().contains("v2")); assertTrue(vault.getFileHeaderCryptor().getClass().getName().contains("v2")); assertEquals(Vault.State.open, vault.getState()); @@ -233,11 +233,11 @@ public class CryptoVaultTest { }; final Path home = new Path("/", EnumSet.of((Path.Type.directory))); final CryptomatorVault vault = new CryptomatorVault(home); - assertEquals(home, vault.load(session, new DefaultVaultMetadataCallbackProvider(new DisabledPasswordCallback() { + vault.load(session, new DefaultVaultMetadataCallbackProvider(new DisabledPasswordCallback() { public Credentials prompt(final Host bookmark, final String title, final String reason, final LoginOptions options) { return new VaultCredentials("vault123"); } - })).getHome()); + })); assertEquals(Vault.State.open, vault.getState()); assertEquals(home, new PathDictionary<>().deserialize(home.serialize(SerializerFactory.get()))); vault.close(); diff --git a/dropbox/src/test/java/ch/cyberduck/core/AbstractDropboxTest.java b/dropbox/src/test/java/ch/cyberduck/core/AbstractDropboxTest.java index 8b9e96f29c..bb845cc381 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/AbstractDropboxTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/AbstractDropboxTest.java @@ -20,8 +20,8 @@ import ch.cyberduck.core.dropbox.DropboxSession; import ch.cyberduck.core.serializer.impl.dd.ProfilePlistReader; import ch.cyberduck.core.ssl.DefaultX509KeyManager; import ch.cyberduck.core.ssl.DefaultX509TrustManager; -import ch.cyberduck.core.vault.VaultMetadata; import ch.cyberduck.core.threading.CancelCallback; +import ch.cyberduck.core.vault.VaultMetadata; import ch.cyberduck.test.VaultTest; import org.junit.After; diff --git a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index 25310cbf0c..31a7c67853 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -44,6 +44,7 @@ import ch.cyberduck.core.shared.DisabledBulkFeature; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -79,8 +80,8 @@ public class CopyWorkerTest extends AbstractDropboxTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final byte[] content = RandomUtils.nextBytes(40500); @@ -105,8 +106,8 @@ public class CopyWorkerTest extends AbstractDropboxTest { final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); new CryptoTouchFeature<>(session, new DefaultTouchFeature( @@ -131,8 +132,8 @@ public class CopyWorkerTest extends AbstractDropboxTest { final Path source = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); new CryptoTouchFeature<>(session, new DefaultTouchFeature( @@ -154,8 +155,8 @@ public class CopyWorkerTest extends AbstractDropboxTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new DropboxDirectoryFeature(session)).mkdir( @@ -189,8 +190,8 @@ public class CopyWorkerTest extends AbstractDropboxTest { assertTrue(new DropboxFindFeature(session).find(cleartextFile)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new DropboxDirectoryFeature(session)).mkdir( @@ -215,8 +216,8 @@ public class CopyWorkerTest extends AbstractDropboxTest { new DropboxTouchFeature(session).touch(new DropboxWriteFeature(session), cleartextFile, new TransferStatus()); assertTrue(new DropboxFindFeature(session).find(cleartextFolder)); assertTrue(new DropboxFindFeature(session).find(cleartextFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -240,8 +241,8 @@ public class CopyWorkerTest extends AbstractDropboxTest { new DropboxDirectoryFeature(session).mkdir(new DropboxWriteFeature(session), clearFolder, new TransferStatus()); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new DropboxDirectoryFeature(session)).mkdir( @@ -266,8 +267,8 @@ public class CopyWorkerTest extends AbstractDropboxTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new DropboxDirectoryFeature(session)).mkdir( diff --git a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/CryptoDropboxSingleTransferWorkerTest.java b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/CryptoDropboxSingleTransferWorkerTest.java index 87aeb29d81..022cd9e115 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/CryptoDropboxSingleTransferWorkerTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/CryptoDropboxSingleTransferWorkerTest.java @@ -49,6 +49,7 @@ import ch.cyberduck.core.transfer.TransferOptions; import ch.cyberduck.core.transfer.TransferSpeedometer; import ch.cyberduck.core.transfer.TransferStatus; import ch.cyberduck.core.transfer.UploadTransfer; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -95,8 +96,8 @@ public class CryptoDropboxSingleTransferWorkerTest extends AbstractDropboxTest { final OutputStream out2 = localFile2.getOutputStream(false); IOUtils.write(content, out2); out2.close(); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Transfer t = new UploadTransfer(new Host(new TestProtocol()), Collections.singletonList(new TransferItem(dir1, localDirectory1)), new NullFilter<>()); assertTrue(new SingleTransferWorker(session, session, t, new TransferOptions(), new TransferSpeedometer(t), new DisabledTransferPrompt() { diff --git a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxDirectoryFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxDirectoryFeatureTest.java index e0001219cd..8e1c9d6094 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxDirectoryFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxDirectoryFeatureTest.java @@ -33,6 +33,7 @@ import ch.cyberduck.core.features.Write; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -58,8 +59,8 @@ public class DropboxDirectoryFeatureTest extends AbstractDropboxTest { 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 AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Path test = cryptomator.getFeature(session, Directory.class, new DropboxDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new DropboxWriteFeature(session)), new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); @@ -75,8 +76,8 @@ public class DropboxDirectoryFeatureTest extends AbstractDropboxTest { 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(130).random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new DropboxDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new DropboxWriteFeature(session)), test, new TransferStatus()); diff --git a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxListServiceTest.java b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxListServiceTest.java index 41772c322c..6b63ddeca0 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxListServiceTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxListServiceTest.java @@ -31,6 +31,7 @@ import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -57,8 +58,8 @@ public class DropboxListServiceTest extends AbstractDropboxTest { public void testListCryptomator() throws Exception { final Path home = new DefaultHomeFinderService(session).find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); assertTrue(new CryptoListService(session, new DropboxListService(session), cryptomator).list(vault, new DisabledListProgressListener()).isEmpty()); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature( diff --git a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxMoveFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxMoveFeatureTest.java index 60e81df08f..8338c06e90 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxMoveFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxMoveFeatureTest.java @@ -37,6 +37,7 @@ import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -65,8 +66,8 @@ public class DropboxMoveFeatureTest extends AbstractDropboxTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new DropboxDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new DropboxWriteFeature(session)), folder, new TransferStatus()); diff --git a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxTouchFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxTouchFeatureTest.java index 5872ade6c6..23176b08ea 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxTouchFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxTouchFeatureTest.java @@ -33,6 +33,7 @@ import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -62,8 +63,8 @@ public class DropboxTouchFeatureTest extends AbstractDropboxTest { public void testTouchLongFilenameEncrypted() throws Exception { final Path home = new DefaultHomeFinderService(session).find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus status = new TransferStatus(); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( @@ -80,8 +81,8 @@ public class DropboxTouchFeatureTest extends AbstractDropboxTest { public void testTouchLongFilenameEncryptedDefaultFeature() throws Exception { final Path home = new DefaultHomeFinderService(session).find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus status = new TransferStatus(); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( diff --git a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxWriteFeatureTest.java b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxWriteFeatureTest.java index c01ff00d63..807e1564f3 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxWriteFeatureTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/DropboxWriteFeatureTest.java @@ -38,6 +38,7 @@ import ch.cyberduck.core.io.StatusOutputStream; import ch.cyberduck.core.io.StreamCopier; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -73,8 +74,8 @@ public class DropboxWriteFeatureTest extends AbstractDropboxTest { 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final CryptoWriteFeature writer = new CryptoWriteFeature<>(session, new DropboxWriteFeature(session), cryptomator); final FileHeader header = cryptomator.getFileHeaderCryptor().create(); diff --git a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java index ad8b216a16..953cd06d5d 100644 --- a/dropbox/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java +++ b/dropbox/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java @@ -40,6 +40,7 @@ import ch.cyberduck.core.pool.SessionPool; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -68,8 +69,8 @@ public class MoveWorkerTest extends AbstractDropboxTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); new CryptoTouchFeature<>(session, new DropboxTouchFeature(session), cryptomator).touch( new CryptoWriteFeature<>(session, new DropboxWriteFeature(session), cryptomator), source, new TransferStatus()); @@ -88,8 +89,8 @@ public class MoveWorkerTest extends AbstractDropboxTest { final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); new CryptoTouchFeature<>(session, new DropboxTouchFeature(session), cryptomator).touch( new CryptoWriteFeature<>(session, new DropboxWriteFeature(session), cryptomator), source, new TransferStatus()); @@ -113,8 +114,8 @@ public class MoveWorkerTest extends AbstractDropboxTest { final Path source = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); new CryptoTouchFeature<>(session, new DropboxTouchFeature(session), cryptomator).touch( new CryptoWriteFeature<>(session, new DropboxWriteFeature(session), cryptomator), source, new TransferStatus()); @@ -135,8 +136,8 @@ public class MoveWorkerTest extends AbstractDropboxTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new DropboxDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new DropboxWriteFeature(session)), folder, new TransferStatus()); @@ -175,8 +176,8 @@ public class MoveWorkerTest extends AbstractDropboxTest { assertTrue(new DefaultFindFeature(session).find(clearFile)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new DropboxDirectoryFeature(session)).mkdir( @@ -201,8 +202,8 @@ public class MoveWorkerTest extends AbstractDropboxTest { new DropboxTouchFeature(session).touch(new DropboxWriteFeature(session), clearFile, new TransferStatus()); assertTrue(new DefaultFindFeature(session).find(clearFolder)); assertTrue(new DefaultFindFeature(session).find(clearFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -226,8 +227,8 @@ public class MoveWorkerTest extends AbstractDropboxTest { new DropboxDirectoryFeature(session).mkdir(new DropboxWriteFeature(session), clearFolder, new TransferStatus()); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new DropboxDirectoryFeature(session)).mkdir( @@ -253,8 +254,8 @@ public class MoveWorkerTest extends AbstractDropboxTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new DropboxDirectoryFeature(session)).mkdir( diff --git a/ftp/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/ftp/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index 49e1dd7152..f1532ea687 100644 --- a/ftp/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -48,6 +48,7 @@ import ch.cyberduck.core.threading.CancelCallback; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -82,8 +83,8 @@ public class CopyWorkerTest extends AbstractFTPTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final byte[] content = RandomUtils.nextBytes(40500); @@ -113,8 +114,8 @@ public class CopyWorkerTest extends AbstractFTPTest { final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); new CryptoTouchFeature<>(session, new DefaultTouchFeature( @@ -142,8 +143,8 @@ public class CopyWorkerTest extends AbstractFTPTest { final Path source = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); new CryptoTouchFeature<>(session, new DefaultTouchFeature( @@ -169,8 +170,8 @@ public class CopyWorkerTest extends AbstractFTPTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new FTPDirectoryFeature(session)).mkdir( @@ -208,8 +209,8 @@ public class CopyWorkerTest extends AbstractFTPTest { assertTrue(new DefaultFindFeature(session).find(cleartextFile)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new FTPDirectoryFeature(session)).mkdir( @@ -238,8 +239,8 @@ public class CopyWorkerTest extends AbstractFTPTest { session).touch(new FTPWriteFeature(session), cleartextFile, new TransferStatus()); assertTrue(new DefaultFindFeature(session).find(cleartextFolder)); assertTrue(new DefaultFindFeature(session).find(cleartextFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -266,8 +267,8 @@ public class CopyWorkerTest extends AbstractFTPTest { new FTPDirectoryFeature(session).mkdir(new FTPWriteFeature(session), clearFolder, new TransferStatus()); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new FTPDirectoryFeature(session)).mkdir( @@ -295,8 +296,8 @@ public class CopyWorkerTest extends AbstractFTPTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new FTPDirectoryFeature(session)).mkdir( diff --git a/ftp/src/test/java/ch/cyberduck/core/cryptomator/CryptoFTPSingleTransferWorkerTest.java b/ftp/src/test/java/ch/cyberduck/core/cryptomator/CryptoFTPSingleTransferWorkerTest.java index c6d4575fcf..13b4b0cd6d 100644 --- a/ftp/src/test/java/ch/cyberduck/core/cryptomator/CryptoFTPSingleTransferWorkerTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/cryptomator/CryptoFTPSingleTransferWorkerTest.java @@ -49,6 +49,7 @@ import ch.cyberduck.core.transfer.TransferOptions; import ch.cyberduck.core.transfer.TransferSpeedometer; import ch.cyberduck.core.transfer.TransferStatus; import ch.cyberduck.core.transfer.UploadTransfer; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -95,8 +96,8 @@ public class CryptoFTPSingleTransferWorkerTest extends AbstractFTPTest { final OutputStream out2 = localFile2.getOutputStream(false); IOUtils.write(content, out2); out2.close(); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Transfer t = new UploadTransfer(new Host(new TestProtocol()), Collections.singletonList(new TransferItem(dir1, localDirectory1)), new NullFilter<>()); assertTrue(new SingleTransferWorker(session, session, t, new TransferOptions(), new TransferSpeedometer(t), new DisabledTransferPrompt() { diff --git a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPDirectoryFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPDirectoryFeatureTest.java index c9b07a3eb1..dc030b2903 100644 --- a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPDirectoryFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPDirectoryFeatureTest.java @@ -30,6 +30,7 @@ import ch.cyberduck.core.ftp.FTPWriteFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -58,8 +59,8 @@ public class FTPDirectoryFeatureTest extends AbstractFTPTest { final Path testdirectory = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path testdirectory2 = new Path(testdirectory, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path testfile2 = new Path(testdirectory2, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new FTPDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new FTPWriteFeature(session)), testdirectory, new TransferStatus()); @@ -77,8 +78,8 @@ public class FTPDirectoryFeatureTest extends AbstractFTPTest { 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(130).random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new FTPDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new FTPWriteFeature(session)), test, new TransferStatus()); diff --git a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPListServiceTest.java b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPListServiceTest.java index fbad93bf83..e4ca59e72c 100644 --- a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPListServiceTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPListServiceTest.java @@ -39,6 +39,7 @@ import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -64,8 +65,8 @@ public class FTPListServiceTest extends AbstractFTPTest { 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); assertTrue(new CryptoListService(session, new FTPListService(session), cryptomator).list(vault).isEmpty()); new CryptoTouchFeature<>(session, new DefaultTouchFeature( diff --git a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPMoveFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPMoveFeatureTest.java index 3f79c73a5a..f47c43f377 100644 --- a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPMoveFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPMoveFeatureTest.java @@ -35,6 +35,7 @@ import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -61,8 +62,8 @@ public class FTPMoveFeatureTest extends AbstractFTPTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new FTPDirectoryFeature(session)).mkdir( new CryptoWriteFeature<>(session, new FTPWriteFeature(session), cryptomator), folder, new TransferStatus()); diff --git a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPTouchFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPTouchFeatureTest.java index 9d633dc277..97006bac41 100644 --- a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPTouchFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPTouchFeatureTest.java @@ -33,6 +33,7 @@ import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -58,8 +59,8 @@ public class FTPTouchFeatureTest extends AbstractFTPTest { 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 AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus status = new TransferStatus().setLength(0L); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( @@ -77,8 +78,8 @@ public class FTPTouchFeatureTest extends AbstractFTPTest { public void testTouchLongFilenameEncrypted() throws Exception { final Path home = new DefaultHomeFinderService(session).find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus status = new TransferStatus(); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( @@ -93,8 +94,8 @@ public class FTPTouchFeatureTest extends AbstractFTPTest { public void testTouchLongFilenameEncryptedDefaultFeature() throws Exception { final Path home = new DefaultHomeFinderService(session).find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus status = new TransferStatus(); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( diff --git a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPWriteFeatureTest.java b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPWriteFeatureTest.java index 2ed75be540..2f0c70cc19 100644 --- a/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPWriteFeatureTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/cryptomator/FTPWriteFeatureTest.java @@ -39,6 +39,7 @@ import ch.cyberduck.core.io.StreamCopier; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -73,8 +74,8 @@ public class FTPWriteFeatureTest extends AbstractFTPTest { 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final CryptoWriteFeature writer = new CryptoWriteFeature<>(session, new FTPWriteFeature(session), cryptomator); final FileHeader header = cryptomator.getFileHeaderCryptor().create(); diff --git a/ftp/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java b/ftp/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java index 470d279d51..91e1c2fdb3 100644 --- a/ftp/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java @@ -45,6 +45,7 @@ import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.threading.CancelCallback; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -74,8 +75,8 @@ public class MoveWorkerTest extends AbstractFTPTest { final Path vault = new Path(home, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch( @@ -95,8 +96,8 @@ public class MoveWorkerTest extends AbstractFTPTest { final Path source = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch( @@ -122,8 +123,8 @@ public class MoveWorkerTest extends AbstractFTPTest { final Path source = new Path(sourceFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new FTPDirectoryFeature(session)).mkdir(cryptomator.getFeature(session, Write.class, new FTPWriteFeature(session)), sourceFolder, new TransferStatus()); new CryptoTouchFeature<>(session, new DefaultTouchFeature( @@ -145,8 +146,8 @@ public class MoveWorkerTest extends AbstractFTPTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new FTPDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new FTPWriteFeature(session)), folder, new TransferStatus()); @@ -185,8 +186,8 @@ public class MoveWorkerTest extends AbstractFTPTest { assertTrue(new DefaultFindFeature(session).find(clearFile)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new FTPDirectoryFeature(session)).mkdir( @@ -214,8 +215,8 @@ public class MoveWorkerTest extends AbstractFTPTest { new DefaultTouchFeature(session).touch(new FTPWriteFeature(session), clearFile, new TransferStatus()); assertTrue(new DefaultFindFeature(session).find(clearFolder)); assertTrue(new DefaultFindFeature(session).find(clearFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -242,8 +243,8 @@ public class MoveWorkerTest extends AbstractFTPTest { new FTPDirectoryFeature(session).mkdir(new FTPWriteFeature(session), clearFolder, new TransferStatus()); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new FTPDirectoryFeature(session)).mkdir( @@ -272,8 +273,8 @@ public class MoveWorkerTest extends AbstractFTPTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new FTPDirectoryFeature(session)).mkdir( diff --git a/ftp/src/test/java/ch/cyberduck/core/ftp/AbstractFTPTest.java b/ftp/src/test/java/ch/cyberduck/core/ftp/AbstractFTPTest.java index 49df40bc58..793bae37d2 100644 --- a/ftp/src/test/java/ch/cyberduck/core/ftp/AbstractFTPTest.java +++ b/ftp/src/test/java/ch/cyberduck/core/ftp/AbstractFTPTest.java @@ -35,8 +35,8 @@ import ch.cyberduck.core.local.DefaultTemporaryFileService; import ch.cyberduck.core.serializer.impl.dd.ProfilePlistReader; import ch.cyberduck.core.ssl.DefaultX509KeyManager; import ch.cyberduck.core.ssl.DefaultX509TrustManager; -import ch.cyberduck.core.vault.VaultMetadata; import ch.cyberduck.core.threading.CancelCallback; +import ch.cyberduck.core.vault.VaultMetadata; import org.apache.ftpserver.FtpServer; import org.apache.ftpserver.FtpServerFactory; diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index a3a38d8c7b..8ef33d8aa5 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -45,6 +45,7 @@ import ch.cyberduck.core.shared.DisabledBulkFeature; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -80,8 +81,8 @@ public class CopyWorkerTest extends AbstractDriveTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final byte[] content = RandomUtils.nextBytes(40500); @@ -107,8 +108,8 @@ public class CopyWorkerTest extends AbstractDriveTest { final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); @@ -135,8 +136,8 @@ public class CopyWorkerTest extends AbstractDriveTest { final Path source = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); @@ -160,8 +161,8 @@ public class CopyWorkerTest extends AbstractDriveTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); @@ -197,8 +198,8 @@ public class CopyWorkerTest extends AbstractDriveTest { assertTrue(new DriveFindFeature(session, fileid).find(cleartextFile)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new DriveDirectoryFeature(session, fileid)).mkdir( @@ -224,8 +225,8 @@ public class CopyWorkerTest extends AbstractDriveTest { new DriveTouchFeature(session, fileid).touch(new DriveWriteFeature(session, fileid), cleartextFile, new TransferStatus()); assertTrue(new DriveFindFeature(session, fileid).find(cleartextFolder)); assertTrue(new DriveFindFeature(session, fileid).find(cleartextFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -250,8 +251,8 @@ public class CopyWorkerTest extends AbstractDriveTest { new DriveDirectoryFeature(session, fileid).mkdir(new DriveWriteFeature(session, fileid), clearFolder, new TransferStatus()); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new DriveDirectoryFeature(session, fileid)).mkdir( @@ -276,8 +277,8 @@ public class CopyWorkerTest extends AbstractDriveTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/CryptoDriveTransferWorkerTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/CryptoDriveTransferWorkerTest.java index 6e6dd8b31b..ae1019c98b 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/CryptoDriveTransferWorkerTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/CryptoDriveTransferWorkerTest.java @@ -49,6 +49,7 @@ import ch.cyberduck.core.transfer.TransferOptions; import ch.cyberduck.core.transfer.TransferSpeedometer; import ch.cyberduck.core.transfer.TransferStatus; import ch.cyberduck.core.transfer.UploadTransfer; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -92,8 +93,8 @@ public class CryptoDriveTransferWorkerTest extends AbstractDriveTest { final OutputStream out2 = localFile2.getOutputStream(false); IOUtils.write(content, out2); out2.close(); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Transfer t = new UploadTransfer(new Host(new TestProtocol()), Collections.singletonList(new TransferItem(dir1, localDirectory1)), new NullFilter<>()); Assert.assertTrue(new SingleTransferWorker(session, session, t, new TransferOptions(), new TransferSpeedometer(t), new DisabledTransferPrompt() { diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveAttributesFinderFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveAttributesFinderFeatureTest.java index 70e272d7a7..30f9f785ad 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveAttributesFinderFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveAttributesFinderFeatureTest.java @@ -44,6 +44,7 @@ import ch.cyberduck.core.googledrive.DriveWriteFeature; import ch.cyberduck.core.shared.DefaultAttributesFinderFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -69,8 +70,8 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { public void testFindCustomAttributesFinderCryptomator() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( @@ -86,8 +87,8 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { public void testFindDefaultAttributesFinderCryptomator() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( @@ -103,8 +104,8 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { public void testFindDirectoryDefaultAttributesFinderCryptomator() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); final Path test = cryptomator.getFeature(session, Directory.class, new DriveDirectoryFeature(session, fileid)).mkdir( @@ -121,8 +122,8 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { public void testFindDefaultAttributesFinderWithCacheCryptomator() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( @@ -143,8 +144,8 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { public void testFindAttributesFinderWithCacheCryptomator() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( @@ -165,8 +166,8 @@ public class DriveAttributesFinderFeatureTest extends AbstractDriveTest { public void testFindDirectoryDefaultAttributesFinderWithCacheCryptomator() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); assertEquals(new CryptoFileIdProvider(session, fileid, cryptomator).getFileId(vault), diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveDirectoryFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveDirectoryFeatureTest.java index d13b98455c..077a4c3e85 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveDirectoryFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveDirectoryFeatureTest.java @@ -39,6 +39,7 @@ import ch.cyberduck.core.googledrive.DriveWriteFeature; import ch.cyberduck.core.shared.DefaultAttributesFinderFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -65,8 +66,8 @@ public class DriveDirectoryFeatureTest extends AbstractDriveTest { public void testMakeDirectoryEncrypted() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); final Path test = cryptomator.getFeature(session, Directory.class, new DriveDirectoryFeature(session, fileid)).mkdir( @@ -91,8 +92,8 @@ public class DriveDirectoryFeatureTest extends AbstractDriveTest { public void testMakeDirectoryLongFilenameEncrypted() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); final Path test = cryptomator.getFeature(session, Directory.class, new DriveDirectoryFeature(session, fileid)).mkdir( diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveListServiceTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveListServiceTest.java index 82e93d8060..46f5844115 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveListServiceTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveListServiceTest.java @@ -36,6 +36,7 @@ import ch.cyberduck.core.googledrive.DriveHomeFinderService; import ch.cyberduck.core.googledrive.DriveWriteFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -62,8 +63,8 @@ public class DriveListServiceTest extends AbstractDriveTest { public void testListCryptomator() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); assertTrue(new CryptoListService(session, new DriveDefaultListService(session, fileid), cryptomator).list(vault, new DisabledListProgressListener()).isEmpty()); diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveMoveFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveMoveFeatureTest.java index 25a6abd63d..29dd72ebbb 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveMoveFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveMoveFeatureTest.java @@ -38,6 +38,7 @@ import ch.cyberduck.core.googledrive.DriveWriteFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -63,8 +64,8 @@ public class DriveMoveFeatureTest extends AbstractDriveTest { public void testMove() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); final Path folder = cryptomator.getFeature(session, Directory.class, new DriveDirectoryFeature(session, fileid)).mkdir( diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveTouchFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveTouchFeatureTest.java index 26e995212f..694c5bef1c 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveTouchFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveTouchFeatureTest.java @@ -35,6 +35,7 @@ import ch.cyberduck.core.googledrive.DriveWriteFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -62,8 +63,8 @@ public class DriveTouchFeatureTest extends AbstractDriveTest { public void testTouch() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( @@ -81,8 +82,8 @@ public class DriveTouchFeatureTest extends AbstractDriveTest { public void testTouchLongFilenameEncrypted() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( @@ -99,8 +100,8 @@ public class DriveTouchFeatureTest extends AbstractDriveTest { public void testTouchLongFilenameEncryptedDefaultFeature() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveWriteFeatureTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveWriteFeatureTest.java index c35ec83112..c3272cad44 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveWriteFeatureTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/DriveWriteFeatureTest.java @@ -49,6 +49,7 @@ import ch.cyberduck.core.io.StreamCopier; import ch.cyberduck.core.shared.DefaultAttributesFinderFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -84,8 +85,8 @@ public class DriveWriteFeatureTest extends AbstractDriveTest { status.setLength(content.length); final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final Path test = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); @@ -118,8 +119,8 @@ public class DriveWriteFeatureTest extends AbstractDriveTest { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); final CryptoWriteFeature writer = new CryptoWriteFeature<>(session, new DriveWriteFeature(session, fileid), cryptomator); diff --git a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java index 9c21cedcb3..3c00924f9a 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java @@ -49,6 +49,7 @@ import ch.cyberduck.core.shared.DisabledBulkFeature; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -83,8 +84,8 @@ public class MoveWorkerTest extends AbstractDriveTest { public void testMoveSameFolderCryptomator() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); @@ -108,8 +109,8 @@ public class MoveWorkerTest extends AbstractDriveTest { public void testMoveToDifferentFolderCryptomator() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final Path source = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); @@ -133,8 +134,8 @@ public class MoveWorkerTest extends AbstractDriveTest { public void testMoveToDifferentFolderLongFilenameCryptomator() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final Path source = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); @@ -156,8 +157,8 @@ public class MoveWorkerTest extends AbstractDriveTest { public void testMoveFolder() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); final Path folder = cryptomator.getFeature(session, Directory.class, new DriveDirectoryFeature(session, fileid)).mkdir( @@ -196,8 +197,8 @@ public class MoveWorkerTest extends AbstractDriveTest { new DriveTouchFeature(session, fileid).touch(new DriveWriteFeature(session, fileid), clearFile, new TransferStatus()); assertTrue(new DefaultFindFeature(session).find(clearFile)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final Path encryptedFolder = cryptomator.getFeature(session, Directory.class, new DriveDirectoryFeature(session, fileid)).mkdir( @@ -223,8 +224,8 @@ public class MoveWorkerTest extends AbstractDriveTest { assertTrue(new DefaultFindFeature(session).find(clearFolder)); assertTrue(new DefaultFindFeature(session).find(clearFile)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -245,8 +246,8 @@ public class MoveWorkerTest extends AbstractDriveTest { final DriveFileIdProvider fileid = new DriveFileIdProvider(session); new DriveDirectoryFeature(session, fileid).mkdir(new DriveWriteFeature(session, fileid), clearFolder, new TransferStatus()); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final Path encryptedFolder = cryptomator.getFeature(session, Directory.class, new DriveDirectoryFeature(session, fileid)).mkdir( @@ -269,8 +270,8 @@ public class MoveWorkerTest extends AbstractDriveTest { public void testMoveDirectoryOutsideVault() throws Exception { final Path home = DriveHomeFinderService.MYDRIVE_FOLDER; final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final DriveFileIdProvider fileid = new DriveFileIdProvider(session); diff --git a/googledrive/src/test/java/ch/cyberduck/core/googledrive/AbstractDriveTest.java b/googledrive/src/test/java/ch/cyberduck/core/googledrive/AbstractDriveTest.java index aa9474cbd3..ff2fa20905 100644 --- a/googledrive/src/test/java/ch/cyberduck/core/googledrive/AbstractDriveTest.java +++ b/googledrive/src/test/java/ch/cyberduck/core/googledrive/AbstractDriveTest.java @@ -24,12 +24,11 @@ import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.ProtocolFactory; -import ch.cyberduck.core.Scheme; import ch.cyberduck.core.serializer.impl.dd.ProfilePlistReader; import ch.cyberduck.core.ssl.DefaultX509KeyManager; import ch.cyberduck.core.ssl.DefaultX509TrustManager; -import ch.cyberduck.core.vault.VaultMetadata; import ch.cyberduck.core.threading.CancelCallback; +import ch.cyberduck.core.vault.VaultMetadata; import ch.cyberduck.test.VaultTest; import org.junit.After; diff --git a/googlestorage/src/test/java/ch/cyberduck/core/cryptomator/GoogleStorageListServiceTest.java b/googlestorage/src/test/java/ch/cyberduck/core/cryptomator/GoogleStorageListServiceTest.java index dd3855eff7..aeb3883733 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/cryptomator/GoogleStorageListServiceTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/cryptomator/GoogleStorageListServiceTest.java @@ -32,6 +32,7 @@ import ch.cyberduck.core.googlestorage.GoogleStorageObjectListService; import ch.cyberduck.core.googlestorage.GoogleStorageTouchFeature; import ch.cyberduck.core.googlestorage.GoogleStorageWriteFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -58,8 +59,8 @@ public class GoogleStorageListServiceTest extends AbstractGoogleStorageTest { public void testListCryptomator() throws Exception { final Path container = new Path("cyberduck-test-eu", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(container, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); assertTrue(new CryptoListService(session, new GoogleStorageObjectListService(session), cryptomator).list(vault).isEmpty()); final CryptoDirectoryFeature mkdir = new CryptoDirectoryFeature<>(session, new GoogleStorageDirectoryFeature(session), diff --git a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/AbstractGoogleStorageTest.java b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/AbstractGoogleStorageTest.java index da6abd6614..7c3946b23e 100644 --- a/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/AbstractGoogleStorageTest.java +++ b/googlestorage/src/test/java/ch/cyberduck/core/googlestorage/AbstractGoogleStorageTest.java @@ -24,7 +24,6 @@ import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.ProtocolFactory; -import ch.cyberduck.core.Scheme; import ch.cyberduck.core.serializer.impl.dd.ProfilePlistReader; import ch.cyberduck.core.ssl.DefaultX509KeyManager; import ch.cyberduck.core.ssl.DefaultX509TrustManager; diff --git a/nio/src/test/java/ch/cyberduck/core/cryptomator/CryptoLocalSingleTransferWorkerTest.java b/nio/src/test/java/ch/cyberduck/core/cryptomator/CryptoLocalSingleTransferWorkerTest.java index 65dfd3ecee..412dba9a36 100644 --- a/nio/src/test/java/ch/cyberduck/core/cryptomator/CryptoLocalSingleTransferWorkerTest.java +++ b/nio/src/test/java/ch/cyberduck/core/cryptomator/CryptoLocalSingleTransferWorkerTest.java @@ -55,6 +55,7 @@ import ch.cyberduck.core.transfer.TransferOptions; import ch.cyberduck.core.transfer.TransferSpeedometer; import ch.cyberduck.core.transfer.TransferStatus; import ch.cyberduck.core.transfer.UploadTransfer; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -116,8 +117,8 @@ public class CryptoLocalSingleTransferWorkerTest { final OutputStream out2 = localFile2.getOutputStream(false); IOUtils.write(content, out2); out2.close(); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry vaults = new DefaultVaultRegistry(new DisabledPasswordCallback() { @Override public Credentials prompt(final Host bookmark, final String title, final String reason, final LoginOptions options) { diff --git a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index 81f8e9d584..fd8cd97df1 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -45,6 +45,7 @@ import ch.cyberduck.core.shared.DisabledBulkFeature; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -79,8 +80,8 @@ public class CopyWorkerTest extends AbstractOneDriveTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final byte[] content = RandomUtils.nextBytes(40500); @@ -106,8 +107,8 @@ public class CopyWorkerTest extends AbstractOneDriveTest { final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); new CryptoTouchFeature<>(session, new DefaultTouchFeature( @@ -131,8 +132,8 @@ public class CopyWorkerTest extends AbstractOneDriveTest { final Path source = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); new CryptoTouchFeature<>(session, new DefaultTouchFeature( @@ -154,8 +155,8 @@ public class CopyWorkerTest extends AbstractOneDriveTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new GraphDirectoryFeature(session, fileid)).mkdir( @@ -191,8 +192,8 @@ public class CopyWorkerTest extends AbstractOneDriveTest { assertTrue(new GraphFindFeature(session, fileid).find(cleartextFile)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new GraphDirectoryFeature(session, fileid)).mkdir( @@ -222,8 +223,8 @@ public class CopyWorkerTest extends AbstractOneDriveTest { session).touch(new GraphWriteFeature(session, fileid), cleartextFile, new TransferStatus()); assertTrue(new GraphFindFeature(session, fileid).find(cleartextFolder)); assertTrue(new GraphFindFeature(session, fileid).find(cleartextFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -247,8 +248,8 @@ public class CopyWorkerTest extends AbstractOneDriveTest { new GraphDirectoryFeature(session, fileid).mkdir(new GraphWriteFeature(session, fileid), clearFolder, new TransferStatus()); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new GraphDirectoryFeature(session, fileid)).mkdir( @@ -273,8 +274,8 @@ public class CopyWorkerTest extends AbstractOneDriveTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new GraphDirectoryFeature(session, fileid)).mkdir( diff --git a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/CryptoOneDriveSingleTransferWorkerTest.java b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/CryptoOneDriveSingleTransferWorkerTest.java index b02faf2d84..0535406179 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/CryptoOneDriveSingleTransferWorkerTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/CryptoOneDriveSingleTransferWorkerTest.java @@ -49,6 +49,7 @@ import ch.cyberduck.core.transfer.TransferOptions; import ch.cyberduck.core.transfer.TransferSpeedometer; import ch.cyberduck.core.transfer.TransferStatus; import ch.cyberduck.core.transfer.UploadTransfer; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -95,8 +96,8 @@ public class CryptoOneDriveSingleTransferWorkerTest extends AbstractOneDriveTest final OutputStream out2 = localFile2.getOutputStream(false); IOUtils.write(content, out2); out2.close(); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Transfer t = new UploadTransfer(new Host(new TestProtocol()), Collections.singletonList(new TransferItem(dir1, localDirectory1)), new NullFilter<>()); assertTrue(new SingleTransferWorker(session, session, t, new TransferOptions(), new TransferSpeedometer(t), new DisabledTransferPrompt() { diff --git a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphDirectoryFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphDirectoryFeatureTest.java index 2af051aee4..6e8cb7ac3d 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphDirectoryFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphDirectoryFeatureTest.java @@ -40,6 +40,7 @@ import ch.cyberduck.core.onedrive.features.GraphWriteFeature; import ch.cyberduck.core.shared.DefaultAttributesFinderFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -66,8 +67,8 @@ public class GraphDirectoryFeatureTest extends AbstractOneDriveTest { public void testMakeDirectoryEncrypted() throws Exception { final Path home = new OneDriveHomeFinderService().find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Path test = cryptomator.getFeature(session, Directory.class, new GraphDirectoryFeature(session, fileid)).mkdir( cryptomator.getFeature(session, Write.class, new GraphWriteFeature(session, fileid)), new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); @@ -92,8 +93,8 @@ public class GraphDirectoryFeatureTest extends AbstractOneDriveTest { public void testMakeDirectoryLongFilenameEncrypted() throws Exception { final Path home = new OneDriveHomeFinderService().find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Path test = cryptomator.getFeature(session, Directory.class, new GraphDirectoryFeature(session, fileid)).mkdir( cryptomator.getFeature(session, Write.class, new GraphWriteFeature(session, fileid)), new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); diff --git a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphMoveFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphMoveFeatureTest.java index 4ee25c0387..7a56d41f32 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphMoveFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphMoveFeatureTest.java @@ -38,6 +38,7 @@ import ch.cyberduck.core.onedrive.features.GraphWriteFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -63,8 +64,8 @@ public class GraphMoveFeatureTest extends AbstractOneDriveTest { final Path home = new OneDriveHomeFinderService().find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new GraphDirectoryFeature(session, fileid)).mkdir( cryptomator.getFeature(session, Write.class, new GraphWriteFeature(session, fileid)), folder, new TransferStatus()); diff --git a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphTouchFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphTouchFeatureTest.java index 56be615141..a9176f4940 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphTouchFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphTouchFeatureTest.java @@ -34,6 +34,7 @@ import ch.cyberduck.core.onedrive.features.GraphWriteFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -60,8 +61,8 @@ public class GraphTouchFeatureTest extends AbstractOneDriveTest { public void testTouchLongFilenameEncrypted() throws Exception { final Path home = new OneDriveHomeFinderService().find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus status = new TransferStatus(); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( @@ -81,8 +82,8 @@ public class GraphTouchFeatureTest extends AbstractOneDriveTest { public void testTouchLongFilenameEncryptedDefaultFeature() throws Exception { final Path home = new OneDriveHomeFinderService().find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus status = new TransferStatus(); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), cryptomator).touch( diff --git a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphWriteFeatureTest.java b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphWriteFeatureTest.java index 7b382dfb36..fe96e0ad13 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphWriteFeatureTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/GraphWriteFeatureTest.java @@ -38,6 +38,7 @@ import ch.cyberduck.core.onedrive.features.GraphFindFeature; import ch.cyberduck.core.onedrive.features.GraphReadFeature; import ch.cyberduck.core.onedrive.features.GraphWriteFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -73,8 +74,8 @@ public class GraphWriteFeatureTest extends AbstractOneDriveTest { final Path home = new OneDriveHomeFinderService().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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final CryptoWriteFeature writer = new CryptoWriteFeature<>(session, new GraphWriteFeature(session, fileid), cryptomator); final FileHeader header = cryptomator.getFileHeaderCryptor().create(); diff --git a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java index 042e7b3b57..11a60204f4 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java @@ -50,6 +50,7 @@ import ch.cyberduck.core.shared.DisabledBulkFeature; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -83,8 +84,8 @@ public class MoveWorkerTest extends AbstractOneDriveTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final byte[] content = RandomUtils.nextBytes(40500); final TransferStatus status = new TransferStatus(); @@ -108,8 +109,8 @@ public class MoveWorkerTest extends AbstractOneDriveTest { final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch(cryptomator.getFeature(session, Write.class, new GraphWriteFeature(session, fileid)), source, new TransferStatus()); @@ -133,8 +134,8 @@ public class MoveWorkerTest extends AbstractOneDriveTest { final Path source = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch(cryptomator.getFeature(session, Write.class, new GraphWriteFeature(session, fileid)), source, new TransferStatus()); @@ -155,8 +156,8 @@ public class MoveWorkerTest extends AbstractOneDriveTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new GraphDirectoryFeature(session, fileid)).mkdir( cryptomator.getFeature(session, Write.class, new GraphWriteFeature(session, fileid)), folder, new TransferStatus()); @@ -189,8 +190,8 @@ public class MoveWorkerTest extends AbstractOneDriveTest { assertTrue(new DefaultFindFeature(session).find(clearFile)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new GraphDirectoryFeature(session, fileid)).mkdir( @@ -216,8 +217,8 @@ public class MoveWorkerTest extends AbstractOneDriveTest { session).touch(new GraphWriteFeature(session, fileid), clearFile, new TransferStatus()); assertTrue(new DefaultFindFeature(session).find(clearFolder)); assertTrue(new DefaultFindFeature(session).find(clearFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -241,8 +242,8 @@ public class MoveWorkerTest extends AbstractOneDriveTest { new GraphDirectoryFeature(session, fileid).mkdir(new GraphWriteFeature(session, fileid), clearFolder, new TransferStatus()); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new GraphDirectoryFeature(session, fileid)).mkdir( @@ -270,8 +271,8 @@ public class MoveWorkerTest extends AbstractOneDriveTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new GraphDirectoryFeature(session, fileid)).mkdir( diff --git a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/OneDriveListServiceTest.java b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/OneDriveListServiceTest.java index 230a6f8601..b923c6c92e 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/cryptomator/OneDriveListServiceTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/cryptomator/OneDriveListServiceTest.java @@ -32,6 +32,7 @@ import ch.cyberduck.core.onedrive.features.GraphDeleteFeature; import ch.cyberduck.core.onedrive.features.GraphWriteFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -58,8 +59,8 @@ public class OneDriveListServiceTest extends AbstractOneDriveTest { final Path home = new OneDriveHomeFinderService().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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); assertTrue(new CryptoListService(session, new GraphItemListService(session, fileid), cryptomator).list(vault, new DisabledListProgressListener()).isEmpty()); new CryptoTouchFeature<>(session, new DefaultTouchFeature( diff --git a/onedrive/src/test/java/ch/cyberduck/core/onedrive/AbstractOneDriveTest.java b/onedrive/src/test/java/ch/cyberduck/core/onedrive/AbstractOneDriveTest.java index afa100a3d2..7dc30f9296 100644 --- a/onedrive/src/test/java/ch/cyberduck/core/onedrive/AbstractOneDriveTest.java +++ b/onedrive/src/test/java/ch/cyberduck/core/onedrive/AbstractOneDriveTest.java @@ -17,11 +17,9 @@ package ch.cyberduck.core.onedrive; import ch.cyberduck.core.Host; import ch.cyberduck.core.Protocol; -import ch.cyberduck.core.Scheme; import ch.cyberduck.core.ssl.X509KeyManager; import ch.cyberduck.core.ssl.X509TrustManager; import ch.cyberduck.core.vault.VaultMetadata; -import ch.cyberduck.test.VaultTest; import org.junit.runners.Parameterized; diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index 7902be83bd..de9e905679 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -44,6 +44,7 @@ import ch.cyberduck.core.shared.DisabledBulkFeature; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -79,8 +80,8 @@ public class CopyWorkerTest extends AbstractSwiftTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final byte[] content = RandomUtils.nextBytes(40500); @@ -105,8 +106,8 @@ public class CopyWorkerTest extends AbstractSwiftTest { final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); new CryptoTouchFeature<>(session, new DefaultTouchFeature( @@ -130,8 +131,8 @@ public class CopyWorkerTest extends AbstractSwiftTest { final Path source = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); new CryptoTouchFeature<>(session, new DefaultTouchFeature( @@ -153,8 +154,8 @@ public class CopyWorkerTest extends AbstractSwiftTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new SwiftDirectoryFeature(session)).mkdir( @@ -190,8 +191,8 @@ public class CopyWorkerTest extends AbstractSwiftTest { assertTrue(new SwiftFindFeature(session).find(cleartextFile)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new SwiftDirectoryFeature(session)).mkdir( @@ -219,8 +220,8 @@ public class CopyWorkerTest extends AbstractSwiftTest { new SwiftTouchFeature(session, new SwiftRegionService(session)).touch(new SwiftWriteFeature(session, new SwiftRegionService(session)), cleartextFile, new TransferStatus()); assertTrue(new SwiftFindFeature(session).find(cleartextFolder)); assertTrue(new SwiftFindFeature(session).find(cleartextFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -244,8 +245,8 @@ public class CopyWorkerTest extends AbstractSwiftTest { new SwiftDirectoryFeature(session).mkdir(new SwiftWriteFeature(session, new SwiftRegionService(session)), clearFolder, new TransferStatus()); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new SwiftDirectoryFeature(session)).mkdir( @@ -270,8 +271,8 @@ public class CopyWorkerTest extends AbstractSwiftTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new SwiftDirectoryFeature(session)).mkdir( diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/CryptoSwiftSingleTransferWorkerTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/CryptoSwiftSingleTransferWorkerTest.java index 7fbcab1ddb..af4e10e4fe 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/CryptoSwiftSingleTransferWorkerTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/CryptoSwiftSingleTransferWorkerTest.java @@ -49,6 +49,7 @@ import ch.cyberduck.core.transfer.TransferOptions; import ch.cyberduck.core.transfer.TransferSpeedometer; import ch.cyberduck.core.transfer.TransferStatus; import ch.cyberduck.core.transfer.UploadTransfer; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -95,8 +96,8 @@ public class CryptoSwiftSingleTransferWorkerTest extends AbstractSwiftTest { final OutputStream out2 = localFile2.getOutputStream(false); IOUtils.write(content, out2); out2.close(); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Transfer t = new UploadTransfer(new Host(new TestProtocol()), Collections.singletonList(new TransferItem(dir1, localDirectory1)), new NullFilter<>()); assertTrue(new SingleTransferWorker(session, session, t, new TransferOptions(), new TransferSpeedometer(t), new DisabledTransferPrompt() { diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftDirectoryFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftDirectoryFeatureTest.java index 075b89883e..6ae66c23ad 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftDirectoryFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftDirectoryFeatureTest.java @@ -30,6 +30,7 @@ import ch.cyberduck.core.openstack.SwiftRegionService; import ch.cyberduck.core.openstack.SwiftWriteFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -55,8 +56,8 @@ public class SwiftDirectoryFeatureTest extends AbstractSwiftTest { final Path home = new Path("/test.cyberduck.ch", EnumSet.of(Path.Type.volume, Path.Type.directory)); 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 AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new SwiftDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new SwiftWriteFeature(session, new SwiftRegionService(session))), test, new TransferStatus()); @@ -70,8 +71,8 @@ public class SwiftDirectoryFeatureTest extends AbstractSwiftTest { final Path home = new Path("/test.cyberduck.ch", EnumSet.of(Path.Type.volume, Path.Type.directory)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path test = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new SwiftDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new SwiftWriteFeature(session, new SwiftRegionService(session))), test, new TransferStatus()); diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftLargeObjectUploadFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftLargeObjectUploadFeatureTest.java index 74706c9e45..6a1295742f 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftLargeObjectUploadFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftLargeObjectUploadFeatureTest.java @@ -41,6 +41,7 @@ import ch.cyberduck.core.openstack.SwiftReadFeature; import ch.cyberduck.core.openstack.SwiftRegionService; import ch.cyberduck.core.openstack.SwiftWriteFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -75,8 +76,8 @@ public class SwiftLargeObjectUploadFeatureTest extends AbstractSwiftTest { home.attributes().setRegion("IAD"); 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final SwiftRegionService regionService = new SwiftRegionService(session); final CryptoUploadFeature service = new CryptoUploadFeature<>(session, diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftLargeUploadWriteFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftLargeUploadWriteFeatureTest.java index 21f80e494c..a28a669884 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftLargeUploadWriteFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftLargeUploadWriteFeatureTest.java @@ -35,6 +35,7 @@ import ch.cyberduck.core.openstack.SwiftReadFeature; import ch.cyberduck.core.openstack.SwiftRegionService; import ch.cyberduck.core.openstack.SwiftSegmentService; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -66,8 +67,8 @@ public class SwiftLargeUploadWriteFeatureTest extends AbstractSwiftTest { home.attributes().setRegion("IAD"); 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final SwiftRegionService regionService = new SwiftRegionService(session); final CryptoWriteFeature feature = new CryptoWriteFeature<>(session, new SwiftLargeUploadWriteFeature(session, regionService, diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftListServiceTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftListServiceTest.java index 9b767235e8..c51b1f4ab7 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftListServiceTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftListServiceTest.java @@ -31,6 +31,7 @@ import ch.cyberduck.core.openstack.SwiftRegionService; import ch.cyberduck.core.openstack.SwiftWriteFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -59,8 +60,8 @@ public class SwiftListServiceTest extends AbstractSwiftTest { home.attributes().setRegion("IAD"); 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); assertTrue(new CryptoListService(session, new SwiftObjectListService(session), cryptomator).list(vault, new DisabledListProgressListener()).isEmpty()); final SwiftRegionService regionService = new SwiftRegionService(session); diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftMoveFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftMoveFeatureTest.java index 5104fe4b31..bb8032e509 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftMoveFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftMoveFeatureTest.java @@ -36,6 +36,7 @@ import ch.cyberduck.core.openstack.SwiftTouchFeature; import ch.cyberduck.core.openstack.SwiftWriteFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -62,8 +63,8 @@ public class SwiftMoveFeatureTest extends AbstractSwiftTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final SwiftRegionService regionService = new SwiftRegionService(session); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new SwiftDirectoryFeature(session, regionService)).mkdir( diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftTouchFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftTouchFeatureTest.java index 85bc98df67..25ffaa55cd 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftTouchFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftTouchFeatureTest.java @@ -32,6 +32,7 @@ import ch.cyberduck.core.openstack.SwiftWriteFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -62,8 +63,8 @@ public class SwiftTouchFeatureTest extends AbstractSwiftTest { public void testTouchLongFilenameEncrypted() throws Exception { final Path home = new Path("/test.cyberduck.ch", EnumSet.of(Path.Type.volume, Path.Type.directory)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final SwiftRegionService regionService = new SwiftRegionService(session); final TransferStatus status = new TransferStatus(); @@ -80,8 +81,8 @@ public class SwiftTouchFeatureTest extends AbstractSwiftTest { public void testTouchLongFilenameEncryptedDefaultFeature() throws Exception { final Path home = new Path("/test.cyberduck.ch", EnumSet.of(Path.Type.volume, Path.Type.directory)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus status = new TransferStatus(); final Path test = new CryptoTouchFeature(session, new DefaultTouchFeature<>(session), cryptomator).touch( diff --git a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftWriteFeatureTest.java b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftWriteFeatureTest.java index c09c1fad75..000db564dc 100644 --- a/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftWriteFeatureTest.java +++ b/openstack/src/test/java/ch/cyberduck/core/cryptomator/SwiftWriteFeatureTest.java @@ -36,6 +36,7 @@ import ch.cyberduck.core.openstack.SwiftReadFeature; import ch.cyberduck.core.openstack.SwiftRegionService; import ch.cyberduck.core.openstack.SwiftWriteFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -73,8 +74,8 @@ public class SwiftWriteFeatureTest extends AbstractSwiftTest { home.attributes().setRegion("IAD"); 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final SwiftRegionService regionService = new SwiftRegionService(session); final CryptoWriteFeature writer = new CryptoWriteFeature(session, new SwiftWriteFeature(session, regionService), cryptomator); diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BrowserController.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BrowserController.java index ff15699b4c..5b611f8289 100644 --- a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BrowserController.java +++ b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/BrowserController.java @@ -3487,11 +3487,11 @@ public class BrowserController extends WindowController implements NSToolbar.Del final Archive archive = Archive.forName(item.representedObject()); item.setTitle(archive.getTitle(this.getSelectedPaths())); } - else if(action.equals(Foundation.selector("quicklookButtonClicked:"))) { + else if(action.equals(BrowserToolbarFactory.BrowserToolbarItem.quicklook.action())) { item.setKeyEquivalent(" "); item.setKeyEquivalentModifierMask(0); } - else if(action.equals(Foundation.selector("lockUnlockEncryptedVaultButtonClicked:"))) { + else if(action.equals(BrowserToolbarFactory.BrowserToolbarItem.cryptomator.action())) { if(this.isMounted()) { final Path selected = new UploadTargetFinder(this.workdir()).find(this.getSelectedPath()); final VaultRegistry registry = pool.getVaultRegistry(); diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/VaultController.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/VaultController.java index 15113990d8..11a854e90d 100644 --- a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/VaultController.java +++ b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/VaultController.java @@ -33,7 +33,6 @@ import ch.cyberduck.core.StringAppender; import ch.cyberduck.core.features.Location; import ch.cyberduck.core.resources.IconCacheFactory; import ch.cyberduck.core.vault.VaultCredentials; - import ch.cyberduck.core.vault.VaultMetadata; import org.apache.commons.lang3.StringUtils; diff --git a/owncloud/src/test/java/ch/cyberduck/core/cryptomator/OcisUploadFeatureTest.java b/owncloud/src/test/java/ch/cyberduck/core/cryptomator/OcisUploadFeatureTest.java index 9c48378f47..3cd034a20a 100644 --- a/owncloud/src/test/java/ch/cyberduck/core/cryptomator/OcisUploadFeatureTest.java +++ b/owncloud/src/test/java/ch/cyberduck/core/cryptomator/OcisUploadFeatureTest.java @@ -44,6 +44,7 @@ import ch.cyberduck.core.owncloud.OwncloudHomeFeature; import ch.cyberduck.core.transfer.TransferStatus; import ch.cyberduck.core.tus.TusCapabilities; import ch.cyberduck.core.tus.TusWriteFeature; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -77,8 +78,8 @@ public class OcisUploadFeatureTest extends AbstractOcisTest { final Path directory = new DAVDirectoryFeature(session).mkdir(new NextcloudWriteFeature(session), new Path(new OwncloudHomeFeature(session.getHost()).find(), new AlphanumericRandomStringService().random(), EnumSet.of(AbstractPath.Type.directory)), new TransferStatus()); final Path vault = new Path(directory, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TusCapabilities capabilities = new TusCapabilities().withHashAlgorithm(HashAlgorithm.sha1); final CryptoUploadFeature service = new CryptoUploadFeature<>(session, diff --git a/owncloud/src/test/java/ch/cyberduck/core/owncloud/AbstractOcisTest.java b/owncloud/src/test/java/ch/cyberduck/core/owncloud/AbstractOcisTest.java index b038ffb8bf..0992ae5e85 100644 --- a/owncloud/src/test/java/ch/cyberduck/core/owncloud/AbstractOcisTest.java +++ b/owncloud/src/test/java/ch/cyberduck/core/owncloud/AbstractOcisTest.java @@ -24,7 +24,6 @@ import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.Profile; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.ProtocolFactory; -import ch.cyberduck.core.Scheme; import ch.cyberduck.core.serializer.impl.dd.ProfilePlistReader; import ch.cyberduck.core.ssl.DefaultX509KeyManager; import ch.cyberduck.core.ssl.DefaultX509TrustManager; diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index 97e08a23f2..051e80f94c 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -44,6 +44,7 @@ import ch.cyberduck.core.shared.DisabledBulkFeature; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -77,8 +78,8 @@ public class CopyWorkerTest extends AbstractS3Test { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final byte[] content = RandomUtils.nextBytes(40500); @@ -104,8 +105,8 @@ public class CopyWorkerTest extends AbstractS3Test { final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); @@ -128,8 +129,8 @@ public class CopyWorkerTest extends AbstractS3Test { public void testCopyToDifferentFolderLongFilenameCryptomator() throws Exception { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final Path source = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); @@ -154,8 +155,8 @@ public class CopyWorkerTest extends AbstractS3Test { public void testCopyFolder() throws Exception { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); @@ -194,8 +195,8 @@ public class CopyWorkerTest extends AbstractS3Test { assertTrue(new S3FindFeature(session, acl).find(cleartextFile)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new S3DirectoryFeature(session, acl)).mkdir( @@ -224,8 +225,8 @@ public class CopyWorkerTest extends AbstractS3Test { new S3TouchFeature(session, acl).touch(new S3WriteFeature(session, acl), cleartextFile, new TransferStatus()); assertTrue(new S3FindFeature(session, acl).find(cleartextFolder)); assertTrue(new S3FindFeature(session, acl).find(cleartextFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -250,8 +251,8 @@ public class CopyWorkerTest extends AbstractS3Test { new S3DirectoryFeature(session, acl).mkdir(new S3WriteFeature(session, acl), clearFolder, new TransferStatus()); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new S3DirectoryFeature(session, acl)).mkdir( @@ -276,8 +277,8 @@ public class CopyWorkerTest extends AbstractS3Test { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/CryptoS3SingleTransferWorkerTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/CryptoS3SingleTransferWorkerTest.java index 09e9f6f6c1..6530e4304b 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/CryptoS3SingleTransferWorkerTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/CryptoS3SingleTransferWorkerTest.java @@ -49,6 +49,7 @@ import ch.cyberduck.core.transfer.TransferOptions; import ch.cyberduck.core.transfer.TransferSpeedometer; import ch.cyberduck.core.transfer.TransferStatus; import ch.cyberduck.core.transfer.UploadTransfer; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -95,8 +96,8 @@ public class CryptoS3SingleTransferWorkerTest extends AbstractS3Test { final OutputStream out2 = localFile2.getOutputStream(false); IOUtils.write(content, out2); out2.close(); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Transfer t = new UploadTransfer(new Host(new TestProtocol()), Collections.singletonList(new TransferItem(dir1, localDirectory1)), new NullFilter<>()); assertTrue(new SingleTransferWorker(session, session, t, new TransferOptions(), new TransferSpeedometer(t), new DisabledTransferPrompt() { diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java index 2a7bd4272b..4676ecde16 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java @@ -50,6 +50,7 @@ import ch.cyberduck.core.shared.DisabledBulkFeature; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -83,8 +84,8 @@ public class MoveWorkerTest extends AbstractS3Test { final Path vault = new Path(home, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final byte[] content = RandomUtils.nextBytes(40500); final TransferStatus status = new TransferStatus(); @@ -107,8 +108,8 @@ public class MoveWorkerTest extends AbstractS3Test { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); new CryptoTouchFeature<>(session, new S3TouchFeature(session, acl), cryptomator).touch( @@ -131,8 +132,8 @@ public class MoveWorkerTest extends AbstractS3Test { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); new CryptoTouchFeature<>(session, new S3TouchFeature(session, acl), cryptomator).touch( @@ -153,8 +154,8 @@ public class MoveWorkerTest extends AbstractS3Test { public void testMoveFolder() throws Exception { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); final Path folder = cryptomator.getFeature(session, Directory.class, new S3DirectoryFeature(session, acl)).mkdir( @@ -194,8 +195,8 @@ public class MoveWorkerTest extends AbstractS3Test { final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); new S3TouchFeature(session, acl).touch(new S3WriteFeature(session, new S3AccessControlListFeature(session)), clearFile, new TransferStatus()); assertTrue(new S3FindFeature(session, acl).find(clearFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final Path encryptedFolder = cryptomator.getFeature(session, Directory.class, new S3DirectoryFeature(session, acl)).mkdir( @@ -221,8 +222,8 @@ public class MoveWorkerTest extends AbstractS3Test { new S3TouchFeature(session, acl).touch(new S3WriteFeature(session, new S3AccessControlListFeature(session)), clearFile, new TransferStatus()); assertTrue(new S3FindFeature(session, acl).find(clearFolder)); assertTrue(new S3FindFeature(session, acl).find(clearFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -245,8 +246,8 @@ public class MoveWorkerTest extends AbstractS3Test { final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); final Path clearFolder = new S3DirectoryFeature(session, acl).mkdir( new S3WriteFeature(session, acl), new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)), new TransferStatus()); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final Path encryptedFolder = cryptomator.getFeature(session, Directory.class, new S3DirectoryFeature(session, acl)).mkdir( @@ -271,8 +272,8 @@ public class MoveWorkerTest extends AbstractS3Test { public void testMoveDirectoryOutsideVault() throws Exception { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3DirectoryFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3DirectoryFeatureTest.java index 8744dfd65a..0e28ddf10a 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3DirectoryFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3DirectoryFeatureTest.java @@ -36,6 +36,7 @@ import ch.cyberduck.core.s3.S3ListService; import ch.cyberduck.core.s3.S3WriteFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -62,8 +63,8 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { public void testMakeDirectoryEncrypted() throws Exception { final Path home = new Path("versioning-test-eu-central-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); final Path test = cryptomator.getFeature(session, Directory.class, new S3DirectoryFeature(session, acl)).mkdir( @@ -84,8 +85,8 @@ public class S3DirectoryFeatureTest extends AbstractS3Test { public void testMakeDirectoryLongFilenameEncrypted() throws Exception { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); final Path test = cryptomator.getFeature(session, Directory.class, new S3DirectoryFeature(session, acl)).mkdir( diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MoveFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MoveFeatureTest.java index 1e4f46f76d..bc7bb21e23 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MoveFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MoveFeatureTest.java @@ -36,6 +36,7 @@ import ch.cyberduck.core.s3.S3TouchFeature; import ch.cyberduck.core.s3.S3WriteFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -62,8 +63,8 @@ public class S3MoveFeatureTest extends AbstractS3Test { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); cryptomator.getFeature(session, Directory.class, new S3DirectoryFeature(session, acl)).mkdir( diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MultipartUploadServiceTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MultipartUploadServiceTest.java index ab1d6b5cd1..bb02fc85e3 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MultipartUploadServiceTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MultipartUploadServiceTest.java @@ -45,6 +45,7 @@ import ch.cyberduck.core.shared.DisabledBulkFeature; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -79,8 +80,8 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); final CryptoUploadFeature m = new CryptoUploadFeature<>(session, @@ -115,8 +116,8 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); final CryptoUploadFeature m = new CryptoUploadFeature<>(session, @@ -148,8 +149,8 @@ public class S3MultipartUploadServiceTest extends AbstractS3Test { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus writeStatus = new TransferStatus(); final byte[] content = RandomUtils.nextBytes(6 * 1024 * 1024); diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MultipartWriteFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MultipartWriteFeatureTest.java index 43244adac1..f4f63d77af 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MultipartWriteFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3MultipartWriteFeatureTest.java @@ -35,6 +35,7 @@ import ch.cyberduck.core.s3.S3FindFeature; import ch.cyberduck.core.s3.S3MultipartWriteFeature; import ch.cyberduck.core.s3.S3ReadFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -64,8 +65,8 @@ public class S3MultipartWriteFeatureTest extends AbstractS3Test { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); final CryptoWriteFeature feature = new CryptoWriteFeature<>(session, new S3MultipartWriteFeature(session, acl), cryptomator); diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3ObjectListServiceTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3ObjectListServiceTest.java index 381a48b9d0..48ad260680 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3ObjectListServiceTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3ObjectListServiceTest.java @@ -31,6 +31,7 @@ import ch.cyberduck.core.s3.S3ObjectListService; import ch.cyberduck.core.s3.S3TouchFeature; import ch.cyberduck.core.s3.S3WriteFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -56,8 +57,8 @@ public class S3ObjectListServiceTest extends AbstractS3Test { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); assertTrue(new CryptoListService(session, new S3ObjectListService(session, acl), cryptomator).list(vault, new DisabledListProgressListener()).isEmpty()); diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3SingleUploadServiceTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3SingleUploadServiceTest.java index 07f94f1387..76e8158df5 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3SingleUploadServiceTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3SingleUploadServiceTest.java @@ -40,6 +40,7 @@ import ch.cyberduck.core.s3.S3ReadFeature; import ch.cyberduck.core.s3.S3SingleUploadService; import ch.cyberduck.core.s3.S3WriteFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -71,8 +72,8 @@ public class S3SingleUploadServiceTest extends AbstractS3Test { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Local local = new Local(System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString()); final int length = 5242880; diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3TouchFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3TouchFeatureTest.java index 5adfb5d381..32a97029b6 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3TouchFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3TouchFeatureTest.java @@ -34,6 +34,7 @@ import ch.cyberduck.core.s3.S3WriteFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -60,8 +61,8 @@ public class S3TouchFeatureTest extends AbstractS3Test { public void testTouchEncrypted() throws Exception { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus status = new TransferStatus(); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); @@ -79,8 +80,8 @@ public class S3TouchFeatureTest extends AbstractS3Test { public void testTouchLongFilenameEncrypted() throws Exception { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus status = new TransferStatus(); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); @@ -97,8 +98,8 @@ public class S3TouchFeatureTest extends AbstractS3Test { public void testTouchEncryptedDefaultFeature() throws Exception { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final TransferStatus status = new TransferStatus(); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3VersioningFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3VersioningFeatureTest.java index 62f7fc7fa4..23adaad582 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3VersioningFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3VersioningFeatureTest.java @@ -46,6 +46,7 @@ import ch.cyberduck.core.s3.S3TouchFeature; import ch.cyberduck.core.s3.S3VersioningFeature; import ch.cyberduck.core.s3.S3WriteFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -73,8 +74,8 @@ public class S3VersioningFeatureTest extends AbstractS3Test { public void testRevert() throws Exception { final Path bucket = new Path("versioning-test-eu-central-1-cyberduck", EnumSet.of(Path.Type.directory, Path.Type.volume)); final Path vault = new Path(bucket, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); final AttributesFinder f = cryptomator.getFeature(session, AttributesFinder.class, new S3AttributesFinderFeature(session, acl)); diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3WriteFeatureTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3WriteFeatureTest.java index 2b35c1fbca..515f703b87 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/S3WriteFeatureTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/S3WriteFeatureTest.java @@ -36,6 +36,7 @@ import ch.cyberduck.core.s3.S3FindFeature; import ch.cyberduck.core.s3.S3ReadFeature; import ch.cyberduck.core.s3.S3WriteFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -71,8 +72,8 @@ public class S3WriteFeatureTest extends AbstractS3Test { final Path home = new Path("test-eu-central-1-cyberduck", EnumSet.of(Path.Type.volume, Path.Type.directory)); 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final S3AccessControlListFeature acl = new S3AccessControlListFeature(session); final CryptoWriteFeature writer = new CryptoWriteFeature<>(session, new S3WriteFeature(session, acl), cryptomator); diff --git a/s3/src/test/java/ch/cyberduck/core/cryptomator/UVFIntegrationTest.java b/s3/src/test/java/ch/cyberduck/core/cryptomator/UVFIntegrationTest.java index dfc2086c31..d38a911ff2 100644 --- a/s3/src/test/java/ch/cyberduck/core/cryptomator/UVFIntegrationTest.java +++ b/s3/src/test/java/ch/cyberduck/core/cryptomator/UVFIntegrationTest.java @@ -164,8 +164,9 @@ public class UVFIntegrationTest { final VaultRegistry vaults = new DefaultVaultRegistry(new DisabledPasswordCallback()); bookmark.setDefaultPath("/" + bucketName); final UVFVault vault = new UVFVault(new DefaultPathHomeFeature(bookmark).find()); - vaults.add(vault.load(storage, new DefaultVaultMetadataUVFProvider(jwe.getBytes(StandardCharsets.US_ASCII), null, null, - new DefaultJWKCredentials(new JWKCredentials(JWK.parse(memberKey)))))); + vault.load(storage, new DefaultVaultMetadataUVFProvider(jwe.getBytes(StandardCharsets.US_ASCII), null, null, + new DefaultJWKCredentials(new JWKCredentials(JWK.parse(memberKey))))); + vaults.add(vault); final PathAttributes attr = storage.getFeature(AttributesFinder.class).find(vault.getHome()); storage.withRegistry(vaults); diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index f57ca90905..c2d8138f45 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -46,6 +46,7 @@ import ch.cyberduck.core.shared.DisabledBulkFeature; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -79,8 +80,8 @@ public class CopyWorkerTest extends AbstractSFTPTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final byte[] content = RandomUtils.nextBytes(40500); @@ -106,8 +107,8 @@ public class CopyWorkerTest extends AbstractSFTPTest { final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); new CryptoTouchFeature<>(session, new DefaultTouchFeature( @@ -131,8 +132,8 @@ public class CopyWorkerTest extends AbstractSFTPTest { final Path source = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); new CryptoTouchFeature<>(session, new DefaultTouchFeature( @@ -154,8 +155,8 @@ public class CopyWorkerTest extends AbstractSFTPTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new SFTPDirectoryFeature(session)).mkdir( @@ -189,8 +190,8 @@ public class CopyWorkerTest extends AbstractSFTPTest { assertTrue(new SFTPFindFeature(session).find(cleartextFile)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new SFTPDirectoryFeature(session)).mkdir( @@ -215,8 +216,8 @@ public class CopyWorkerTest extends AbstractSFTPTest { new SFTPTouchFeature(session).touch(new SFTPWriteFeature(session), cleartextFile, new TransferStatus()); assertTrue(new SFTPFindFeature(session).find(cleartextFolder)); assertTrue(new SFTPFindFeature(session).find(cleartextFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -240,8 +241,8 @@ public class CopyWorkerTest extends AbstractSFTPTest { new SFTPDirectoryFeature(session).mkdir(new SFTPWriteFeature(session), clearFolder, new TransferStatus()); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new SFTPDirectoryFeature(session)).mkdir( @@ -266,8 +267,8 @@ public class CopyWorkerTest extends AbstractSFTPTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new SFTPDirectoryFeature(session)).mkdir( diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/CryptoSFTPSingleTransferWorkerTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/CryptoSFTPSingleTransferWorkerTest.java index b81a92b887..37b5a5bdd9 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/CryptoSFTPSingleTransferWorkerTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/CryptoSFTPSingleTransferWorkerTest.java @@ -15,7 +15,20 @@ package ch.cyberduck.core.cryptomator; * GNU General Public License for more details. */ -import ch.cyberduck.core.*; +import ch.cyberduck.core.AlphanumericRandomStringService; +import ch.cyberduck.core.ConnectionCallback; +import ch.cyberduck.core.Credentials; +import ch.cyberduck.core.DisabledListProgressListener; +import ch.cyberduck.core.DisabledPasswordCallback; +import ch.cyberduck.core.Host; +import ch.cyberduck.core.Local; +import ch.cyberduck.core.LoginCallback; +import ch.cyberduck.core.LoginOptions; +import ch.cyberduck.core.NullFilter; +import ch.cyberduck.core.Path; +import ch.cyberduck.core.PathAttributes; +import ch.cyberduck.core.ProgressListener; +import ch.cyberduck.core.TestProtocol; import ch.cyberduck.core.cryptomator.features.CryptoListService; import ch.cyberduck.core.cryptomator.features.CryptoReadFeature; import ch.cyberduck.core.features.AttributesFinder; @@ -43,6 +56,7 @@ import ch.cyberduck.core.transfer.TransferSpeedometer; import ch.cyberduck.core.transfer.TransferStatus; import ch.cyberduck.core.transfer.UploadTransfer; import ch.cyberduck.core.transfer.upload.UploadFilterOptions; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -94,8 +108,8 @@ public class CryptoSFTPSingleTransferWorkerTest extends AbstractSFTPTest { final OutputStream out2 = localFile2.getOutputStream(false); IOUtils.write(content, out2); out2.close(); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry vaults = new DefaultVaultRegistry(new DisabledPasswordCallback() { @Override public Credentials prompt(final Host bookmark, final String title, final String reason, final LoginOptions options) { diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/DefaultTouchFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/DefaultTouchFeatureTest.java index 99881721f9..471f7aa3db 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/DefaultTouchFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/DefaultTouchFeatureTest.java @@ -29,6 +29,7 @@ import ch.cyberduck.core.sftp.SFTPWriteFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -53,8 +54,8 @@ public class DefaultTouchFeatureTest extends AbstractSFTPTest { public void testTouchEncrypted() throws Exception { final Path home = new SFTPHomeDirectoryService(session).find(); final Path vault = new Path(home, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch(new CryptoWriteFeature<>(session, new SFTPWriteFeature(session), cryptomator), diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java index 4020bb7154..11ca40cd0b 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/MoveWorkerTest.java @@ -50,6 +50,7 @@ import ch.cyberduck.core.shared.DisabledBulkFeature; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -83,8 +84,8 @@ public class MoveWorkerTest extends AbstractSFTPTest { final Path vault = new Path(home, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final byte[] content = RandomUtils.nextBytes(40500); final TransferStatus status = new TransferStatus(); @@ -108,8 +109,8 @@ public class MoveWorkerTest extends AbstractSFTPTest { final Path source = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch(new CryptoWriteFeature<>(session, new SFTPWriteFeature(session), cryptomator), source, new TransferStatus()); @@ -132,8 +133,8 @@ public class MoveWorkerTest extends AbstractSFTPTest { final Path source = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch(new CryptoWriteFeature<>(session, new SFTPWriteFeature(session), cryptomator), source, new TransferStatus()); @@ -154,8 +155,8 @@ public class MoveWorkerTest extends AbstractSFTPTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new SFTPDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new SFTPWriteFeature(session)), folder, new TransferStatus()); @@ -194,8 +195,8 @@ public class MoveWorkerTest extends AbstractSFTPTest { assertTrue(new SFTPFindFeature(session).find(clearFile)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new SFTPDirectoryFeature(session)).mkdir( @@ -220,8 +221,8 @@ public class MoveWorkerTest extends AbstractSFTPTest { new SFTPTouchFeature(session).touch(new SFTPWriteFeature(session), clearFile, new TransferStatus()); assertTrue(new SFTPFindFeature(session).find(clearFolder)); assertTrue(new SFTPFindFeature(session).find(clearFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -245,8 +246,8 @@ public class MoveWorkerTest extends AbstractSFTPTest { new SFTPDirectoryFeature(session).mkdir(new SFTPWriteFeature(session), clearFolder, new TransferStatus()); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new SFTPDirectoryFeature(session)).mkdir( @@ -272,8 +273,8 @@ public class MoveWorkerTest extends AbstractSFTPTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new SFTPDirectoryFeature(session)).mkdir( diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPAttributesFinderFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPAttributesFinderFeatureTest.java index 1aa417aa2d..c843967d02 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPAttributesFinderFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPAttributesFinderFeatureTest.java @@ -39,6 +39,7 @@ import ch.cyberduck.core.sftp.SFTPWriteFeature; import ch.cyberduck.core.shared.DefaultAttributesFinderFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -62,8 +63,8 @@ public class SFTPAttributesFinderFeatureTest extends AbstractSFTPTest { public void testFindCryptomator() throws Exception { final Path home = new SFTPHomeDirectoryService(session).find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch( @@ -83,8 +84,8 @@ public class SFTPAttributesFinderFeatureTest extends AbstractSFTPTest { public void testFindDefaultAttributesFinderCryptomator() throws Exception { final Path home = new SFTPHomeDirectoryService(session).find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch( @@ -100,8 +101,8 @@ public class SFTPAttributesFinderFeatureTest extends AbstractSFTPTest { public void testFindDefaultAttributesFinderWithCacheCryptomator() throws Exception { final Path home = new SFTPHomeDirectoryService(session).find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch( diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPCryptomatorInteroperabilityTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPCryptomatorInteroperabilityTest.java index a049ba2a6b..813fcbb8a5 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPCryptomatorInteroperabilityTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPCryptomatorInteroperabilityTest.java @@ -24,7 +24,6 @@ import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.PasswordCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.cryptomator.features.CryptoReadFeature; -import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.proxy.DisabledProxyFinder; import ch.cyberduck.core.sftp.SFTPHomeDirectoryService; import ch.cyberduck.core.sftp.SFTPProtocol; @@ -34,6 +33,7 @@ import ch.cyberduck.core.ssl.DefaultX509KeyManager; import ch.cyberduck.core.ssl.DisabledX509TrustManager; import ch.cyberduck.core.threading.CancelCallback; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPDirectoryFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPDirectoryFeatureTest.java index af197f552b..aecd4baeb1 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPDirectoryFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPDirectoryFeatureTest.java @@ -31,6 +31,7 @@ import ch.cyberduck.core.sftp.SFTPHomeDirectoryService; import ch.cyberduck.core.sftp.SFTPWriteFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -56,8 +57,8 @@ public class SFTPDirectoryFeatureTest extends AbstractSFTPTest { final Path home = new SFTPHomeDirectoryService(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 AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new SFTPDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new SFTPWriteFeature(session)), test, new TransferStatus()); @@ -72,8 +73,8 @@ public class SFTPDirectoryFeatureTest extends AbstractSFTPTest { final Path home = new SFTPHomeDirectoryService(session).find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path test = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new SFTPDirectoryFeature(session)).mkdir(new SFTPWriteFeature(session), test, new TransferStatus()); assertTrue(cryptomator.getFeature(session, Find.class, new SFTPFindFeature(session)).find(test)); diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPFindFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPFindFeatureTest.java index 8ccc659dc6..b60a9ebd86 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPFindFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPFindFeatureTest.java @@ -30,6 +30,7 @@ import ch.cyberduck.core.sftp.SFTPWriteFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -57,8 +58,8 @@ public class SFTPFindFeatureTest extends AbstractSFTPTest { final Path home = new SFTPHomeDirectoryService(session).find(); final Path vault = new Path(home, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); final Path test = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); assertFalse(cryptomator.getFeature(session, Find.class, new DefaultFindFeature(session)).find(new Path(vault, "a", EnumSet.of(Path.Type.directory)))); new CryptoTouchFeature<>(session, new CryptoTouchFeature<>(session, new DefaultTouchFeature( @@ -74,8 +75,8 @@ public class SFTPFindFeatureTest extends AbstractSFTPTest { final Path vault = new Path(home, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); final Path test = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); new CryptoTouchFeature<>(session, new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator), cryptomator).touch(new CryptoWriteFeature<>(session, new SFTPWriteFeature(session), cryptomator), test, new TransferStatus()); diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPListServiceTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPListServiceTest.java index 49aa730a61..892df5655c 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPListServiceTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPListServiceTest.java @@ -39,6 +39,7 @@ import ch.cyberduck.core.sftp.SFTPWriteFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -64,8 +65,8 @@ public class SFTPListServiceTest extends AbstractSFTPTest { final Path home = new SFTPHomeDirectoryService(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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); assertTrue(new CryptoListService(session, new SFTPListService(session), cryptomator).list(vault, new DisabledListProgressListener()).isEmpty()); new CryptoTouchFeature<>(session, new CryptoTouchFeature<>(session, new DefaultTouchFeature(session), diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPMoveFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPMoveFeatureTest.java index 8c52ce2a3f..509c83dcf5 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPMoveFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPMoveFeatureTest.java @@ -39,6 +39,7 @@ import ch.cyberduck.core.sftp.SFTPWriteFeature; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -67,8 +68,8 @@ public class SFTPMoveFeatureTest extends AbstractSFTPTest { final Path vault = new Path(home, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); new CryptoTouchFeature<>(session, new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator), cryptomator).touch(new CryptoWriteFeature<>(session, new SFTPWriteFeature(session), cryptomator), source, new TransferStatus()); @@ -87,8 +88,8 @@ public class SFTPMoveFeatureTest extends AbstractSFTPTest { final Path source = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); new CryptoTouchFeature<>(session, new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator), cryptomator).touch(new CryptoWriteFeature<>(session, new SFTPWriteFeature(session), cryptomator), source, new TransferStatus()); @@ -111,8 +112,8 @@ public class SFTPMoveFeatureTest extends AbstractSFTPTest { final Path source = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); new CryptoTouchFeature<>(session, new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator), cryptomator).touch(new CryptoWriteFeature<>(session, new SFTPWriteFeature(session), cryptomator), source, new TransferStatus()); @@ -131,8 +132,8 @@ public class SFTPMoveFeatureTest extends AbstractSFTPTest { final Path home = new SFTPHomeDirectoryService(session).find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new SFTPDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new SFTPWriteFeature(session)), folder, new TransferStatus()); @@ -157,8 +158,8 @@ public class SFTPMoveFeatureTest extends AbstractSFTPTest { final Path home = new SFTPHomeDirectoryService(session).find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new SFTPDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new SFTPWriteFeature(session)), folder, new TransferStatus()); @@ -178,8 +179,8 @@ public class SFTPMoveFeatureTest extends AbstractSFTPTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, "folder-1", EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, "file-1", EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); cryptomator.getFeature(session, Directory.class, new SFTPDirectoryFeature(session)).mkdir( cryptomator.getFeature(session, Write.class, new SFTPWriteFeature(session)), folder, new TransferStatus()); diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPReadFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPReadFeatureTest.java index c46c30b04f..72273dd7aa 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPReadFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPReadFeatureTest.java @@ -37,6 +37,7 @@ import ch.cyberduck.core.sftp.SFTPListService; import ch.cyberduck.core.sftp.SFTPReadFeature; import ch.cyberduck.core.sftp.SFTPWriteFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -71,8 +72,8 @@ public class SFTPReadFeatureTest extends AbstractSFTPTest { final Path home = new SFTPHomeDirectoryService(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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final CryptoWriteFeature writer = new CryptoWriteFeature<>(session, new SFTPWriteFeature(session), cryptomator); final FileHeader header = cryptomator.getFileHeaderCryptor().create(); diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPSymlinkFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPSymlinkFeatureTest.java index 7c4eddb197..3ea1a24cdb 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPSymlinkFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPSymlinkFeatureTest.java @@ -35,6 +35,7 @@ import ch.cyberduck.core.sftp.SFTPSymlinkFeature; import ch.cyberduck.core.sftp.SFTPWriteFeature; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -61,8 +62,8 @@ public class SFTPSymlinkFeatureTest extends AbstractSFTPTest { public void testSymlink() throws Exception { final Path home = new SFTPHomeDirectoryService(session).find(); final Path vault = new Path(home, UUID.randomUUID().toString(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Path target = new Path(vault, UUID.randomUUID().toString(), EnumSet.of(Path.Type.file)); new CryptoTouchFeature<>(session, new CryptoTouchFeature<>(session, new DefaultTouchFeature( diff --git a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPWriteFeatureTest.java b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPWriteFeatureTest.java index b1bfbae49f..0bc48d6d92 100644 --- a/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPWriteFeatureTest.java +++ b/ssh/src/test/java/ch/cyberduck/core/cryptomator/SFTPWriteFeatureTest.java @@ -44,6 +44,7 @@ import ch.cyberduck.core.sftp.SFTPReadFeature; import ch.cyberduck.core.sftp.SFTPWriteFeature; import ch.cyberduck.core.shared.DefaultAttributesFinderFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -78,8 +79,8 @@ public class SFTPWriteFeatureTest extends AbstractSFTPTest { final Path home = new SFTPHomeDirectoryService(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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final CryptoWriteFeature writer = new CryptoWriteFeature<>(session, new SFTPWriteFeature(session), cryptomator); final FileHeader header = cryptomator.getFileHeaderCryptor().create(); @@ -109,8 +110,8 @@ public class SFTPWriteFeatureTest extends AbstractSFTPTest { final Path home = new SFTPHomeDirectoryService(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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final CryptoWriteFeature writer = new CryptoWriteFeature<>(session, new SFTPWriteFeature(session), cryptomator); final FileHeader header = cryptomator.getFileHeaderCryptor().create(); diff --git a/webdav/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java b/webdav/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java index 19555ab2b5..3ac7137b2d 100644 --- a/webdav/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/cryptomator/CopyWorkerTest.java @@ -43,6 +43,7 @@ import ch.cyberduck.core.shared.DisabledBulkFeature; import ch.cyberduck.core.transfer.Transfer; import ch.cyberduck.core.transfer.TransferItem; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -76,8 +77,8 @@ public class CopyWorkerTest extends AbstractDAVTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path target = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); final byte[] content = RandomUtils.nextBytes(40500); @@ -102,8 +103,8 @@ public class CopyWorkerTest extends AbstractDAVTest { final Path source = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); new CryptoTouchFeature<>(session, new DefaultTouchFeature( @@ -128,8 +129,8 @@ public class CopyWorkerTest extends AbstractDAVTest { final Path source = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); final Path targetFolder = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.directory)); final Path target = new Path(targetFolder, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); new CryptoTouchFeature<>(session, new DefaultTouchFeature( @@ -151,8 +152,8 @@ public class CopyWorkerTest extends AbstractDAVTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new DAVDirectoryFeature(session)).mkdir( @@ -187,8 +188,8 @@ public class CopyWorkerTest extends AbstractDAVTest { assertTrue(new DAVFindFeature(session).find(cleartextFile)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new DAVDirectoryFeature(session)).mkdir( @@ -217,8 +218,8 @@ public class CopyWorkerTest extends AbstractDAVTest { session).touch(new DAVWriteFeature(session), cleartextFile, new TransferStatus()); assertTrue(new DAVFindFeature(session).find(cleartextFolder)); assertTrue(new DAVFindFeature(session).find(cleartextFile)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); // move directory into vault @@ -242,8 +243,8 @@ public class CopyWorkerTest extends AbstractDAVTest { new DAVDirectoryFeature(session).mkdir(new DAVWriteFeature(session), clearFolder, new TransferStatus()); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new DAVDirectoryFeature(session)).mkdir( @@ -273,8 +274,8 @@ public class CopyWorkerTest extends AbstractDAVTest { final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFolder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path encryptedFile = new Path(encryptedFolder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry registry = new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator); session.withRegistry(registry); cryptomator.getFeature(session, Directory.class, new DAVDirectoryFeature(session)).mkdir( diff --git a/webdav/src/test/java/ch/cyberduck/core/cryptomator/CryptoDAVSingleTransferWorkerTest.java b/webdav/src/test/java/ch/cyberduck/core/cryptomator/CryptoDAVSingleTransferWorkerTest.java index 8eddc8006c..fb8b336f9a 100644 --- a/webdav/src/test/java/ch/cyberduck/core/cryptomator/CryptoDAVSingleTransferWorkerTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/cryptomator/CryptoDAVSingleTransferWorkerTest.java @@ -24,7 +24,6 @@ import ch.cyberduck.core.Local; import ch.cyberduck.core.LoginCallback; import ch.cyberduck.core.LoginOptions; import ch.cyberduck.core.NullFilter; -import ch.cyberduck.core.PasswordCallback; import ch.cyberduck.core.Path; import ch.cyberduck.core.ProgressListener; import ch.cyberduck.core.TestProtocol; @@ -60,6 +59,7 @@ import ch.cyberduck.core.transfer.TransferOptions; import ch.cyberduck.core.transfer.TransferSpeedometer; import ch.cyberduck.core.transfer.TransferStatus; import ch.cyberduck.core.transfer.UploadTransfer; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -107,8 +107,8 @@ public class CryptoDAVSingleTransferWorkerTest extends AbstractDAVTest { final OutputStream out2 = localFile2.getOutputStream(false); IOUtils.write(content, out2); out2.close(); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry vaults = new DefaultVaultRegistry(new DisabledPasswordCallback() { @Override public Credentials prompt(final Host bookmark, final String title, final String reason, final LoginOptions options) { @@ -154,8 +154,8 @@ public class CryptoDAVSingleTransferWorkerTest extends AbstractDAVTest { final Path home = new DefaultHomeFinderService(session).find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); final DefaultVaultRegistry vaults = new DefaultVaultRegistry(new DisabledPasswordCallback() { @Override public Credentials prompt(final Host bookmark, final String title, final String reason, final LoginOptions options) { diff --git a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVDirectoryFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVDirectoryFeatureTest.java index 93401aaa10..fb215e3fe1 100644 --- a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVDirectoryFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVDirectoryFeatureTest.java @@ -30,6 +30,7 @@ import ch.cyberduck.core.features.Write; import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -55,8 +56,8 @@ public class DAVDirectoryFeatureTest extends AbstractDAVTest { 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 AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(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()); @@ -70,8 +71,8 @@ public class DAVDirectoryFeatureTest extends AbstractDAVTest { 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(130).random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(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()); diff --git a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVListServiceTest.java b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVListServiceTest.java index 6499ec0ac7..238f407373 100644 --- a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVListServiceTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVListServiceTest.java @@ -31,6 +31,7 @@ import ch.cyberduck.core.features.Delete; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -56,8 +57,8 @@ public class DAVListServiceTest extends AbstractDAVTest { 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); assertTrue(new CryptoListService(session, new DAVListService(session), cryptomator).list(vault, new DisabledListProgressListener()).isEmpty()); new CryptoTouchFeature<>(session, new DefaultTouchFeature( diff --git a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVMoveFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVMoveFeatureTest.java index da6015302e..1795d9fd6a 100644 --- a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVMoveFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVMoveFeatureTest.java @@ -39,6 +39,7 @@ import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -63,8 +64,8 @@ public class DAVMoveFeatureTest extends AbstractDAVTest { final Path home = new DefaultHomeFinderService(session).find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); final Path folder = new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(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)), folder, new TransferStatus()); diff --git a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVReadFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVReadFeatureTest.java index 2b2b83b490..092c132e7e 100644 --- a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVReadFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVReadFeatureTest.java @@ -40,6 +40,7 @@ import ch.cyberduck.core.features.Find; import ch.cyberduck.core.io.StreamCopier; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -74,8 +75,8 @@ public class DAVReadFeatureTest extends AbstractDAVTest { 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final CryptoWriteFeature writer = new CryptoWriteFeature<>(session, new DAVWriteFeature(session), cryptomator); final FileHeader header = cryptomator.getFileHeaderCryptor().create(); diff --git a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVTouchFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVTouchFeatureTest.java index 1dca5f6a5e..73fae467d6 100644 --- a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVTouchFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVTouchFeatureTest.java @@ -33,6 +33,7 @@ import ch.cyberduck.core.shared.DefaultFindFeature; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.shared.DefaultTouchFeature; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -60,8 +61,8 @@ public class DAVTouchFeatureTest extends AbstractDAVTest { public void testTouchLongFilenameEncrypted() throws Exception { final Path home = new DefaultHomeFinderService(session).find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Path template = new Path(vault, new AlphanumericRandomStringService(130).random(), EnumSet.of(Path.Type.file)); final Path test = new CryptoTouchFeature<>(session, new DefaultTouchFeature( @@ -78,8 +79,8 @@ public class DAVTouchFeatureTest extends AbstractDAVTest { 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(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch(new CryptoWriteFeature<>(session, new DAVWriteFeature(session), cryptomator), test, new TransferStatus()); @@ -93,8 +94,8 @@ public class DAVTouchFeatureTest extends AbstractDAVTest { 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(130).random(), EnumSet.of(Path.Type.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); new CryptoTouchFeature<>(session, new DefaultTouchFeature( session), cryptomator).touch(new CryptoWriteFeature<>(session, new DAVWriteFeature(session), cryptomator), test, new TransferStatus()); diff --git a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVWriteFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVWriteFeatureTest.java index 6a2cb172f5..76205dfe64 100644 --- a/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVWriteFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/cryptomator/DAVWriteFeatureTest.java @@ -41,6 +41,7 @@ import ch.cyberduck.core.features.Find; import ch.cyberduck.core.io.StreamCopier; import ch.cyberduck.core.shared.DefaultHomeFinderService; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -75,8 +76,8 @@ public class DAVWriteFeatureTest extends AbstractDAVTest { 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.file)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final CryptoWriteFeature writer = new CryptoWriteFeature<>(session, new DAVWriteFeature(session), cryptomator); final FileHeader header = cryptomator.getFileHeaderCryptor().create(); diff --git a/webdav/src/test/java/ch/cyberduck/core/dav/DAVAttributesFinderFeatureTest.java b/webdav/src/test/java/ch/cyberduck/core/dav/DAVAttributesFinderFeatureTest.java index ed93774b2c..9ea4180191 100644 --- a/webdav/src/test/java/ch/cyberduck/core/dav/DAVAttributesFinderFeatureTest.java +++ b/webdav/src/test/java/ch/cyberduck/core/dav/DAVAttributesFinderFeatureTest.java @@ -24,6 +24,7 @@ import ch.cyberduck.core.ssl.DefaultX509KeyManager; import ch.cyberduck.core.ssl.DisabledX509TrustManager; import ch.cyberduck.core.threading.CancelCallback; import ch.cyberduck.core.transfer.TransferStatus; +import ch.cyberduck.core.vault.DefaultVaultMetadataCredentialsProvider; import ch.cyberduck.core.vault.DefaultVaultRegistry; import ch.cyberduck.core.vault.VaultCredentials; import ch.cyberduck.core.vault.VaultMetadata; @@ -190,8 +191,8 @@ public class DAVAttributesFinderFeatureTest extends AbstractDAVTest { public void testFindDefaultAttributesFinderCryptomator() throws Exception { final Path home = new DefaultHomeFinderService(session).find(); final Path vault = new Path(home, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.directory)); - final AbstractVault cryptomator = new CryptoVaultProvider(session).create(session, null, vault, new VaultCredentials("test"), - new VaultMetadata(vaultVersion)); + final AbstractVault cryptomator = new CryptoVaultProvider(session).provide(session, vault, new VaultMetadata(vaultVersion)); + cryptomator.create(session, null, new DefaultVaultMetadataCredentialsProvider(new VaultCredentials("test"))); session.withRegistry(new DefaultVaultRegistry(new DisabledPasswordCallback(), cryptomator)); final Path test = new CryptoTouchFeature<>(session, new DAVTouchFeature(session), cryptomator).touch( new CryptoWriteFeature<>(session, new DAVWriteFeature(session), cryptomator), new Path(vault, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file)), new TransferStatus());