update 3.25.3

Author: zhangtingwei998

README.md

@@ -1,3 +1,10 @@
+Version 3.25.3
+   
+New Features:
+
+1. Added APIs related to CustomDomain, including ObsClient.getBucketCustomDomain,ObsClient.setBucketCustomDomain,ObsClient.deleteBucketCustomDomain.
+
+------------------------------------------------------------------------------------------------- 
 Version 3.24.12
 
 New Features:

README_CN.md

@@ -1,4 +1,11 @@
-Version 3.24.12
+Version 3.25.3
+
+新特性：
+
+1. 支持自定义域名相关接口(ObsClient.getBucketCustomDomain/ObsClient.setBucketCustomDomain/ObsClient.deleteBucketCustomDomain)
+
+-------------------------------------------------------------------------------------------------
+Version 3.24.12
 
 新特性：
 

src/log.conf

@@ -0,0 +1,22 @@
+[LOGCONF]
+
+#Configure log file dir
+LogFileDir 			= ./logs
+
+#Configure log file name
+LogFileName 		= eSDK-OBS-PYTHON.log
+
+#Configure log file size, unit:MB
+LogFileSize     	= 30
+
+#Configure max log file numbers
+LogFileNumber   	= 5
+
+#Configure log level for log file (DEBUG | INFO | WARNING | ERROR)
+LogFileLevel    	= INFO
+
+#Configure whether to print log to console (Yes:1 No:0)
+PrintLogToConsole   = 0
+
+#Configure log level for console (DEBUG | INFO | WARNING | ERROR)
+PrintLogLevel		= WARNING

src/obs/__init__.py

@@ -22,7 +22,7 @@
 from obs.model import TopicConfiguration, FunctionGraphConfiguration, FilterRule, Replication, ReplicationRule
 from obs.model import Options, PutObjectHeader, AppendObjectHeader, AppendObjectContent, RedirectAllRequestTo
 from obs.model import Redirect, RoutingRule, Tag, TagInfo, Transition, NoncurrentVersionTransition, Rule, Versions, AbortIncompleteMultipartUpload
-from obs.model import Object, WebsiteConfiguration, Logging, CompleteMultipartUploadRequest, DeleteObjectsRequest
+from obs.model import Object, WebsiteConfiguration, Logging, CompleteMultipartUploadRequest, DeleteObjectsRequest,CustomDomainConfiguration
 from obs.model import ListMultipartUploadsRequest, GetObjectRequest, UploadFileHeader, Payer
 from obs.model import ExtensionHeader, FetchStatus, BucketAliasModel, ListBucketAliasModel
 from obs.workflow import WorkflowClient
@@ -96,5 +96,6 @@
     'CTRCipherGenerator',
     'CtrRSACipherGenerator',
     'BucketAliasModel',
-    'ListBucketAliasModel'
+    'ListBucketAliasModel',
+    'CustomDomainConfiguration'
 ]

src/obs/bucket.py

@@ -82,7 +82,10 @@ class BucketClient(object):
         'getBucketFetchPolicy',
         'deleteBucketFetchPolicy',
         'setBucketFetchJob',
-        'getBucketFetchJob'
+        'getBucketFetchJob',
+        'setBucketCustomDomain',
+        'deleteBucketCustomDomain',
+        'getBucketCustomDomain',
     ]
 
     def __init__(self, obsClient, bucketName):

src/obs/client.py

@@ -91,12 +91,17 @@
 DEFAULT_MINIMUM_SIZE = 100 * 1024
 DEFAULT_MAXIMUM_SIZE = 5 * 1024 * 1024 * 1024
 
+MAX_CERT_XML_BODY_SIZE = 40*1024 #40 KB
+MIN_CERTIFICATE_NAME_LEN = 3
+MAX_CERTIFICATE_NAME_LEN = 63
+CERTIFICATE_ID_LEN = 16
 DEFAULT_BYTE_INTTERVAL = 102400
 DEFAULT_TASK_INTTERVAL = 100
 DEFAULT_TASK_NUM = 8
 DEFAULT_TASK_QUEUE_SIZE = 20000
