Merge pull request #148 from dt3310321/s3

parse canned acl

qcloud_cos/cos_client.py

@@ -1047,6 +1047,7 @@ def get_object_acl(self, Bucket, Key, **kwargs):
             lst = []
             lst.append(data['AccessControlList']['Grant'])
             data['AccessControlList']['Grant'] = lst
+        data['CannedACL'] = parse_object_canned_acl(data, rt.headers)
         return data
 
     def restore_object(self, Bucket, Key, RestoreRequest={}, **kwargs):
@@ -1497,6 +1498,7 @@ def get_bucket_acl(self, Bucket, **kwargs):
             lst = []
             lst.append(data['AccessControlList']['Grant'])
             data['AccessControlList']['Grant'] = lst
+        data['CannedACL'] = parse_bucket_canned_acl(data)
         return data
 
     def put_bucket_cors(self, Bucket, CORSConfiguration={}, **kwargs):

qcloud_cos/cos_comm.py

@@ -414,6 +414,29 @@ def get_date(yy, mm, dd):
     return final_date_str
 
 
+def parse_object_canned_acl(result_acl, rsp_headers):
+    """根据ACL返回的body信息,以及default头部来判断CannedACL"""
+    if "x-cos-acl" in rsp_headers and rsp_headers["x-cos-acl"] == "default":
+        return "default"
+    public_read = {'Grantee': {'Type': 'Group', 'URI': 'http://cam.qcloud.com/groups/global/AllUsers'}, 'Permission': 'READ'}
+    if 'AccessControlList' in result_acl and 'Grant' in result_acl['AccessControlList']:
+        if public_read in result_acl['AccessControlList']['Grant']:
+            return "public-read"
+    return "private"
+
+
+def parse_bucket_canned_acl(result_acl):
+    """根据ACL返回的body信息来判断Bucket CannedACL"""
+    public_read = {'Grantee': {'Type': 'Group', 'URI': 'http://cam.qcloud.com/groups/global/AllUsers'}, 'Permission': 'READ'}
+    public_write = {'Grantee': {'Type': 'Group', 'URI': 'http://cam.qcloud.com/groups/global/AllUsers'}, 'Permission': 'WRITE'}
+    if 'AccessControlList' in result_acl and 'Grant' in result_acl['AccessControlList']:
+        if public_read in result_acl['AccessControlList']['Grant']:
+            if public_write in result_acl['AccessControlList']['Grant']:
+                return "public-read-write"
+            return "public-read"
+    return "private"
+
+
 class CiDetectType():
     """ci内容设备的类型设置,可与操作设多个"""
     PORN = 1

qcloud_cos/version.py

@@ -1,2 +1,2 @@
 
-__version__ = '5.1.9.1'
+__version__ = '5.1.9.2'

setup.py

@@ -16,7 +16,7 @@ def long_description():
 
 setup(
     name='cos-python-sdk-v5',
-    version='1.9.1',
+    version='1.9.2',
     url='https://www.qcloud.com/',
     license='MIT',
     author='tiedu, lewzylu, channingliu',