tencentcloud-sdk-python-common 3.0.1445__tar.gz → 3.0.1447__tar.gz

{tencentcloud-sdk-python-common-3.0.1445 → tencentcloud-sdk-python-common-3.0.1447}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: tencentcloud-sdk-python-common
-Version: 3.0.1445
+Version: 3.0.1447
 Summary: Tencent Cloud Common SDK for Python
 Home-page: https://github.com/TencentCloud/tencentcloud-sdk-python
 Author: Tencent Cloud

{tencentcloud-sdk-python-common-3.0.1445 → tencentcloud-sdk-python-common-3.0.1447}/tencentcloud/__init__.py

@@ -14,4 +14,4 @@
 # limitations under the License.
 
 
-__version__ = '3.0.1445'
+__version__ = '3.0.1447'

{tencentcloud-sdk-python-common-3.0.1445 → tencentcloud-sdk-python-common-3.0.1447}/tencentcloud/common/abstract_client.py

@@ -147,14 +147,16 @@ class AbstractClient(object):
         params['Timestamp'] = int(time.time())
         params['Version'] = self._apiVersion
 
+        cred_secret_id, cred_secret_key, cred_token = self.credential.get_credential_info()
+
         if self.region:
             params['Region'] = self.region
 
-        if self.credential.token:
-            params['Token'] = self.credential.token
+        if cred_token:
+            params['Token'] = cred_token
 
-        if self.credential.secret_id:
-            params['SecretId'] = self.credential.secret_id
+        if cred_secret_id:
+            params['SecretId'] = cred_secret_id
 
         if self.profile.signMethod:
             params['SignatureMethod'] = self.profile.signMethod
@@ -163,7 +165,7 @@ class AbstractClient(object):
             params['Language'] = self.profile.language
 
         signInParam = self._format_sign_string(params, options)
-        params['Signature'] = Sign.sign(str(self.credential.secret_key),
+        params['Signature'] = Sign.sign(str(cred_secret_key),
                                         str(signInParam),
                                         str(self.profile.signMethod))
 
@@ -189,6 +191,7 @@ class AbstractClient(object):
 
         endpoint = self._get_endpoint(options=options)
         timestamp = int(time.time())
+        cred_secret_id, cred_secret_key, cred_token = self.credential.get_credential_info()
         req.header["Host"] = endpoint
         req.header["X-TC-Action"] = action[0].upper() + action[1:]
         req.header["X-TC-RequestClient"] = self.request_client
@@ -198,8 +201,8 @@ class AbstractClient(object):
             req.header["X-TC-Content-SHA256"] = "UNSIGNED-PAYLOAD"
         if self.region:
             req.header['X-TC-Region'] = self.region
-        if self.credential.token:
-            req.header['X-TC-Token'] = self.credential.token
+        if cred_token:
+            req.header['X-TC-Token'] = cred_token
         if self.profile.language:
             req.header['X-TC-Language'] = self.profile.language
 
@@ -215,13 +218,13 @@ class AbstractClient(object):
 
         service = self._service
         date = datetime.utcfromtimestamp(timestamp).strftime('%Y-%m-%d')
-        signature = self._get_tc3_signature(params, req, date, service, options)
+        signature = self._get_tc3_signature(params, req, date, service, cred_secret_key, options)
 
         auth = "TC3-HMAC-SHA256 Credential=%s/%s/%s/tc3_request, SignedHeaders=content-type;host, Signature=%s" % (
-            self.credential.secret_id, date, service, signature)
+            cred_secret_id, date, service, signature)
         req.header["Authorization"] = auth
 
-    def _get_tc3_signature(self, params, req, date, service, options=None):
+    def _get_tc3_signature(self, params, req, date, service, secret_key, options=None):
         options = options or {}
         canonical_uri = req.uri
         canonical_querystring = ""
@@ -258,8 +261,7 @@ class AbstractClient(object):
                                           req.header["X-TC-Timestamp"],
                                           credential_scope,
                                           digest)
-
-        return Sign.sign_tc3(self.credential.secret_key, date, service, string2sign)
+        return Sign.sign_tc3(secret_key, date, service, string2sign)
 
     def _build_req_without_signature(self, action, params, req, options=None):
         content_type = self._default_content_type

{tencentcloud-sdk-python-common-3.0.1445 → tencentcloud-sdk-python-common-3.0.1447}/tencentcloud/common/credential.py

@@ -16,6 +16,7 @@
 import json
 import os
 import time
+import threading
 
 try:
     # py3
@@ -70,6 +71,9 @@ class Credential(object):
     @property
     def secretKey(self):
         return self.secret_key
