Merge pull request #15807 from iterate-ch/feature/CTERA-136-listservice

Add preflight check for list feature.
iterate-ch · Apr 8, 2024 · 3b3b5fa · 3b3b5fa
2 parents 1d6d8dc + 6204709
commit 3b3b5fa
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/core/src/main/java/ch/cyberduck/core/ListService.java b/core/src/main/java/ch/cyberduck/core/ListService.java
@@ -17,8 +17,18 @@
  * Bug fixes, suggestions and comments should be sent to feedback@cyberduck.ch
  */
 
+import ch.cyberduck.core.exception.AccessDeniedException;
 import ch.cyberduck.core.exception.BackgroundException;
 
+import java.text.MessageFormat;
+
 public interface ListService {
     AttributedList<Path> list(Path directory, ListProgressListener listener) throws BackgroundException;
+
+    default void preflight(final Path directory) throws BackgroundException {
+        if(!directory.attributes().getPermission().isExecutable() || !directory.attributes().getPermission().isReadable()) {
+            throw new AccessDeniedException(MessageFormat.format(LocaleFactory.localizedString("Listing directory {0} failed", "Error"),
+                    directory.getName())).withFile(directory);
+        }
+    }
 }
diff --git a/ctera/src/main/java/ch/cyberduck/core/ctera/CteraListService.java b/ctera/src/main/java/ch/cyberduck/core/ctera/CteraListService.java
@@ -18,6 +18,7 @@
 import ch.cyberduck.core.Path;
 import ch.cyberduck.core.dav.DAVListService;
 import ch.cyberduck.core.dav.DAVPathEncoder;
+import ch.cyberduck.core.exception.BackgroundException;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -27,8 +28,7 @@
 
 import com.github.sardine.DavResource;
 
-import static ch.cyberduck.core.ctera.CteraAttributesFinderFeature.ALL_ACL_QN;
-import static ch.cyberduck.core.ctera.CteraAttributesFinderFeature.GUID_QN;
+import static ch.cyberduck.core.ctera.CteraAttributesFinderFeature.*;
 
 public class CteraListService extends DAVListService {
 
@@ -45,4 +45,9 @@ protected List<DavResource> list(final Path directory) throws IOException {
                 Stream.of(GUID_QN), ALL_ACL_QN.stream()
         ).collect(Collectors.toSet())));
     }
+
+    @Override
+    public void preflight(final Path directory) throws BackgroundException {
+        assumeRole(directory, READPERMISSION);
+    }
 }