Merge pull request #187 from longbai/unicode

dns hijack

Author: longbai

Diff for: CHANGELOG.md

@@ -4,6 +4,7 @@
 ### 修正
 * 2.x unicode 问题 by @hunter007
 * 上传重试判断
+* 上传时 dns劫持处理
 
 ### 增加
 * fsizeMin 上传策略

Diff for: qiniu/http.py

@@ -19,7 +19,7 @@
 
 
 def __return_wrapper(resp):
-    if resp.status_code != 200:
+    if resp.status_code != 200 or resp.headers.get('X-Reqid') is None:
         return None, ResponseInfo(resp)
     ret = resp.json() if resp.text != '' else {}
     return ret, ResponseInfo(resp)
@@ -111,20 +111,22 @@ def __init__(self, response, exception=None):
                     self.error = 'unknown'
                 else:
                     self.error = ret['error']
+            if self.req_id is None and self.status_code == 200:
+                self.error = 'server is not qiniu'
 
     def ok(self):
-        return self.status_code == 200
+        return self.status_code == 200 and self.req_id is not None
 
     def need_retry(self):
-        if self.__response is None:
+        if self.__response is None or self.req_id is None:
             return True
         code = self.status_code
         if (code // 100 == 5 and code != 579) or code == 996:
             return True
         return False
 
     def connect_failed(self):
-        return self.__response is None
+        return self.__response is None or self.req_id is None
 
     def __str__(self):
         return ', '.join(['%s:%s' % item for item in self.__dict__.items()])

Diff for: qiniu/services/storage/uploader.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import os
+import time
 
 from qiniu import config
 from qiniu.utils import urlsafe_base64_encode, crc32, file_crc32, _file_iter
@@ -128,7 +129,10 @@ def __init__(self, up_token, key, input_stream, data_size, params, mime_type,
         self.mime_type = mime_type
         self.progress_handler = progress_handler
         self.upload_progress_recorder = upload_progress_recorder or UploadProgressRecorder()
-        self.modify_time = modify_time
+        self.modify_time = modify_time or time.time()
+
+        print(self.modify_time)
+        print(modify_time)
 
     def record_upload_progress(self, offset):
         record_data = {
@@ -138,15 +142,20 @@ def record_upload_progress(self, offset):
         }
         if self.modify_time:
             record_data['modify_time'] = self.modify_time
+
+        print(record_data)
         self.upload_progress_recorder.set_upload_record(self.key, record_data)
 
     def recovery_from_record(self):
         record = self.upload_progress_recorder.get_upload_record(self.key)
         if not record:
             return 0
 
-        if not record['modify_time'] or record['size'] != self.size or \
-                record['modify_time'] != self.modify_time:
+        try:
+            if not record['modify_time'] or record['size'] != self.size or \
+                    record['modify_time'] != self.modify_time:
+                return 0
+        except KeyError:
             return 0
 
         self.blockStatus = [{'ctx': ctx} for ctx in record['contexts']]

Diff for: test_qiniu.py

@@ -323,7 +323,7 @@ class ResumableUploaderTestCase(unittest.TestCase):
     params = {'x:a': 'a'}
     q = Auth(access_key, secret_key)
 
-    def test_putfile(self):
+    def test_put_stream(self):
         localfile = __file__
         key = 'test_file_r'
         size = os.stat(localfile).st_size