esdk-obs-python 3.25.3__tar.gz → 3.25.8__tar.gz

{esdk-obs-python-3.25.3 → esdk-obs-python-3.25.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: esdk-obs-python
-Version: 3.25.3
+Version: 3.25.8
 Summary: OBS Python SDK
 Home-page: UNKNOWN
 License: Apache-2.0

{esdk-obs-python-3.25.3 → esdk-obs-python-3.25.8}/esdk_obs_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: esdk-obs-python
-Version: 3.25.3
+Version: 3.25.8
 Summary: OBS Python SDK
 Home-page: UNKNOWN
 License: Apache-2.0

{esdk-obs-python-3.25.3 → esdk-obs-python-3.25.8}/obs/__init__.py

@@ -23,7 +23,7 @@ from obs.model import TopicConfiguration, FunctionGraphConfiguration, FilterRule
 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,CustomDomainConfiguration
-from obs.model import ListMultipartUploadsRequest, GetObjectRequest, UploadFileHeader, Payer
+from obs.model import ListMultipartUploadsRequest, GetObjectRequest, UploadFileHeader, Payer, ClientVerify
 from obs.model import ExtensionHeader, FetchStatus, BucketAliasModel, ListBucketAliasModel
 from obs.workflow import WorkflowClient
 from obs.crypto_client import CryptoObsClient
@@ -97,5 +97,6 @@ __all__ = [
     'CtrRSACipherGenerator',
     'BucketAliasModel',
     'ListBucketAliasModel',
-    'CustomDomainConfiguration'
+    'CustomDomainConfiguration',
+    'ClientVerify'
 ]

{esdk-obs-python-3.25.3 → esdk-obs-python-3.25.8}/obs/bucket.py

@@ -1,113 +1,113 @@
-#!/usr/bin/python
-# -*- coding:utf-8 -*-
-# Copyright 2019 Huawei Technologies Co.,Ltd.
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-# this file except in compliance with the License.  You may obtain a copy of the
-# License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations under the License.
-
-
-class BucketClient(object):
-    allowedMethod = [
-        'createBucket',
-        'deleteBucket',
-        'headBucket',
-        'getBucketMetadata',
-        'setBucketQuota',
-        'getBucketQuota',
-        'getBucketStorageInfo',
-        'setBucketAcl',
-        'getBucketAcl',
-        'setBucketPolicy',
-        'getBucketPolicy',
-        'deleteBucketPolicy',
-        'setBucketVersioning',
-        'getBucketVersioning',
-        'listVersions',
-        'listObjects',
-        'listMultipartUploads',
-        'deleteBucketLifecycle',
-        'setBucketLifecycle',
-        'getBucketLifecycle',
-        'deleteBucketWebsite',
-        'setBucketWebsite',
-        'getBucketWebsite',
-        'setBucketLogging',
-        'getBucketLogging',
-        'getBucketLocation',
-        'getBucketTagging',
-        'setBucketTagging',
-        'deleteBucketTagging',
-        'setBucketCors',
-        'deleteBucketCors',
-        'getBucketCors',
-        'setBucketNotification',
-        'getBucketNotification',
-        'getObjectMetadata',
-        'setObjectMetadata',
-        'getObject',
-        'putContent',
-        'putObject',
-        'appendObject',
-        'putFile',
-        'uploadPart',
-        'copyObject',
-        'setObjectAcl',
-        'getObjectAcl',
-        'deleteObject',
-        'deleteObjects',
-        'restoreObject',
-        'initiateMultipartUpload',
-        'copyPart',
-        'completeMultipartUpload',
-        'abortMultipartUpload',
-        'listParts',
-        'getBucketStoragePolicy',
-        'setBucketStoragePolicy',
-        'optionsBucket',
-        'optionsObject',
-        'setBucketEncryption',
-        'getBucketEncryption',
-        'deleteBucketEncryption',
-        'headObject',
-        'setBucketRequestPayment',
-        'getBucketRequestPayment',
-        'setBucketFetchPolicy',
-        'getBucketFetchPolicy',
-        'deleteBucketFetchPolicy',
-        'setBucketFetchJob',
-        'getBucketFetchJob',
-        'setBucketCustomDomain',
-        'deleteBucketCustomDomain',
-        'getBucketCustomDomain',
-    ]
-
-    def __init__(self, obsClient, bucketName):
-        self.__obsClient = obsClient
-        self.__bucketName = bucketName
-
-    def __getattr__(self, key):
-        if key in self.allowedMethod and hasattr(self.__obsClient, key):
-            original_method = getattr(self.__obsClient, key)
-            if callable(original_method):
-                def delegate(*args, **kwargs):
-                    _args = list(args)
-                    if key == 'copyObject':
-                        if 'destBucketName' not in kwargs:
-                            if len(_args) >= 2:
-                                _args.insert(2, self.__bucketName)
-                            else:
-                                kwargs['destBucketName'] = self.__bucketName
-                    else:
-                        if 'bucketName' not in kwargs:
-                            _args.insert(0, self.__bucketName)
-                    return original_method(*_args, **kwargs)
-
-                return delegate
-        return super(BucketClient, self).__getattribute__(key)
+#!/usr/bin/python
+# -*- coding:utf-8 -*-
+# Copyright 2019 Huawei Technologies Co.,Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+# this file except in compliance with the License.  You may obtain a copy of the
+# License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations under the License.
+
+
+class BucketClient(object):
+    allowedMethod = [
+        'createBucket',
+        'deleteBucket',
+        'headBucket',
+        'getBucketMetadata',
+        'setBucketQuota',
+        'getBucketQuota',
+        'getBucketStorageInfo',
+        'setBucketAcl',
+        'getBucketAcl',
+        'setBucketPolicy',
+        'getBucketPolicy',
+        'deleteBucketPolicy',
+        'setBucketVersioning',
+        'getBucketVersioning',
+        'listVersions',
+        'listObjects',
+        'listMultipartUploads',
+        'deleteBucketLifecycle',
+        'setBucketLifecycle',
+        'getBucketLifecycle',
+        'deleteBucketWebsite',
+        'setBucketWebsite',
+        'getBucketWebsite',
+        'setBucketLogging',
+        'getBucketLogging',
+        'getBucketLocation',
+        'getBucketTagging',
+        'setBucketTagging',
+        'deleteBucketTagging',
+        'setBucketCors',
+        'deleteBucketCors',
+        'getBucketCors',
+        'setBucketNotification',
+        'getBucketNotification',
+        'getObjectMetadata',
+        'setObjectMetadata',
+        'getObject',
+        'putContent',
+        'putObject',
+        'appendObject',
+        'putFile',
+        'uploadPart',
+        'copyObject',
+        'setObjectAcl',
+        'getObjectAcl',
+        'deleteObject',
+        'deleteObjects',
+        'restoreObject',
+        'initiateMultipartUpload',
+        'copyPart',
+        'completeMultipartUpload',
+        'abortMultipartUpload',
+        'listParts',
+        'getBucketStoragePolicy',
+        'setBucketStoragePolicy',
+        'optionsBucket',
+        'optionsObject',
+        'setBucketEncryption',
+        'getBucketEncryption',
+        'deleteBucketEncryption',
+        'headObject',
+        'setBucketRequestPayment',
+        'getBucketRequestPayment',
+        'setBucketFetchPolicy',
+        'getBucketFetchPolicy',
+        'deleteBucketFetchPolicy',
+        'setBucketFetchJob',
+        'getBucketFetchJob',
+        'setBucketCustomDomain',
+        'deleteBucketCustomDomain',
+        'getBucketCustomDomain',
+    ]
+
+    def __init__(self, obsClient, bucketName):
+        self.__obsClient = obsClient
+        self.__bucketName = bucketName
+
+    def __getattr__(self, key):
+        if key in self.allowedMethod and hasattr(self.__obsClient, key):
+            original_method = getattr(self.__obsClient, key)
+            if callable(original_method):
+                def delegate(*args, **kwargs):
+                    _args = list(args)
+                    if key == 'copyObject':
+                        if 'destBucketName' not in kwargs:
+                            if len(_args) >= 2:
+                                _args.insert(2, self.__bucketName)
+                            else:
+                                kwargs['destBucketName'] = self.__bucketName
+                    else:
+                        if 'bucketName' not in kwargs:
+                            _args.insert(0, self.__bucketName)
+                    return original_method(*_args, **kwargs)
+
+                return delegate
+        return super(BucketClient, self).__getattribute__(key)

{esdk-obs-python-3.25.3 → esdk-obs-python-3.25.8}/obs/client.py

@@ -199,9 +199,9 @@ class ConvertWrapper(object):
 
 class _BasicClient(object):
     def __init__(self, access_key_id='', secret_access_key='', is_secure=True, server=None,
-                 signature='obs', region='region', path_style=False, ssl_verify=False,
+                 signature='obs', region='region', path_style=False, ssl_verify=False, is_use_gmssl=False,
                  port=None, max_retry_count=3, timeout=60, chunk_size=const.READ_ONCE_LENGTH,
-                 long_conn_mode=False, proxy_host=None, proxy_port=None,
+                 long_conn_mode=False, proxy_host=None, proxy_port=None, client_verify=None,
                  proxy_username=None, proxy_password=None, security_token=None,
                  custom_ciphers=None, use_http2=False, is_signature_negotiation=True, is_cname=False,
                  max_redirect_count=10, security_providers=None, security_provider_policy=None, client_mode='obs',
@@ -239,7 +239,8 @@ class _BasicClient(object):
         self.is_signature_negotiation = is_signature_negotiation
         self.is_cname = is_cname
         self.max_redirect_count = max_redirect_count
-
+        self.is_use_gmssl = is_use_gmssl
+        self.client_verify = client_verify
         if client_mode == 'obs':
             if self.path_style or self.is_cname:
                 self.is_signature_negotiation = False
@@ -364,30 +365,45 @@ class _BasicClient(object):
         self.connHolder = {'connSet': Queue(), 'lock': threading.Lock()}
 
     def _init_ssl_context(self, custom_ciphers):
-        try:
-            import ssl
-            if hasattr(ssl, 'SSLContext'):
+        import ssl
+        if hasattr(ssl, 'SSLContext'):
+            if self.is_use_gmssl:
+                if not hasattr(ssl, 'PROTOCOL_GMTLS'):
+                    raise Exception('ssl not support PROTOCOL_GMTLS.')
+                context = ssl.SSLContext(ssl.PROTOCOL_GMTLS)
+                context.set_ciphers('ECC-SM4-SM3:ECDHE-SM4-SM3')
+            else:
                 context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-                context.options |= ssl.OP_NO_SSLv2
-                context.options |= ssl.OP_NO_SSLv3
-                if custom_ciphers is not None:
-                    custom_ciphers = util.to_string(custom_ciphers).strip()
-                    if custom_ciphers != '' and hasattr(context, 'set_ciphers') and callable(context.set_ciphers):
-                        context.set_ciphers(custom_ciphers)
-                if self.ssl_verify:
-                    import _ssl
-                    cafile = util.to_string(self.ssl_verify)
-                    context.options |= getattr(_ssl, "OP_NO_COMPRESSION", 0)
-                    context.verify_mode = ssl.CERT_REQUIRED
-                    if os.path.isfile(cafile):
-                        context.load_verify_locations(cafile)
-                else:
-                    context.verify_mode = ssl.CERT_NONE
-                if hasattr(context, 'check_hostname'):
-                    context.check_hostname = False
-                self.context = context
-        except Exception:
-            print(traceback.format_exc())
+            context.options |= ssl.OP_NO_SSLv2
+            context.options |= ssl.OP_NO_SSLv3
+            if custom_ciphers is not None:
+                custom_ciphers = util.to_string(custom_ciphers).strip()
+                if custom_ciphers != '' and hasattr(context, 'set_ciphers') and callable(context.set_ciphers):
+                    context.set_ciphers(custom_ciphers)
+            if self.ssl_verify:
+                import _ssl
+                cafile = util.to_string(self.ssl_verify)
+                context.options |= getattr(_ssl, "OP_NO_COMPRESSION", 0)
+                context.verify_mode = ssl.CERT_REQUIRED
+                if os.path.isfile(cafile):
+                    context.load_verify_locations(cafile)
+            else:
+                context.verify_mode = ssl.CERT_NONE
+            is_client_sign_verify = self.client_verify and self.client_verify.clientCert and \
+                                    self.client_verify.clientKey
+            is_client_enc_verify = self.client_verify and self.client_verify.clientEncCert and \
+                                   self.client_verify.clientEncKey
+            if is_client_sign_verify:
+                context.load_cert_chain(certfile=util.to_string(self.client_verify.clientCert),
+                                        keyfile=util.to_string(self.client_verify.clientKey),
+                                        password=util.to_string(self.client_verify.clientKeyPassword))
+                if is_client_enc_verify:
+                    context.load_cert_chain(certfile=util.to_string(self.client_verify.clientEncCert),
+                                            keyfile=util.to_string(self.client_verify.clientEncKey),
+                                            password=util.to_string(self.client_verify.clientEncKeyPassword))
+            if hasattr(context, 'check_hostname'):
+                context.check_hostname = False
+            self.context = context
 
     def close(self):
         if self.connHolder is not None:
@@ -502,7 +518,7 @@ class _BasicClient(object):
                 if flag >= self.max_retry_count or readable:
                     return self._make_error_result(e, ret)
                 flag += 1
-                time.sleep(math.pow(2, flag) * 0.05)
+                time.sleep(math.pow(2, flag) * 0.1)
                 self.log_client.log(WARNING, 'request again, time:%d' % int(flag))
                 continue
 
@@ -824,7 +840,9 @@ class _BasicClient(object):
                     result_wrapper = ResponseWrapper(conn, response, self.connHolder, content_length, notifier, obs_crc64=obs_crc64)
                     self.log_client.log(DEBUG, 'CRC64 from the server is {0}'.format(obs_crc64))
                 else:
-                    raise Exception('No CRC64 is obtained from the server.')
+                    result_wrapper = ResponseWrapper(conn, response, self.connHolder, content_length, notifier)
+                    self.log_client.log(WARNING, 'object {0} not get CRC64 from the server.'.format(objectKey))
+
             else:
                 result_wrapper = ResponseWrapper(conn, response, self.connHolder, content_length, notifier)
             if loadStreamInMemory:
@@ -1248,9 +1266,7 @@ class ObsClient(_BasicClient):
         if matchAnyKey:
             policy.append('["starts-with", "$key", ""],')
 
-        policy.append(']}')
-
-        originPolicy = ''.join(policy)
+        originPolicy = ''.join(policy).rstrip(',') + ']}'
 
         policy = util.base64_encode(originPolicy)
 

{esdk-obs-python-3.25.3 → esdk-obs-python-3.25.8}/obs/const.py

@@ -101,7 +101,7 @@ DEFAULT_TASK_NUM = 8
 DEFAULT_TASK_QUEUE_SIZE = 20000
 CONNECTION_POOL_SIZE = 10
 
-OBS_SDK_VERSION = '3.25.3'
+OBS_SDK_VERSION = '3.25.8'
 
 V2_META_HEADER_PREFIX = 'x-amz-meta-'
 V2_HEADER_PREFIX = 'x-amz-'

{esdk-obs-python-3.25.3 → esdk-obs-python-3.25.8}/obs/convertor.py

@@ -641,6 +641,14 @@ class Convertor(object):
             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"))
+            if certificate.get("certificateType", None):
+                ET.SubElement(root, "CertificateType").text = util.to_string(certificate.get("certificateType", None))
+            if certificate.get("encCertificate", None):
+                ET.SubElement(root, "ENCCertificate").text = util.to_string(certificate.get("encCertificate", None))
+            if certificate.get("encPrivateKey", None):
+                ET.SubElement(root, "ENCPrivateKey").text = util.to_string(certificate.get("encPrivateKey", None))
+            if util.to_string(certificate.get("deleteCertificate", None)):
+                ET.SubElement(root, "DeleteCertificate").text = util.to_string(certificate.get("deleteCertificate", None))
             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)
@@ -1336,7 +1344,12 @@ class Convertor(object):
             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)
+            name = self._find_item(domain, "Name")
+            certificate_type = self._find_item(domain, "CertificateType")
+            e = self._find_item(domain, "ExpiredTime")
+            expired_time = DateTime.UTCToLocal(e)
+            curr_bucket = BucketCustomDomain(domainName=domain_name, createTime=create_time, certificateId=certificate_id,
+                                             name=name, certificateType=certificate_type, expiredTime=expired_time)
             entries.append(curr_bucket)
 
         return ListBucketCustomDomainsResponse(domains=entries)