+CONNECTION_POOL_SIZE = 10
 
-OBS_SDK_VERSION = '3.24.6.1'
+OBS_SDK_VERSION = '3.25.3'
 
 V2_META_HEADER_PREFIX = 'x-amz-meta-'
 V2_HEADER_PREFIX = 'x-amz-'

src/obs/const.py

@@ -29,7 +29,7 @@
     InitiateMultipartUploadResponse, CopyObjectResponse, GetObjectMetadataResponse, SetObjectMetadataResponse, \
     UploadPartResponse, CopyPartResponse, Replication, GetBucketRequestPaymentResponse, GetBPAModel, GetBPSModel
 from obs.model import FetchPolicy, SetBucketFetchJobResponse, GetBucketFetchJobResponse, FetchJobResponse, \
-    ListWorkflowTemplateResponse
+    ListWorkflowTemplateResponse,BucketCustomDomain,ListBucketCustomDomainsResponse
 from obs.model import GetWorkflowResponse, UpdateWorkflowResponse, ListWorkflowResponse, \
     AsyncAPIStartWorkflowResponse, ListWorkflowExecutionResponse, GetWorkflowExecutionResponse, \
     RestoreFailedWorkflowExecutionResponse, GetTriggerPolicyResponse, CreateWorkflowTemplateResponse, \
@@ -630,6 +630,26 @@ def trans_website(self, website):
             root = self._trans_website_routingRules(root, website)
         return ET.tostring(root, 'UTF-8')
 
+    def trans_custom_domain_cert(self, certificate, domainName):
+        pathArgs = {"customdomain": domainName}
+        if certificate:
+            root = ET.Element("CustomDomainConfiguration")
+            ET.SubElement(root, "Name").text = util.to_string(certificate.get("name"))
+            if certificate.get("certificateId", None):
+                ET.SubElement(root, "CertificateId").text = util.to_string(certificate.get("certificateId", None))
+            ET.SubElement(root, "Certificate").text = util.to_string(certificate.get("certificate"))
+            if certificate.get("certificateChain", None):
+                ET.SubElement(root, "CertificateChain").text = util.to_string(certificate.get("certificateChain", None))
+            ET.SubElement(root, "PrivateKey").text = util.to_string(certificate.get("privateKey"))
+            entity = ET.tostring(root, "UTF-8")
+            if len(entity) > const.MAX_CERT_XML_BODY_SIZE:
+                error_message = "XML body size exceeds {} KB limit".format(const.MAX_CERT_XML_BODY_SIZE / 1024)
+                return {"error": error_message, "pathArgs": pathArgs, "entity": entity, "size": len(entity)}
+
+            headers = {const.CONTENT_MD5_HEADER: util.base64_encode(util.md5_encode(entity))}
+            return {"pathArgs": pathArgs, "headers": headers, "entity": entity}
+        return {"pathArgs": pathArgs}
+
     @staticmethod
     def _trans_website_routingRules(root, website):
         if isinstance(website.get('routingRules'), list) and bool(website['routingRules']):
@@ -1305,6 +1325,21 @@ def parseGetBucketMetadata(self, headers):
         option.epid = headers.get(self.ha.epid_header())
         option.redundancy = headers.get(self.ha.bucket_redundancy_header())
         return option
+    
+    def parseGetBucketCustomDomain(self, xml, headers=None):
+        root = ET.fromstring(xml)
+        domains = root.findall("Domains")
+        entries = []
+
+        for domain in domains:
+            domain_name = self._find_item(domain, "DomainName")
+            d = self._find_item(domain, "CreateTime")
+            certificate_id = self._find_item(domain, "CertificateId")
+            create_time = DateTime.UTCToLocal(d)
+            curr_bucket = BucketCustomDomain(domain_name=domain_name,create_time=create_time,certificate_id=certificate_id)
+            entries.append(curr_bucket)
+
+        return ListBucketCustomDomainsResponse(domains=entries)
 
     def parseGetBucketLocation(self, xml, headers=None):
         root = ET.fromstring(xml)

