let all directory be readable if it is executable, revert using isExe…

…cutable in the server
wolpi · Jun 2, 2024 · 2ac77ac · 2ac77ac
1 parent e2bc355
commit 2ac77ac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/primitiveFTPd/src/org/primftpd/filesystem/FsSshFile.java b/primitiveFTPd/src/org/primftpd/filesystem/FsSshFile.java
@@ -49,6 +49,11 @@ public SshFile getParentFile() {
 		return new FsSshFile(file.getParentFile(), pftpdService, session);
 	}
 
+	@Override
+	public boolean isReadable() {
+		return super.isReadable() || isDirectory() && isExecutable();
+	}
+
 	@Override
 	public boolean isExecutable() {
 		logger.trace("[{}] isExecutable()", name);

diff --git a/sshd-core-0.14.0/src/org/apache/sshd/server/sftp/SftpSubsystem.java b/sshd-core-0.14.0/src/org/apache/sshd/server/sftp/SftpSubsystem.java
@@ -689,7 +689,7 @@ protected void process(Buffer buffer) throws IOException {
                         sendStatus(id, SSH_FX_NO_SUCH_FILE, path);
                     } else if (!p.isDirectory()) {
                         sendStatus(id, SSH_FX_NO_SUCH_FILE, path);
-                    } else if (!p.isExecutable()) {
+                    } else if (!p.isReadable()) {
                         sendStatus(id, SSH_FX_PERMISSION_DENIED, path);
                     } else {
                         String handle = UUID.randomUUID().toString();
@@ -714,7 +714,7 @@ protected void process(Buffer buffer) throws IOException {
                         sendStatus(id, SSH_FX_NO_SUCH_FILE, p.getFile().getAbsolutePath());
                     } else if (!p.getFile().isDirectory()) {
                         sendStatus(id, SSH_FX_NO_SUCH_FILE, p.getFile().getAbsolutePath());
-                    } else if (!p.getFile().isExecutable()) {
+                    } else if (!p.getFile().isReadable()) {
                         sendStatus(id, SSH_FX_PERMISSION_DENIED, p.getFile().getAbsolutePath());
                     } else {
                         DirectoryHandle dh = (DirectoryHandle) p;