Merge branch 'master' into features/add-decode-except

Author: xwen-winnie

qiniu/__init__.py

@@ -27,4 +27,4 @@
 from .services.compute.qcos_api import QcosClient
 from .services.sms.sms import Sms
 from .services.pili.rtc_server_manager import RtcServer, get_room_token
-from .utils import urlsafe_base64_encode, urlsafe_base64_decode, etag, entry
+from .utils import urlsafe_base64_encode, urlsafe_base64_decode, etag, entry, canonical_mime_header_key

qiniu/auth.py

@@ -5,7 +5,7 @@
 from hashlib import sha1
 from requests.auth import AuthBase
 from .compat import urlparse, json, b
-from .utils import urlsafe_base64_encode
+from .utils import urlsafe_base64_encode, canonical_mime_header_key
 
 # 上传策略，参数规格详见
 # https://developer.qiniu.com/kodo/manual/1206/put-policy
@@ -58,6 +58,9 @@ def __init__(self, access_key, secret_key):
     def get_access_key(self):
         return self.__access_key
 
+    def get_secret_key(self):
+        return self.__secret_key
+
     def __token(self, data):
         data = b(data)
         hashed = hmac.new(self.__secret_key, data, sha1)
@@ -265,15 +268,21 @@ def token_of_request(
         path_with_query = path
         if query != '':
             path_with_query = ''.join([path_with_query, '?', query])
-        data = ''.join(["%s %s" %
-                        (method, path_with_query), "\n", "Host: %s" %
-                        host, "\n"])
+        data = ''.join([
+            "%s %s" % (method, path_with_query),
+            "\n",
+            "Host: %s" % host
+        ])
 
         if content_type:
-            data += "Content-Type: %s" % (content_type) + "\n"
+            data += "\n"
+            data += "Content-Type: %s" % content_type
+
+        if qheaders:
+            data += "\n"
+            data += qheaders
 
-        data += qheaders
-        data += "\n"
+        data += "\n\n"
 
         if content_type and content_type != "application/octet-stream" and body:
             if isinstance(body, bytes):
@@ -283,11 +292,13 @@ def token_of_request(
         return '{0}:{1}'.format(self.__access_key, self.__token(data))
 
     def qiniu_headers(self, headers):
-        res = ""
-        for key in headers:
-            if key.startswith(self.qiniu_header_prefix):
-                res += key + ": %s\n" % (headers.get(key))
-        return res
+        qiniu_fields = list(filter(
+            lambda k: k.startswith(self.qiniu_header_prefix) and len(k) > len(self.qiniu_header_prefix),
+            headers,
+        ))
+        return "\n".join([
+            "%s: %s" % (canonical_mime_header_key(key), headers.get(key)) for key in sorted(qiniu_fields)
+        ])
 
     @staticmethod
     def __checkKey(access_key, secret_key):
@@ -300,6 +311,8 @@ def __init__(self, auth):
         self.auth = auth
 
     def __call__(self, r):
+        if r.headers.get('Content-Type', None) is None:
+            r.headers['Content-Type'] = 'application/x-www-form-urlencoded'
         token = self.auth.token_of_request(
             r.method, r.headers.get('Host', None),
             r.url, self.auth.qiniu_headers(r.headers),

qiniu/http.py

@@ -79,16 +79,16 @@ def _get(url, params, auth, headers=None):
     if _session is None:
         _init()
     try:
-        post_headers = _headers.copy()
+        get_headers = _headers.copy()
         if headers is not None:
             for k, v in headers.items():
-                post_headers.update({k: v})
+                get_headers.update({k: v})
         r = _session.get(
             url,
             params=params,
             auth=auth,
             timeout=config.get_default('connection_timeout'),
-            headers=post_headers)
+            headers=get_headers)
     except Exception as e:
         return None, ResponseInfo(None, e)
     return __return_wrapper(r)
@@ -153,31 +153,16 @@ def _put_with_qiniu_mac_and_headers(url, data, auth, headers):
 
 def _post_with_qiniu_mac(url, data, auth):
     qn_auth = qiniu.auth.QiniuMacRequestsAuth(
-        auth) if auth is not None else None
-    timeout = config.get_default('connection_timeout')
-    try:
-        r = requests.post(
-            url,
-            json=data,
-            auth=qn_auth,
-            timeout=timeout,
-            headers=_headers)
-    except Exception as e:
-        return None, ResponseInfo(None, e)
-    return __return_wrapper(r)
+        auth
+    ) if auth is not None else None
+    return _post(url, data, None, qn_auth)
 
 
 def _get_with_qiniu_mac(url, params, auth):
-    try:
-        r = requests.get(
-            url,
-            params=params,
-            auth=qiniu.auth.QiniuMacRequestsAuth(auth) if auth is not None else None,
-            timeout=config.get_default('connection_timeout'),
-            headers=_headers)
-    except Exception as e:
-        return None, ResponseInfo(None, e)
-    return __return_wrapper(r)
+    qn_auth = qiniu.auth.QiniuMacRequestsAuth(
+        auth
+    ) if auth is not None else None
+    return _get(url, params, qn_auth)
 
 
 def _get_with_qiniu_mac_and_headers(url, params, auth, headers):

qiniu/services/storage/bucket.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from qiniu import config
+from qiniu import config, QiniuMacAuth
 from qiniu import http
 from qiniu.utils import urlsafe_base64_encode, entry
 
@@ -17,6 +17,7 @@ class BucketManager(object):
 
     def __init__(self, auth, zone=None):
         self.auth = auth
+        self.mac_auth = QiniuMacAuth(auth.get_access_key(), auth.get_secret_key())
         if (zone is None):
             self.zone = config.get_default('default_zone')
         else:
@@ -387,10 +388,10 @@ def __server_do(self, host, operation, *args):
         return self.__post(url)
 
     def __post(self, url, data=None):
-        return http._post_with_auth(url, data, self.auth)
+        return http._post_with_qiniu_mac(url, data, self.mac_auth)
 
     def __get(self, url, params=None):
-        return http._get_with_auth(url, params, self.auth)
+        return http._get_with_qiniu_mac(url, params, self.mac_auth)
 
 
 def _build_op(*args):

qiniu/utils.py

@@ -172,3 +172,35 @@ def rfc_from_timestamp(timestamp):
     last_modified_str = last_modified_date.strftime(
         '%a, %d %b %Y %H:%M:%S GMT')
     return last_modified_str
+
+
+def _valid_header_key_char(ch):
+    is_token_table = [
+        "!", "#", "$", "%", "&", "\\", "*", "+", "-", ".",
+        "0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
+        "A", "B", "C", "D", "E", "F", "G", "H", "I", "J",
+        "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",
+        "U", "W", "V", "X", "Y", "Z",
+        "^", "_", "`",
+        "a", "b", "c", "d", "e", "f", "g", "h", "i", "j",
+        "k", "l", "m", "n", "o", "p", "q", "r", "s", "t",
+        "u", "v", "w", "x", "y", "z",
+        "|", "~"]
+    return 0 <= ord(ch) < 128 and ch in is_token_table
+
+
+def canonical_mime_header_key(field_name):
+    for ch in field_name:
+        if not _valid_header_key_char(ch):
+            return field_name
+    result = ""
+    upper = True
+    for ch in field_name:
+        if upper and "a" <= ch <= "z":
+            result += ch.upper()
+        elif not upper and "A" <= ch <= "Z":
+            result += ch.lower()
+        else:
+            result += ch
+        upper = ch == "-"
+    return result