Merge pull request #3 from Statflo/directory-permissions-fix

Directory permissions fix

Author: marksteele

src/main/java/com/upplication/s3fs/util/S3Utils.java

@@ -87,27 +87,30 @@ public S3BasicFileAttributes getS3FileAttributes(S3Path s3Path) throws NoSuchFil
      * @return S3PosixFileAttributes never null
      * @throws NoSuchFileException if the Path doesnt exists
      */
-    public S3PosixFileAttributes getS3PosixFileAttributes(S3Path s3Path) throws NoSuchFileException {
-        S3ObjectSummary objectSummary = getS3ObjectSummary(s3Path);
-
-        String key = s3Path.getKey();
-        String bucketName = s3Path.getFileStore().name();
-
-        S3BasicFileAttributes attrs = toS3FileAttributes(objectSummary, key);
-        S3UserPrincipal userPrincipal = null;
-        Set<PosixFilePermission> permissions = null;
-
-        if (!attrs.isDirectory()) {
-            AmazonS3 client = s3Path.getFileSystem().getClient();
-            AccessControlList acl = client.getObjectAcl(bucketName, key);
-            Owner owner = acl.getOwner();
-
-            userPrincipal = new S3UserPrincipal(owner.getId() + ":" + owner.getDisplayName());
-            permissions = toPosixFilePermissions(acl.getGrantsAsList());
-        }
-
-        return new S3PosixFileAttributes((String)attrs.fileKey(), attrs.lastModifiedTime(),
-                attrs.size(), attrs.isDirectory(), attrs.isRegularFile(), userPrincipal, null, permissions);
+    public S3PosixFileAttributes getS3PosixFileAttributes(final S3Path s3Path) throws NoSuchFileException {
+        final String key = s3Path.getKey();
+        final String bucketName = s3Path.getFileStore().name();
+        final S3ObjectSummary objectSummary = getS3ObjectSummary(s3Path);
+        final S3BasicFileAttributes attrs = toS3FileAttributes(objectSummary, key);
+        final AmazonS3 client = s3Path.getFileSystem().getClient();
+        final AccessControlList acl = (!attrs.isDirectory())
+            ? client.getObjectAcl(bucketName, key)
+            : client.getBucketAcl(bucketName);
+
+        final Owner owner = acl.getOwner();
+        final Set<PosixFilePermission> permissions = toPosixFilePermissions(acl.getGrantsAsList());
+        final S3UserPrincipal userPrincipal = new S3UserPrincipal(owner.getId() + ":" + owner.getDisplayName());
+
+        return new S3PosixFileAttributes(
+            (String) attrs.fileKey(),
+            attrs.lastModifiedTime(),
+            attrs.size(),
+            attrs.isDirectory(),
+            attrs.isRegularFile(),
+            userPrincipal,
+            null,
+            permissions
+        );
     }
 
 
@@ -189,4 +192,4 @@ public S3BasicFileAttributes toS3FileAttributes(S3ObjectSummary objectSummary, S
         }
         return new S3BasicFileAttributes(resolvedKey, lastModifiedTime, size, directory, regularFile);
     }
-}
+}

src/test/java/com/upplication/s3fs/S3UtilsIT.java

@@ -3,9 +3,11 @@
 import static com.upplication.s3fs.AmazonS3Factory.ACCESS_KEY;
 import static com.upplication.s3fs.AmazonS3Factory.SECRET_KEY;
 import static com.upplication.s3fs.util.S3EndpointConstant.S3_GLOBAL_URI_IT;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -22,6 +24,7 @@
 import org.junit.Before;
 
 import com.github.marschall.memoryfilesystem.MemoryFileSystemBuilder;
+import java.nio.file.attribute.PosixFilePermission;
 import org.junit.Test;
 
 
@@ -229,6 +232,10 @@ public void lookup_S3PosixFileAttributes_when_S3Path_is_file() throws IOExceptio
         assertNotNull(result.owner());
         assertNull(result.group());
         assertNotNull(result.permissions());
+
+        assertTrue(result.permissions().contains(PosixFilePermission.OWNER_EXECUTE));
+        assertTrue(result.permissions().contains(PosixFilePermission.OWNER_WRITE));
+        assertTrue(result.permissions().contains(PosixFilePermission.OWNER_READ));
     }
 
     @Test
@@ -254,9 +261,13 @@ public void lookup_S3PosixFileAttributes_when_S3Path_is_a_directory_and_is_virtu
         assertNotNull(result.lastModifiedTime());
         assertNotNull(result.size());
         // posix
-        assertNull(result.owner());
+        assertNotNull(result.owner());
         assertNull(result.group());
-        assertNull(result.permissions());
+        assertNotNull(result.permissions());
+
+        assertTrue(result.permissions().contains(PosixFilePermission.OWNER_EXECUTE));
+        assertTrue(result.permissions().contains(PosixFilePermission.OWNER_WRITE));
+        assertTrue(result.permissions().contains(PosixFilePermission.OWNER_READ));
     }
 
     @Test
@@ -285,9 +296,13 @@ public void lookup_S3PosixFileAttributes_when_S3Path_is_a_directory_and_is_not_v
         assertNotNull(result.lastModifiedTime());
         assertNotNull(result.size());
         // posix
-        assertNull(result.owner());
+        assertNotNull(result.owner());
         assertNull(result.group());
-        assertNull(result.permissions());
+        assertNotNull(result.permissions());
+
+        assertTrue(result.permissions().contains(PosixFilePermission.OWNER_EXECUTE));
+        assertTrue(result.permissions().contains(PosixFilePermission.OWNER_WRITE));
+        assertTrue(result.permissions().contains(PosixFilePermission.OWNER_READ));
     }
 
     public S3ObjectSummary getS3ObjectSummary(S3Path s3Path) throws NoSuchFileException {

src/test/java/com/upplication/s3fs/S3UtilsTest.java

@@ -52,7 +52,6 @@ public void getS3ObjectSummary() throws IOException {
         assertEquals(19, file1ObjectSummary.getSize());
     }
 
-
     @Test(expected = NoSuchFileException.class)
     public void getS3ObjectSummary404() throws IOException {
         S3Path root = fileSystem.getPath("/bucket");