Inherit from UVFVault.

Author: chenkins

hub/src/main/java/ch/iterate/hub/protocols/hub/HubCryptoVault.java

@@ -8,12 +8,10 @@
 import ch.cyberduck.core.AbstractPath;
 import ch.cyberduck.core.DisabledListProgressListener;
 import ch.cyberduck.core.ListService;
-import ch.cyberduck.core.LoginOptions;
-import ch.cyberduck.core.PasswordCallback;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.Session;
 import ch.cyberduck.core.cryptomator.ContentWriter;
-import ch.cyberduck.core.cryptomator.CryptoVault;
+import ch.cyberduck.core.cryptomator.UVFVault;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.features.Directory;
 import ch.cyberduck.core.preferences.PreferencesFactory;
@@ -22,36 +20,19 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.cryptomator.cryptolib.api.CryptorProvider;
-import org.cryptomator.cryptolib.api.Masterkey;
 
 import java.nio.charset.StandardCharsets;
-import java.util.Base64;
 import java.util.EnumSet;
 
 /**
  * Cryptomator vault implementation for Cipherduck (without masterkey file).
  */
-public class HubCryptoVault extends CryptoVault { // TODO extend from UVFVault
+public class HubCryptoVault extends UVFVault {
     private static final Logger log = LogManager.getLogger(HubCryptoVault.class);
 
-    // See https://github.com/cryptomator/hub/blob/develop/frontend/src/common/vaultconfig.ts
-    //const jwtPayload: VaultConfigPayload = {
-    //    jti: vaultId,
-    //    format: 8,
-    //    cipherCombo: 'SIV_GCM',
-    //    shorteningThreshold: 220
-    //};
-    //const header = JSON.stringify({
-    //    kid: kid,
-    //    typ: 'jwt',
-    //    alg: 'HS256',
-    //    hub: hubConfig
-    //});
-    private static final VaultConfig VAULT_CONFIG = new VaultConfig(8, 220, CryptorProvider.Scheme.SIV_GCM, "HS256", null);
 
     public HubCryptoVault(final Path home) {
-        super(home);
+        super(home, null, null, null); // TODO cleanup
     }
 
     public HubCryptoVault(final Path home, final String masterkey, final String config, final byte[] pepper) {
@@ -91,19 +72,6 @@ public synchronized Path create(final Session<?> session, final String region, f
         return home;
     }
 
-    @Override
-    public HubCryptoVault load(final Session<?> session, final PasswordCallback prompt) throws BackgroundException {
-        // no-interactive prompt in Cipherduck
-        final String masterkey = prompt.prompt(session.getHost(), "", "", new LoginOptions()).getPassword();
-        try {
-            this.open(VAULT_CONFIG, new Masterkey(Base64.getDecoder().decode(masterkey)));
-        }
-        catch(IllegalArgumentException e) {
-            throw new BackgroundException(e);
-        }
-        return this;
-    }
-
     public Path getMasterkey() {
         // No master key in vault
         return null;