Add UVF implementation.

Author: chenkins

core/src/main/java/ch/cyberduck/core/PathAttributes.java

@@ -156,7 +156,7 @@ public class PathAttributes extends Attributes implements Serializable {
     /**
      * Unique identifier for cryptomator
      */
-    private String directoryId;
+    private byte[] directoryId;
 
     private Map<String, String> custom = Collections.emptyMap();
 
@@ -480,11 +480,11 @@ public PathAttributes setLockId(final String lockId) {
         return this;
     }
 
-    public String getDirectoryId() {
+    public byte[] getDirectoryId() {
         return directoryId;
     }
 
-    public PathAttributes setDirectoryId(final String directoryId) {
+    public PathAttributes setDirectoryId(final byte[] directoryId) {
         this.directoryId = directoryId;
         return this;
     }
@@ -803,7 +803,7 @@ public PathAttributes setLockId(final String lockId) {
         }
 
         @Override
-        public PathAttributes setDirectoryId(final String directoryId) {
+        public PathAttributes setDirectoryId(final byte[] directoryId) {
             return this;
         }
 

cryptomator/pom.xml

@@ -25,7 +25,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <cryptolib.version>2.1.2.1</cryptolib.version>
+        <cryptolib.version>2.3.0.uvfdraft-SNAPSHOT</cryptolib.version>
     </properties>
 
     <dependencies>

cryptomator/src/main/java/ch/cyberduck/core/cryptomator/AbstractVault.java

@@ -21,10 +21,12 @@
 import ch.cyberduck.core.Session;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.features.Read;
+import ch.cyberduck.core.io.StreamCopier;
 import ch.cyberduck.core.transfer.TransferStatus;
 
 import org.apache.commons.io.IOUtils;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -49,6 +51,19 @@ public String read(final Path file) throws BackgroundException {
         }
     }
 
+    public byte[] readBytes(final Path file) throws BackgroundException {
+        final Read read = session._getFeature(Read.class);
+        final TransferStatus status = new TransferStatus().setLength(file.attributes().getSize());
+        try (final InputStream in = read.read(file, status, new DisabledConnectionCallback())) {
+            final ByteArrayOutputStream out = new ByteArrayOutputStream();
+            new StreamCopier(status, status).transfer(in, out);
+            return out.toByteArray();
+        }
+        catch(IOException e) {
+            throw new DefaultIOExceptionMappingService().map(e);
+        }
+    }
+
     public Reader getReader(final Path file) throws BackgroundException {
         final Read read = session._getFeature(Read.class);
         return new InputStreamReader(read.read(file, new TransferStatus().setLength(file.attributes().getSize()), new DisabledConnectionCallback()), StandardCharsets.UTF_8);

cryptomator/src/main/java/ch/cyberduck/core/cryptomator/ContentReader.java

@@ -22,16 +22,15 @@
 import ch.cyberduck.core.features.AclPermission;
 import ch.cyberduck.core.transfer.TransferStatus;
 
-import java.util.EnumSet;
 import java.util.List;
 
 public class CryptoAclPermission implements AclPermission {
 
     private final Session<?> session;
     private final AclPermission delegate;
-    private final CryptoVault cryptomator;
+    private final AbstractVault cryptomator;
 
-    public CryptoAclPermission(final Session<?> session, final AclPermission delegate, final CryptoVault cryptomator) {
+    public CryptoAclPermission(final Session<?> session, final AclPermission delegate, final AbstractVault cryptomator) {
 
         this.session = session;
         this.delegate = delegate;

cryptomator/src/main/java/ch/cyberduck/core/cryptomator/CryptoAclPermission.java

@@ -27,26 +27,29 @@ public interface CryptoDirectory {
      * Get encrypted filename for given clear text filename with id of parent encrypted directory.
      *
      * @param session     Connection
-     * @param directoryId Parent folder directory id
+     * @param parent      Parent folder
      * @param filename    Clear text filename
      * @param type        File type
      * @return Encrypted filename
      */
-    String toEncrypted(Session<?> session, String directoryId, String filename, EnumSet<Path.Type> type) throws BackgroundException;
+    String toEncrypted(Session<?> session, Path parent, String filename, EnumSet<Path.Type> type) throws BackgroundException;
 
     /**
      * Get encrypted reference for clear text directory path.
      *
-     * @param session     Connection
-     * @param directoryId Directory ID or null to read directory id from metadata file
-     * @param directory   Clear text
+     * @param session   Connection
+     * @param directory Clear text
      */
-    Path toEncrypted(Session<?> session, String directoryId, Path directory) throws BackgroundException;
+    Path toEncrypted(Session<?> session, Path directory) throws BackgroundException;
 
     /**
      * Remove from cache
      */
     void delete(Path directory);
 
     void destroy();
+
+    byte[] getOrCreateDirectoryId(Session<?> session, Path directory) throws BackgroundException;
+
+    byte[] createDirectoryId(final Path directory);
 }

cryptomator/src/main/java/ch/cyberduck/core/cryptomator/CryptoDirectory.java

@@ -27,9 +27,9 @@
 public class CryptoTransferStatus extends ProxyTransferStatus implements StreamCancelation, StreamProgress {
     private static final Logger log = LogManager.getLogger(CryptoTransferStatus.class);
 
-    private final CryptoVault vault;
+    private final AbstractVault vault;
 
-    public CryptoTransferStatus(final CryptoVault vault, final TransferStatus proxy) {
+    public CryptoTransferStatus(final AbstractVault vault, final TransferStatus proxy) {
         super(proxy);
         this.vault = vault;
         this.setLength(vault.toCiphertextSize(proxy.getOffset(), proxy.getLength()))