Merge pull request tencentyun#53 from dt3310321/s3

S3

Author: dt3310321

qcloud_cos/cos_client.py

@@ -149,7 +149,7 @@ def send_request(self, method, url, timeout=30, **kwargs):
             timeout = self._conf._timeout
         if self._conf._token is not None:
             kwargs['headers']['x-cos-security-token'] = self._conf._token
-        kwargs['headers']['User-Agent'] = 'cos-python-sdk-v5.1.5.1'
+        kwargs['headers']['User-Agent'] = 'cos-python-sdk-v5.1.5.2'
         kwargs['headers'] = format_values(kwargs['headers'])
         if 'data' in kwargs:
             kwargs['data'] = to_bytes(kwargs['data'])

qcloud_cos/cos_comm.py

@@ -6,6 +6,7 @@
 import base64
 import os
 import io
+import re
 import sys
 import xml.dom.minidom
 import xml.etree.ElementTree
@@ -193,10 +194,12 @@ def format_values(data):
 def format_region(region):
     """格式化地域"""
     if not isinstance(region, string_types):
-        raise CosClientError("bucket is not string type")
+        raise CosClientError("region is not string type")
     if not region:
         raise CosClientError("region is required not empty!")
     region = to_unicode(region)
+    if not re.match('^[A-Za-z0-9][A-Za-z0-9.\-]*[A-Za-z0-9]$', region):
+        raise CosClientError("region format is illegal, only digit, letter and - is allowed!")
     if region.find(u'cos.') != -1:
         return region  # 传入cos.ap-beijing-1这样显示加上cos.的region
     if region == u'cn-north' or region == u'cn-south' or region == u'cn-east' or region == u'cn-south-2' or region == u'cn-southwest' or region == u'sg':
@@ -230,6 +233,8 @@ def format_bucket(bucket, appid):
         raise CosClientError("bucket is not string")
     if not bucket:
         raise CosClientError("bucket is required not empty")
+    if not (re.match('^[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9]$', bucket) or re.match('^[A-Za-z0-9]$', bucket)):
+        raise CosClientError("bucket format is illegal, only digit, letter and - is allowed!")
     # appid为空直接返回bucket
     if not appid:
         return to_unicode(bucket)