modify bearer-token

Author: wallisyan

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

@@ -59,7 +59,7 @@ def __init__(self, access_key_id=None, access_key_secret=None, bearer_token=None
                  extra_user_agent=None, enable_https=None, http_port=None, https_port=None,
                  connection_timeout=None, read_timeout=None, enable_http_debug=None,
                  http_proxy=None, https_proxy=None, enable_stream_logger=None,
-                 profile_name=None, config_file=None):
+                 profile_name=None, config_file=None, auto_retry=True):
 
         self.access_key_id = access_key_id
         self.access_key_secret = access_key_secret
@@ -76,30 +76,38 @@ def __init__(self, access_key_id=None, access_key_secret=None, bearer_token=None
         self.https_port = https_port
         self.connection_timeout = connection_timeout
         self.read_timeout = read_timeout
-        self.enable_http_debug = enable_http_debug
+        # self.enable_http_debug = enable_http_debug  # http-debug 只从环境变量获取
+        self.http_debug = None
         # proxy provider两个： client  env
-        # self.http_proxy = http_proxy
-        # self.https_proxy = https_proxy
-        self.proxy = {
+        self.http_proxy = http_proxy
+        self.https_proxy = https_proxy
+        self._proxy = {
             'http': http_proxy,
             'https': https_proxy,
         }
         self.enable_stream_logger = enable_stream_logger
         self.profile_name = profile_name
         self.config_file = config_file
+        # retry
+        self._auto_retry = auto_retry
+        import aliyunsdkcore.retry.retry_policy as retry_policy
+        if self._auto_retry:
+            self.retry_policy = retry_policy.get_default_retry_policy(
+                max_retry_times=self.max_retry_times)
+        else:
+            self.retry_policy = retry_policy.NO_RETRY_POLICY
 
     def read_from_env(self):
         # 从环境变量读取一定量的数据
-        pass
-        # 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()))
+        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 read_from_profile(self):
         ENV_NAME_FOR_CONFIG_FILE = 'ALIBABA_CLOUD_CONFIG_FILE'
         DEFAULT_NAME_FOR_CONFIG_FILE = ['/etc/.alibabacloud/config',
-                                        '~/.alibabacloud/config']
+                                        '~/alibabacloud/config']
         # TODO read from profile
         from alibabacloud.utils.ini_helper import load_config
         profile = {}
@@ -194,8 +202,10 @@ def handle_request(self, api_request, request_handlers=None, context=None):
             #     self.handle_request(api_request,
             #                         request_handlers=request_handlers[i:],
             #                         context=context)
+        if context.exception:
+            return context.exception
 
-        return context.response
+        return context.http_response
 
     def get_credentials(self):
         credentials_provider = self.credentials_provider({

aliyun-python-sdk-core/alibabacloud/credentials/credentials_provider.py

@@ -275,7 +275,6 @@ def __init__(self, profile):
         self.profile = profile
 
     def load(self):
-        print('static')
         if self.profile:
             fetcher = self._create_credentials_fetcher()
             credentials = fetcher()
@@ -314,7 +313,6 @@ def __init__(self):
         self.environ = os.environ
 
     def load(self):
-        print('env')
         if self.ENV_NAME_FOR_ACCESS_KEY_ID in self.environ:
             fetcher = self._create_credentials_fetcher()
             credentials = fetcher()
@@ -356,7 +354,6 @@ def __init__(self, profile_name=None):
         self.environ = os.environ
 
     def load(self):
-        print('profile')
         self._loaded_config = {}
 
         if self.ENV_NAME_FOR_CREDENTIALS_FILE in self.environ:

aliyun-python-sdk-core/alibabacloud/credentials/encyptfile

@@ -20,6 +20,7 @@ def __init__(self):
         self.http_request = None
         self.api_response = None
         self.http_response = None
+        self.exception = None
         self.retry_flag = False
         self.retry_backoff = 0
 

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

@@ -60,9 +60,7 @@ def handle_response(self, context):
     def do_request(context):
         http_request = context.http_request
         with Session() as s:
-            print(111111111, http_request.protocol)
             current_protocol = 'http://' if http_request.protocol.lower() == 'http' else 'https://'
-            print(2222222, context.endpoint)
             # TODO : 最终拼接的是啥，还需要调查下
             url = current_protocol + context.endpoint + http_request.url
 
@@ -82,6 +80,5 @@ def do_request(context):
             response = s.send(prepped, proxies=http_request.proxy,
                               timeout=http_request.timeout,
                               allow_redirects=False, verify=None, cert=None)
-            response.status_code
-            context.response = response
+            context.http_response = response
 

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

@@ -118,7 +118,7 @@ def handle_request(self, context):
         # http_request的method and protocol/proxy
         http_request.method = api_request.get_method()
         http_request.protocol = api_request.get_protocol_type()  # http|https
-        http_request.proxy = context.config.proxy  # http|https
+        http_request.proxy = context.config._proxy  # http|https
         if http_request.protocol == 'https':
             http_request.port = 443
 

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

@@ -13,6 +13,8 @@
 # limitations under the License.
 
 import copy
+import time
+
 from alibabacloud.handlers import RequestHandler
 import aliyunsdkcore.retry.retry_policy as retry_policy
 from aliyunsdkcore.retry.retry_condition import RetryCondition
@@ -24,33 +26,50 @@
 
 class RetryHandler(RequestHandler):
 
-    def _add_request_client_token(self, api_request):
-        # TODO implement: add a ClientToken parameter on api_request
-        pass
+    # def _add_request_client_token(self, api_request):
+    #     # TODO implement: add a ClientToken parameter on api_request
+    #     pass
 
     def handle_request(self, context):
+        print(1111111, context.http_request.retries)
         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) & \
+            if context.config.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):
+        print('context.exception', context.exception)
         api_request = context.api_request
         retry_policy_context = RetryPolicyContext(api_request, context.exception,
                                                   context.http_request.retries,
                                                   context.http_response.status_code)
 
-        should_retry = context.client.retry_policy.should_retry(retry_policy_context)
+        should_retry = context.config.retry_policy.should_retry(retry_policy_context)
 
         if should_retry & RetryCondition.SHOULD_RETRY:
+            retry_policy_context.retryable = should_retry
+
+            time_to_sleep = context.config.retry_policy.compute_delay_before_next_retry(retry_policy_context)
+            time.sleep(time_to_sleep / 1000.0)
+            context.http_request.retries += 1
+
             context.retry_flag = True
-            context.retry_backoff = context.client.retry_policy.compute_delay_before_next_retry(
-                retry_policy_context
-            )
+            # context.retry_backoff = context.config.retry_policy.compute_delay_before_next_retry(
+            #     retry_policy_context
+            # )
         else:
             context.retry_flag = False
-            context.retry_backoff = 0
+            # context.retry_backoff = 0
             if context.exception:
                 raise context.exception
-        context.http_request.retries += 1
+
+
+    @staticmethod
+    def _add_request_client_token(request):
+        if hasattr(request, "set_ClientToken") and hasattr(request, "get_ClientToken"):
+            client_token = request.get_ClientToken()
+            if not client_token:
+                # ClientToken has not been set
+                client_token = aliyunsdkcore.utils.parameter_helper.get_uuid()  # up to 60 chars
+                request.set_ClientToken(client_token)

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

@@ -23,7 +23,7 @@ class ServerErrorHandler(RequestHandler):
     def handle_response(self, context):
         http_request = context.http_request
 
-        response = context.response
+        response = context.http_response
         request_id = None
 
         try:
@@ -34,7 +34,6 @@ def handle_response(self, context):
             # data instead
             # logger.warning('Failed to parse response as json format. Response:%s', response.text)
             pass
-        print('进入而偶然')
         if response.status_code < codes.OK or response.status_code >= codes.MULTIPLE_CHOICES:
 
             server_error_code, server_error_message = self._parse_error_info_from_response_body(

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

@@ -22,7 +22,7 @@
 import logging
 
 from alibabacloud.signer.signer import Signer
-
+from aliyunsdkcore.auth.algorithm import bearer_token
 logger = logging.getLogger(__name__)
 
 
@@ -36,7 +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()
+            request.get_url_params(signer=bearer_token)
         else:
             request.add_header("x-acs-bearer-token", token)
         signature = request.get_signed_signature(region_id, '')

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

@@ -0,0 +1,42 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
+# coding=utf-8
+
+
+import hashlib
+import hmac
+
+from aliyunsdkcore.compat import ensure_string
+from aliyunsdkcore.compat import ensure_bytes
+from aliyunsdkcore.compat import b64_encode_bytes
+
+
+def get_sign_string(source, secret):
+    return ""
+
+
+def get_signer_name():
+    return ""
+
+
+def get_signer_version():
+    return "1.0"
+
+
+def get_signer_type():
+    return "BEARERTOKEN"