fix the bug of resumeable upload v2

bachue · bachue · commit f59acd9c7881 · 2021-09-23T19:14:02.000+08:00
diff --git a/composer.json b/composer.json
@@ -2,7 +2,12 @@
     "name": "qiniu/php-sdk",
     "type": "library",
     "description": "Qiniu Resource (Cloud) Storage SDK for PHP",
-    "keywords": ["qiniu", "storage", "sdk", "cloud"],
+    "keywords": [
+        "qiniu",
+        "storage",
+        "sdk",
+        "cloud"
+    ],
     "homepage": "http://developer.qiniu.com/",
     "license": "MIT",
     "authors": [
@@ -16,11 +21,16 @@
         "php": ">=5.3.3"
     },
     "require-dev": {
+        "paragonie/random_compat": ">=2",
         "phpunit/phpunit": "~4.0",
         "squizlabs/php_codesniffer": "~3.6"
     },
     "autoload": {
-        "psr-4": {"Qiniu\\": "src/Qiniu"},
-        "files": ["src/Qiniu/functions.php"]
+        "psr-4": {
+            "Qiniu\\": "src/Qiniu"
+        },
+        "files": [
+            "src/Qiniu/functions.php"
+        ]
     }
-}
+}
diff --git a/src/Qiniu/Http/Client.php b/src/Qiniu/Http/Client.php
@@ -152,7 +152,7 @@ private static function escapeQuotes($str)
         $replace = array("\\\\", "\\\"");
         return str_replace($find, $replace, $str);
     }
-    
+
     private static function ucwordsHyphen($str)
     {
         return str_replace('- ', '-', ucwords(str_replace('-', '- ', $str)));
diff --git a/src/Qiniu/Storage/ResumeUploader.php b/src/Qiniu/Storage/ResumeUploader.php
@@ -171,7 +171,13 @@ public function upload($fname)
                 $response = $this->makeBlock($data, $blockSize);
             } else {
                 $md5 = md5($data);
-                $response = $this->uploadPart($data, $partNumber, $this->finishedEtags["uploadId"], $encodedObjectName);
+                $response = $this->uploadPart(
+                    $data,
+                    $partNumber,
+                    $this->finishedEtags["uploadId"],
+                    $encodedObjectName,
+                    $md5
+                );
             }
 
             $ret = null;
@@ -203,7 +209,8 @@ public function upload($fname)
                         $data,
                         $partNumber,
                         $this->finishedEtags["uploadId"],
-                        $encodedObjectName
+                        $encodedObjectName,
+                        $md5
                     );
                     $ret = $response->json();
                 }
@@ -330,12 +337,12 @@ private function initReq($encodedObjectName)
     /**
      * 分块上传v2
      */
-    private function uploadPart($block, $partNumber, $uploadId, $encodedObjectName)
+    private function uploadPart($block, $partNumber, $uploadId, $encodedObjectName, $md5)
     {
         $headers = array(
             'Authorization' => 'UpToken ' . $this->upToken,
             'Content-Type' => 'application/octet-stream',
-            'Content-MD5' => $block
+            'Content-MD5' => $md5
         );
         $url = $this->host.'/buckets/'.$this->bucket.'/objects/'.$encodedObjectName.
             '/uploads/'.$uploadId.'/'.$partNumber;
diff --git a/src/Qiniu/Storage/UploadManager.php b/src/Qiniu/Storage/UploadManager.php
@@ -48,7 +48,7 @@ public function put(
         $mime = 'application/octet-stream',
         $fname = "default_filename"
     ) {
-    
+
         $params = self::trimParams($params);
         return FormUploader::put(
             $upToken,
@@ -92,7 +92,7 @@ public function putFile(
         $version = 'v1',
         $partSize = config::BLOCK_SIZE
     ) {
-    
+
         $file = fopen($filePath, 'rb');
         if ($file === false) {
             throw new \Exception("file can not open", 1);
diff --git a/tests/Qiniu/Tests/CdnManagerTest.php b/tests/Qiniu/Tests/CdnManagerTest.php
@@ -56,43 +56,43 @@ protected function setUp()
     public function testRefreshUrls()
     {
         list($ret, $err) = $this->cdnManager->refreshUrls(array($this->refreshUrl));
-        $this->assertNotNull($ret);
         $this->assertNull($err);
+        $this->assertNotNull($ret);
     }
 
     public function testRefreshDirs()
     {
         list($ret, $err) = $this->cdnManager->refreshDirs(array($this->refreshDirs));
-        $this->assertNotNull($ret);
         $this->assertNull($err);
+        $this->assertNotNull($ret);
     }
 
     public function testRefreshUrlsAndDirs()
     {
         list($ret, $err) = $this->cdnManager->refreshUrlsAndDirs(array($this->refreshUrl), array($this->refreshDirs));
-        $this->assertNotNull($ret);
         $this->assertNull($err);
+        $this->assertNotNull($ret);
     }
 
     public function testGetCdnRefreshList()
     {
         list($ret, $err) = $this->cdnManager->getCdnRefreshList(null, null, null, 'success');
-        $this->assertNotNull($ret);
         $this->assertNull($err);
+        $this->assertNotNull($ret);
     }
 
     public function testPrefetchUrls()
     {
         list($ret, $err) = $this->cdnManager->prefetchUrls(array($this->refreshUrl));
-        $this->assertNotNull($ret);
         $this->assertNull($err);
+        $this->assertNotNull($ret);
     }
 
     public function testGetCdnPrefetchList()
     {
         list($ret, $err) = $this->cdnManager->getCdnPrefetchList(null, null, 'success');
-        $this->assertNotNull($ret);
         $this->assertNull($err);
+        $this->assertNotNull($ret);
     }
 
     public function testGetBandwidthData()
@@ -103,8 +103,8 @@ public function testGetBandwidthData()
             $this->testEndDate,
             $this->testGranularity
         );
-        $this->assertNotNull($ret);
         $this->assertNull($err);
+        $this->assertNotNull($ret);
     }
 
     public function testGetFluxData()
@@ -115,31 +115,31 @@ public function testGetFluxData()
             $this->testEndDate,
             $this->testGranularity
         );
-        $this->assertNotNull($ret);
         $this->assertNull($err);
+        $this->assertNotNull($ret);
     }
 
     public function testGetCdnLogList()
     {
         list($ret, $err) = $this->cdnManager->getCdnLogList(array('fake.qiniu.com'), $this->testLogDate);
-        $this->assertNull($ret);
         $this->assertNotNull($err);
+        $this->assertNull($ret);
     }
 
     public function testCreateTimestampAntiLeechUrl()
     {
         $signUrl = $this->cdnManager->createTimestampAntiLeechUrl($this->refreshUrl, $this->encryptKey, 3600);
         $response = Client::get($signUrl);
-        $this->assertEquals($response->statusCode, 200);
         $this->assertNull($response->error);
+        $this->assertEquals($response->statusCode, 200);
 
         $signUrl = $this->cdnManager->createTimestampAntiLeechUrl(
             $this->refreshUrl . '?qiniu',
             $this->encryptKey,
             3600
         );
         $response = Client::get($signUrl);
-        $this->assertEquals($response->statusCode, 200);
         $this->assertNull($response->error);
+        $this->assertEquals($response->statusCode, 200);
     }
 }
