feat: update auth headers

Author: zpp12354321

volcenginesdkcore/api_client.py

@@ -539,7 +539,7 @@ def update_params_for_auth(self, host, path, method, headers, querys, auth_setti
                 body = json.dumps(body)
             else:
                 body = ""
-            SignerV4.sign(path, method, headers, body, dict(querys),
+            SignerV4.sign(path, method, headers, body, querys,
                           self.configuration.ak, self.configuration.sk, self.configuration.region, service)
 
     def __deserialize_file(self, response):

volcenginesdkcore/signv4.py

@@ -5,7 +5,7 @@
 import datetime
 import hmac
 import hashlib
-from six.moves.urllib.parse import quote
+from six.moves.urllib.parse import urlencode
 
 
 class SignerV4(object):
@@ -41,9 +41,8 @@ def sign(path, method, headers, body, query, ak, sk, region, service):
 
         signed_headers_string = ';'.join(sorted(signed_headers.keys()))
 
-        canonical_request = '\n'.join(
-            [method, path, SignerV4.norm_query(query), signed_str,
-             signed_headers_string, body_hash])
+        # The sorted() method sorts tuples by default, using the first item in each tuple.
+        canonical_request = '\n'.join([method, path, urlencode(sorted(query)), signed_str, signed_headers_string, body_hash])
         credential_scope = '/'.join([format_date[:8], region, service, 'request'])
         signing_str = '\n'.join(['HMAC-SHA256', format_date, credential_scope,
                                  hashlib.sha256(canonical_request.encode('utf-8')).hexdigest()])
@@ -67,19 +66,3 @@ def get_signing_secret_key_v4(sk, date, region, service):
     @staticmethod
     def hmac_sha256(key, msg):
         return hmac.new(key, msg.encode('utf-8'), hashlib.sha256).digest()
-
-    @staticmethod
-    def norm_query(params):
-        query = ''
-        for key in sorted(params.keys()):
-            if type(params[key]) == list:
-                for k in params[key]:
-                    query = query + quote(key, safe='-_.~') + '=' + quote(k, safe='-_.~') + '&'
-            elif type(params[key]) in [int, float, bool]:
-                # The argument to urllib.parse.quote must be a string
-                ele = str(params[key])
-                query = query + quote(key, safe='-_.~') + '=' + quote(ele, safe='-_.~') + '&'
-            else:
-                query = query + quote(key, safe='-_.~') + '=' + quote(params[key], safe='-_.~') + '&'
-        query = query[:-1]
-        return query.replace('+', '%20')