Merge pull request #14420 from iterate-ch/bugfix/MD-18808-validation

Review target validation.

Author: ylangisc

azure/src/main/java/ch/cyberduck/core/azure/AzureMoveFeature.java

@@ -51,7 +51,7 @@ public AzureMoveFeature(final AzureSession session, final OperationContext conte
 
     @Override
     public boolean isSupported(final Path source, final Path target) {
-        return !containerService.isContainer(source);
+        return !containerService.isContainer(source) && !containerService.isContainer(target);
     }
 
     @Override

backblaze/src/main/java/ch/cyberduck/core/b2/B2CopyFeature.java

@@ -33,7 +33,7 @@
 public class B2CopyFeature implements Copy {
 
     private final PathContainerService containerService
-        = new B2PathContainerService();
+            = new B2PathContainerService();
 
     private final B2Session session;
     private final B2VersionIdProvider fileid;
@@ -47,8 +47,8 @@ public B2CopyFeature(final B2Session session, final B2VersionIdProvider fileid)
     public Path copy(final Path source, final Path target, final TransferStatus status, final ConnectionCallback callback, final StreamListener listener) throws BackgroundException {
         try {
             final B2FileResponse response = session.getClient().copyFile(fileid.getVersionId(source),
-                fileid.getVersionId(containerService.getContainer(target)),
-                containerService.getKey(target));
+                    fileid.getVersionId(containerService.getContainer(target)),
+                    containerService.getKey(target));
             listener.sent(status.getLength());
             fileid.cache(target, response.getFileId());
             return target.withAttributes(new B2AttributesFinderFeature(session, fileid).toAttributes(response));
@@ -66,6 +66,9 @@ public boolean isSupported(final Path source, final Path target) {
         if(source.getType().contains(Path.Type.upload)) {
             return false;
         }
+        if(containerService.isContainer(source) || containerService.isContainer(target)) {
+            return false;
+        }
         return new SimplePathPredicate(containerService.getContainer(source)).test(containerService.getContainer(target));
     }
 }

googlestorage/src/main/java/ch/cyberduck/core/googlestorage/GoogleStorageMoveFeature.java

@@ -45,6 +45,6 @@ public Path move(final Path source, final Path target, final TransferStatus stat
 
     @Override
     public boolean isSupported(final Path source, final Path target) {
-        return !containerService.isContainer(source);
+        return !containerService.isContainer(source) && !containerService.isContainer(target);
     }
 }

openstack/src/main/java/ch/cyberduck/core/openstack/SwiftMoveFeature.java

@@ -65,6 +65,6 @@ public Path move(final Path file, final Path renamed, final TransferStatus statu
 
     @Override
     public boolean isSupported(final Path source, final Path target) {
-        return !containerService.isContainer(source);
+        return !containerService.isContainer(source) && !containerService.isContainer(target);
     }
 }

s3/src/main/java/ch/cyberduck/core/s3/S3MoveFeature.java

@@ -105,6 +105,6 @@ public Path move(final Path source, final Path renamed, final TransferStatus sta
 
     @Override
     public boolean isSupported(final Path source, final Path target) {
-        return !containerService.isContainer(source);
+        return !containerService.isContainer(source) && !containerService.isContainer(target);
     }
 }