dns hijacking test

longbai · longbai · commit 1b6141ac87c7 · 2015-06-02T20:32:34.000+08:00
diff --git a/library/src/androidTest/java/com/qiniu/android/FormUploadTest.java b/library/src/androidTest/java/com/qiniu/android/FormUploadTest.java
@@ -325,7 +325,6 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
 
     @SmallTest
     public void testPortBackup() throws Throwable {
-
         Configuration c = new Configuration.Builder()
                 .zone(new Zone("upload.qiniu.com", Zone.zone0.upHostBackup, Zone.zone0.upIp))
                 .upPort(9999)
@@ -347,6 +346,49 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
         }, opt);
 
 
+        try {
+            signal.await(120, TimeUnit.SECONDS); // wait for callback
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        // 尝试获取info信息。
+        // key == null ： 没进入 complete ？ 什么导致的？
+        if (!expectKey.equals(key)) {
+            //此处通不过， travis 会打印信息
+            Assert.assertEquals("", info);
+        }
+        if (info == null || !info.isOK()) {
+            //此处通不过， travis 会打印信息
+            Assert.assertEquals("", info);
+        }
+        Assert.assertEquals(expectKey, key);
+        Assert.assertTrue(info.isOK());
+        Assert.assertNotNull(info.reqId);
+        Assert.assertNotNull(resp);
+    }
+
+    @SmallTest
+    public void testDnsHijacking() throws Throwable {
+        Configuration c = new Configuration.Builder()
+                .zone(new Zone("uphijacktest.qiniu.com", Zone.zone0.upHostBackup, Zone.zone0.upIp))
+                .build();
+        UploadManager _up = new UploadManager(c);
+        final String expectKey = "你好;\"\r\n\r\n\r\n";
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("x:foo", "fooval");
+        final UploadOptions opt = new UploadOptions(params, null, true, null, null);
+
+        uploadManager.put("hello".getBytes(), expectKey, TestConfig.token, new UpCompletionHandler() {
+            public void complete(String k, ResponseInfo rinfo, JSONObject response) {
+                Log.i("qiniutest", k + rinfo);
+                key = k;
+                info = rinfo;
+                resp = response;
+                signal.countDown();
+            }
+        }, opt);
+
+
         try {
             signal.await(120, TimeUnit.SECONDS); // wait for callback
         } catch (InterruptedException e) {
diff --git a/library/src/androidTest/java/com/qiniu/android/ResumeUploadTest.java b/library/src/androidTest/java/com/qiniu/android/ResumeUploadTest.java
@@ -9,6 +9,7 @@
 import com.qiniu.android.storage.Configuration;
 import com.qiniu.android.storage.UpCompletionHandler;
 import com.qiniu.android.storage.UploadManager;
+import com.qiniu.android.storage.Zone;
 
 import junit.framework.Assert;
 
@@ -106,6 +107,47 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
         TempFile.remove(f);
     }
 
+    private void templateHijack(int size) throws Throwable {
+        final String expectKey = "r=" + size + "k";
+        final File f = TempFile.createFile(size);
+
+        Configuration c = new Configuration.Builder()
+                .zone(new Zone("uphijacktest.qiniu.com", Zone.zone0.upHostBackup, Zone.zone0.upIp))
+                .build();
+        UploadManager uploadManager = new UploadManager(c);
+
+        uploadManager.put(f, expectKey, TestConfig.token, new UpCompletionHandler() {
+            public void complete(String k, ResponseInfo rinfo, JSONObject response) {
+                Log.i("qiniutest", k + rinfo);
+                key = k;
+                info = rinfo;
+                resp = response;
+                signal.countDown();
+            }
+        }, null);
+
+        try {
+            signal.await(500, TimeUnit.SECONDS); // wait for callback
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        // 尝试获取info信息。
+        // key == null ： 没进入 complete ？ 什么导致的？
+        if (!expectKey.equals(key)) {
+            //此处通不过， travis 会打印信息
+            Assert.assertEquals("", info);
+        }
+        if (info == null || !info.isOK()) {
+            //此处通不过， travis 会打印信息
+            Assert.assertEquals("", info);
+        }
+        Assert.assertEquals(expectKey, key);
+        Assert.assertTrue(info.isOK());
+        Assert.assertNotNull(info.reqId);
+        Assert.assertNotNull(resp);
+        TempFile.remove(f);
+    }
+
     @MediumTest
     public void test600k() throws Throwable {
         template(600);
@@ -121,6 +163,12 @@ public void test4M() throws Throwable {
         template(1024 * 4);
     }
 
+    @LargeTest
+    public void test2MHijack() throws Throwable {
+        templateHijack(1024 * 2);
+    }
+
+
 //    @LargeTest
 //    public void test8M1k() throws Throwable{
 //        template(1024*8+1);
diff --git a/library/src/main/java/com/qiniu/android/http/ResponseInfo.java b/library/src/main/java/com/qiniu/android/http/ResponseInfo.java
@@ -118,7 +118,7 @@ public boolean needRetry() {
     }
 
     public boolean isNotQiniu() {
-        return statusCode < 500 && statusCode >= 200 && reqId != null;
+        return statusCode < 500 && statusCode >= 200 && reqId == null;
     }
 
     public String toString() {
diff --git a/library/src/main/java/com/qiniu/android/storage/FormUploader.java b/library/src/main/java/com/qiniu/android/storage/FormUploader.java
@@ -109,7 +109,7 @@ public void complete(ResponseInfo info, JSONObject response) {
                 } else if(options.cancellationSignal.isCancelled()){
                     ResponseInfo i = ResponseInfo.cancelled();
                     completionHandler.complete(key, i, null);
-                } else if (info.needRetry()) {
+                } else if (info.needRetry() || (info.isNotQiniu() && !token.hasReturnUrl())) {
                     CompletionHandler retried = new CompletionHandler() {
                         @Override
                         public void complete(ResponseInfo info, JSONObject response) {
diff --git a/library/src/main/java/com/qiniu/android/storage/ResumeUploader.java b/library/src/main/java/com/qiniu/android/storage/ResumeUploader.java
@@ -186,7 +186,11 @@ public void complete(ResponseInfo info, JSONObject response) {
                         return;
                     }
 
-                    if (info.needRetry() && retried < config.retryMax) {
+                    if (isNotQiniu(info)){
+                        forceIp = true;
+                    }
+
+                    if (isNotQiniu(info) || (info.needRetry() && retried < config.retryMax)) {
                         nextTask(offset, retried + 1, host);
                         return;
                     }
@@ -222,10 +226,10 @@ public void complete(ResponseInfo info, JSONObject response) {
                         nextTask((offset / Configuration.BLOCK_SIZE) * Configuration.BLOCK_SIZE, retried, host);
                         return;
                     }
-                    if (info.isNotQiniu() && !token.hasReturnUrl()){
+                    if (isNotQiniu(info)){
                         forceIp = true;
                     }
-                    if (retried >= config.retryMax || !info.needRetry()) {
+                    if (!isNotQiniu(info) && (retried >= config.retryMax || !info.needRetry())) {
                         completionHandler.complete(key, info, null);
                         return;
                     }
@@ -318,4 +322,8 @@ private void record(int offset) {
                 size, offset, modifyTime, StringUtils.jsonJoin(contexts));
         config.recorder.set(recorderKey, data.getBytes());
     }
+
+    private boolean isNotQiniu(ResponseInfo info){
+        return info.isNotQiniu() && !token.hasReturnUrl();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public boolean needRetry() {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`public boolean isNotQiniu() {`
`121`		`- return statusCode < 500 && statusCode >= 200 && reqId != null;`
	`121`	`+ return statusCode < 500 && statusCode >= 200 && reqId == null;`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`public String toString() {`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,11 @@ public void complete(ResponseInfo info, JSONObject response) {`
`186`	`186`	`return;`
`187`	`187`	`}`
`188`	`188`
`189`		`- if (info.needRetry() && retried < config.retryMax) {`
	`189`	`+ if (isNotQiniu(info)){`
	`190`	`+ forceIp = true;`
	`191`	`+ }`
	`192`	`+`
	`193`	`+ if (isNotQiniu(info) \|\| (info.needRetry() && retried < config.retryMax)) {`
`190`	`194`	`nextTask(offset, retried + 1, host);`
`191`	`195`	`return;`
`192`	`196`	`}`
`@@ -222,10 +226,10 @@ public void complete(ResponseInfo info, JSONObject response) {`
`222`	`226`	`nextTask((offset / Configuration.BLOCK_SIZE) * Configuration.BLOCK_SIZE, retried, host);`
`223`	`227`	`return;`
`224`	`228`	`}`
`225`		`- if (info.isNotQiniu() && !token.hasReturnUrl()){`
	`229`	`+ if (isNotQiniu(info)){`
`226`	`230`	`forceIp = true;`
`227`	`231`	`}`
`228`		`- if (retried >= config.retryMax \|\| !info.needRetry()) {`
	`232`	`+ if (!isNotQiniu(info) && (retried >= config.retryMax \|\| !info.needRetry())) {`
`229`	`233`	`completionHandler.complete(key, info, null);`
`230`	`234`	`return;`
`231`	`235`	`}`
`@@ -318,4 +322,8 @@ private void record(int offset) {`
`318`	`322`	`size, offset, modifyTime, StringUtils.jsonJoin(contexts));`
`319`	`323`	`config.recorder.set(recorderKey, data.getBytes());`
`320`	`324`	`}`
	`325`	`+`
	`326`	`+ private boolean isNotQiniu(ResponseInfo info){`
	`327`	`+ return info.isNotQiniu() && !token.hasReturnUrl();`
	`328`	`+ }`
`321`	`329`	`}`