From f6c85547792ce5702ee34153975275547a972700 Mon Sep 17 00:00:00 2001 From: Julian Raufelder Date: Fri, 9 Apr 2021 09:22:41 +0200 Subject: [PATCH] Add VaultConfigBuilder as parameter in createVault To enhance testing --- .../data/cloud/crypto/MasterkeyCryptoCloudProvider.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/data/src/main/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProvider.java b/data/src/main/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProvider.java index e7b7739f..300d4372 100644 --- a/data/src/main/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProvider.java +++ b/data/src/main/java/org/cryptomator/data/cloud/crypto/MasterkeyCryptoCloudProvider.java @@ -61,6 +61,12 @@ public class MasterkeyCryptoCloudProvider implements CryptoCloudProvider { @Override public void create(CloudFolder location, CharSequence password) throws BackendException { + // Just for testing (id in VaultConfig is auto generated which makes sense while creating a vault but not for testing) + create(location, password, VaultConfig.createVaultConfig()); + } + + // Visible for testing + void create(CloudFolder location, CharSequence password, VaultConfig.VaultConfigBuilder vaultConfigBuilder) throws BackendException { // 1. write masterkey: Masterkey masterkey = Masterkey.generate(secureRandom); try (ByteArrayOutputStream data = new ByteArrayOutputStream()) { @@ -71,7 +77,7 @@ public class MasterkeyCryptoCloudProvider implements CryptoCloudProvider { } // 2. initialize vault: - VaultConfig vaultConfig = new VaultConfig.VaultConfigBuilder() // + VaultConfig vaultConfig = vaultConfigBuilder // .vaultFormat(MAX_VAULT_VERSION) // .cipherCombo(DEFAULT_CIPHER_COMBO) // .keyId(URI.create(String.format("%s:%s", MASTERKEY_SCHEME, MASTERKEY_FILE_NAME))) //