modify sign

Author: wb-yxy487231

aliyun-python-sdk-core/alibabacloud/client.py

@@ -68,7 +68,7 @@ def __init__(self, access_key_id=None, access_key_secret=None, region_id=None,
         # proxy provider两个： client  env
         self.http_proxy = http_proxy
         self.https_proxy = https_proxy
-        self.proxy = {
+        self._proxy = {
             'http': self.http_proxy,
             'https': self.https_proxy,
         }
@@ -77,6 +77,11 @@ def __init__(self, access_key_id=None, access_key_secret=None, region_id=None,
         self.config_file = config_file
 
     def read_from_env(self):
+        # 从环境变量读取一定量的数据
+        env_vars = ['HTTP_DEBUG', 'HTTPS_PROXY', 'HTTP_PROXY']
+        for item in env_vars:
+            if getattr(self, item.lower()) is None:
+                setattr(self, item.lower(), os.environ.get(item) or os.environ.get(item.lower()))
 
         def _set_env_to_config(config_name, env_name):
 
@@ -132,17 +137,13 @@ def read_from_profile(self):
             if profile.get(key)is not None and getattr(self, key) is None:
                 # 不存在config当中的值 pass
                 setattr(self, key, profile.get(key))
-
-        return None
+            print('不存在config当中的值', key)
 
     def read_from_default(self):
         # some config DEFAULT
         # 用户实例化的时候，就进行了覆盖
         pass
 
-    def handle_timeout(self):
-        pass
-
 
 def get_merged_client_config(config):
     config.read_from_env()

aliyun-python-sdk-core/alibabacloud/handlers/http_header_handler.py

@@ -33,7 +33,7 @@ def handle_http_request(self, context):
         signed_header = api_request.get_signed_header(context.config.region_id,
                                                       context.config.access_key_id,
                                                       context.config.access_key_secret)
-        # 重新处理的header
+        # 重新处理的header, http-request 的header
         headers = signed_header
         body_params = api_request.get_body_params()
         if body_params:

aliyun-python-sdk-core/alibabacloud/handlers/log_handler.py

@@ -18,11 +18,11 @@
 class LogHandler(RequestHandler):
 
     def handle_request(self, context):
-        log_string = self._get_request_log_string(context.request)
+        # log_string = self._get_request_log_string(context.request)
         context.client.logger.debug(log_string)
 
     def handle_response(self, context):
-        log_string = self._get_response_log_string(context.response)
+        # log_string = self._get_response_log_string(context.response)
         context.client.logger.debug(log_string)
 
     def _get_request_log_string(self, request):

aliyun-python-sdk-core/alibabacloud/handlers/retry_handler.py

@@ -29,11 +29,11 @@ def _add_request_client_token(self, api_request):
         pass
 
     def handle_request(self, context):
-        retry_policy_context = RetryPolicyContext(context.api_request, None, 0, None)
-        if context.client.retry_policy.should_retry(retry_policy_context) & \
-                RetryCondition.SHOULD_RETRY_WITH_CLIENT_TOKEN:
-            self._add_request_client_token(context.api_request)
-        context.http_request.retries = 0
+        if context.http_request.retries == 0:
+            retry_policy_context = RetryPolicyContext(context.api_request, None, 0, None)
+            if context.client.retry_policy.should_retry(retry_policy_context) & \
+                    RetryCondition.SHOULD_RETRY_WITH_CLIENT_TOKEN:
+                self._add_request_client_token(context.api_request)
 
     def handle_response(self, context):
         api_request = context.api_request
@@ -54,4 +54,3 @@ def handle_response(self, context):
             if context.exception:
                 raise context.exception
         context.http_request.retries += 1
-

aliyun-python-sdk-core/alibabacloud/signer/access_key_signer.py

@@ -31,5 +31,7 @@ def sign(self, access_key_credential, context):
         cred = access_key_credential
         request = context.api_request
         region_id = context.config.region_id
+        if request.get_style() == 'RPC':
+            request.get_url_params()
         signature = request.get_signed_signature(region_id, cred.access_key_id)
         return signature

aliyun-python-sdk-core/alibabacloud/signer/bearer_token_signer.py

@@ -36,6 +36,7 @@ def sign(self, bear_token_credential, context):
         # which token
         if request.get_style() == 'RPC':
             request.add_query_param("BearerToken", token)
+            request.get_url_params()
         else:
             request.add_header("x-acs-bearer-token", token)
         signature = request.get_signed_signature(region_id, None)

aliyun-python-sdk-core/alibabacloud/signer/security_signer.py

@@ -33,6 +33,7 @@ def sign(self, security_credential, context):
         region_id = context.config.region_id
         if request.get_style() == 'RPC':
             request.add_query_param("SecurityToken", security_credential.token)
+            request.get_url_params()
         else:
             request.add_header("x-acs-security-token", security_credential.token)
         signature = request.get_signed_signature(region_id, security_credential.access_key_id)

aliyun-python-sdk-core/aliyunsdkcore/auth/composer/roa_signature_composer.py

@@ -119,29 +119,6 @@ def __build_query_string(uri, queries):
     return query_builder
 
 
-def get_signature(
-        queries,
-        access_key,
-        secret,
-        format,
-        headers,
-        uri_pattern,
-        paths,
-        method,
-        signer=mac1):
-    headers = refresh_sign_parameters(
-        parameters=headers,
-        format=format)
-    sign_to_string = compose_string_to_sign(
-        method=method,
-        queries=queries,
-        headers=headers,
-        uri_pattern=uri_pattern,
-        paths=paths)
-    signature = signer.get_sign_string(sign_to_string, secret=secret)
-    return signature, sign_to_string
-
-
 def get_signed_signature(queries, format, headers, uri_pattern, paths, method):
     headers = refresh_sign_parameters(
         parameters=headers,

aliyun-python-sdk-core/aliyunsdkcore/auth/composer/rpc_signature_composer.py

@@ -31,7 +31,6 @@
 # format: XML or JSON
 def __refresh_sign_parameters(
         parameters,
-        access_key_id,
         accept_format="JSON",
         signer=mac1):
     if parameters is None or not isinstance(parameters, dict):
@@ -43,7 +42,6 @@ def __refresh_sign_parameters(
     parameters["SignatureType"] = signer.get_signer_type()
     parameters["SignatureVersion"] = signer.get_signer_version()
     parameters["SignatureNonce"] = helper.get_uuid()
-    parameters["AccessKeyId"] = access_key_id
     if accept_format is not None:
         parameters["Format"] = accept_format
     return parameters
@@ -68,22 +66,29 @@ def __get_signature(string_to_sign, secret, signer=mac1):
     return signer.get_sign_string(string_to_sign, secret + '&')
 
 
-def __get_url_params(params, ak, accept_format, signer=mac1):
-    url_params = __refresh_sign_parameters(params, ak, accept_format, signer)
+def get_url_params(params, accept_format, signer):
+    url_params = __refresh_sign_parameters(params, accept_format, signer)
     return url_params
 
 
-def get_signed_signature(params, ak, accept_format, method, body_params, signer=mac1):
-    url_params = __get_url_params(params, ak, accept_format, signer)
+def get_signed_signature(region_id, access_key_id, method, body_params,url_params):
     sign_params = dict(url_params)
+    if 'RegionId' not in sign_params:
+        sign_params['RegionId'] = region_id
+    sign_params["AccessKeyId"] = access_key_id
     sign_params.update(body_params)
     string_to_sign = __compose_string_to_sign(method, sign_params)
     return string_to_sign
 
 
-def get_signed_url(params, ak, secret, accept_format, signer=mac1, string_to_sign=None):
-    url_params = __get_url_params(params, ak, accept_format, signer)
+def get_signed_url(region_id, access_key_id, secret, url_params, string_to_sign, signer=mac1):
+    sign_params = dict(url_params)
+    if 'RegionId' not in sign_params:
+        sign_params['RegionId'] = region_id
+    sign_params["AccessKeyId"] = access_key_id
+
     signature = __get_signature(string_to_sign, secret, signer)
-    url_params['Signature'] = signature
-    url = '/?' + __pop_standard_urlencode(urlencode(url_params))
+    print('rpc.signature', signature)
+    sign_params['Signature'] = signature
+    url = '/?' + __pop_standard_urlencode(urlencode(sign_params))
     return url

aliyun-python-sdk-core/aliyunsdkcore/auth/signers/access_key_signer.py

@@ -31,6 +31,9 @@ def __init__(self, access_key_credential):
 
     def sign(self, region_id, request):
         cred = self._credential
+        if request.get_style() == 'RPC':
+            request.get_url_params()
+        request.get_signed_signature(region_id, cred.access_key_id)
         header = request.get_signed_header(region_id, cred.access_key_id, cred.access_key_secret)
         url = request.get_url(region_id, cred.access_key_id, cred.access_key_secret)
         return header, url