Merge pull request #16494 from iterate-ch/bugfix/MD-22410-refactoring

Refactoring
iterate-ch · Nov 6, 2024 · 5e1d091 · 5e1d091
2 parents 918c983 + 1ccd382
commit 5e1d091
Show file tree

Hide file tree

Showing 42 changed files with 115 additions and 177 deletions.
diff --git a/azure/src/main/java/ch/cyberduck/core/azure/AzureAclPermissionFeature.java b/azure/src/main/java/ch/cyberduck/core/azure/AzureAclPermissionFeature.java
@@ -25,7 +25,6 @@
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.exception.NotfoundException;
 import ch.cyberduck.core.features.AclPermission;
-import ch.cyberduck.core.shared.DefaultAclFeature;
 import ch.cyberduck.core.transfer.TransferStatus;
 
 import org.jets3t.service.acl.Permission;
@@ -55,7 +54,7 @@
  * <p/>
  * No public read access: Container and blob data can be read by the account owner only.
  */
-public class AzureAclPermissionFeature extends DefaultAclFeature implements AclPermission {
+public class AzureAclPermissionFeature implements AclPermission {
 
     private final AzureSession session;
 

diff --git a/azure/src/main/java/ch/cyberduck/core/azure/AzureMetadataFeature.java b/azure/src/main/java/ch/cyberduck/core/azure/AzureMetadataFeature.java
@@ -19,7 +19,6 @@
  */
 
 import ch.cyberduck.core.DirectoryDelimiterPathContainerService;
-import ch.cyberduck.core.Local;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.PathContainerService;
 import ch.cyberduck.core.exception.BackgroundException;
@@ -58,7 +57,7 @@ public AzureMetadataFeature(final AzureSession session, final OperationContext c
     }
 
     @Override
-    public Map<String, String> getDefault(final Local local) {
+    public Map<String, String> getDefault() {
         return new HostPreferences(session.getHost()).getMap("azure.metadata.default");
     }
 

diff --git a/backblaze/src/main/java/ch/cyberduck/core/b2/B2BucketTypeFeature.java b/backblaze/src/main/java/ch/cyberduck/core/b2/B2BucketTypeFeature.java
@@ -24,7 +24,6 @@
 import ch.cyberduck.core.features.AclPermission;
 import ch.cyberduck.core.features.Location;
 import ch.cyberduck.core.preferences.HostPreferences;
-import ch.cyberduck.core.shared.DefaultAclFeature;
 import ch.cyberduck.core.transfer.TransferStatus;
 
 import org.jets3t.service.acl.Permission;
@@ -40,7 +39,7 @@
 import synapticloop.b2.exception.B2ApiException;
 import synapticloop.b2.response.B2BucketResponse;
 
-public class B2BucketTypeFeature extends DefaultAclFeature implements AclPermission, Location {
+public class B2BucketTypeFeature implements AclPermission, Location {
 
     private final PathContainerService containerService
             = new B2PathContainerService();

diff --git a/backblaze/src/main/java/ch/cyberduck/core/b2/B2MetadataFeature.java b/backblaze/src/main/java/ch/cyberduck/core/b2/B2MetadataFeature.java
@@ -15,7 +15,6 @@
  * GNU General Public License for more details.
  */
 
-import ch.cyberduck.core.Local;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.features.Headers;
@@ -39,7 +38,7 @@ public B2MetadataFeature(final B2Session session, final B2VersionIdProvider file
     }
 
     @Override
-    public Map<String, String> getDefault(final Local file) {
+    public Map<String, String> getDefault() {
         return new HostPreferences(session.getHost()).getMap("b2.metadata.default");
     }
 

diff --git a/core/src/main/java/ch/cyberduck/core/features/AclPermission.java b/core/src/main/java/ch/cyberduck/core/features/AclPermission.java
@@ -15,10 +15,13 @@
  * GNU General Public License for more details.
  */
 
+import ch.cyberduck.core.AbstractPath;
 import ch.cyberduck.core.Acl;
-import ch.cyberduck.core.Local;
 import ch.cyberduck.core.Path;
+import ch.cyberduck.core.Permission;
 import ch.cyberduck.core.exception.BackgroundException;
+import ch.cyberduck.core.preferences.Preferences;
+import ch.cyberduck.core.preferences.PreferencesFactory;
 import ch.cyberduck.core.transfer.TransferStatus;
 
 import java.util.EnumSet;
@@ -63,16 +66,35 @@ default void setPermission(Path file, Acl acl) throws BackgroundException {
      */
     List<Acl.Role> getAvailableAclRoles(List<Path> files);
 
+    Preferences preferences = PreferencesFactory.get();
+
     /**
-     * @param file  Remote file
-     * @param local File on local disk
+     * @param file Remote file
      * @return Default ACL to set for file
      */
-    Acl getDefault(Path file, Local local) throws BackgroundException;
+    default Acl getDefault(final Path type) throws BackgroundException {
+        if(preferences.getBoolean("queue.upload.permissions.default")) {
+            if(type.getType().contains(Path.Type.file)) {
+                return toAcl(new Permission(preferences.getInteger("queue.upload.permissions.file.default")));
+            }
+            else {
+                return toAcl(new Permission(preferences.getInteger("queue.upload.permissions.folder.default")));
+            }
+        }
+        return Acl.EMPTY;
+    }
 
-    /**
-     * @param type File or folder
-     * @return Default ACL for new file or folder
-     */
-    Acl getDefault(EnumSet<Path.Type> type) throws BackgroundException;
+    static Acl toAcl(final Permission permission) {
+        final Acl acl = new Acl();
+        if(permission.getOther().implies(Permission.Action.read)) {
+            acl.addAll(new Acl.GroupUser(Acl.GroupUser.EVERYONE), new Acl.Role(Acl.Role.READ));
+        }
+        if(permission.getGroup().implies(Permission.Action.read)) {
+            acl.addAll(new Acl.GroupUser(Acl.GroupUser.AUTHENTICATED), new Acl.Role(Acl.Role.READ));
+        }
+        if(permission.getGroup().implies(Permission.Action.write)) {
+            acl.addAll(new Acl.GroupUser(Acl.GroupUser.AUTHENTICATED), new Acl.Role(Acl.Role.WRITE));
+        }
+        return acl;
+    }
 }
diff --git a/core/src/main/java/ch/cyberduck/core/features/Metadata.java b/core/src/main/java/ch/cyberduck/core/features/Metadata.java
@@ -15,7 +15,6 @@
  * GNU General Public License for more details.
  */
 
-import ch.cyberduck.core.Local;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.exception.BackgroundException;
 import ch.cyberduck.core.transfer.TransferStatus;
@@ -24,7 +23,7 @@
 
 @Optional
 public interface Metadata {
-    Map<String, String> getDefault(Local local);
+    Map<String, String> getDefault();
 
     Map<String, String> getMetadata(Path file) throws BackgroundException;
 

diff --git a/core/src/main/java/ch/cyberduck/core/shared/DefaultAclFeature.java b/core/src/main/java/ch/cyberduck/core/shared/DefaultAclFeature.java
diff --git a/core/src/main/java/ch/cyberduck/core/shared/DisabledHeadersFeature.java b/core/src/main/java/ch/cyberduck/core/shared/DisabledHeadersFeature.java
@@ -15,7 +15,6 @@
  * GNU General Public License for more details.
  */
 
-import ch.cyberduck.core.Local;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.features.Headers;
 import ch.cyberduck.core.transfer.TransferStatus;
@@ -25,7 +24,7 @@
 
 public class DisabledHeadersFeature implements Headers {
     @Override
-    public Map<String, String> getDefault(final Local local) {
+    public Map<String, String> getDefault() {
         return Collections.emptyMap();
     }
 

diff --git a/core/src/main/java/ch/cyberduck/core/transfer/copy/AbstractCopyFilter.java b/core/src/main/java/ch/cyberduck/core/transfer/copy/AbstractCopyFilter.java
@@ -128,14 +128,14 @@ public TransferStatus prepare(final Path file, final Local n, final TransferStat
                 catch(NotfoundException | AccessDeniedException | InteroperabilityException e) {
                     final AclPermission targetFeature = targetSession.getFeature(AclPermission.class);
                     if(targetFeature != null) {
-                        status.setAcl(targetFeature.getDefault(file.getType()));
+                        status.setAcl(targetFeature.getDefault(file));
                     }
                 }
             }
             else {
                 final AclPermission targetFeature = targetSession.getFeature(AclPermission.class);
                 if(targetFeature != null) {
-                    status.setAcl(targetFeature.getDefault(file.getType()));
+                    status.setAcl(targetFeature.getDefault(file));
                 }
             }
         }

diff --git a/core/src/main/java/ch/cyberduck/core/transfer/upload/AbstractUploadFilter.java b/core/src/main/java/ch/cyberduck/core/transfer/upload/AbstractUploadFilter.java
@@ -129,12 +129,12 @@ public TransferStatus prepare(final Path file, final Local local, final Transfer
                 // Look if there is directory or file that clashes with this upload
                 if(file.getType().contains(Path.Type.file)) {
                     if(find.find(new Path(file.getAbsolute(), EnumSet.of(Path.Type.directory)))) {
-                        throw new AccessDeniedException(String.format("Cannot replace folder %s with file %s", file.getAbsolute(), local.getName()));
+                        throw new AccessDeniedException(String.format("Cannot replace folder %s with file %s", file.getAbsolute(), file.getName()));
                     }
                 }
                 if(file.getType().contains(Path.Type.directory)) {
                     if(find.find(new Path(file.getAbsolute(), EnumSet.of(Path.Type.file)))) {
-                        throw new AccessDeniedException(String.format("Cannot replace file %s with folder %s", file.getAbsolute(), local.getName()));
+                        throw new AccessDeniedException(String.format("Cannot replace file %s with folder %s", file.getAbsolute(), file.getName()));
                     }
                 }
             }
@@ -201,11 +201,11 @@ public TransferStatus prepare(final Path file, final Local local, final Transfer
                         status.setAcl(feature.getPermission(file));
                     }
                     catch(NotfoundException | AccessDeniedException | InteroperabilityException e) {
-                        status.setAcl(feature.getDefault(file, local));
+                        status.setAcl(feature.getDefault(file));
                     }
                 }
                 else {
-                    status.setAcl(feature.getDefault(file, local));
+                    status.setAcl(feature.getDefault(file));
                 }
             }
             else {
@@ -231,11 +231,11 @@ public TransferStatus prepare(final Path file, final Local local, final Transfer
                         status.setMetadata(feature.getMetadata(file));
                     }
                     catch(NotfoundException | AccessDeniedException | InteroperabilityException e) {
-                        status.setMetadata(feature.getDefault(local));
+                        status.setMetadata(feature.getDefault());
                     }
                 }
                 else {
-                    status.setMetadata(feature.getDefault(local));
+                    status.setMetadata(feature.getDefault());
                 }
             }
         }

diff --git a/core/src/main/java/ch/cyberduck/core/vault/registry/VaultRegistryAclPermissionFeature.java b/core/src/main/java/ch/cyberduck/core/vault/registry/VaultRegistryAclPermissionFeature.java
@@ -15,8 +15,8 @@
  * GNU General Public License for more details.
  */
 
+import ch.cyberduck.core.AbstractPath;
 import ch.cyberduck.core.Acl;
-import ch.cyberduck.core.Local;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.Session;
 import ch.cyberduck.core.exception.BackgroundException;
@@ -60,13 +60,8 @@ public List<Acl.Role> getAvailableAclRoles(final List<Path> files) {
     }
 
     @Override
-    public Acl getDefault(final Path file, final Local local) throws BackgroundException {
-        return proxy.getDefault(file, local);
-    }
-
-    @Override
-    public Acl getDefault(final EnumSet<Path.Type> type) throws BackgroundException {
-        return proxy.getDefault(type);
+    public Acl getDefault(final Path file) throws BackgroundException {
+        return proxy.getDefault(file);
     }
 
     @Override

diff --git a/core/src/main/java/ch/cyberduck/core/vault/registry/VaultRegistryHeadersFeature.java b/core/src/main/java/ch/cyberduck/core/vault/registry/VaultRegistryHeadersFeature.java
@@ -15,7 +15,6 @@
  * GNU General Public License for more details.
  */
 
-import ch.cyberduck.core.Local;
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.Session;
 import ch.cyberduck.core.exception.BackgroundException;
@@ -38,8 +37,8 @@ public VaultRegistryHeadersFeature(final Session<?> session, final Headers proxy
     }
 
     @Override
-    public Map<String, String> getDefault(final Local local) {
-        return proxy.getDefault(local);
+    public Map<String, String> getDefault() {
+        return proxy.getDefault();
     }
 
     @Override

diff --git a/core/src/main/java/ch/cyberduck/core/worker/CreateDirectoryWorker.java b/core/src/main/java/ch/cyberduck/core/worker/CreateDirectoryWorker.java
@@ -66,7 +66,7 @@ public Path run(final Session<?> session) throws BackgroundException {
             }
             final AclPermission acl = session.getFeature(AclPermission.class);
             if(acl != null) {
-                status.setAcl(acl.getDefault(EnumSet.of(Path.Type.directory)));
+                status.setAcl(acl.getDefault(folder));
             }
         }
         status.setRegion(region);

diff --git a/core/src/main/java/ch/cyberduck/core/worker/TouchWorker.java b/core/src/main/java/ch/cyberduck/core/worker/TouchWorker.java
@@ -77,7 +77,7 @@ public Path run(final Session<?> session) throws BackgroundException {
             }
             final AclPermission acl = session.getFeature(AclPermission.class);
             if(acl != null) {
-                status.setAcl(acl.getDefault(EnumSet.of(Path.Type.file)));
+                status.setAcl(acl.getDefault(file));
             }
         }
         final Path result = feature.touch(file, status);

diff --git a/core/src/main/java/ch/cyberduck/core/worker/WriteAclWorker.java b/core/src/main/java/ch/cyberduck/core/worker/WriteAclWorker.java
@@ -76,6 +76,9 @@ public WriteAclWorker(final List<Path> files,
     @Override
     public Boolean run(final Session<?> session) throws BackgroundException {
         final AclPermission feature = session.getFeature(AclPermission.class);
+        if(null == feature) {
+            return false;
+        }
         log.debug("Run with feature {}", feature);
         for(Path file : files) {
             this.write(session, feature, file);

diff --git a/core/src/main/java/ch/cyberduck/core/worker/WriteDistributionWorker.java b/core/src/main/java/ch/cyberduck/core/worker/WriteDistributionWorker.java
@@ -53,6 +53,9 @@ public WriteDistributionWorker(final List<Path> files, final LoginCallback promp
     @Override
     public Boolean run(final Session<?> session) throws BackgroundException {
         final DistributionConfiguration feature = session.getFeature(DistributionConfiguration.class);
+        if(null == feature) {
+            return false;
+        }
         log.debug("Run with feature {}", feature);
         final PathContainerService container = session.getFeature(PathContainerService.class);
         for(Path file : this.getContainers(container, files)) {

diff --git a/core/src/main/java/ch/cyberduck/core/worker/WriteEncryptionWorker.java b/core/src/main/java/ch/cyberduck/core/worker/WriteEncryptionWorker.java
@@ -70,6 +70,9 @@ public WriteEncryptionWorker(final List<Path> files, final Encryption.Algorithm
     @Override
     public Boolean run(final Session<?> session) throws BackgroundException {
         final Encryption feature = session.getFeature(Encryption.class);
+        if(null == feature) {
+            return false;
+        }
         log.debug("Run with feature {}", feature);
         for(Path file : files) {
             if(this.isCanceled()) {

diff --git a/core/src/main/java/ch/cyberduck/core/worker/WriteLifecycleWorker.java b/core/src/main/java/ch/cyberduck/core/worker/WriteLifecycleWorker.java
@@ -50,6 +50,9 @@ public WriteLifecycleWorker(final List<Path> files, final LifecycleConfiguration
     @Override
     public Boolean run(final Session<?> session) throws BackgroundException {
         final Lifecycle feature = session.getFeature(Lifecycle.class);
+        if(null == feature) {
+            return false;
+        }
         log.debug("Run with feature {}", feature);
         final PathContainerService container = session.getFeature(PathContainerService.class);
         for(Path file : this.getContainers(container, files)) {