Merge pull request #197 from zhy1985555/master

优化匿名访问接口\优化对象标签接口

Author: zhy1985555

qcloud_cos/cos_auth.py

@@ -74,6 +74,13 @@ def __init__(self, conf, key=None, params={}, expire=10000, sign_host=None):
             self._path = u'/'
 
     def __call__(self, r):
+
+        # 匿名请求直接返回
+        if self._anonymous:
+            r.headers['Authorization'] = ""
+            logger.debug("anonymous reqeust")
+            return r
+
         path = self._path
         uri_params = self._params
         headers = filter_headers(r.headers)
@@ -128,8 +135,6 @@ def __call__(self, r):
             headers=';'.join(sorted(headers.keys())),
             sign=sign
         )
-        if self._anonymous:
-            r.headers['Authorization'] = ""
         logger.debug("sign_key" + str(sign_key))
         logger.debug(r.headers['Authorization'])
         logger.debug("request headers: " + str(r.headers))

qcloud_cos/cos_client.py

@@ -108,6 +108,9 @@ def __init__(self, Appid=None, Region=None, SecretId=None, SecretKey=None, Token
         elif (Access_id and Access_key):
             self._secret_id = self.convert_secret_value(Access_id)
             self._secret_key = self.convert_secret_value(Access_key)
+        elif self._anonymous:
+            self._secret_id = None
+            self._secret_key = None
         else:
             raise CosClientError('SecretId and SecretKey is Required!')
 
@@ -2743,13 +2746,12 @@ def delete_bucket_inventory(self, Bucket, Id, **kwargs):
             params=params)
         return None
 
-    def put_object_tagging(self, Bucket, Key, Tagging={}, VersionId=None, **kwargs):
+    def put_object_tagging(self, Bucket, Key, Tagging={}, **kwargs):
         """设置object的标签
 
         :param Bucket(string): 存储桶名称.
         :param Key(string): COS路径.
         :param Tagging(dict): Object的标签集合
-        :param VersionId(string): 对象版本ID,可选.不指定时为Object的最新版本.
         :param kwargs(dict): 设置请求headers.
         :return: None.
 
@@ -2777,11 +2779,10 @@ def put_object_tagging(self, Bucket, Key, Tagging={}, VersionId=None, **kwargs):
         lst = ['<Tag>', '</Tag>']  # 类型为list的标签
         xml_config = format_xml(data=Tagging, root='Tagging', lst=lst)
         headers = mapped(kwargs)
-        headers['Content-MD5'] = get_md5(xml_config)
-        headers['Content-Type'] = 'application/xml'
         params = {'tagging': ''}
-        if VersionId:
-            params['VersionId'] = VersionId
+        if 'versionId' in headers:
+            params['versionId'] = headers['versionId']
+            del headers['versionId']
         url = self._conf.uri(bucket=Bucket, path=Key)
         logger.info("put object tagging, url=:{url} ,headers=:{headers}".format(
             url=url,
@@ -2796,12 +2797,11 @@ def put_object_tagging(self, Bucket, Key, Tagging={}, VersionId=None, **kwargs):
             params=params)
         return None
 
-    def get_object_tagging(self, Bucket, Key, VersionId=None, **kwargs):
+    def get_object_tagging(self, Bucket, Key, **kwargs):
         """获取object标签
 
         :param Bucket(string): 存储桶名称.
         :param Key(string): COS路径.
-        :param VersionId(string): 对象版本ID,可选.不指定时为Object的最新版本.
         :param kwargs(dict): 设置请求headers.
         :return(dict): Bucket对应的标签.
 
@@ -2817,8 +2817,9 @@ def get_object_tagging(self, Bucket, Key, VersionId=None, **kwargs):
         """
         headers = mapped(kwargs)
         params = {'tagging': ''}
-        if VersionId:
-            params['VersionId'] = VersionId
+        if 'versionId' in headers:
+            params['versionId'] = headers['versionId']
+            del headers['versionId']
         url = self._conf.uri(bucket=Bucket, path=Key)
         logger.info("get object tagging, url=:{url} ,headers=:{headers}".format(
             url=url,
@@ -2835,12 +2836,11 @@ def get_object_tagging(self, Bucket, Key, VersionId=None, **kwargs):
             format_dict(data['TagSet'], ['Tag'])
         return data
 
-    def delete_object_tagging(self, Bucket, Key, VersionId=None, **kwargs):
+    def delete_object_tagging(self, Bucket, Key, **kwargs):
         """删除object标签
 
         :param Bucket(string): 存储桶名称.
         :param Key(string): COS路径.
-        :param VersionId(string): 对象版本ID,可选.不指定时为Object的最新版本.
         :param kwargs(dict): 设置请求headers.
         :return(dict): None.
 
@@ -2856,8 +2856,9 @@ def delete_object_tagging(self, Bucket, Key, VersionId=None, **kwargs):
         """
         headers = mapped(kwargs)
         params = {'tagging': ''}
-        if VersionId:
-            params['VersionId'] = VersionId
+        if 'versionId' in headers:
+            params['versionId'] = headers['versionId']
+            del headers['versionId']
         url = self._conf.uri(bucket=Bucket, path=Key)
         logger.info("delete object tagging, url=:{url} ,headers=:{headers}".format(
             url=url,

qcloud_cos/version.py

@@ -1 +1 @@
-__version__ = '5.1.9.14'
+__version__ = '5.1.9.15'

setup.py

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

ut/test.py

@@ -1114,7 +1114,7 @@ def test_put_get_delete_bucket_tagging():
     )
 
 
-def test_put_get_delete_bucket_tagging():
+def test_put_get_delete_object_tagging():
     """测试设置获取删除object标签"""
     tagging_config = {
         'TagSet': {