src/obs/convertor.py

@@ -15,216 +15,6 @@
 __all__ = '''mkCrcFun Crc
 '''.split()
 
-from obs.const import IS_PYTHON2
-import struct
-
-
-class Crc:
-    def __init__(self, poly, initCrc=~0, rev=True, xorOut=0, initialize=True):
-        if not initialize:
-            return
-
-        (sizeBits, initCrc, xorOut) = _verifyParams(poly, initCrc, xorOut)
-        self.digest_size = sizeBits // 8
-        self.poly = poly
-        self.initCrc = initCrc
-        self.reverse = rev
-        self.xorOut = xorOut
-
-        (crcfun, table) = _mkCrcFun(poly, sizeBits, initCrc, rev, xorOut)
-        self.table = table
-        self._crc = crcfun
-
-        self.crcValue = self.initCrc
-
-    def __str__(self):
-        lst = []
-        lst.append('reverse = %s' % self.reverse)
-        lst.append('poly = 0x%X' % self.poly)
-        fmt = '0x%%0%dX' % (self.digest_size * 2)
-        lst.append('crcValue = %s' % (fmt % self.crcValue))
-        lst.append('xorOut   = %s' % (fmt % self.xorOut))
-        lst.append('initCrc  = %s' % (fmt % self.initCrc))
-        return '\n'.join(lst)
-
-    def new(self, arg=None):
-        n = Crc(poly=None, initialize=False)
-        n._crc = self._crc
-        n.table = self.table
-        n.digest_size = self.digest_size
-        n.reverse = self.reverse
-        n.initCrc = self.initCrc
-        n.crcValue = self.initCrc
-        n.xorOut = self.xorOut
-        n.poly = self.poly
-        if arg is not None:
-            n.update(arg)
-        return n
-
-    def copy(self):
-        c = self.new()
-        c.crcValue = self.crcValue
-        return c
-
-    def update(self, data):
-        self.crcValue = self._crc(data, self.crcValue)
-
-    def digest(self):
-        n = self.digest_size
-        crc = self.crcValue
-        lst = []
-        while n > 0:
-            lst.append(crc & 0xFF)
-            crc = crc >> 8
-            n -= 1
-        lst.reverse()
-        return bytes(lst)
-
-    def hexdigest(self):
-        crc = self.crcValue
-        n = self.digest_size
-        lst = []
-        while n > 0:
-            lst.append('%02X' % (crc & 0xFF))
-            crc = crc >> 8
-            n -= 1
-        lst.reverse()
-        return ''.join(lst)
-
-
-def mkCrcFun(poly, initCrc=~0, rev=True, xorOut=0):
-    (sizeBits, initCrc, xorOut) = _verifyParams(poly, initCrc, xorOut)
-    return _mkCrcFun(poly, sizeBits, initCrc, rev, xorOut)[0]
-
-
-def _verifyPoly(poly):
-    msg = 'The degree of the polynomial must be 64'
-    n = 64
-    low = 1 << n
-    high = low * 2
-    if low <= poly < high:
-        return n
-    raise ValueError(msg)
-
-
-def _bitrev(x, n):
-    y = 0
-    for i in range(n):
-        y = (y << 1) | (x & 1)
-        x = x >> 1
-    return y
-
-
-def _bytecrc(crc, poly, n):
-    mask = 1 << (n - 1)
-    for i in range(8):
-        if crc & mask:
-            crc = (crc << 1) ^ poly
-        else:
-            crc = crc << 1
-    mask = (1 << n) - 1
-    crc = crc & mask
-    return crc
-
-
-def _bytecrc_r(crc, poly, n):
-    for i in range(8):
-        if crc & 1:
-            crc = (crc >> 1) ^ poly
-        else:
-            crc = crc >> 1
-    mask = (1 << n) - 1
-    crc = crc & mask
-    return crc
-
-
-def _mkTable(poly, n):
-    mask = (1 << n) - 1
-    poly = poly & mask
-    table = [_bytecrc(i << (n - 8), poly, n) for i in range(256)]
-    return table
-
-
-def _mkTable_r(poly, n):
-    mask = (1 << n) - 1
-    poly = _bitrev(poly & mask, n)
-    table = [_bytecrc_r(i, poly, n) for i in range(256)]
-    return table
-
-
-_sizeToTypeCode = {}
-
-for typeCode in 'B H I L Q'.split():
-    size = {1: 8, 2: 16, 4: 32, 8: 64}.get(struct.calcsize(typeCode), None)
-    if size is not None and size not in _sizeToTypeCode:
-        _sizeToTypeCode[size] = '256%s' % typeCode
-
-_sizeToTypeCode[24] = _sizeToTypeCode[32]
-
-del typeCode, size
-
-
-def _verifyParams(poly, initCrc, xorOut):
-    sizeBits = _verifyPoly(poly)
-    mask = (1 << sizeBits) - 1
-    initCrc = initCrc & mask
-    xorOut = xorOut & mask
-    return (sizeBits, initCrc, xorOut)
-
-
-def _mkCrcFun(poly, sizeBits, initCrc, rev, xorOut):
-    if rev:
-        tableList = _mkTable_r(poly, sizeBits)
-        _fun = _crc64r
-    else:
-        tableList = _mkTable(poly, sizeBits)
-        _fun = _crc64
-
-    _table = tableList
-
-    if xorOut == 0:
-        def crcfun(data, crc=initCrc, table=_table, fun=_fun):
-            return fun(data, crc, table)
-    else:
-        def crcfun(data, crc=initCrc, table=_table, fun=_fun):
-            return xorOut ^ fun(data, xorOut ^ crc, table)
-
-    return crcfun, tableList
-
-
-def _get_buffer_view(in_obj):
-    if isinstance(in_obj, str):
-        raise TypeError('Unicode-objects must be encoded before calculating a CRC')
-    mv = memoryview(in_obj)
-    if mv.ndim > 1:
-        raise BufferError('Buffer must be single dimension')
-    return mv
-
-
-def _crc64(data, crc, table):
-    crc = crc & 0xFFFFFFFFFFFFFFFF
-    if IS_PYTHON2:
-        for x in data:
-            crc = table[ord(x) ^ (int(crc >> 56) & 0xFF)] ^ ((crc << 8) & 0xFFFFFFFFFFFFFF00)
-    else:
-        mv = _get_buffer_view(data)
-        for x in mv.tobytes():
-            crc = table[x ^ ((crc >> 56) & 0xFF)] ^ ((crc << 8) & 0xFFFFFFFFFFFFFF00)
-    return crc
-
-
-def _crc64r(data, crc, table):
-    crc = crc & 0xFFFFFFFFFFFFFFFF
-    if IS_PYTHON2:
-        for x in data:
-            crc = table[ord(x) ^ int(crc & 0xFF)] ^ (crc >> 8)
-    else:
-        mv = _get_buffer_view(data)
-        for x in mv.tobytes():
-            crc = table[x ^ (crc & 0xFF)] ^ (crc >> 8)
-    return crc
-
-
 import sys
 
 is_py3 = (sys.version_info[0] == 3)

src/obs/crc64mod.py

@@ -145,7 +145,7 @@ def downloadFile(self, bucketName, objectKey, downloadFile=None, partSize=5 * 10
 
     def _parse_content(self, objectKey, conn, readable, result_wrapper=None, download_start=None,
                        downloadPath=None, chuckSize=const.READ_ONCE_LENGTH, loadStreamInMemory=False,
-                       progressCallback=None, notifier=None):
+                       progressCallback=None, isAttachCrc64=False, notifier=None):
         if readable.status >= 300:
             return super(CryptoObsClient, self)._parse_content(objectKey, conn, readable,
                                                                download_start=download_start, downloadPath=downloadPath,