Add UVF directory feature.

Author: ylangisc

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

@@ -23,10 +23,13 @@
 import ch.cyberduck.core.Permission;
 import ch.cyberduck.core.Session;
 import ch.cyberduck.core.SimplePathPredicate;
+import ch.cyberduck.core.cryptomator.features.CryptoDirectoryUVFFeature;
 import ch.cyberduck.core.cryptomator.impl.CryptoDirectoryUVFProvider;
 import ch.cyberduck.core.cryptomator.impl.CryptoFilenameV7Provider;
 import ch.cyberduck.core.cryptomator.random.FastSecureRandomProvider;
 import ch.cyberduck.core.exception.BackgroundException;
+import ch.cyberduck.core.features.Directory;
+import ch.cyberduck.core.features.Write;
 import ch.cyberduck.core.vault.VaultCredentials;
 
 import org.apache.logging.log4j.LogManager;
@@ -193,7 +196,7 @@ public Path encrypt(Session<?> session, Path file, boolean metadata) throws Back
             if(file.getType().contains(Path.Type.encrypted)) {
                 final Path decrypted = file.attributes().getDecrypted();
                 parent = this.getDirectoryProvider().toEncrypted(session, decrypted.getParent());
-                filename = this.getDirectoryProvider().toEncrypted(session, parent, decrypted.getName(), decrypted.getType());
+                filename = this.getDirectoryProvider().toEncrypted(session, decrypted.getParent(), decrypted.getName(), decrypted.getType());
             }
             else {
                 parent = this.getDirectoryProvider().toEncrypted(session, file.getParent());
@@ -361,6 +364,17 @@ public byte[] getRootDirId() {
         return rootDirId;
     }
 
+    @Override
+    public <T> T getFeature(final Session<?> session, final Class<T> type, final T delegate) {
+
+        if(type == Directory.class) {
+            return (T) new CryptoDirectoryUVFFeature(session, (Directory) delegate, session._getFeature(Write.class), this
+            );
+        }
+
+        return super.getFeature(session, type, delegate);
+    }
+
     @Override
     public boolean equals(final Object o) {
         if(this == o) {

cryptomator/src/main/java/ch/cyberduck/core/cryptomator/features/CryptoDirectoryUVFFeature.java

@@ -0,0 +1,112 @@
+package ch.cyberduck.core.cryptomator.features;
+
+/*
+ * Copyright (c) 2002-2025 iterate GmbH. All rights reserved.
+ * https://cyberduck.io/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+import ch.cyberduck.core.Path;
+import ch.cyberduck.core.Session;
+import ch.cyberduck.core.cryptomator.AbstractVault;
+import ch.cyberduck.core.cryptomator.ContentWriter;
+import ch.cyberduck.core.cryptomator.random.RandomNonceGenerator;
+import ch.cyberduck.core.exception.BackgroundException;
+import ch.cyberduck.core.features.Directory;
+import ch.cyberduck.core.features.Find;
+import ch.cyberduck.core.features.Write;
+import ch.cyberduck.core.transfer.TransferStatus;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.cryptomator.cryptolib.api.FileHeader;
+
+import java.nio.ByteBuffer;
+import java.util.EnumSet;
+
+public class CryptoDirectoryUVFFeature<Reply> extends CryptoDirectoryV7Feature<Reply> {
+    private static final Logger log = LogManager.getLogger(CryptoDirectoryUVFFeature.class);
+
+    private final Session<?> session;
+    private final Write<Reply> writer;
+    private final Directory<Reply> delegate;
+    private final AbstractVault vault;
+
+    public CryptoDirectoryUVFFeature(final Session<?> session, final Directory<Reply> delegate,
+                                     final Write<Reply> writer, final AbstractVault vault) {
+        super(session, delegate, writer, vault);
+        this.session = session;
+        this.writer = writer;
+        this.delegate = delegate;
+        this.vault = vault;
+    }
+
+    @Override
+    public Path mkdir(final Path folder, final TransferStatus status) throws BackgroundException {
+        final byte[] directoryId = vault.getDirectoryProvider().createDirectoryId(folder);
+        // Create metadata file for directory
+        final Path directoryMetadataFolder = session._getFeature(Directory.class).mkdir(vault.encrypt(session, folder, true),
+                new TransferStatus().setRegion(status.getRegion()));
+        final Path directoryMetadataFile = new Path(directoryMetadataFolder,
+                vault.getDirectoryMetadataFilename(),
+                EnumSet.of(Path.Type.file));
+        log.debug("Write metadata {} for folder {}", directoryMetadataFile, folder);
+        new ContentWriter(session).write(directoryMetadataFile, this.encryptDirectoryMetadataWithCurrentRevision(directoryId));
+        final Path encrypt = vault.encrypt(session, folder, false);
+        final Path intermediate = encrypt.getParent();
+        if(!session._getFeature(Find.class).find(intermediate)) {
+            session._getFeature(Directory.class).mkdir(intermediate, new TransferStatus().setRegion(status.getRegion()));
+        }
+        // Write metadata
+        final FileHeader header = vault.getFileHeaderCryptor().create();
+        status.setHeader(vault.getFileHeaderCryptor().encryptHeader(header));
+        status.setNonces(new RandomNonceGenerator(vault.getNonceSize()));
+        final Path target = delegate.withWriter(new CryptoWriteFeature<>(session, writer, vault)).mkdir(encrypt, status);
+        //TODO kopie von dir.uvf auch hier noch anlegen
+        final Path recoveryDirectoryMetadataFile = new Path(target,
+                vault.getDirectoryMetadataFilename(),
+                EnumSet.of(Path.Type.file));
+        log.debug("Write recovery metadata {} for folder {}", recoveryDirectoryMetadataFile, folder);
+        new ContentWriter(session).write(directoryMetadataFile, this.encryptDirectoryMetadataWithCurrentRevision(directoryId));
+        // Implementation may return new copy of attributes without encryption attributes
+
+        target.attributes().setDirectoryId(directoryId);
+        target.attributes().setDecrypted(folder);
+        // Make reference of encrypted path in attributes of decrypted file point to metadata file
+        final Path decrypt = vault.decrypt(session, vault.encrypt(session, target, true));
+        decrypt.attributes().setFileId(directoryMetadataFolder.attributes().getFileId());
+        decrypt.attributes().setVersionId(directoryMetadataFolder.attributes().getVersionId());
+        return decrypt;
+    }
+
+    // TODO replace with DirectoryContentCryptor#encryptDirectoryMetadata once we have access to dirId
+    private byte[] encryptDirectoryMetadataWithCurrentRevision(final byte[] dirId) {
+        final ByteBuffer cleartextBuf = ByteBuffer.wrap(dirId);
+        final FileHeader header = vault.getCryptor().fileHeaderCryptor().create();
+        final ByteBuffer headerBuf = vault.getCryptor().fileHeaderCryptor().encryptHeader(header);
+        final ByteBuffer contentBuf = vault.getCryptor().fileContentCryptor().encryptChunk(cleartextBuf, 0, header);
+        final byte[] result = new byte[headerBuf.remaining() + contentBuf.remaining()];
+        headerBuf.get(result, 0, headerBuf.remaining());
+        contentBuf.get(result, headerBuf.limit(), contentBuf.remaining());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder("CryptoDirectoryUVFFeature{");
+        sb.append("proxy=").append(delegate);
+        sb.append('}');
+        return sb.toString();
+    }
+
+
+}