diff --git a/tests/Qiniu/Tests/EtagTest.php b/tests/Qiniu/Tests/EtagTest.php
@@ -7,7 +7,7 @@ class EtagTest extends \PHPUnit_Framework_TestCase
 {
     public function test0M()
     {
-        $file = qiniuTempFile(0);
+        $file = qiniuTempFile(0, false);
         list($r, $error) = Etag::sum($file);
         unlink($file);
         $this->assertEquals('Fto5o-5ea0sNMlW_75VgGJCv2AcJ', $r);
@@ -16,7 +16,7 @@ public function test0M()
 
     public function testLess4M()
     {
-        $file = qiniuTempFile(3 * 1024 * 1024);
+        $file = qiniuTempFile(3 * 1024 * 1024, false);
         list($r, $error) = Etag::sum($file);
         unlink($file);
         $this->assertEquals('Fs5BpnAjRykYTg6o5E09cjuXrDkG', $r);
@@ -25,7 +25,7 @@ public function testLess4M()
 
     public function test4M()
     {
-        $file = qiniuTempFile(4 * 1024 * 1024);
+        $file = qiniuTempFile(4 * 1024 * 1024, false);
         list($r, $error) = Etag::sum($file);
         unlink($file);
         $this->assertEquals('FiuKULnybewpEnrfTmxjsxc-3dWp', $r);
@@ -34,7 +34,7 @@ public function test4M()
 
     public function testMore4M()
     {
-        $file = qiniuTempFile(5 * 1024 * 1024);
+        $file = qiniuTempFile(5 * 1024 * 1024, false);
         list($r, $error) = Etag::sum($file);
         unlink($file);
         $this->assertEquals('lhvyfIWMYFTq4s4alzlhXoAkqfVL', $r);
@@ -43,7 +43,7 @@ public function testMore4M()
 
     public function test8M()
     {
-        $file = qiniuTempFile(8 * 1024 * 1024);
+        $file = qiniuTempFile(8 * 1024 * 1024, false);
         list($r, $error) = Etag::sum($file);
         unlink($file);
         $this->assertEquals('lmRm9ZfGZ86bnMys4wRTWtJj9ClG', $r);
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -39,14 +39,23 @@
     $tid .= '.' . $pid;
 }
 
-function qiniuTempFile($size)
+function qiniuTempFile($size, $randomized = true)
 {
     $fileName = tempnam(sys_get_temp_dir(), 'qiniu_');
     $file = fopen($fileName, 'wb');
-    if ($size > 0) {
+    if ($randomized) {
+        $rest_size = $size;
+        while ($rest_size > 0) {
+            $length = min($rest_size, 4 * 1024);
+            if (fwrite($file, random_bytes($length)) == false) {
+                return false;
+            }
+            $rest_size -= $length;
+        }
+    } else if ($size > 0) {
         fseek($file, $size - 1);
         fwrite($file, ' ');
     }
     fclose($file);
     return $fileName;
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ private static function escapeQuotes($str)`
`152`	`152`	`$replace = array("\\\\", "\\\"");`
`153`	`153`	`return str_replace($find, $replace, $str);`
`154`	`154`	`}`
`155`		`-`
	`155`	`+`
`156`	`156`	`private static function ucwordsHyphen($str)`
`157`	`157`	`{`
`158`	`158`	`return str_replace('- ', '-', ucwords(str_replace('-', '- ', $str)));`
Original file line number	Diff line number	Diff line change
`@@ -56,43 +56,43 @@ protected function setUp()`
`56`	`56`	`public function testRefreshUrls()`
`57`	`57`	`{`
`58`	`58`	`list($ret, $err) = $this->cdnManager->refreshUrls(array($this->refreshUrl));`
`59`		`- $this->assertNotNull($ret);`
`60`	`59`	`$this->assertNull($err);`
	`60`	`+ $this->assertNotNull($ret);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public function testRefreshDirs()`
`64`	`64`	`{`
`65`	`65`	`list($ret, $err) = $this->cdnManager->refreshDirs(array($this->refreshDirs));`
`66`		`- $this->assertNotNull($ret);`
`67`	`66`	`$this->assertNull($err);`
	`67`	`+ $this->assertNotNull($ret);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`public function testRefreshUrlsAndDirs()`
`71`	`71`	`{`
`72`	`72`	`list($ret, $err) = $this->cdnManager->refreshUrlsAndDirs(array($this->refreshUrl), array($this->refreshDirs));`
`73`		`- $this->assertNotNull($ret);`
`74`	`73`	`$this->assertNull($err);`
	`74`	`+ $this->assertNotNull($ret);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public function testGetCdnRefreshList()`
`78`	`78`	`{`
`79`	`79`	`list($ret, $err) = $this->cdnManager->getCdnRefreshList(null, null, null, 'success');`
`80`		`- $this->assertNotNull($ret);`
`81`	`80`	`$this->assertNull($err);`
	`81`	`+ $this->assertNotNull($ret);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public function testPrefetchUrls()`
`85`	`85`	`{`
`86`	`86`	`list($ret, $err) = $this->cdnManager->prefetchUrls(array($this->refreshUrl));`
`87`		`- $this->assertNotNull($ret);`
`88`	`87`	`$this->assertNull($err);`
	`88`	`+ $this->assertNotNull($ret);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`public function testGetCdnPrefetchList()`
`92`	`92`	`{`
`93`	`93`	`list($ret, $err) = $this->cdnManager->getCdnPrefetchList(null, null, 'success');`
`94`		`- $this->assertNotNull($ret);`
`95`	`94`	`$this->assertNull($err);`
	`95`	`+ $this->assertNotNull($ret);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`public function testGetBandwidthData()`
`@@ -103,8 +103,8 @@ public function testGetBandwidthData()`
`103`	`103`	`$this->testEndDate,`
`104`	`104`	`$this->testGranularity`
`105`	`105`	`);`
`106`		`- $this->assertNotNull($ret);`
`107`	`106`	`$this->assertNull($err);`
	`107`	`+ $this->assertNotNull($ret);`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`public function testGetFluxData()`
`@@ -115,31 +115,31 @@ public function testGetFluxData()`
`115`	`115`	`$this->testEndDate,`
`116`	`116`	`$this->testGranularity`
`117`	`117`	`);`
`118`		`- $this->assertNotNull($ret);`
`119`	`118`	`$this->assertNull($err);`
	`119`	`+ $this->assertNotNull($ret);`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`public function testGetCdnLogList()`
`123`	`123`	`{`
`124`	`124`	`list($ret, $err) = $this->cdnManager->getCdnLogList(array('fake.qiniu.com'), $this->testLogDate);`
`125`		`- $this->assertNull($ret);`
`126`	`125`	`$this->assertNotNull($err);`
	`126`	`+ $this->assertNull($ret);`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`public function testCreateTimestampAntiLeechUrl()`
`130`	`130`	`{`
`131`	`131`	`$signUrl = $this->cdnManager->createTimestampAntiLeechUrl($this->refreshUrl, $this->encryptKey, 3600);`
`132`	`132`	`$response = Client::get($signUrl);`
`133`		`- $this->assertEquals($response->statusCode, 200);`
`134`	`133`	`$this->assertNull($response->error);`
	`134`	`+ $this->assertEquals($response->statusCode, 200);`
`135`	`135`
`136`	`136`	`$signUrl = $this->cdnManager->createTimestampAntiLeechUrl(`
`137`	`137`	`$this->refreshUrl . '?qiniu',`
`138`	`138`	`$this->encryptKey,`
`139`	`139`	`3600`
`140`	`140`	`);`
`141`	`141`	`$response = Client::get($signUrl);`
`142`		`- $this->assertEquals($response->statusCode, 200);`
`143`	`142`	`$this->assertNull($response->error);`
	`143`	`+ $this->assertEquals($response->statusCode, 200);`
`144`	`144`	`}`
`145`	`145`	`}`