Add authenticated read to ACL enumeration type

Author: zhuxiaolong37

src/main/java/com/aliyun/oss/model/CannedAccessControlList.java

@@ -50,7 +50,18 @@ public enum CannedAccessControlList {
      * Both the owner and {@link GroupGrantee#AllUsers} have
      * {@link Permission#FullControl}. It's not safe and thus not recommended.
      */
-    PublicReadWrite("public-read-write");
+    PublicReadWrite("public-read-write"),
+
+    /**
+     * The owner has the {@link Permission#FullControl}, other
+     * {@link GroupGrantee#AllUsers} have authenticated-read access.
+     */
+    AuthenticatedRead("authenticated-read"),
+
+    /**
+     * Unknown
+     */
+    Unknown("Unknown");
 
     private String cannedAclString;
 
@@ -70,6 +81,6 @@ public static CannedAccessControlList parse(String acl) {
             }
         }
 
-        throw new IllegalArgumentException("Unable to parse the provided acl " + acl);
+        return Unknown;
     }
 }

src/test/java/com/aliyun/oss/integrationtests/BucketInfoTest.java

@@ -121,4 +121,35 @@ public void testCreateBucket() {
         }
     }
 
+    @Test
+    public void testGetBucketInfoWithAuthenticatedRead() {
+        try {
+            ossClient.setBucketAcl(bucketName, CannedAccessControlList.AuthenticatedRead);
+
+            BucketInfo info = ossClient.getBucketInfo(bucketName);
+            Assert.assertNotNull(info.getComment());
+            Assert.assertNotNull(info.getDataRedundancyType());
+            Assert.assertEquals(info.getBucket().getName(), bucketName);
+            Assert.assertEquals(info.getBucket().getLocation(), TestConfig.OSS_TEST_REGION);
+            Assert.assertNotNull(info.getBucket().getCreationDate());
+            Assert.assertTrue(info.getBucket().getExtranetEndpoint().length() > 0);
+            Assert.assertTrue(info.getBucket().getIntranetEndpoint().length() > 0);
+            Assert.assertTrue(info.getBucket().getOwner().getId().length() > 0);
+            Assert.assertEquals(CannedAccessControlList.AuthenticatedRead, info.getCannedACL());
+            Assert.assertEquals(info.getBucket().getOwner().getDisplayName(), info.getBucket().getOwner().getId());
+            Assert.assertEquals(info.getRequestId().length(), REQUEST_ID_LEN);
+            for (Grant grant : info.getGrants()) {
+                Assert.assertEquals(grant.getGrantee(), GroupGrantee.AllUsers);
+                Assert.assertEquals(grant.getPermission(), Permission.Read);
+            }
+
+            ossClient.setBucketAcl(bucketName, CannedAccessControlList.AuthenticatedRead);
+            info = ossClient.getBucketInfo(bucketName);
+            Assert.assertEquals(CannedAccessControlList.AuthenticatedRead, info.getCannedACL());
+
+        } catch (Exception e) {
+            Assert.fail(e.getMessage());
+        }
+    }
+
 }