+    
+    def get_credential_info(self):
+        return self.secret_id, self.secret_key, self.token
 
 
 class CVMRoleCredential(object):
@@ -91,6 +95,7 @@ class CVMRoleCredential(object):
         self._secret_key = None
         self._token = None
         self._expired_ts = 0
+        self._lock = threading.Lock()
 
     @property
     def secretId(self):
@@ -98,8 +103,9 @@ class CVMRoleCredential(object):
 
     @property
     def secret_id(self):
-        self.update_credential()
-        return self._secret_id
+        with self._lock:
+            self.update_credential()
+            return self._secret_id
 
     @property
     def secretKey(self):
@@ -107,13 +113,15 @@ class CVMRoleCredential(object):
 
     @property
     def secret_key(self):
-        self.update_credential()
-        return self._secret_key
+        with self._lock:
+            self.update_credential()
+            return self._secret_key
 
     @property
     def token(self):
-        self.update_credential()
-        return self._token
+        with self._lock:
+            self.update_credential()
+            return self._token
 
     def get_role_name(self):
         if self.role:
@@ -159,6 +167,11 @@ class CVMRoleCredential(object):
             return None
         return self
 
+    def get_credential_info(self):
+        with self._lock:
+            self.update_credential()
+            return self._secret_id, self._secret_key, self._token
+
 
 class STSAssumeRoleCredential(object):
     """Tencent Cloud Credential via STS service
@@ -200,31 +213,42 @@ class STSAssumeRoleCredential(object):
         self._tmp_credential = None
         if endpoint:
             self._endpoint = endpoint
+        self._lock = threading.Lock()
 
     @property
     def secretId(self):
-        self._need_refresh()
-        return self._tmp_secret_id
+        with self._lock:
+            self._need_refresh()
+            return self._tmp_secret_id
 
     @property
     def secretKey(self):
-        self._need_refresh()
-        return self._tmp_secret_key
+        with self._lock:
+            self._need_refresh()
+            return self._tmp_secret_key
 
     @property
     def secret_id(self):
-        self._need_refresh()
-        return self._tmp_secret_id
+        with self._lock:
+            self._need_refresh()
+            return self._tmp_secret_id
 
     @property
     def secret_key(self):
-        self._need_refresh()
-        return self._tmp_secret_key
+        with self._lock:
+            self._need_refresh()
+            return self._tmp_secret_key
 
     @property
     def token(self):
-        self._need_refresh()
-        return self._token
+        with self._lock:
+            self._need_refresh()
+            return self._token
+    
+    def get_credential_info(self):
+        with self._lock:
+            self._need_refresh()
+            return self._tmp_secret_id, self._tmp_secret_key, self._token
 
     def _need_refresh(self):
         if None in [self._token, self._tmp_secret_key, self._tmp_secret_id] or self._expired_time < int(time.time()):
@@ -405,31 +429,42 @@ class OIDCRoleArnCredential(object):
         self._tmp_secret_key = None
         self._expired_time = 0
         self._is_tke = False
+        self._lock = threading.Lock()
 
     @property
     def secretId(self):
-        self._keep_fresh()
-        return self._tmp_secret_id
+        with self._lock:
+            self._keep_fresh()
+            return self._tmp_secret_id
 
     @property
     def secretKey(self):
-        self._keep_fresh()
-        return self._tmp_secret_key
+        with self._lock:
+            self._keep_fresh()
+            return self._tmp_secret_key
 
     @property
     def secret_id(self):
-        self._keep_fresh()
-        return self._tmp_secret_id
+        with self._lock:
+            self._keep_fresh()
+            return self._tmp_secret_id
 
     @property
     def secret_key(self):
-        self._keep_fresh()
-        return self._tmp_secret_key
+        with self._lock:
+            self._keep_fresh()
+            return self._tmp_secret_key
 
     @property
     def token(self):
-        self._keep_fresh()
-        return self._token
+        with self._lock:
+            self._keep_fresh()
+            return self._token
+        
+    def get_credential_info(self):
+        with self._lock:
+            self._keep_fresh()
+            return self._tmp_secret_id, self._tmp_secret_key, self._token
 
     @property
     def endpoint(self):

{tencentcloud-sdk-python-common-3.0.1445 → tencentcloud-sdk-python-common-3.0.1447}/tencentcloud_sdk_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: tencentcloud-sdk-python-common
-Version: 3.0.1445
+Version: 3.0.1447
 Summary: Tencent Cloud Common SDK for Python
 Home-page: https://github.com/TencentCloud/tencentcloud-sdk-python
 Author: Tencent Cloud