Skip to content
This repository was archived by the owner on Feb 26, 2025. It is now read-only.

Added directory permissions to improve SFTP compatibility #96

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added directory permissions to improve SFTP compatibility #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/main/java/com/upplication/s3fs/util/S3Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.nio.file.NoSuchFileException;
import java.nio.file.attribute.FileTime;
import java.nio.file.attribute.PosixFilePermission;
import java.nio.file.attribute.PosixFilePermissions;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
Expand Down Expand Up @@ -94,17 +95,18 @@ public S3PosixFileAttributes getS3PosixFileAttributes(S3Path s3Path) throws NoSu
String bucketName = s3Path.getFileStore().name();

S3BasicFileAttributes attrs = toS3FileAttributes(objectSummary, key);
S3UserPrincipal userPrincipal = null;
Set<PosixFilePermission> permissions = null;

AccessControlList acl;
AmazonS3 client = s3Path.getFileSystem().getClient();
if (!attrs.isDirectory()) {
AmazonS3 client = s3Path.getFileSystem().getClient();
AccessControlList acl = client.getObjectAcl(bucketName, key);
Owner owner = acl.getOwner();
acl = client.getObjectAcl(bucketName, key);
} else {
acl = client.getBucketAcl(bucketName);

userPrincipal = new S3UserPrincipal(owner.getId() + ":" + owner.getDisplayName());
permissions = toPosixFilePermissions(acl.getGrantsAsList());
}
Owner owner = acl.getOwner();
S3UserPrincipal userPrincipal = new S3UserPrincipal(owner.getId() + ":" + owner.getDisplayName());
Set<PosixFilePermission> permissions = toPosixFilePermissions(acl.getGrantsAsList());

return new S3PosixFileAttributes((String)attrs.fileKey(), attrs.lastModifiedTime(),
attrs.size(), attrs.isDirectory(), attrs.isRegularFile(), userPrincipal, null, permissions);
Expand Down Expand Up @@ -189,4 +191,4 @@ public S3BasicFileAttributes toS3FileAttributes(S3ObjectSummary objectSummary, S
}
return new S3BasicFileAttributes(resolvedKey, lastModifiedTime, size, directory, regularFile);
}
}
}