View GitHub Repository ThinkLibrary

Schedule Inspection
Subscribe
Passed
Push — v6 ( 6c09a8...b3cd76 )
by 光春
02:47
created
Status
Category
Toggle Patches
src/service/ksyun/bin/samples/FormUpload.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -2,9 +2,9 @@  discard block
 
 block discarded – undo
2 2 
 //更加详细的表单上传请参考js sdk
3 3 
 require_once "../Ks3Client.class.php";
4 4
5 
-$client = new Ks3Client("","");
5 
+$client = new Ks3Client("", "");
6 6 
 $bucket_name = "phpsdktestlijunwei";
7 
-if(!$client->bucketExists(array("Bucket"=>$bucket_name))){
7 
+if (!$client->bucketExists(array("Bucket"=>$bucket_name))) {
8 8 
     $client->createBucket(array("Bucket"=>$bucket_name));
9 9 
 }
10 10 
 
@@ -24,7 +24,7 @@  discard block
 
 block discarded – undo
24 24 
 $unknowData = array(
25 25 
 	"random"
26 26 
 	);
27 
-$result = $client->postObject($bucket_name,$postData,$unknowData);
27 
+$result = $client->postObject($bucket_name, $postData, $unknowData);
28 28 
 print_r($result);
29 29
30 30 
 ?>
 
@@ -33,14 +33,14 @@  discard block
 
 block discarded – undo
33 33 
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
34 34 
 </head>
35 35 
 <body>
36 
-<form action="<?php echo $host_uri;?>" method="post" enctype="multipart/form-data">
37 
-Key to upload: <input type="input" name="key" value="<?php echo $key;?>" /><br />
38 
-<input type="hidden" name="success_action_redirect" value="<?php echo $redirect;?>" />
36 
+<form action="<?php echo $host_uri; ?>" method="post" enctype="multipart/form-data">
37 
+Key to upload: <input type="input" name="key" value="<?php echo $key; ?>" /><br />
38 
+<input type="hidden" name="success_action_redirect" value="<?php echo $redirect; ?>" />
39 39 
 <input type="hidden" name="Content-Type" value="text/html" />
40 40 
 <input type="hidden" name="random" value="vfegf34egf3" />
41 
-<input type="hidden" name="KSSAccessKeyId" value="<?php echo $result["KSSAccessKeyId"];?>" />
42 
-<input type="hidden" name="Policy" value="<?php echo $result["Policy"];?>" />
43 
-<input type="hidden" name="Signature" value="<?php echo $result["Signature"];?>" />
41 
+<input type="hidden" name="KSSAccessKeyId" value="<?php echo $result["KSSAccessKeyId"]; ?>" />
42 
+<input type="hidden" name="Policy" value="<?php echo $result["Policy"]; ?>" />
43 
+<input type="hidden" name="Signature" value="<?php echo $result["Signature"]; ?>" />
44 44 
 File: <input type="file" name="file" /> <br />
45 45 
 <!-- The elements after this will be ignored -->
46 46 
 <input type="submit" name="submit" value="Upload to KSS S3" />
Please login to merge, or discard this patch.
src/service/ksyun/bin/samples/TestEncryptionClientMeta.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,5 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 
-define("ENCRYPTPTION_STORAGE_MODE","ObjectMetadata");
2 
+define("ENCRYPTPTION_STORAGE_MODE", "ObjectMetadata");
3 3 
 require_once "../Ks3EncryptionClient.class.php";
4 4 
 require_once "../Ks3Client.class.php";
5 5 
 $bucket = "test-encryption";
 
@@ -7,16 +7,16 @@  discard block
 
 block discarded – undo
7 7
8 8 
 $filename = "secret.key";
9 9 
 $handle = fopen($filename, "r");
10 
-$contents = fread($handle, filesize ($filename));
10 
+$contents = fread($handle, filesize($filename));
11 11 
 fclose($handle);
12 12
13 
-$client = new Ks3EncryptionClient("lMQTr0hNlMpB0iOk/i+x","D4CsYLs75JcWEjbiI22zR3P7kJ/+5B1qdEje7A7I",$contents);
14 
-putObjectByContentAndGetObjectUsingMeta($client,$bucket,$keyprefix);
15 
-putObjectByFileAndGetObjectUsingMeta($client,$bucket,$keyprefix);
16 
-multipartUpload($client,$bucket,$keyprefix);
13 
+$client = new Ks3EncryptionClient("lMQTr0hNlMpB0iOk/i+x", "D4CsYLs75JcWEjbiI22zR3P7kJ/+5B1qdEje7A7I", $contents);
14 
+putObjectByContentAndGetObjectUsingMeta($client, $bucket, $keyprefix);
15 
+putObjectByFileAndGetObjectUsingMeta($client, $bucket, $keyprefix);
16 
+multipartUpload($client, $bucket, $keyprefix);
17 17
18 
-function putObjectByContentAndGetObjectUsingMeta($client,$bucket,$keyprefix){
19 
-	for($i = 45 ;$i < 60;$i++){
18 
+function putObjectByContentAndGetObjectUsingMeta($client, $bucket, $keyprefix) {
19 
+	for ($i = 45; $i < 60; $i++) {
20 20
21 21 
 		$content = EncryptionUtil::genereateOnceUsedKey($i);
22 22 
 
@@ -27,11 +27,11 @@  discard block
 
 block discarded – undo
27 27 
 			"Content"=>$content
28 28 
 		);
29 29 
 		$client->putObjectByContent($args);
30 
-		rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOMeta",
31 
-			"D://testdown/down",base64_encode(md5($args["Content"])));
30 
+		rangeGetAndCheckMd5($client, $bucket, $keyprefix."EOMeta",
31 
+			"D://testdown/down", base64_encode(md5($args["Content"])));
32 32 
 	}
33 33 
 }
34 
-function putObjectByFileAndGetObjectUsingMeta($client,$bucket,$keyprefix){
34 
+function putObjectByFileAndGetObjectUsingMeta($client, $bucket, $keyprefix) {
35 35
36 36 
 	$args = array(
37 37 
 		"Bucket"=>$bucket,
 
@@ -42,39 +42,39 @@  discard block
 
 block discarded – undo
42 42 
 			)
43 43 
 	);
44 44 
 	$client->putObjectByFile($args);
45 
-	rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOMeta",
46 
-			"D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
45 
+	rangeGetAndCheckMd5($client, $bucket, $keyprefix."EOMeta",
46 
+			"D://testdown/down", base64_encode(md5_file("D://IMG.jpg")));
47 47 
 }
48 
-function multipartUpload($client,$bucket,$keyprefix){
48 
+function multipartUpload($client, $bucket, $keyprefix) {
49 49 
 	//初始化分开上传，获取uploadid
50 50 
     $args = array(
51 51 
         "Bucket"=>$bucket,
52 52 
         "Key"=>$keyprefix."EOMeta",
53 53 
     );
54 54 
     $uploadid = $client->initMultipartUpload($args);
55 
-    $uploadid = $uploadid["UploadId"];//获取到uploadid
55 
+    $uploadid = $uploadid["UploadId"]; //获取到uploadid
56 56 
         //开始上传
57 57
58 
-    $file = "D://IMG.jpg";//要上传的文件
58 
+    $file = "D://IMG.jpg"; //要上传的文件
59 59 
     $partsize = 1024*100;
60 
-    $resource = fopen($file,"r");
60 
+    $resource = fopen($file, "r");
61 61 
     $stat = fstat($resource);
62 
-    $total = $stat["size"];//获取文件的总大小
62 
+    $total = $stat["size"]; //获取文件的总大小
63 63 
     fclose($resource);
64 
-    $count = (int)(($total-1)/$partsize)+1;//计算文件需要分几块上传
65 
-    for($i = 0;$i < $count;$i++){
64 
+    $count = (int)(($total-1)/$partsize)+1; //计算文件需要分几块上传
65 
+    for ($i = 0; $i < $count; $i++) {
66 66 
         //依次上传每一块
67 67 
         echo "upload".$i."\r\n";
68 
-        $args=array(
68 
+        $args = array(
69 69 
             "Bucket"=>$bucket,
70 70 
         	"Key"=>$keyprefix."EOMeta",
71 
-        	"LastPart"=>($i===$count-1),
71 
+        	"LastPart"=>($i === $count-1),
72 72 
             "Options"=>array(
73 73 
                 "partNumber"=>$i+1,
74 74 
                 "uploadId"=>$uploadid
75 75 
             ),
76 76 
             "ObjectMeta"=>array(
77 
-                "Content-Length"=>min($partsize,$total-$partsize*$i)//每次上传$partsize大小
77 
+                "Content-Length"=>min($partsize, $total-$partsize*$i)//每次上传$partsize大小
78 78 
             ),
79 79 
             "Content"=>array(
80 80 
                 "content"=>$file,
 
@@ -84,9 +84,9 @@  discard block
 
 block discarded – undo
84 84 
         $etag = $client->uploadPart($args);
85 85 
         $etag = $etag["ETag"];
86 86 
     }
87 
-    $parts = $client->listParts(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOMeta","Options"=>array("uploadId"=>$uploadid)));
87 
+    $parts = $client->listParts(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOMeta", "Options"=>array("uploadId"=>$uploadid)));
88 88 
     //结束上传
89 
-    $args=array(
89 
+    $args = array(
90 90 
         "Bucket"=>$bucket,
91 91 
         "Key"=>$keyprefix."EOMeta",
92 92 
         "Options"=>array("uploadId"=>$uploadid),
 
@@ -94,21 +94,21 @@  discard block
 
 block discarded – undo
94 94 
     );
95 95 
     $result = $client->completeMultipartUpload($args);
96 96
97 
-    rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOMeta",
98 
-    	"D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
97 
+    rangeGetAndCheckMd5($client, $bucket, $keyprefix."EOMeta",
98 
+    	"D://testdown/down", base64_encode(md5_file("D://IMG.jpg")));
99 99 
 }
100 
-function rangeGetAndCheckMd5($client,$bucket,$key,$file,$expectedMd5){
101 
-	$args = array("Bucket"=>$bucket,"Key"=>$key);
100 
+function rangeGetAndCheckMd5($client, $bucket, $key, $file, $expectedMd5) {
101 
+	$args = array("Bucket"=>$bucket, "Key"=>$key);
102 102 
 	$meta = $client->getObjectMeta($args);
103 103 
 	$contentlength = $meta["ObjectMeta"]["Content-Length"];
104 104
105 105 
 	$filelist = array();
106 106
107 
-	for($begin = 0;$begin <$contentlength;){
108 
-		$index = rand((int)($contentlength/20),(int)($contentlength/10));
109 
-		$range = array("start"=>$begin,"end"=>$begin+$index);
107 
+	for ($begin = 0; $begin < $contentlength;) {
108 
+		$index = rand((int)($contentlength/20), (int)($contentlength/10));
109 
+		$range = array("start"=>$begin, "end"=>$begin+$index);
110 110 
 		$destFile = $file.$begin."-".($begin+$index);
111 
-		array_push($filelist,$destFile);
111 
+		array_push($filelist, $destFile);
112 112 
 		$begin += ($index+1);
113 113 
 		$args = array(
114 114 
 			"Bucket"=>$bucket,
 
@@ -120,17 +120,17 @@  discard block
 
 block discarded – undo
120 120 
 	}
121 121
122 122 
 	foreach ($filelist as $key => $value) {
123 
-		$handle = fopen($value,"r");
123 
+		$handle = fopen($value, "r");
124 124 
 		$size = filesize($value);
125 
-		if($size > 0){
126 
-			$content = fread($handle,$size);
127 
-			file_put_contents($file,$content,FILE_APPEND);
125 
+		if ($size > 0) {
126 
+			$content = fread($handle, $size);
127 
+			file_put_contents($file, $content, FILE_APPEND);
128 128 
 		}
129 129 
 		fclose($handle);
130 130 
 		@unlink($value);
131 131 
 	}
132 132 
 	$md5 = base64_encode(md5_file($file));
133 
-	if($md5 != $expectedMd5)
133 
+	if ($md5 != $expectedMd5)
134 134 
 		throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
135 135 
 	@unlink($file);
136 136 
 }
Please login to merge, or discard this patch.
src/service/ksyun/bin/samples/TestEncryptionClientFile.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,5 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 
-define("ENCRYPTPTION_STORAGE_MODE","InstructionFile");
2 
+define("ENCRYPTPTION_STORAGE_MODE", "InstructionFile");
3 3 
 require_once "../Ks3EncryptionClient.class.php";
4 4 
 require_once "../Ks3Client.class.php";
5 5 
 $bucket = "test-encryption";
 
@@ -7,17 +7,17 @@  discard block
 
 block discarded – undo
7 7
8 8 
 $filename = "secret.key";
9 9 
 $handle = fopen($filename, "r");
10 
-$contents = fread($handle, filesize ($filename));
10 
+$contents = fread($handle, filesize($filename));
11 11 
 fclose($handle);
12 12
13 
-$client = new Ks3EncryptionClient("lMQTr0hNlMpB0iOk/i+x","D4CsYLs75JcWEjbiI22zR3P7kJ/+5B1qdEje7A7I",$contents);
14 
-putObjectByContentAndGetObjectUsingInstruction($client,$bucket,$keyprefix);
15 
-putObjectByFileAndGetObjectUsingFile($client,$bucket,$keyprefix);
16 
-multipartUpload($client,$bucket,$keyprefix);
17 
-copyAnddeleteObject($client,$bucket,$keyprefix);
13 
+$client = new Ks3EncryptionClient("lMQTr0hNlMpB0iOk/i+x", "D4CsYLs75JcWEjbiI22zR3P7kJ/+5B1qdEje7A7I", $contents);
14 
+putObjectByContentAndGetObjectUsingInstruction($client, $bucket, $keyprefix);
15 
+putObjectByFileAndGetObjectUsingFile($client, $bucket, $keyprefix);
16 
+multipartUpload($client, $bucket, $keyprefix);
17 
+copyAnddeleteObject($client, $bucket, $keyprefix);
18 18
19 
-function putObjectByContentAndGetObjectUsingInstruction($client,$bucket,$keyprefix){
20 
-	$content = EncryptionUtil::genereateOnceUsedKey(rand(100,1000));
19 
+function putObjectByContentAndGetObjectUsingInstruction($client, $bucket, $keyprefix) {
20 
+	$content = EncryptionUtil::genereateOnceUsedKey(rand(100, 1000));
21 21 
 	$args = array(
22 22 
 		"Bucket"=>$bucket,
23 23 
 		"Key"=>$keyprefix."EOFile",
 
@@ -25,10 +25,10 @@  discard block
 
 block discarded – undo
25 25 
 		"Content"=>$content
26 26 
 	);
27 27 
 	$client->putObjectByContent($args);
28 
-	rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOFile",
29 
-			"D://testdown/down",base64_encode(md5($args["Content"])));
28 
+	rangeGetAndCheckMd5($client, $bucket, $keyprefix."EOFile",
29 
+			"D://testdown/down", base64_encode(md5($args["Content"])));
30 30 
 }
31 
-function putObjectByFileAndGetObjectUsingFile($client,$bucket,$keyprefix){
31 
+function putObjectByFileAndGetObjectUsingFile($client, $bucket, $keyprefix) {
32 32
33 33 
 	$args = array(
34 34 
 		"Bucket"=>$bucket,
 
@@ -39,39 +39,39 @@  discard block
 
 block discarded – undo
39 39 
 			)
40 40 
 	);
41 41 
 	$client->putObjectByFile($args);
42 
-	rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOFile",
43 
-			"D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
42 
+	rangeGetAndCheckMd5($client, $bucket, $keyprefix."EOFile",
43 
+			"D://testdown/down", base64_encode(md5_file("D://IMG.jpg")));
44 44 
 }
45 
-function multipartUpload($client,$bucket,$keyprefix){
45 
+function multipartUpload($client, $bucket, $keyprefix) {
46 46 
 	//初始化分开上传，获取uploadid
47 47 
     $args = array(
48 48 
         "Bucket"=>$bucket,
49 49 
         "Key"=>$keyprefix."EOFile",
50 50 
     );
51 51 
     $uploadid = $client->initMultipartUpload($args);
52 
-    $uploadid = $uploadid["UploadId"];//获取到uploadid
52 
+    $uploadid = $uploadid["UploadId"]; //获取到uploadid
53 53 
         //开始上传
54 54
55 
-    $file = "D://IMG.jpg";//要上传的文件
55 
+    $file = "D://IMG.jpg"; //要上传的文件
56 56 
     $partsize = 1024*100;
57 
-    $resource = fopen($file,"r");
57 
+    $resource = fopen($file, "r");
58 58 
     $stat = fstat($resource);
59 
-    $total = $stat["size"];//获取文件的总大小
59 
+    $total = $stat["size"]; //获取文件的总大小
60 60 
     fclose($resource);
61 
-    $count = (int)(($total-1)/$partsize)+1;//计算文件需要分几块上传
62 
-    for($i = 0;$i < $count;$i++){
61 
+    $count = (int)(($total-1)/$partsize)+1; //计算文件需要分几块上传
62 
+    for ($i = 0; $i < $count; $i++) {
63 63 
         //依次上传每一块
64 64 
         echo "upload".$i."\r\n";
65 
-        $args=array(
65 
+        $args = array(
66 66 
             "Bucket"=>$bucket,
67 67 
         	"Key"=>$keyprefix."EOFile",
68 
-        	"LastPart"=>($i===$count-1),
68 
+        	"LastPart"=>($i === $count-1),
69 69 
             "Options"=>array(
70 70 
                 "partNumber"=>$i+1,
71 71 
                 "uploadId"=>$uploadid
72 72 
             ),
73 73 
             "ObjectMeta"=>array(
74 
-                "Content-Length"=>min($partsize,$total-$partsize*$i)//每次上传$partsize大小
74 
+                "Content-Length"=>min($partsize, $total-$partsize*$i)//每次上传$partsize大小
75 75 
             ),
76 76 
             "Content"=>array(
77 77 
                 "content"=>$file,
 
@@ -81,9 +81,9 @@  discard block
 
 block discarded – undo
81 81 
         $etag = $client->uploadPart($args);
82 82 
         $etag = $etag["ETag"];
83 83 
     }
84 
-    $parts = $client->listParts(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFile","Options"=>array("uploadId"=>$uploadid)));
84 
+    $parts = $client->listParts(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFile", "Options"=>array("uploadId"=>$uploadid)));
85 85 
     //结束上传
86 
-    $args=array(
86 
+    $args = array(
87 87 
         "Bucket"=>$bucket,
88 88 
         "Key"=>$keyprefix."EOFile",
89 89 
         "Options"=>array("uploadId"=>$uploadid),
 
@@ -91,11 +91,11 @@  discard block
 
 block discarded – undo
91 91 
     );
92 92 
     $result = $client->completeMultipartUpload($args);
93 93
94 
-    rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOFile",
95 
-    	"D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
94 
+    rangeGetAndCheckMd5($client, $bucket, $keyprefix."EOFile",
95 
+    	"D://testdown/down", base64_encode(md5_file("D://IMG.jpg")));
96 96 
 }
97 
-function copyAnddeleteObject($client,$bucket,$keyprefix){
98 
-	$content = EncryptionUtil::genereateOnceUsedKey(rand(100,1000));
97 
+function copyAnddeleteObject($client, $bucket, $keyprefix) {
98 
+	$content = EncryptionUtil::genereateOnceUsedKey(rand(100, 1000));
99 99 
 	$args = array(
100 100 
 		"Bucket"=>$bucket,
101 101 
 		"Key"=>$keyprefix."EOFile",
 
@@ -104,10 +104,10 @@  discard block
 
 block discarded – undo
104 104 
 	);
105 105 
 	$client->putObjectByContent($args);
106 106
107 
-	if($client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy")))
108 
-		$client->deleteObject(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy"));
109 
-	if($client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy.instruction")))
110 
-		$client->deleteObject(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy.instruction"));
107 
+	if ($client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy")))
108 
+		$client->deleteObject(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy"));
109 
+	if ($client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy.instruction")))
110 
+		$client->deleteObject(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy.instruction"));
111 111
112 112 
 	$copyReq = array(
113 113 
 		"Bucket"=>$bucket,
 
@@ -119,30 +119,30 @@  discard block
 
 block discarded – undo
119 119 
 		);
120 120 
 	$client->copyObject($copyReq);
121 121
122 
-	if(!$client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy")))
122 
+	if (!$client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy")))
123 123 
 		throw new Exception("not found ".$keyprefix."EOFileCopy");
124 
-	if(!$client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy.instruction")))
124 
+	if (!$client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy.instruction")))
125 125 
 		throw new Exception("not found ".$keyprefix."EOFileCopy.instruction");
126 126
127 
-	$client->deleteObject(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy"));
127 
+	$client->deleteObject(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy"));
128 128
129 
-	if($client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy")))
129 
+	if ($client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy")))
130 130 
 		throw new Exception("found ".$keyprefix."EOFileCopy");
131 
-	if($client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy.instruction")))
131 
+	if ($client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy.instruction")))
132 132 
 		throw new Exception("found ".$keyprefix."EOFileCopy.instruction");
133 133 
 }
134 
-function rangeGetAndCheckMd5($client,$bucket,$key,$file,$expectedMd5){
135 
-	$args = array("Bucket"=>$bucket,"Key"=>$key);
134 
+function rangeGetAndCheckMd5($client, $bucket, $key, $file, $expectedMd5) {
135 
+	$args = array("Bucket"=>$bucket, "Key"=>$key);
136 136 
 	$meta = $client->getObjectMeta($args);
137 137 
 	$contentlength = $meta["ObjectMeta"]["Content-Length"];
138 138
139 139 
 	$filelist = array();
140 140
141 
-	for($begin = 0;$begin <$contentlength;){
142 
-		$index = rand((int)($contentlength/20),(int)($contentlength/10));
143 
-		$range = array("start"=>$begin,"end"=>$begin+$index);
141 
+	for ($begin = 0; $begin < $contentlength;) {
142 
+		$index = rand((int)($contentlength/20), (int)($contentlength/10));
143 
+		$range = array("start"=>$begin, "end"=>$begin+$index);
144 144 
 		$destFile = $file.$begin."-".($begin+$index);
145 
-		array_push($filelist,$destFile);
145 
+		array_push($filelist, $destFile);
146 146 
 		$begin += ($index+1);
147 147 
 		$args = array(
148 148 
 			"Bucket"=>$bucket,
 
@@ -154,17 +154,17 @@  discard block
 
 block discarded – undo
154 154 
 	}
155 155
156 156 
 	foreach ($filelist as $key => $value) {
157 
-		$handle = fopen($value,"r");
157 
+		$handle = fopen($value, "r");
158 158 
 		$size = filesize($value);
159 
-		if($size > 0){
160 
-			$content = fread($handle,$size);
161 
-			file_put_contents($file,$content,FILE_APPEND);
159 
+		if ($size > 0) {
160 
+			$content = fread($handle, $size);
161 
+			file_put_contents($file, $content, FILE_APPEND);
162 162 
 		}
163 163 
 		fclose($handle);
164 164 
 		@unlink($value);
165 165 
 	}
166 166 
 	$md5 = base64_encode(md5_file($file));
167 
-	if($md5 != $expectedMd5)
167 
+	if ($md5 != $expectedMd5)
168 168 
 		throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
169 169 
 	@unlink($file);
170 170 
 }
Please login to merge, or discard this patch.
src/service/ksyun/bin/samples/Samples.php 1 patch
Spacing   +55 added lines, -55 removed lines patch added patch discarded remove patch 
@@ -2,7 +2,7 @@  discard block
 
 block discarded – undo
2 2 
 require_once "../Ks3Client.class.php";
3 3 
 require_once "../core/Utils.class.php";
4 4
5 
-$client = new Ks3Client("","","kss.ksyun.com");//!!第三个参数endpoint需要对应bucket所在region!! 详见http://ks3.ksyun.com/doc/api/index.html  Region（区域）一节
5 
+$client = new Ks3Client("", "", "kss.ksyun.com"); //!!第三个参数endpoint需要对应bucket所在region!! 详见http://ks3.ksyun.com/doc/api/index.html  Region（区域）一节
6 6 
 //print_r(listBuckets($client));
7 7 
 //print_r(deleteBucket($client));
8 8 
 //print_r(deleteBucketCORS($client));
 
@@ -32,16 +32,16 @@  discard block
 
 block discarded – undo
32 32 
 //print_r(multipartUploadWithAdpAndCallBack($client));
33 33 
 //print_r(putAdp($client));
34 34 
 //print_r(postObject($client));
35 
-function listBuckets($client){
35 
+function listBuckets($client) {
36 36 
 	return $client->listBuckets();
37 37 
 }
38 
-function deleteBucket($client){
38 
+function deleteBucket($client) {
39 39 
 	return $client->deleteBucket(array("Bucket"=>"ksc-scm"));
40 40 
 }
41 
-function deleteBucketCORS($client){
41 
+function deleteBucketCORS($client) {
42 42 
 	return $client->deleteBucketCORS(array("Bucket"=>"ksc-scm"));
43 43 
 }
44 
-function listObjects($client){
44 
+function listObjects($client) {
45 45 
 	$args = array(
46 46 
 		"Bucket"=>"lijunwei.test",
47 47 
 		"Options"=>array(
 
@@ -53,49 +53,49 @@  discard block
 
 block discarded – undo
53 53 
 		);
54 54 
 	return $client->listObjects($args);
55 55 
 }
56 
-function getBucketAcl($client){
56 
+function getBucketAcl($client) {
57 57 
 	return $client->getBucketAcl(array("Bucket"=>"aaphp"));
58 58 
 }
59 
-function getBucketCORS($client){
59 
+function getBucketCORS($client) {
60 60 
 	return $client->getBucketCORS(array("Bucket"=>"ksc-scm"));
61 61 
 }
62 
-function getBucketLocation($client){
62 
+function getBucketLocation($client) {
63 63 
 	return $client->getBucketLocation(array("Bucket"=>"ksc-scm"));
64 64 
 }
65 
-function getBucketLogging($client){
65 
+function getBucketLogging($client) {
66 66 
 	return $client->getBucketLogging(array("Bucket"=>"ksc-scm"));
67 67 
 }
68 
-function bucketExists($client){
68 
+function bucketExists($client) {
69 69 
 	$args = array("Bucket"=>"ksc-scm");
70 70 
 	return $client->bucketExists($args);
71 71 
 }
72 
-function createBucket($client){
72 
+function createBucket($client) {
73 73 
 	$args = array(
74 74 
 		"Bucket"=>"ksc-scm",
75 75 
 		"ACL"=>"private"
76 76 
 		);
77 77 
 	return $client->createBucket($args);
78 78 
 }
79 
-function setBucketAcl($client){
79 
+function setBucketAcl($client) {
80 80 
 	$args = array(
81 81 
 		"Bucket"=>"ksc-scm",
82 82 
 		"ACL"=>"private"
83 83 
 		);
84 84 
 	return $client->setBucketAcl($args);
85 85 
 }
86 
-function setBucketCORS($client){
86 
+function setBucketCORS($client) {
87 87 
 	$args = array(
88 88 
 		"Bucket"=>"ksc-scm",
89 89 
 		"CORS"=>array(
90 90 
 			array(
91 
-				"AllowedMethod"=>array("GET","PUT"),
91 
+				"AllowedMethod"=>array("GET", "PUT"),
92 92 
 				"AllowedOrigin"=>array("http://www.kingsoft.com"),
93 93 
 				"AllowedHeader"=>array("*"),
94 94 
 				"ExposeHeader"=>array("*"),
95 95 
 				"MaxAgeSeconds"=>10
96 96 
 			),
97 97 
 			array(
98 
-				"AllowedMethod"=>array("GET","PUT"),
98 
+				"AllowedMethod"=>array("GET", "PUT"),
99 99 
 				"AllowedOrigin"=>array("*"),
100 100 
 				"AllowedHeader"=>array("*"),
101 101 
 				"ExposeHeader"=>array("*"),
 
@@ -105,7 +105,7 @@  discard block
 
 block discarded – undo
105 105 
 	);
106 106 
 	return $client->setBucketCORS($args);
107 107 
 }
108 
-function setBucketLogging($client){
108 
+function setBucketLogging($client) {
109 109 
 	$args = array(
110 110 
 		"Bucket"=>"ksc-scm",
111 111 
 		"BucketLogging"=>array(
 
@@ -116,21 +116,21 @@  discard block
 
 block discarded – undo
116 116 
 		);
117 117 
 	return $client->setBucketLogging($args);
118 118 
 }
119 
-function deleteObject($client){
119 
+function deleteObject($client) {
120 120 
 	$args = array(
121 121 
 		"Bucket"=>"ksc-scm",
122 122 
 		"Key"=>"123.pdf"
123 123 
 		);
124 124 
 	return $client->deleteObject($args);
125 125 
 }
126 
-function deleteObjects($client){
126 
+function deleteObjects($client) {
127 127 
 	$args = array(
128 128 
 		"Bucket"=>"ksc-scm",
129 
-		"DeleteKeys"=>array("copy/test.zip","copy/123.doc")
129 
+		"DeleteKeys"=>array("copy/test.zip", "copy/123.doc")
130 130 
 		);
131 131 
 	return $client->deleteObjects($args);
132 132 
 }
133 
-function getObject($client){
133 
+function getObject($client) {
134 134 
 	$args = array(
135 135 
 		"Bucket"=>"aaphp",
136 136 
 		"Key"=>"multi.exe",
 
@@ -142,28 +142,28 @@  discard block
 
 block discarded – undo
142 142 
 		);
143 143 
 	return $client->getObject($args);
144 144 
 }
145 
-function getObjectAcl($client){
145 
+function getObjectAcl($client) {
146 146 
 	$args = array(
147 147 
 		"Bucket"=>"aaphp",
148 148 
 		"Key"=>"multi.exe"
149 149 
 		);
150 150 
 	return $client->getObjectAcl($args);
151 151 
 }
152 
-function objectExists($client){
152 
+function objectExists($client) {
153 153 
 	$args = array(
154 154 
 		"Bucket"=>"ksc-scm",
155 155 
 		"Key"=>"123.pdf"
156 156 
 		);
157 157 
 	return $client->objectExists($args);
158 158 
 }
159 
-function getObjectMeta($client){
159 
+function getObjectMeta($client) {
160 160 
 	$args = array(
161 161 
 		"Bucket"=>"aaphp",
162 162 
 		"Key"=>"test.zip"
163 163 
 		);
164 164 
 	return $client->getObjectMeta($args);
165 165 
 }
166 
-function setObjectAcl($client){
166 
+function setObjectAcl($client) {
167 167 
 	$args = array(
168 168 
 		"Bucket"=>"aaphp",
169 169 
 		"Key"=>"test.zip",
 
@@ -171,7 +171,7 @@  discard block
 
 block discarded – undo
171 171 
 		);
172 172 
 	return $client->setObjectAcl($args);
173 173 
 }
174 
-function copyObject($client){
174 
+function copyObject($client) {
175 175 
 	$args = array(
176 176 
 		"Bucket"=>"aaphp",
177 177 
 		"Key"=>"copy/test.zip",
 
@@ -182,10 +182,10 @@  discard block
 
 block discarded – undo
182 182 
 		);
183 183 
 	return $client->copyObject($args);
184 184 
 }
185 
-function putObjectByFile($client){
185 
+function putObjectByFile($client) {
186 186 
 	$file = "D://phpput";
187 
-	if(Utils::chk_chinese($file)){
188 
-		$file = iconv('utf-8','gbk',$file);
187 
+	if (Utils::chk_chinese($file)) {
188 
+		$file = iconv('utf-8', 'gbk', $file);
189 189 
 	}
190 190 
 	$content = $file;
191 191 
 	$args = array(
 
@@ -193,7 +193,7 @@  discard block
 
 block discarded – undo
193 193 
 		"Key"=>"stream_upload1.txt",
194 194 
 		"ACL"=>"public-read",
195 195 
 		"ObjectMeta"=>array(
196 
-			"Content-Type"=>"image/jpg",//只传0-10字节,
196 
+			"Content-Type"=>"image/jpg", //只传0-10字节,
197 197 
 			),
198 198 
 		"Content"=>array(
199 199 
 			"content"=>$file,
 
@@ -202,7 +202,7 @@  discard block
 
 block discarded – undo
202 202 
 	);
203 203 
 	return $client->putObjectByFile($args);
204 204 
 }
205 
-function multipartUpload($client){
205 
+function multipartUpload($client) {
206 206 
 	$args = array(
207 207 
 		"Bucket"=>"aaphp",
208 208 
 		"Key"=>"multi.zip",
 
@@ -220,16 +220,16 @@  discard block
 
 block discarded – undo
220 220 
 	//开始上传
221 221
222 222 
 	$file = "D://新建文件夹.rar";
223 
-	if(Utils::chk_chinese($file)){
224 
-		$file = iconv('utf-8','gbk',$file);
223 
+	if (Utils::chk_chinese($file)) {
224 
+		$file = iconv('utf-8', 'gbk', $file);
225 225 
 	}
226 226 
 	$total = Utils::getFileSize($file);
227 227 
 	$partsize = 1024*1024*5;
228 228 
 	$count = (int)(($total-1)/$partsize)+1;
229 229 
 	echo $count."\r\n";
230 
-	for($i = 0;$i < $count;$i++){
230 
+	for ($i = 0; $i < $count; $i++) {
231 231 
 		echo "upload".$i."\r\n";
232 
-		$args=array(
232 
+		$args = array(
233 233 
 			"Bucket"=>"aaphp",
234 234 
 			"Key"=>"multi.zip",
235 235 
 			"Options"=>array(
 
@@ -248,10 +248,10 @@  discard block
 
 block discarded – undo
248 248 
 		print_r($etag);
249 249 
 		$etag = $etag["ETag"];
250 250 
 	}
251 
-	$parts = $client->listParts(array("Bucket"=>"aaphp","Key"=>"multi.zip","Options"=>array("uploadId"=>$uploadid)));
251 
+	$parts = $client->listParts(array("Bucket"=>"aaphp", "Key"=>"multi.zip", "Options"=>array("uploadId"=>$uploadid)));
252 252 
 	print_r($parts);
253 253 
 	//结束上传
254 
-	$args=array(
254 
+	$args = array(
255 255 
 		"Bucket"=>"aaphp",
256 256 
 		"Key"=>"multi.zip",
257 257 
 		"Options"=>array("uploadId"=>$uploadid),
 
@@ -260,16 +260,16 @@  discard block
 
 block discarded – undo
260 260 
 	$result = $client->completeMultipartUpload($args);
261 261 
 	print_r($result);
262 262 
 }
263 
-function abortMultipartUpload($client){
264 
-	$args=array(
263 
+function abortMultipartUpload($client) {
264 
+	$args = array(
265 265 
 		"Bucket"=>"aaphp",
266 266 
 		"Key"=>"multi.zip",
267 267 
 		"Options"=>array("uploadId"=>"1234")
268 268 
 		);
269 269 
 	return $client->abortMultipartUpload($args);
270 270 
 }
271 
-function generatePresignedUrl($client){
272 
-	$args=array(
271 
+function generatePresignedUrl($client) {
272 
+	$args = array(
273 273 
 		"Bucket"=>"aaphp",
274 274 
 		"Key"=>"multi.zip",
275 275 
 		"Options"=>array(
 
@@ -279,7 +279,7 @@  discard block
 
 block discarded – undo
279 279 
 		);
280 280 
 	return $client->generatePresignedUrl($args);
281 281 
 }
282 
-function putObjectWithAdpAndCallBack($client){
282 
+function putObjectWithAdpAndCallBack($client) {
283 283 
 	$content = "D://野生动物.3gp";
284 284 
 	$args = array(
285 285 
 		"Bucket"=>"aaphp",
 
@@ -299,13 +299,13 @@  discard block
 
 block discarded – undo
299 299 
 		),
300 300 
 		"CallBack"=>array(
301 301 
 			"Url"=>"http://10.4.2.38:19090/",
302 
-			"BodyMagicVariables"=>array("bucket"=>"bucket","key"=>"key"),
302 
+			"BodyMagicVariables"=>array("bucket"=>"bucket", "key"=>"key"),
303 303 
 			"BodyVariables"=>array("name"=>"lijunwei")
304 304 
 		)
305 305 
 	);
306 306 
 	return $client->putObjectByFile($args);
307 307 
 }
308 
-function  multipartUploadWithAdpAndCallBack($client){
308 
+function  multipartUploadWithAdpAndCallBack($client) {
309 309 
 	$args = array(
310 310 
 		"Bucket"=>"aaphp",
311 311 
 		"Key"=>"multi.zip",
 
@@ -323,16 +323,16 @@  discard block
 
 block discarded – undo
323 323 
 	//开始上传
324 324
325 325 
 	$file = "D://野生动物.3gp";
326 
-	if(Utils::chk_chinese($file)){
327 
-		$file = iconv('utf-8','gbk',$file);
326 
+	if (Utils::chk_chinese($file)) {
327 
+		$file = iconv('utf-8', 'gbk', $file);
328 328 
 	}
329 329 
 	$partsize = 1024*1024*5;
330 330 
 	$total = Utils::getFileSize($file);
331 331 
 	$count = (int)(($total-1)/$partsize)+1;
332 332 
 	echo $count."\r\n";
333 
-	for($i = 0;$i < $count;$i++){
333 
+	for ($i = 0; $i < $count; $i++) {
334 334 
 		echo "upload".$i."\r\n";
335 
-		$args=array(
335 
+		$args = array(
336 336 
 			"Bucket"=>"aaphp",
337 337 
 			"Key"=>"multi.zip",
338 338 
 			"Options"=>array(
 
@@ -351,10 +351,10 @@  discard block
 
 block discarded – undo
351 351 
 		print_r($etag);
352 352 
 		$etag = $etag["ETag"];
353 353 
 	}
354 
-	$parts = $client->listParts(array("Bucket"=>"aaphp","Key"=>"multi.zip","Options"=>array("uploadId"=>$uploadid)));
354 
+	$parts = $client->listParts(array("Bucket"=>"aaphp", "Key"=>"multi.zip", "Options"=>array("uploadId"=>$uploadid)));
355 355 
 	print_r($parts);
356 356 
 	//结束上传
357 
-	$args=array(
357 
+	$args = array(
358 358 
 		"Bucket"=>"aaphp",
359 359 
 		"Key"=>"multi.zip",
360 360 
 		"Options"=>array("uploadId"=>$uploadid),
 
@@ -370,7 +370,7 @@  discard block
 
 block discarded – undo
370 370 
 		),
371 371 
 		"CallBack"=>array(
372 372 
 			"Url"=>"http://10.4.2.38:19090/",
373 
-			"BodyMagicVariables"=>array("bucket"=>"bucket","key"=>"key"),
373 
+			"BodyMagicVariables"=>array("bucket"=>"bucket", "key"=>"key"),
374 374 
 			"BodyVariables"=>array("name"=>"lijunwei")
375 375 
 		)
376 376 
 	);
 
@@ -380,8 +380,8 @@  discard block
 
 block discarded – undo
380 380 
 	$task = $client->getAdp(array("TaskID"=>$taskid));
381 381 
 	print_r($task);
382 382 
 }
383 
-function putAdp($client){
384 
-	$args=array(
383 
+function putAdp($client) {
384 
+	$args = array(
385 385 
 		"Bucket"=>"aaphp",
386 386 
 		"Key"=>"multi.zip",
387 387 
 		"Adp"=>array(
 
@@ -400,14 +400,14 @@  discard block
 
 block discarded – undo
400 400 
 	$task = $client->getAdp(array("TaskID"=>$taskid));
401 401 
 	print_r($task);
402 402 
 }
403 
-function postObject($client){
403 
+function postObject($client) {
404 404
405 405 
 	$postData = array(
406 406 
 		"key"=>"~!@\\#$\%^&*()_+-=qw",
407 407 
 		"acl"=>"public-read"
408 408 
 		);
409 
-	$unKnowData=array("122","334");
409 
+	$unKnowData = array("122", "334");
410 410
411 
-	print_r($client->postObject("ksc-scm",$postData,$unKnowData));
411 
+	print_r($client->postObject("ksc-scm", $postData, $unKnowData));
412 412 
 }
413 413 
 ?>
Please login to merge, or discard this patch.
src/service/ksyun/bin/encryption/EncryptionUtil.php 1 patch
Spacing   +92 added lines, -92 removed lines patch added patch discarded remove patch 
@@ -1,7 +1,7 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 
-class EncryptionUtil{
2 
+class EncryptionUtil {
3 3 
 	public static $INSTRUCTION_SUFFIX = ".instruction";
4 
-	public static function genereateOnceUsedKey($length=32){
4 
+	public static function genereateOnceUsedKey($length = 32) {
5 5 
 		$randpwd = "";
6 6 
 		for ($i = 0; $i < $length; $i++)
7 7 
 		{  
@@ -9,24 +9,24 @@  discard block
 
 block discarded – undo
9 9 
 		}
10 10 
 		return $randpwd;
11 11 
 	}
12 
-	public static function encode_AES_ECB($data,$secret_key){
13 
-		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_ECB,'');
12 
+	public static function encode_AES_ECB($data, $secret_key) {
13 
+		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_ECB, '');
14 14
15 
-		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_ECB);
16 
-		$pad = $blocksize - (strlen($data) % $blocksize);
17 
-		$data = $data . str_repeat(chr($pad), $pad);
15 
+		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_ECB);
16 
+		$pad = $blocksize-(strlen($data)%$blocksize);
17 
+		$data = $data.str_repeat(chr($pad), $pad);
18 18
19 
-		$iv = mcrypt_create_iv (mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
20 
-		mcrypt_generic_init($td,$secret_key,$iv);
21 
-		$encrypted = mcrypt_generic($td,$data);
19 
+		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
20 
+		mcrypt_generic_init($td, $secret_key, $iv);
21 
+		$encrypted = mcrypt_generic($td, $data);
22 22 
 		mcrypt_generic_deinit($td);
23 23 
 		return $encrypted;
24 24 
 	}
25 
-	public static function decode_AES_ECB($data,$secret_key){
26 
-		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_ECB,'');
27 
-		$iv = mcrypt_create_iv (mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
28 
-		mcrypt_generic_init($td,$secret_key,$iv);
29 
-		$data = mdecrypt_generic($td,$data);
25 
+	public static function decode_AES_ECB($data, $secret_key) {
26 
+		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_ECB, '');
27 
+		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
28 
+		mcrypt_generic_init($td, $secret_key, $iv);
29 
+		$data = mdecrypt_generic($td, $data);
30 30 
 		mcrypt_generic_deinit($td);
31 31 
 		mcrypt_module_close($td);
32 32 
 
@@ -36,155 +36,155 @@  discard block
 
 block discarded – undo
36 36
37 37 
 		return trim($data);
38 38 
 	}
39 
-	public static function getKeyEncryptionAlgm($encryptionMaterials){
40 
-		if(is_array($encryptionMaterials)){
39 
+	public static function getKeyEncryptionAlgm($encryptionMaterials) {
40 
+		if (is_array($encryptionMaterials)) {
41 41 
 			return "RSA";
42 
-		}else{
42 
+		}else {
43 43 
 			return "AES";
44 44 
 		}
45 45 
 	}
46 
-	public static function getAdjustedRange($range,$blocksize){
46 
+	public static function getAdjustedRange($range, $blocksize) {
47 47 
 		$a = $range["start"];
48 48 
 		$b = $range["end"];
49 
-		$a = $a - ($a%$blocksize)-$blocksize;
50 
-		if($a < 0)
49 
+		$a = $a-($a%$blocksize)-$blocksize;
50 
+		if ($a < 0)
51 51 
 			$a = 0;
52 52
53 53 
 		$b = $b+$blocksize-$b%$blocksize+$blocksize;
54 54
55 
-		return array("start"=>$a,"end"=>$b);
55 
+		return array("start"=>$a, "end"=>$b);
56 56 
 	}
57 
-	public static function encodeCek($encryptionMaterials,$cek){
57 
+	public static function encodeCek($encryptionMaterials, $cek) {
58 58 
 		$encrypKeyAlg = EncryptionUtil::getKeyEncryptionAlgm($encryptionMaterials);
59 
-		if($encrypKeyAlg === "AES"){
59 
+		if ($encrypKeyAlg === "AES") {
60 60 
 			$secretKey = $encryptionMaterials;
61 
-			$encryptedSek = EncryptionUtil::encode_AES_ECB($cek,$secretKey);
62 
-			if(empty($encryptedSek))
61 
+			$encryptedSek = EncryptionUtil::encode_AES_ECB($cek, $secretKey);
62 
+			if (empty($encryptedSek))
63 63 
 				throw new Ks3ClientException("can not encode cek useing AES");
64 
-		}else if($encrypKeyAlg === "RSA"){
64 
+		}else if ($encrypKeyAlg === "RSA") {
65 65 
 			$encryptedSek = "";
66 
-			openssl_public_encrypt($cek,$encryptedSek, $encryptionMaterials[0]);
67 
-			if(empty($encryptedSek))
66 
+			openssl_public_encrypt($cek, $encryptedSek, $encryptionMaterials[0]);
67 
+			if (empty($encryptedSek))
68 68 
 				throw new Ks3ClientException("can not encode cek useing RSA");
69 69 
 		}
70 70 
 		return $encryptedSek;
71 71 
 	}
72 
-	public static function decodeCek($encryptionMaterials,$cekEncrypted){
72 
+	public static function decodeCek($encryptionMaterials, $cekEncrypted) {
73 73 
 		$encrypKeyAlg = EncryptionUtil::getKeyEncryptionAlgm($encryptionMaterials);
74 
-		if($encrypKeyAlg === "AES"){
74 
+		if ($encrypKeyAlg === "AES") {
75 75 
 			$secretKey = $encryptionMaterials;
76 
-			$cek = EncryptionUtil::decode_AES_ECB($cekEncrypted,$secretKey);
77 
-			if(empty($cek))
76 
+			$cek = EncryptionUtil::decode_AES_ECB($cekEncrypted, $secretKey);
77 
+			if (empty($cek))
78 78 
 				throw new Ks3ClientException("can not decode cek useing AES,secret key maybe not correct");
79 
-		}else if($encrypKeyAlg === "RSA"){
79 
+		}else if ($encrypKeyAlg === "RSA") {
80 80 
 			$cek = "";
81 
-			openssl_private_decrypt($cekEncrypted,$cek, $encryptionMaterials[1]);
82 
-			if(empty($cek))
81 
+			openssl_private_decrypt($cekEncrypted, $cek, $encryptionMaterials[1]);
82 
+			if (empty($cek))
83 83 
 				throw new Ks3ClientException("can not decode cek useing RSA,public/private key pair maybe not correct");
84 84 
 		}
85 85 
 		return $cek;
86 86 
 	}
87 
-	public static function getPKCS5EncrypedLength($length,$blocksize){
88 
-		$pad = $blocksize - $length%$blocksize;
87 
+	public static function getPKCS5EncrypedLength($length, $blocksize) {
88 
+		$pad = $blocksize-$length%$blocksize;
89 89 
 		return $length+$pad;
90 90 
 	}
91 91 
 	//pkcs5填充
92 
-	public static function PKCS5Padding($data,$blocksize){
93 
-		$pad = $blocksize - strlen($data)%$blocksize;
94 
-		for($i = 0;$i < $pad;$i++){
95 
-			$data.= chr($pad);
92 
+	public static function PKCS5Padding($data, $blocksize) {
93 
+		$pad = $blocksize-strlen($data)%$blocksize;
94 
+		for ($i = 0; $i < $pad; $i++) {
95 
+			$data .= chr($pad);
96 96 
 		}
97 97 
 		return $data;
98 98 
 	}
99 
-	public static function updateContentMD5Header($req){
100 
-		if(!is_array($req))
99 
+	public static function updateContentMD5Header($req) {
100 
+		if (!is_array($req))
101 101 
 			return $req;
102 
-		if(isset($req["ObjectMeta"])){
102 
+		if (isset($req["ObjectMeta"])) {
103 103 
 			$meta = $req["ObjectMeta"];
104 
-		}else{
104 
+		}else {
105 105 
 			return $req;
106 106 
 		}
107 
-		if(is_array($meta) && isset($meta["Content-MD5"])){
107 
+		if (is_array($meta) && isset($meta["Content-MD5"])) {
108 108 
 			$md5 = $meta["Content-MD5"];
109 
-		}else{
109 
+		}else {
110 110 
 			return $req;
111 111 
 		}
112 
-		if(empty($md5)){
112 
+		if (empty($md5)) {
113 113 
 			return $req;
114 
-		}else{
114 
+		}else {
115 115 
 			$req["ObjectMeta"]["Content-MD5"] = NULL;
116 116 
 			$req["UserMeta"]["x-kss-meta-x-kss-unencrypted-content-md5"] = $md5;
117 117 
 		}
118 118 
 		return $req;
119 119 
 	}
120 
-	public static function metaTextLength($req){
121 
-		if(!is_array($req))
120 
+	public static function metaTextLength($req) {
121 
+		if (!is_array($req))
122 122 
 			return -1;
123 
-		if(isset($req["ObjectMeta"])){
123 
+		if (isset($req["ObjectMeta"])) {
124 124 
 			$meta = $req["ObjectMeta"];
125 
-		}else{
125 
+		}else {
126 126 
 			return -1;
127 127 
 		}
128 
-		if(is_array($meta) && isset($meta["Content-Length"])){
128 
+		if (is_array($meta) && isset($meta["Content-Length"])) {
129 129 
 			$length = $meta["Content-Length"];
130 130 
 			return $length;
131 131 
 		}else
132 132 
 			return -1;
133 133 
 	}
134 
-	public static function plainTextLength($args){
135 
-		if(isset($args["Content"])){
136 
-			if(is_array($args["Content"])){
134 
+	public static function plainTextLength($args) {
135 
+		if (isset($args["Content"])) {
136 
+			if (is_array($args["Content"])) {
137 137 
 				$content = $args["Content"]["content"];
138 138 
 				$seek_position = 0;
139 139 
 				$resourceLength = 0;
140 140 
 				$length = -1;
141 141 
 				$isFile = FALSE;
142 142
143 
-				if (!is_resource($content)){
143 
+				if (!is_resource($content)) {
144 144 
 					$isFile = TRUE;
145 145 
 					//如果之前用户已经转化为GBK则不转换
146 
-					if(Utils::chk_chinese($content)&&!Utils::check_char($content)){
147 
-						$content = iconv('utf-8','gbk',$content);
146 
+					if (Utils::chk_chinese($content) && !Utils::check_char($content)) {
147 
+						$content = iconv('utf-8', 'gbk', $content);
148 148 
 					}
149 
-					if(!file_exists($content))
149 
+					if (!file_exists($content))
150 150 
 						throw new Ks3ClientException("the specified file does not exist ");
151 151 
 					$length = Utils::getFileSize($content);
152 
-					$content = fopen($content,"r");
153 
-				}else{
152 
+					$content = fopen($content, "r");
153 
+				}else {
154 154 
 					$stats = fstat($content);
155 
-					if ($stats && $stats["size"] >= 0){
155 
+					if ($stats && $stats["size"] >= 0) {
156 156 
 						$length = $stats["size"];
157 157 
 					}
158 158 
 				}
159 159 
 				$resourceLength = $length;
160 160 
 				//优先取用户设置seek_position，没有的话取ftell
161 
-				if(isset($args["Content"]["seek_position"])&&$args["Content"]["seek_position"]>0){
161 
+				if (isset($args["Content"]["seek_position"]) && $args["Content"]["seek_position"] > 0) {
162 162 
 					$seek_position = $args["Content"]["seek_position"];
163 
-				}else if(!$isFile){
163 
+				}else if (!$isFile) {
164 164 
 					$seek_position = ftell($content);
165 
-					if($seek_position<0)
165 
+					if ($seek_position < 0)
166 166 
 						$seek_position = 0;
167 
-					fseek($content,0);
167 
+					fseek($content, 0);
168 168 
 				}
169 169
170 170 
 				$lengthInMeta = -1;
171 
-				if(isset($args["ObjectMeta"]["Content-Length"])){
171 
+				if (isset($args["ObjectMeta"]["Content-Length"])) {
172 172 
 					$lengthInMeta = $args["ObjectMeta"]["Content-Length"];
173 173 
 				}
174 
-				if($lengthInMeta > 0){
174 
+				if ($lengthInMeta > 0) {
175 175 
 					$length = $lengthInMeta;
176 
-				}else if($resourceLength > 0){
176 
+				}else if ($resourceLength > 0) {
177 177 
 					//根据seek_position计算实际长度
178 
-					$length = $resourceLength - $seek_position;
178 
+					$length = $resourceLength-$seek_position;
179 179 
 				}
180 
-				if($length <= 0)
180 
+				if ($length <= 0)
181 181 
 					throw new Ks3ClientException("calculate content length failed,unexpected contetn length ".$length);
182 182 
 				return $length;
183 
-			}else{
183 
+			}else {
184 184 
 				$content = $args["Content"];
185 185 
 				$lengthInMeta = EncryptionUtil::metaTextLength($args);
186 186 
 				$length = strlen($content);
187 
-				if($length<$lengthInMeta||$lengthInMeta <= 0)
187 
+				if ($length < $lengthInMeta || $lengthInMeta <= 0)
188 188 
 					return $length;
189 189 
 				else
190 190 
 					return $lengthInMeta;
 
@@ -192,14 +192,14 @@  discard block
 
 block discarded – undo
192 192 
 		}
193 193 
 		return -1;
194 194 
 	}
195 
-	public static function initMultipartUploadContext($initResult,$iv,$cek,$encryptedCek,$matdesc="{}"){
195 
+	public static function initMultipartUploadContext($initResult, $iv, $cek, $encryptedCek, $matdesc = "{}") {
196 196 
 		$cacheDir = KS3_API_PATH.DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR;
197 197 
 		$encryptionDir = KS3_API_PATH.DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR;
198 
-		if(!is_dir($cacheDir))
198 
+		if (!is_dir($cacheDir))
199 199 
 			mkdir($cacheDir);
200 
-		if(!is_dir($encryptionDir))
200 
+		if (!is_dir($encryptionDir))
201 201 
 			mkdir($encryptionDir);
202 
-		if(is_array($matdesc)){
202 
+		if (is_array($matdesc)) {
203 203 
 			$matdesc = json_encode($matdesc);
204 204 
 		}
205 205 
 		$initResult["firstIv"] = base64_encode($iv);
 
@@ -213,7 +213,7 @@  discard block
 
 block discarded – undo
213 213 
 		fwrite($file, $json);
214 214 
 		fclose($file);
215 215 
 	}
216 
-	public static function updateMultipartUploadContext($UploadId,$iv,$lastPart = FALSE){
216 
+	public static function updateMultipartUploadContext($UploadId, $iv, $lastPart = FALSE) {
217 217 
 		$encryptionDir = KS3_API_PATH.DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR;
218 218 
 		$content = EncryptionUtil::getMultipartUploadContext($UploadId);
219 219 
 		$content["nextIv"] = base64_encode($iv);
 
@@ -223,32 +223,32 @@  discard block
 
 block discarded – undo
223 223 
 		fwrite($file, $json);
224 224 
 		fclose($file);
225 225 
 	}
226 
-	public static function getMultipartUploadContext($UploadId){
226 
+	public static function getMultipartUploadContext($UploadId) {
227 227 
 		$encryptionDir = KS3_API_PATH.DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR;
228 
-		if(!EncryptionUtil::multipartUploadContextExists($UploadId))
228 
+		if (!EncryptionUtil::multipartUploadContextExists($UploadId))
229 229 
 			throw new Ks3ClientException("can not found multipart upload context in cache dir");
230 230 
 		$jsonString = file_get_contents($encryptionDir.$UploadId);
231 
-		$arry = json_decode($jsonString,TRUE);
231 
+		$arry = json_decode($jsonString, TRUE);
232 232 
 		return $arry;
233 233 
 	}
234 
-	public static function deleteMultipartUploadContext($UploadId){
234 
+	public static function deleteMultipartUploadContext($UploadId) {
235 235 
 		$encryptionDir = KS3_API_PATH.DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR;
236 236 
 		@unlink($encryptionDir.$UploadId);
237 237 
 	}
238 
-	public static function multipartUploadContextExists($UploadId){
238 
+	public static function multipartUploadContextExists($UploadId) {
239 239 
 		$encryptionDir = KS3_API_PATH.DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR;
240 240 
 		return file_exists($encryptionDir.$UploadId);
241 241 
 	}
242 
-	public static function openfile($path,$mode){
242 
+	public static function openfile($path, $mode) {
243 243 
 		$file = fopen($path, $mode);
244 
-		if($file)
244 
+		if ($file)
245 245 
 			return $file;
246 246 
 		else
247 247 
 			throw new Ks3ClientException("open file ".$path." error");
248 248 
 	}
249 249 
 	//matdesc为字符串或array数据类型。
250 
-	public static function createInstructionFile($bucket,$key,$cek,$iv,$matdesc="{}"){
251 
-		if(is_array($matdesc)){
250 
+	public static function createInstructionFile($bucket, $key, $cek, $iv, $matdesc = "{}") {
251 
+		if (is_array($matdesc)) {
252 252 
 			$matdesc = json_encode($matdesc);
253 253 
 		}
254 254 
 		$key = $key.EncryptionUtil::$INSTRUCTION_SUFFIX;
 
@@ -269,9 +269,9 @@  discard block
 
 block discarded – undo
269 269 
 			);
270 270 
 		return $req;
271 271 
 	}
272 
-	public static function isInstructionFile($s3Object){
272 
+	public static function isInstructionFile($s3Object) {
273 273 
 		$meta = $s3Object["Meta"];
274 
-		if(isset($meta["UserMeta"]["x-kss-meta-x-kss-crypto-instr-file"]))
274 
+		if (isset($meta["UserMeta"]["x-kss-meta-x-kss-crypto-instr-file"]))
275 275 
 			return TRUE;
276 276 
 		return FALSE;
277 277 
 	}
Please login to merge, or discard this patch.
src/service/ksyun/bin/encryption/EncryptionHandlers.php 1 patch
Spacing   +124 added lines, -124 removed lines patch added patch discarded remove patch 
@@ -2,47 +2,47 @@  discard block
 
 block discarded – undo
2 2 
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR."EncryptionUtil.php";
3 3 
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR."EncryptionCallBack.php";
4 4 
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."exceptions".DIRECTORY_SEPARATOR."Exceptions.php";
5 
-interface EncryptionHandler{
6 
-	public function putObjectByContentSecurely($args=array());
7 
-	public function putObjectByFileSecurely($args=array());
8 
-	public function getObjectSecurely($args=array());
9 
-	public function initMultipartUploadSecurely($args=array());
10 
-	public function uploadPartSecurely($args=array());
11 
-	public function abortMultipartUploadSecurely($args=array());
12 
-	public function completeMultipartUploadSecurely($args=array());
5 
+interface EncryptionHandler {
6 
+	public function putObjectByContentSecurely($args = array());
7 
+	public function putObjectByFileSecurely($args = array());
8 
+	public function getObjectSecurely($args = array());
9 
+	public function initMultipartUploadSecurely($args = array());
10 
+	public function uploadPartSecurely($args = array());
11 
+	public function abortMultipartUploadSecurely($args = array());
12 
+	public function completeMultipartUploadSecurely($args = array());
13 13 
 }
14 
-class EncryptionEO implements EncryptionHandler{
14 
+class EncryptionEO implements EncryptionHandler {
15 15 
 	private $encryptionMaterials = NULL;
16 16 
 	private $ks3client = NULL;
17 
-	public function __construct($ks3client,$encryptionMaterials){
17 
+	public function __construct($ks3client, $encryptionMaterials) {
18 18 
 		$this->encryptionMaterials = $encryptionMaterials;
19 19 
 		$this->ks3client = $ks3client;
20 20 
 	}
21 
-	public function putObjectByContentSecurely($args=array()){
21 
+	public function putObjectByContentSecurely($args = array()) {
22 22 
 		$sek = EncryptionUtil::genereateOnceUsedKey();
23 
-		$encryptedSek = EncryptionUtil::encodeCek($this->encryptionMaterials,$sek);
23 
+		$encryptedSek = EncryptionUtil::encodeCek($this->encryptionMaterials, $sek);
24 24 
 		$content = $args["Content"];
25 
-		if(empty($content))
25 
+		if (empty($content))
26 26 
 			throw new Ks3ClientException("please specifie Content in request args");
27 27 
 		$metaContentLength = EncryptionUtil::metaTextLength($args);
28 28 
 		$plainTextLength = strlen($content);
29 
-		if($metaContentLength > 0 && $metaContentLength < $plainTextLength){
29 
+		if ($metaContentLength > 0 && $metaContentLength < $plainTextLength) {
30 30 
 			$plainTextLength = $metaContentLength;
31 31 
 		}
32 
-		if($plainTextLength > 0)
32 
+		if ($plainTextLength > 0)
33 33 
 			$args["UserMeta"]["x-kss-meta-x-kss-unencrypted-content-length"] = $plainTextLength;
34 34 
 		else
35 35 
 			throw new Ks3ClientException("unexpected content length ".$plainTextLength);
36 36
37 
-		$content =  substr($content, 0,$plainTextLength);
37 
+		$content = substr($content, 0, $plainTextLength);
38 38
39 39
40 
-		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_CBC,'');
41 
-		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_RAND);
42 
-		mcrypt_generic_init($td,$sek,$iv);
40 
+		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, '');
41 
+		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
42 
+		mcrypt_generic_init($td, $sek, $iv);
43 43 
 		//对content进行pkcs5填充
44 
-		$content = EncryptionUtil::PKCS5Padding($content,mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_CBC));
45 
-		$encrypted = mcrypt_generic($td,$content);
44 
+		$content = EncryptionUtil::PKCS5Padding($content, mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC));
45 
+		$encrypted = mcrypt_generic($td, $content);
46 46 
 		mcrypt_generic_deinit($td);
47 47
48 48 
 		$args["ObjectMeta"]["Content-Length"] = strlen($encrypted);
 
@@ -52,7 +52,7 @@  discard block
 
 block discarded – undo
52 52
53 53 
 		//TODO
54 54 
 		$matdesc = "{}";
55 
-		if(ENCRYPTPTION_STORAGE_MODE == "ObjectMetadata"){
55 
+		if (ENCRYPTPTION_STORAGE_MODE == "ObjectMetadata") {
56 56 
 			$args["UserMeta"]["x-kss-meta-x-kss-key"] = base64_encode($encryptedSek);
57 57 
 			$args["UserMeta"]["x-kss-meta-x-kss-iv"] = base64_encode($iv);
58 58 
 			$args["UserMeta"]["x-kss-meta-x-kss-matdesc"] = $matdesc;
 
@@ -60,31 +60,31 @@  discard block
 
 block discarded – undo
60 60
61 61 
 		$result = $this->ks3client->putObjectByContent($args);
62 62
63 
-		if(ENCRYPTPTION_STORAGE_MODE == "InstructionFile"){
64 
-			$req = EncryptionUtil::createInstructionFile($args["Bucket"],$args["Key"],
65 
-			base64_encode($encryptedSek),base64_encode($iv),$matdesc);
63 
+		if (ENCRYPTPTION_STORAGE_MODE == "InstructionFile") {
64 
+			$req = EncryptionUtil::createInstructionFile($args["Bucket"], $args["Key"],
65 
+			base64_encode($encryptedSek), base64_encode($iv), $matdesc);
66 66 
 			$this->ks3client->putObjectByContent($req);
67 67 
 		}
68 68
69 69 
 		return $result;
70 70 
 	}
71 
-	public function putObjectByFileSecurely($args=array()){
71 
+	public function putObjectByFileSecurely($args = array()) {
72 72 
 		$sek = EncryptionUtil::genereateOnceUsedKey();
73 
-		$encryptedSek = EncryptionUtil::encodeCek($this->encryptionMaterials,$sek);
74 
-		if(!isset($args["Content"])||!is_array($args["Content"])
73 
+		$encryptedSek = EncryptionUtil::encodeCek($this->encryptionMaterials, $sek);
74 
+		if (!isset($args["Content"]) || !is_array($args["Content"])
75 75 
 			||!isset($args["Content"]["content"])
76 76 
 			||empty($args["Content"]["content"]))
77 77 
 			throw new Ks3ClientException("please specifie file content in request args");
78 78 
 		$content = $args["Content"];
79 79 
 		$plainTextLength = EncryptionUtil::plainTextLength($args);
80 
-		if($plainTextLength <= 0){
80 
+		if ($plainTextLength <= 0) {
81 81 
 			throw new Ks3ClientException("get content length failed ,unexpected content length ".$plainTextLength);
82 82 
 		}
83 
-		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_CBC,'');
84 
-		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_RAND);
83 
+		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, '');
84 
+		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
85 85
86 86 
 		$args = EncryptionUtil::updateContentMD5Header($args);
87 
-		$encryptedLength = EncryptionUtil::getPKCS5EncrypedLength($plainTextLength,mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_CBC));
87 
+		$encryptedLength = EncryptionUtil::getPKCS5EncrypedLength($plainTextLength, mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC));
88 88
89 89 
 		$args["ObjectMeta"]["Content-Length"] = $encryptedLength;
90 90 
 		$args["UserMeta"]["x-kss-meta-x-kss-unencrypted-content-length"] = $plainTextLength;
 
@@ -97,7 +97,7 @@  discard block
 
 block discarded – undo
97 97
98 98 
 		//TODO
99 99 
 		$matdesc = "{}";
100 
-		if(ENCRYPTPTION_STORAGE_MODE == "ObjectMetadata"){
100 
+		if (ENCRYPTPTION_STORAGE_MODE == "ObjectMetadata") {
101 101 
 			$args["UserMeta"]["x-kss-meta-x-kss-key"] = base64_encode($encryptedSek);
102 102 
 			$args["UserMeta"]["x-kss-meta-x-kss-iv"] = base64_encode($iv);
103 103 
 			$args["UserMeta"]["x-kss-meta-x-kss-matdesc"] = $matdesc;
 
@@ -105,86 +105,86 @@  discard block
 
 block discarded – undo
105 105
106 106 
 		$result = $this->ks3client->putObjectByFile($args);
107 107
108 
-		if(ENCRYPTPTION_STORAGE_MODE == "InstructionFile"){
109 
-			$req = EncryptionUtil::createInstructionFile($args["Bucket"],$args["Key"],
110 
-			base64_encode($encryptedSek),base64_encode($iv),$matdesc);
108 
+		if (ENCRYPTPTION_STORAGE_MODE == "InstructionFile") {
109 
+			$req = EncryptionUtil::createInstructionFile($args["Bucket"], $args["Key"],
110 
+			base64_encode($encryptedSek), base64_encode($iv), $matdesc);
111 111 
 			$this->ks3client->putObjectByContent($req);
112 112 
 		}
113 113
114 114 
 		return $result;
115 115 
 	}
116 
-	public function getObjectSecurely($args=array()){
116 
+	public function getObjectSecurely($args = array()) {
117 117 
 		$meta = $this->ks3client->getObjectMeta($args);
118 
-		if(isset($meta["UserMeta"]["x-kss-meta-x-kss-key"])&&isset($meta["UserMeta"]["x-kss-meta-x-kss-iv"])){
118 
+		if (isset($meta["UserMeta"]["x-kss-meta-x-kss-key"]) && isset($meta["UserMeta"]["x-kss-meta-x-kss-iv"])) {
119 119 
 			$encryptedInMeta = TRUE;
120 
-		}else{
120 
+		}else {
121 121 
 			$encryptedInMeta = FALSE;
122 122 
 		}
123 123 
 		$encrypted = TRUE;
124 124 
 		$encryptionInfo = array();
125 
-		if($encryptedInMeta){
125 
+		if ($encryptedInMeta) {
126 126 
 			$encryptionInfo["iv"] = base64_decode($meta["UserMeta"]["x-kss-meta-x-kss-iv"]);
127 
-			$matdesc =$meta["UserMeta"]["x-kss-meta-x-kss-matdesc"];
127 
+			$matdesc = $meta["UserMeta"]["x-kss-meta-x-kss-matdesc"];
128 128 
 			$encryptionInfo["matdesc"] = $matdesc;
129 129 
 			$cekEncrypted = base64_decode($meta["UserMeta"]["x-kss-meta-x-kss-key"]);
130 
-			$encryptionInfo["cek"] = $cek = EncryptionUtil::decodeCek($this->encryptionMaterials,$cekEncrypted);
131 
-		}else{
132 
-			if($this->ks3client->objectExists(array(
130 
+			$encryptionInfo["cek"] = $cek = EncryptionUtil::decodeCek($this->encryptionMaterials, $cekEncrypted);
131 
+		}else {
132 
+			if ($this->ks3client->objectExists(array(
133 133 
 				"Bucket"=>$args["Bucket"],
134 134 
 				"Key"=>$args["Key"].EncryptionUtil::$INSTRUCTION_SUFFIX)
135 135 
 				)
136 
-			){
136 
+			) {
137 137 
 				$insKey = $args["Key"].EncryptionUtil::$INSTRUCTION_SUFFIX;
138 138 
 				$getIns = array(
139 139 
 					"Bucket"=>$args["Bucket"],
140 140 
 					"Key"=>$insKey,
141 141 
 				);
142 142 
 				$s3Object = $this->ks3client->getObject($getIns);
143 
-				if(!EncryptionUtil::isInstructionFile($s3Object))
143 
+				if (!EncryptionUtil::isInstructionFile($s3Object))
144 144 
 					throw new Ks3ClientException($insKey." is not an InstructionFile");
145 145
146 146 
 				$content = $s3Object["Content"];
147 
-				$content = json_decode($content,TRUE);
147 
+				$content = json_decode($content, TRUE);
148 148 
 				$encryptionInfo["iv"] = base64_decode($content["x-kss-iv"]);
149 
-				$matdesc =$content["x-kss-matdesc"];
149 
+				$matdesc = $content["x-kss-matdesc"];
150 150 
 				$encryptionInfo["matdesc"] = $matdesc;
151 151 
 				$cekEncrypted = base64_decode($content["x-kss-key"]);
152 
-				$encryptionInfo["cek"] = $cek = EncryptionUtil::decodeCek($this->encryptionMaterials,$cekEncrypted);
153 
-			}else{
154 
-				$encrypted =FALSE;
152 
+				$encryptionInfo["cek"] = $cek = EncryptionUtil::decodeCek($this->encryptionMaterials, $cekEncrypted);
153 
+			}else {
154 
+				$encrypted = FALSE;
155 155 
 			}
156 156 
 		}
157 157 
 		//是否为下载到文件中
158 
-		$isWriteToFile=FALSE;
159 
-		if($encrypted)
158 
+		$isWriteToFile = FALSE;
159 
+		if ($encrypted)
160 160 
 		{
161 161 
 			$iv = $encryptionInfo["iv"];
162 162 
 			$cek = $encryptionInfo["cek"];
163 163
164 
-			if(empty($iv))
164 
+			if (empty($iv))
165 165 
 				throw new Ks3ClientException("can not find iv in UserMeta or InstructionFile");
166 
-			if(empty($cek))
166 
+			if (empty($cek))
167 167 
 				throw new Ks3ClientException("can not find cek in UserMeta or InstructionFile");
168 168
169 
-			if(isset($args["Range"])){
169 
+			if (isset($args["Range"])) {
170 170 
 				$range = $args["Range"];
171 
-				if(!is_array($range)){
172 
-					if(preg_match('/^bytes=[0-9]*-[0-9]*$/', $range)){
173 
-						$ranges = explode("-",substr($range,strlen("bytes=")));
171 
+				if (!is_array($range)) {
172 
+					if (preg_match('/^bytes=[0-9]*-[0-9]*$/', $range)) {
173 
+						$ranges = explode("-", substr($range, strlen("bytes=")));
174 174 
 						$a = $ranges[0];
175 175 
 						$b = $ranges[1];
176 
-						if($a > $b){
176 
+						if ($a > $b) {
177 177 
 							throw new Ks3ClientException("Invalid range ".$range);
178 178 
 						}
179 
-						$range = array("start"=>$a,"end"=>$b);
180 
-					}else{
179 
+						$range = array("start"=>$a, "end"=>$b);
180 
+					}else {
181 181 
 						throw new Ks3ClientException("Invalid range ".$range);
182 182 
 					}
183 
-				}else{
184 
-					if(!isset($range["start"])||!isset($range["end"])){
183 
+				}else {
184 
+					if (!isset($range["start"]) || !isset($range["end"])) {
185 185 
 						throw new Ks3ClientException("Invalid range ".serialize($range));
186 186 
 					}
187 
-					if($range["start"] > $range["end"]){
187 
+					if ($range["start"] > $range["end"]) {
188 188 
 						throw new Ks3ClientException("Invalid range ".serialize($range));
189 189 
 					}
190 190 
 				}
 
@@ -192,97 +192,97 @@  discard block
 
 block discarded – undo
192 192
193 193 
 			$isWriteToFile = isset($args["WriteTo"]);
194 194 
 			$contentLength = $meta["ObjectMeta"]["Content-Length"];
195 
-			if($isWriteToFile){
195 
+			if ($isWriteToFile) {
196 196 
 				$writeCallBack = new AESCBCStreamWriteCallBack();
197 
-				$writeCallBack->iv=$iv;
198 
-				$writeCallBack->cek=$cek;
197 
+				$writeCallBack->iv = $iv;
198 
+				$writeCallBack->cek = $cek;
199 199 
 				$writeCallBack->contentLength = $contentLength;
200 
-				if(isset($range)){
201 
-					$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_CBC);
202 
-					$adjustedRange = EncryptionUtil::getAdjustedRange($range,$blocksize);
200 
+				if (isset($range)) {
201 
+					$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC);
202 
+					$adjustedRange = EncryptionUtil::getAdjustedRange($range, $blocksize);
203 203 
 					$writeCallBack->expectedRange = $range;
204 204 
 					$writeCallBack->adjustedRange = $adjustedRange;
205 
-					$args["Range"]=$adjustedRange;
205 
+					$args["Range"] = $adjustedRange;
206 206 
 				}
207 207 
 				$args["writeCallBack"] = $writeCallBack;
208 208 
 				return $this->ks3client->getObject($args);
209 
-			}else{
209 
+			}else {
210 210 
 				$offset = 0;
211 
-				$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_CBC);
212 
-				if(isset($range)){
213 
-					$adjustedRange = EncryptionUtil::getAdjustedRange($range,$blocksize);
214 
-					$args["Range"]=$adjustedRange;
211 
+				$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC);
212 
+				if (isset($range)) {
213 
+					$adjustedRange = EncryptionUtil::getAdjustedRange($range, $blocksize);
214 
+					$args["Range"] = $adjustedRange;
215 215 
 				}
216 216 
 				$s3Object = $this->ks3client->getObject($args);
217 217 
 				$content = $s3Object["Content"];
218 218
219 
-				if(isset($range)){
220 
-					if($adjustedRange["start"] > 0){
221 
-						$iv = substr($content,0,$blocksize);
222 
-						$content = substr($content,$blocksize);
219 
+				if (isset($range)) {
220 
+					if ($adjustedRange["start"] > 0) {
221 
+						$iv = substr($content, 0, $blocksize);
222 
+						$content = substr($content, $blocksize);
223 223 
 						$offset = $blocksize+$adjustedRange["start"];
224 224 
 					}
225 225 
 				}
226 
-				if(!empty($content)){
227 
-					$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_CBC,'');
228 
-					mcrypt_generic_init($td,$cek,$iv);
229 
-					$decoded = mdecrypt_generic($td,$content);
226 
+				if (!empty($content)) {
227 
+					$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, '');
228 
+					mcrypt_generic_init($td, $cek, $iv);
229 
+					$decoded = mdecrypt_generic($td, $content);
230 230 
 					mcrypt_generic_deinit($td);
231 231 
 					mcrypt_module_close($td);
232 
-				}else{
232 
+				}else {
233 233 
 					$decoded = "";
234 234 
 				}
235 235
236 236 
 				//判断是否需要删除最后填充的字符,以及获取填充的字符
237 237 
 				$needRemovePad = FALSE;
238 238 
 				$pad = NULL;
239 
-				if($offset+strlen($decoded) >=$contentLength){
239 
+				if ($offset+strlen($decoded) >= $contentLength) {
240 240 
 					$needRemovePad = TRUE;
241 
-					$pad = ord(substr($decoded,strlen($decoded)-1,1));
242 
-					if($pad<=0||$pad>$blocksize)
241 
+					$pad = ord(substr($decoded, strlen($decoded)-1, 1));
242 
+					if ($pad <= 0 || $pad > $blocksize)
243 243 
 					{
244 244 
 						//invalid pad
245 245 
 						$needRemovePad = FALSE;
246 246 
 					}
247 247 
 				}
248 248 
 				$endOffset = 0;
249 
-				if(isset($range)){
250 
-					if($offset+strlen($decoded)>$range["end"]){
249 
+				if (isset($range)) {
250 
+					if ($offset+strlen($decoded) > $range["end"]) {
251 251 
 						$preLength = strlen($decoded);
252 
-						$decoded = substr($decoded, 0,$range["end"]-$offset+1);
252 
+						$decoded = substr($decoded, 0, $range["end"]-$offset+1);
253 253 
 						$endOffset = $preLength-strlen($decoded);
254 254 
 					}
255 
-					if($offset<$range["start"]){
256 
-						$decoded = substr($decoded,$range["start"] - $offset);
255 
+					if ($offset < $range["start"]) {
256 
+						$decoded = substr($decoded, $range["start"]-$offset);
257 257 
 					}
258 258 
 				}
259 259 
 				//再次根据截取的长度判断是否需要删除最后填充的字符
260 
-				if($needRemovePad&&$endOffset > $pad){
260 
+				if ($needRemovePad && $endOffset > $pad) {
261 261 
 					$needRemovePad = FALSE;
262 262 
 				}
263 
-				if($needRemovePad){
263 
+				if ($needRemovePad) {
264 264 
 					$padOffset = $pad-$endOffset;
265 265 
 					$actualWriteCount = strlen($decoded)-$padOffset;
266 
-					if($actualWriteCount <= 0)//负数的情况就是用户期望的range里全是填充的
266 
+					if ($actualWriteCount <= 0)//负数的情况就是用户期望的range里全是填充的
267 267 
 						$decoded = "";
268 268 
 					else
269 
-						$decoded = substr($decoded,0,strlen($decoded)-$padOffset);
269 
+						$decoded = substr($decoded, 0, strlen($decoded)-$padOffset);
270 270 
 				}
271 271 
 				$s3Object["Content"] = $decoded;
272 272 
 				return $s3Object;
273 273 
 			}
274 
-		}else{
274 
+		}else {
275 275 
 			return $this->ks3client->getObject($args);
276 276 
 		}
277 277 
 	}
278 
-	public function initMultipartUploadSecurely($args=array()){
278 
+	public function initMultipartUploadSecurely($args = array()) {
279 279 
 		$sek = EncryptionUtil::genereateOnceUsedKey();
280 
-		$encryptedSek = EncryptionUtil::encodeCek($this->encryptionMaterials,$sek);
281 
-		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_CBC,'');
282 
-		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_RAND);
280 
+		$encryptedSek = EncryptionUtil::encodeCek($this->encryptionMaterials, $sek);
281 
+		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, '');
282 
+		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
283 283
284 284 
 		$matdesc = "{}";
285 
-		if(ENCRYPTPTION_STORAGE_MODE == "ObjectMetadata"){
285 
+		if (ENCRYPTPTION_STORAGE_MODE == "ObjectMetadata") {
286 286 
 			$args["UserMeta"]["x-kss-meta-x-kss-key"] = base64_encode($encryptedSek);
287 287 
 			$args["UserMeta"]["x-kss-meta-x-kss-iv"] = base64_encode($iv);
288 288 
 			$args["UserMeta"]["x-kss-meta-x-kss-matdesc"] = $matdesc;
 
@@ -290,33 +290,33 @@  discard block
 
 block discarded – undo
290 290
291 291 
 		$initResult = $this->ks3client->initMultipartUpload($args);
292 292
293 
-		EncryptionUtil::initMultipartUploadContext($initResult,$iv,$sek,$encryptedSek,$matdesc);
293 
+		EncryptionUtil::initMultipartUploadContext($initResult, $iv, $sek, $encryptedSek, $matdesc);
294 294
295 295 
 		return $initResult;
296 296 
 	}
297 
-	public function uploadPartSecurely($args=array()){
297 
+	public function uploadPartSecurely($args = array()) {
298 298 
 		$uploadId = $args["Options"]["uploadId"];
299 299 
 		$isLastPart = FALSE;
300 
-		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_CBC);
301 
-		if(isset($args["LastPart"]))
300 
+		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC);
301 
+		if (isset($args["LastPart"]))
302 302 
 			$isLastPart = $args["LastPart"];
303 303 
 		$exists = EncryptionUtil::multipartUploadContextExists($uploadId);
304 
-		if(!$exists){
304 
+		if (!$exists) {
305 305 
 			throw new Ks3ClientException("no such upload in cache/encryption/");
306 306 
 		}
307 307 
 		$context = EncryptionUtil::getMultipartUploadContext($uploadId);
308 
-		if($context["lastPart"]){
309 
-			throw new Ks3ClientException("this upload with uploadId ".$uploadId," has been upload last part");
308 
+		if ($context["lastPart"]) {
309 
+			throw new Ks3ClientException("this upload with uploadId ".$uploadId, " has been upload last part");
310 310 
 		}
311 311 
 		$plainTextLength = EncryptionUtil::plainTextLength($args);
312 
-		if($plainTextLength <= 0){
312 
+		if ($plainTextLength <= 0) {
313 313 
 			throw new Ks3ClientException("get content length failed ,unexpected content length ".$plainTextLength);
314 314 
 		}
315 
-		if(!$isLastPart){
316 
-			if($plainTextLength % $blocksize != 0)
315 
+		if (!$isLastPart) {
316 
+			if ($plainTextLength%$blocksize != 0)
317 317 
 				throw new Ks3ClientException("Invalid part size,part size (".$plainTextLength.") must be multiples of the block size ".$blocksize);
318 
-		}else{
319 
-			$args["ObjectMeta"]["Content-Length"] = $plainTextLength + ($blocksize - $plainTextLength%$blocksize);
318 
+		}else {
319 
+			$args["ObjectMeta"]["Content-Length"] = $plainTextLength+($blocksize-$plainTextLength%$blocksize);
320 320 
 		}
321 321 
 		$readCallBack = new AESCBCStreamReadCallBack();
322 322 
 		$readCallBack->iv = base64_decode($context["nextIv"]);
 
@@ -327,28 +327,28 @@  discard block
 
 block discarded – undo
327 327 
 		$args["readCallBack"] = $readCallBack;
328 328
329 329 
 		$upResult = $this->ks3client->uploadPart($args);
330 
-		EncryptionUtil::updateMultipartUploadContext($uploadId,$readCallBack->iv,$isLastPart);
330 
+		EncryptionUtil::updateMultipartUploadContext($uploadId, $readCallBack->iv, $isLastPart);
331 331 
 		return $upResult;
332 332 
 	}
333 
-	public function abortMultipartUploadSecurely($args=array()){
333 
+	public function abortMultipartUploadSecurely($args = array()) {
334 334 
 		$uploadId = $args["Options"]["uploadId"];
335 335 
 		EncryptionUtil::deleteMultipartUploadContext($uploadId);
336 336 
 		return $this->ks3client->abortMultipartUpload($args);
337 337 
 	}
338 
-	public function completeMultipartUploadSecurely($args=array()){
338 
+	public function completeMultipartUploadSecurely($args = array()) {
339 339 
 		$uploadId = $args["Options"]["uploadId"];
340 340 
 		$exists = EncryptionUtil::multipartUploadContextExists($uploadId);
341 
-		if(!$exists){
341 
+		if (!$exists) {
342 342 
 			throw new Ks3ClientException("no such upload in cache/encryption/");
343 343 
 		}
344 344 
 		$context = EncryptionUtil::getMultipartUploadContext($uploadId);
345 
-		if(!$context["lastPart"]){
345 
+		if (!$context["lastPart"]) {
346 346 
 			throw new Ks3ClientException("Unable to complete an encrypted multipart upload without being told which part was the last. when upload part you can add item in args like args[\"LastPart\"]=TRUE");
347 347 
 		}
348 348 
 		$result = $this->ks3client->completeMultipartUpload($args);
349 
-		if(ENCRYPTPTION_STORAGE_MODE=="InstructionFile"){
350 
-			$req = EncryptionUtil::createInstructionFile($args["Bucket"],$args["Key"],
351 
-			$context["encryptedCek"],$context["firstIv"],$context["matdesc"]);
349 
+		if (ENCRYPTPTION_STORAGE_MODE == "InstructionFile") {
350 
+			$req = EncryptionUtil::createInstructionFile($args["Bucket"], $args["Key"],
351 
+			$context["encryptedCek"], $context["firstIv"], $context["matdesc"]);
352 352 
 			$this->ks3client->putObjectByContent($req);
353 353 
 		}
354 354 
 		EncryptionUtil::deleteMultipartUploadContext($uploadId);
Please login to merge, or discard this patch.
src/service/ksyun/bin/encryption/EncryptionCallBack.php 1 patch
Spacing   +70 added lines, -70 removed lines patch added patch discarded remove patch 
@@ -1,7 +1,7 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 2 
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR."EncryptionUtil.php";
3 3 
 //下载
4 
-class AESCBCStreamWriteCallBack{
4 
+class AESCBCStreamWriteCallBack {
5 5 
 	private $iv;
6 6 
 	private $cek;
7 7 
 	private $contentLength;
 
@@ -11,13 +11,13 @@  discard block
 
 block discarded – undo
11 11 
 	private $adjustedRange;
12 12 
 	//当前指针位置
13 13 
 	private $currentIndex;
14 
-	private $buffer;//上一次调用streaming_write_callback后，未解码的数据
14 
+	private $buffer; //上一次调用streaming_write_callback后，未解码的数据
15 15 
 	private $firstWrite = TRUE;
16 
-	public function __set($property_name, $value){
17 
-		$this->$property_name=$value;
16 
+	public function __set($property_name, $value) {
17 
+		$this->$property_name = $value;
18 18 
 	}
19 
-	public function __get($property_name){
20 
-		if(isset($this->$property_name))
19 
+	public function __get($property_name) {
20 
+		if (isset($this->$property_name))
21 21 
 		{
22 22 
 			return($this->$property_name);
23 23 
 		}else
 
@@ -26,59 +26,59 @@  discard block
 
 block discarded – undo
26 26 
 		}
27 27 
 	}
28 28 
 	//最后的数据大小肯定是blocksize的倍数，所以最后buffer中不会有未解密的内容。否则可以认为该文件是错误的
29 
-	public function streaming_write_callback($curl_handle,$data,$write_stream){
29 
+	public function streaming_write_callback($curl_handle, $data, $write_stream) {
30 30 
 		$data = $this->buffer.$data;
31 31
32 32 
 		$length = strlen($data);
33 33 
 		//不能把上次的没读完的长度算在这次里,应该算在上次
34 34 
 		$written_total = 0-strlen($this->buffer);
35 
-		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_CBC);
36 
-		if($length<$blocksize)
35 
+		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC);
36 
+		if ($length < $blocksize)
37 37 
 			$this->buffer = $data;
38 
-		else{
38 
+		else {
39 39 
 			//如果期望的范围之后还有数据，则认为数据已经接收完毕。不做任何处理
40 
-			if($this->expectedRange["end"] < $this->expectedRange["start"]){
40 
+			if ($this->expectedRange["end"] < $this->expectedRange["start"]) {
41 41 
 				return $written_total+strlen($data);
42 42 
 			}
43 
-			$this->buffer = substr($data,$length - $length%$blocksize);
44 
-			$data = substr($data,0,$length - $length%$blocksize);
43 
+			$this->buffer = substr($data, $length-$length%$blocksize);
44 
+			$data = substr($data, 0, $length-$length%$blocksize);
45 45
46 46 
 			$ivoffset = 0;
47 47 
 			//range get时，如果不是从刚开始，则应该取加密后数据的前16个字节作为之后解密的iv
48 
-			if($this->firstWrite){
48 
+			if ($this->firstWrite) {
49 49 
 				$this->firstWrite = FALSE;
50 
-				if(!$this->isBegin()){
51 
-					$this->iv = substr($data,0,$blocksize);
52 
-					$data = substr($data,$blocksize);
50 
+				if (!$this->isBegin()) {
51 
+					$this->iv = substr($data, 0, $blocksize);
52 
+					$data = substr($data, $blocksize);
53 53 
 					$ivoffset = $blocksize;
54 54 
 				}
55 55 
 				//初始化当前位置
56 
-				if(isset($this->adjustedRange))
56 
+				if (isset($this->adjustedRange))
57 57 
 					$this->currentIndex = $ivoffset+$this->adjustedRange["start"];
58 58 
 				else
59 59 
 					$this->currentIndex = $ivoffset;
60 60 
 			}
61 
-			$written_total+=$ivoffset;
62 
-			if(strlen($data) == 0){
61 
+			$written_total += $ivoffset;
62 
+			if (strlen($data) == 0) {
63 63 
 				$decoded = "";
64 64 
 				return $written_total;
65 
-			}else{
66 
-				$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_CBC,'');
67 
-				mcrypt_generic_init($td,$this->cek,$this->iv);
68 
-				$decoded = mdecrypt_generic($td,$data);
65 
+			}else {
66 
+				$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, '');
67 
+				mcrypt_generic_init($td, $this->cek, $this->iv);
68 
+				$decoded = mdecrypt_generic($td, $data);
69 69 
 				mcrypt_generic_deinit($td);
70 70 
 				mcrypt_module_close($td);
71 71 
 			}
72 72
73 
-			$this->iv = substr($data,strlen($data)-$blocksize);
73 
+			$this->iv = substr($data, strlen($data)-$blocksize);
74 74 
 			//判断是否需要删除最后填充的字符,以及获取填充的字符
75 75 
 			$needRemovePad = FALSE;
76 76 
 			$pad = NULL;
77 77
78 
-			if($this->currentIndex+strlen($decoded) >=$this->contentLength){
78 
+			if ($this->currentIndex+strlen($decoded) >= $this->contentLength) {
79 79 
 				$needRemovePad = TRUE;
80 
-				$pad = ord(substr($decoded,strlen($decoded)-1,1));
81 
-				if($pad<=0||$pad>$blocksize)
80 
+				$pad = ord(substr($decoded, strlen($decoded)-1, 1));
81 
+				if ($pad <= 0 || $pad > $blocksize)
82 82 
 				{
83 83 
 					//invalid pad
84 84 
 					$needRemovePad = FALSE;
 
@@ -88,21 +88,21 @@  discard block
 
 block discarded – undo
88 88 
 			//将解密后的数据截取到期望的长度
89 89 
 			$startOffset = 0;
90 90 
 			$endOffset = 0;
91 
-			if(isset($this->expectedRange)){
91 
+			if (isset($this->expectedRange)) {
92 92 
 				$trueEnd = $expectedEnd = $this->expectedRange["end"];
93 93
94 
-				if($this->currentIndex+strlen($decoded)>$expectedEnd){
94 
+				if ($this->currentIndex+strlen($decoded) > $expectedEnd) {
95 95 
 					$preLength = strlen($decoded);
96 
-					$decoded = substr($decoded, 0,$expectedEnd-$this->currentIndex+1);
96 
+					$decoded = substr($decoded, 0, $expectedEnd-$this->currentIndex+1);
97 97 
 					$endOffset = $preLength-strlen($decoded);
98 
-				}else{
98 
+				}else {
99 99 
 					//因为range是开始结束都计算的，range=1-2。currentIndex=1,长度是2，end=currentIndex+2-1
100 100 
 					$trueEnd = $this->currentIndex+strlen($decoded)-1;
101 101 
 				}
102 102 
 				$expectedStart = $this->expectedRange["start"];
103 
-				if($this->currentIndex<$expectedStart){
104 
-					$decoded = substr($decoded,$expectedStart - $this->currentIndex);
105 
-					$startOffset = $expectedStart - $this->currentIndex;
103 
+				if ($this->currentIndex < $expectedStart) {
104 
+					$decoded = substr($decoded, $expectedStart-$this->currentIndex);
105 
+					$startOffset = $expectedStart-$this->currentIndex;
106 106 
 				}
107 107 
 				//调整下次期望的开始
108 108 
 				$this->expectedRange["start"] = $trueEnd+1;
 
@@ -110,56 +110,56 @@  discard block
 
 block discarded – undo
110 110
111 111 
 			$padOffset = 0;
112 112 
 			//再次根据截取的长度判断是否需要删除最后填充的字符
113 
-			if($needRemovePad&&$endOffset > $pad){
113 
+			if ($needRemovePad && $endOffset > $pad) {
114 114 
 				$needRemovePad = FALSE;
115 115 
 			}
116 116 
 			$actualWriteCount = 0;
117 
-			if($needRemovePad){
117 
+			if ($needRemovePad) {
118 118 
 				$padOffset = $pad-$endOffset;
119 119 
 				$actualWriteCount = strlen($decoded)-$padOffset;
120 
-				if($actualWriteCount <= 0)//负数的情况就是用户期望的range里全是填充的
120 
+				if ($actualWriteCount <= 0)//负数的情况就是用户期望的range里全是填充的
121 121 
 					$decoded = "";
122 122 
 				else
123 
-					$decoded = substr($decoded,0,strlen($decoded)-$padOffset);
123 
+					$decoded = substr($decoded, 0, strlen($decoded)-$padOffset);
124 124 
 			}
125 125 
 			$count = fwrite($write_stream, $decoded);
126 
-			if($count == 0)
126 
+			if ($count == 0)
127 127 
 				$count = $actualWriteCount;
128 128 
 			$count += $padOffset;
129 129 
 			$count += $startOffset;
130 130 
 			$count += $endOffset;
131 131 
 			$this->currentIndex += $count;
132 
-			$written_total+=$count;
132 
+			$written_total += $count;
133 133 
 		}
134 134 
 		//否则curl框架会报错
135 
-		$written_total+=strlen($this->buffer);
135 
+		$written_total += strlen($this->buffer);
136 136 
 		return $written_total;
137 137 
 	}
138 138 
 	//是的话则使用初始化IV
139 
-	private function isBegin(){
139 
+	private function isBegin() {
140 140 
 		$beginIndex = 0;
141 
-		if(isset($this->adjustedRange["start"]))
141 
+		if (isset($this->adjustedRange["start"]))
142 142 
 			$beginIndex = $this->adjustedRange["start"];
143 
-		if($beginIndex == 0)
143 
+		if ($beginIndex == 0)
144 144 
 			return TRUE;
145 145 
 		else
146 146 
 			return FALSE;
147 147 
 	}
148 148 
 }
149 149 
 //上传
150 
-class AESCBCStreamReadCallBack{
150 
+class AESCBCStreamReadCallBack {
151 151 
 	private $iv;
152 152 
 	private $cek;
153 153 
 	private $contentLength;
154 154 
 	private $buffer;
155 155 
 	private $hasread = 0;
156 
-	private $mutipartUpload =FALSE;
156 
+	private $mutipartUpload = FALSE;
157 157 
 	private $isLastPart = FALSE;
158 
-	public function __set($property_name, $value){
159 
-		$this->$property_name=$value;
158 
+	public function __set($property_name, $value) {
159 
+		$this->$property_name = $value;
160 160 
 	}
161 
-	public function __get($property_name){
162 
-		if(isset($this->$property_name))
161 
+	public function __get($property_name) {
162 
+		if (isset($this->$property_name))
163 163 
 		{
164 164 
 			return($this->$property_name);
165 165 
 		}else
 
@@ -167,7 +167,7 @@  discard block
 
 block discarded – undo
167 167 
 			return(NULL);
168 168 
 		}
169 169 
 	}
170 
-	public function streaming_read_callback($curl_handle,$file_handle,$length,$read_stream,$seek_position){
170 
+	public function streaming_read_callback($curl_handle, $file_handle, $length, $read_stream, $seek_position) {
171 171 
 		// Once we've sent as much as we're supposed to send...
172 172 
 		if ($this->hasread >= $this->contentLength)
173 173 
 		{
 
@@ -175,7 +175,7 @@  discard block
 
 block discarded – undo
175 175 
 			return '';
176 176 
 		}
177 177 
 		// If we're at the beginning of an upload and need to seek...
178 
-		if ($this->hasread == 0 && $seek_position>0 && $seek_position !== ftell($read_stream))
178 
+		if ($this->hasread == 0 && $seek_position > 0 && $seek_position !== ftell($read_stream))
179 179 
 		{
180 180 
 			if (fseek($read_stream, $seek_position) !== 0)
181 181 
 			{
 
@@ -184,38 +184,38 @@  discard block
 
 block discarded – undo
184 184 
 		}
185 185
186 186
187 
-		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_ECB);
188 
-		$needRead = min($this->contentLength - $this->hasread,$length);
189 
-		$read = fread($read_stream,$needRead);
187 
+		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_ECB);
188 
+		$needRead = min($this->contentLength-$this->hasread, $length);
189 
+		$read = fread($read_stream, $needRead);
190 190 
 		$this->hasread += strlen($read);
191 191 
 		$isLast = FALSE;
192 
-		if($this->hasread >= $this->contentLength){
192 
+		if ($this->hasread >= $this->contentLength) {
193 193 
 			$isLast = TRUE;
194 194 
 		}
195 195 
 		$data = $this->buffer.$read;
196 196
197 197 
 		$dataLength = strlen($data);
198 198
199 
-		if(!$isLast){
200 
-			$this->buffer = substr($data,$dataLength-$dataLength%$blocksize);
201 
-			$data = substr($data, 0,$dataLength-$dataLength%$blocksize);
202 
-		}else{
199 
+		if (!$isLast) {
200 
+			$this->buffer = substr($data, $dataLength-$dataLength%$blocksize);
201 
+			$data = substr($data, 0, $dataLength-$dataLength%$blocksize);
202 
+		}else {
203 203 
 			//分块上传除最后一块外肯定是blocksize大小的倍数，所以不需要填充。
204 
-			if($this->mutipartUpload){
205 
-				if($this->isLastPart){
204 
+			if ($this->mutipartUpload) {
205 
+				if ($this->isLastPart) {
206 206 
 					$this->buffer = NULL;
207 
-					$data = EncryptionUtil::PKCS5Padding($data,$blocksize);
208 
-				}else{
207 
+					$data = EncryptionUtil::PKCS5Padding($data, $blocksize);
208 
+				}else {
209 209 
 					//donothing
210 210 
 				}
211 
-			}else{
211 
+			}else {
212 212 
 				$this->buffer = NULL;
213 
-				$data = EncryptionUtil::PKCS5Padding($data,$blocksize);
213 
+				$data = EncryptionUtil::PKCS5Padding($data, $blocksize);
214 214 
 			}
215 215 
 		}
216 
-		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_CBC,'');
217 
-		mcrypt_generic_init($td,$this->cek,$this->iv);
218 
-		$encrypted = mcrypt_generic($td,$data);
216 
+		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, '');
217 
+		mcrypt_generic_init($td, $this->cek, $this->iv);
218 
+		$encrypted = mcrypt_generic($td, $data);
219 219 
 		mcrypt_generic_deinit($td);
220 220 
 		//去除自动填充的16个字节//php的当恰好为16的倍数时竟然不填充？
221 221 
 		//$encrypted = substr($encrypted,0,strlen($encrypted)-$blocksize);
Please login to merge, or discard this patch.
src/service/ksyun/bin/Ks3Client.class.php 1 patch
Spacing   +123 added lines, -123 removed lines patch added patch discarded remove patch 
@@ -4,28 +4,28 @@  discard block
 
 block discarded – undo
4 4 
 date_default_timezone_set('Asia/Shanghai');
5 5
6 6 
 //检测API路径
7 
-if(!defined("KS3_API_PATH"))
7 
+if (!defined("KS3_API_PATH"))
8 8 
 define("KS3_API_PATH", dirname(__FILE__));
9 9 
 //是否使用VHOST
10 
-if(!defined("KS3_API_VHOST"))
11 
-define("KS3_API_VHOST",TRUE);
10 
+if (!defined("KS3_API_VHOST"))
11 
+define("KS3_API_VHOST", TRUE);
12 12 
 //是否开启日志(写入日志文件)
13 
-if(!defined("KS3_API_LOG"))
14 
-define("KS3_API_LOG",TRUE);
13 
+if (!defined("KS3_API_LOG"))
14 
+define("KS3_API_LOG", TRUE);
15 15 
 //是否显示日志(直接输出日志)
16 
-if(!defined("KS3_API_DISPLAY_LOG"))
16 
+if (!defined("KS3_API_DISPLAY_LOG"))
17 17 
 define("KS3_API_DISPLAY_LOG", TRUE);
18 18 
 //定义日志目录(默认是该项目log下)
19 
-if(!defined("KS3_API_LOG_PATH"))
20 
-define("KS3_API_LOG_PATH","");
19 
+if (!defined("KS3_API_LOG_PATH"))
20 
+define("KS3_API_LOG_PATH", "");
21 21 
 //是否使用HTTPS
22 
-if(!defined("KS3_API_USE_HTTPS"))
23 
-define("KS3_API_USE_HTTPS",FALSE);
22 
+if (!defined("KS3_API_USE_HTTPS"))
23 
+define("KS3_API_USE_HTTPS", FALSE);
24 24 
 //是否开启curl debug模式
25 
-if(!defined("KS3_API_DEBUG_MODE"))
26 
-define("KS3_API_DEBUG_MODE",FALSE);
27 
-define("KS3_API_Author","[email protected]");
28 
-define("KS3_API_Version","1.2");
25 
+if (!defined("KS3_API_DEBUG_MODE"))
26 
+define("KS3_API_DEBUG_MODE", FALSE);
27 
+define("KS3_API_Author", "[email protected]");
28 
+define("KS3_API_Version", "1.2");
29 29
30 30 
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."config".DIRECTORY_SEPARATOR."Consts.php";
31 31 
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."core".DIRECTORY_SEPARATOR."API.php";
 
@@ -38,34 +38,34 @@  discard block
 
 block discarded – undo
38 38 
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."lib".DIRECTORY_SEPARATOR."RequestCore.class.php";
39 39 
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."exceptions".DIRECTORY_SEPARATOR."Exceptions.php";
40 40
41 
-if(function_exists('get_loaded_extensions')){
41 
+if (function_exists('get_loaded_extensions')) {
42 42 
 	//检测curl扩展
43 43 
 	$extensions = get_loaded_extensions();
44 
-	if($extensions){
45 
-		if(!in_array('curl', $extensions)){
44 
+	if ($extensions) {
45 
+		if (!in_array('curl', $extensions)) {
46 46 
 			throw new Ks3ClientException("please install curl extension");
47 47 
 		}
48 
-		if(!in_array('mbstring', $extensions)){
48 
+		if (!in_array('mbstring', $extensions)) {
49 49 
 			throw new Ks3ClientException("please install mbstring extension");
50 50
51 51 
 		}
52 
-	}else{
52 
+	}else {
53 53 
 		throw new Ks3ClientException("please install extensions");
54 54 
 	}
55 
-}else{
55 
+}else {
56 56 
 	throw new Ks3ClientException();
57 57 
 }
58 58
59 
-class Ks3Client{
59 
+class Ks3Client {
60 60 
 	private $accessKey;
61 61 
 	private $secretKey;
62 62 
 	private $endpoint;
63 63 
 	private $log;
64 
-	public function __construct($accessKey = NULL, $secretKey = NULL, $endpoint = NULL ){
64 
+	public function __construct($accessKey = NULL, $secretKey = NULL, $endpoint = NULL) {
65 65 
 		$this->accessKey = $accessKey;
66 66 
 		$this->secretKey = $secretKey;
67 67
68 
-		if(empty($endpoint)){
68 
+		if (empty($endpoint)) {
69 69 
 			throw new Ks3ClientException("must set endpoint, please see http://ks3.ksyun.com/doc/api/index.html Region part");
70 70 
 		}
71 71 
 		$this->endpoint = $endpoint;
 
@@ -108,144 +108,144 @@  discard block
 
 block discarded – undo
108 108 
 	putAdp,添加异步数据处理任务
109 109 
 	getAdp,查询异步数据处理任务
110 110 
 	*/
111 
-	public function __call($method,$args=array()){
111 
+	public function __call($method, $args = array()) {
112 112 
 		$holder = new MessageHolder();
113 113
114 114 
 		$holder->msg = "------------------Logging Start-------------------------\r\n";
115 115 
 		$holder->msg .= "method->".$method." args->".serialize($args)."\r\n";
116 116 
 		$ex = NULL;
117 
-		try{
118 
-			$result = $this->invoke($method,$args,$holder);
119 
-		}catch(Exception $e){
120 
-			$holder->msg.=$e."\r\n";
117 
+		try {
118 
+			$result = $this->invoke($method, $args, $holder);
119 
+		} catch (Exception $e) {
120 
+			$holder->msg .= $e."\r\n";
121 121 
 			$ex = $e;
122 122 
 		}
123 123 
 		$holder->msg .= "------------------Logging End-------------------------\r\n";
124 124 
 		$this->log->info($holder->msg);
125 
-		if($ex !=NULL)
125 
+		if ($ex != NULL)
126 126 
 			throw $ex;
127 127 
 		return $result;
128 128 
 	}
129 
-	private function invoke($method,$args=array(),$holder,$location=NULL){
129 
+	private function invoke($method, $args = array(), $holder, $location = NULL) {
130 130 
 		$api = API::$API[$method];
131 
-		if(!$api){
131 
+		if (!$api) {
132 132 
 			throw new Ks3ClientException($method." Not Found API");
133 133 
 		}
134 
-		if(count($args) !== 0){
135 
-			if(count($args)>1||!is_array($args[0])){
134 
+		if (count($args) !== 0) {
135 
+			if (count($args) > 1 || !is_array($args[0])) {
136 136 
 				throw new Ks3ClientException("this method only needs one array argument");
137 137 
 			}
138 138 
 			$args = $args[0];
139 139 
 		}
140 
-		if(isset($api["redirect"])){
140 
+		if (isset($api["redirect"])) {
141 141 
 			$api = API::$API[$api["redirect"]];
142 142 
 		}
143 143 
 		$request = new Ks3Request();
144 
-		if(empty($args["Bucket"])){
145 
-			if($api["needBucket"]){
144 
+		if (empty($args["Bucket"])) {
145 
+			if ($api["needBucket"]) {
146 146 
 				throw new Ks3ClientException($method." this api need bucket");
147 147 
 			}
148 
-		}else{
148 
+		}else {
149 149 
 			$request->bucket = $args["Bucket"];
150 150 
 		}
151 151 
 		$position = "Key";
152 152 
 		//position主要为queryadp接口用的
153 
-		if(isset($api["objectPostion"])){
153 
+		if (isset($api["objectPostion"])) {
154 154 
 			$position = $api["objectPostion"];
155 155 
 		}
156 
-		if(empty($args[$position])){
157 
-			if($api["needObject"]){
156 
+		if (empty($args[$position])) {
157 
+			if ($api["needObject"]) {
158 158 
 				throw new Ks3ClientException($method." this api need ".$position);
159 159 
 			}
160 
-		}else{
160 
+		}else {
161 161 
 			$key = $args[$position];
162 
-			$preEncoding = mb_detect_encoding($key, array("ASCII","UTF-8","GB2312","GBK","BIG5"));
163 
-			$holder->msg.="key encoding ".$preEncoding."\r\n";
164 
-			if(strtolower($preEncoding) != "utf-8"){
165 
-				$key = iconv($preEncoding, "UTF-8",$key);
162 
+			$preEncoding = mb_detect_encoding($key, array("ASCII", "UTF-8", "GB2312", "GBK", "BIG5"));
163 
+			$holder->msg .= "key encoding ".$preEncoding."\r\n";
164 
+			if (strtolower($preEncoding) != "utf-8") {
165 
+				$key = iconv($preEncoding, "UTF-8", $key);
166 166 
 			}
167 167 
 			$request->key = $key;
168 168 
 		}
169 169 
 		$method = $api["method"];
170 
-		if($method == "Method"){
171 
-			if(empty($args["Method"])){
172 
-				$request->method="GET";
173 
-			}else{
174 
-				$request->method=$args["Method"];
170 
+		if ($method == "Method") {
171 
+			if (empty($args["Method"])) {
172 
+				$request->method = "GET";
173 
+			}else {
174 
+				$request->method = $args["Method"];
175 175 
 			}
176 
-		}else{
177 
-			$request->method=$api["method"];
176 
+		}else {
177 
+			$request->method = $api["method"];
178 178 
 		}
179 
-		if(KS3_API_USE_HTTPS)
180 
-			$request->scheme="https://";
179 
+		if (KS3_API_USE_HTTPS)
180 
+			$request->scheme = "https://";
181 181 
 		else
182 
-			$request->scheme="http://";
183 
-		$request->endpoint=$this->endpoint;
182 
+			$request->scheme = "http://";
183 
+		$request->endpoint = $this->endpoint;
184 184 
 		//add subresource
185 
-		if(!empty($api["subResource"])){
186 
-			$request->subResource=$api["subResource"];
185 
+		if (!empty($api["subResource"])) {
186 
+			$request->subResource = $api["subResource"];
187 187 
 		}
188 188 
 		//add query params
189 
-		if(isset($api["queryParams"] )){
189 
+		if (isset($api["queryParams"])) {
190 190 
 			foreach ($api["queryParams"] as $key => $value) {
191 191 
 				$required = FALSE;
192 
-				if(substr($value,0,1)==="!"){
192 
+				if (substr($value, 0, 1) === "!") {
193 193 
 					$required = TRUE;
194 
-					$value=substr($value,1);
194 
+					$value = substr($value, 1);
195 195 
 				}
196 
-				$index = explode("->",$value);
196 
+				$index = explode("->", $value);
197 197 
 				$curIndexArg = $args;
198 198 
 				$add = TRUE;
199 199 
 				$curkey = "";
200 200 
 				foreach ($index as $key1 => $value1) {
201 
-					if(!isset($curIndexArg[$value1])&&$value1 !== "*"){
201 
+					if (!isset($curIndexArg[$value1]) && $value1 !== "*") {
202 202 
 						$add = FALSE;
203 
-					}else{
203 
+					}else {
204 204 
 						$curkey = $value1;
205 205 
 						//星号表示所有,按照暂时的业务，默认星号后面就没了
206 
-						if($curkey == "*"){
206 
+						if ($curkey == "*") {
207 207 
 							foreach ($curIndexArg as $queryK => $queryV) {
208 
-								if(!is_array($queryV)){
209 
-									$request->addQueryParams($queryK,$queryV);
208 
+								if (!is_array($queryV)) {
209 
+									$request->addQueryParams($queryK, $queryV);
210 210 
 								}
211 211 
 							}
212 212 
 							$add = FALSE;
213 213 
 							$required = FALSE;
214 214 
 							break;
215 
-						}else{
215 
+						}else {
216 216 
 							$curIndexArg = $curIndexArg[$value1];
217 217 
 						}
218 218 
 					}
219 219 
 				}
220 
-				if(!empty($curIndexArg)&&$add){
221 
-					$request->addQueryParams($curkey,$curIndexArg);
220 
+				if (!empty($curIndexArg) && $add) {
221 
+					$request->addQueryParams($curkey, $curIndexArg);
222 222 
 					continue;
223 223 
 				}
224 
-				if($required)
224 
+				if ($required)
225 225 
 					throw new Ks3ClientException($method." param ".$value." is required");
226 226 
 			}
227 227 
 		}
228 
-		if(isset($api["body"])){
229 
-			if(isset($api["body"]["builder"])){
228 
+		if (isset($api["body"])) {
229 
+			if (isset($api["body"]["builder"])) {
230 230 
 				$builderName = $api["body"]["builder"];
231 231 
 				$builder = new $builderName();
232 232 
 				$request->body = $builder->build($args);
233 
-			}else if(isset($api["body"]["position"])){
233 
+			}else if (isset($api["body"]["position"])) {
234 234 
 				$position = $api["body"]["position"];
235 
-				$index = explode("->",$position);
235 
+				$index = explode("->", $position);
236 236 
 				$curIndexArg = $args;
237 237 
 				$add = TRUE;
238 238 
 				$curkey = "";
239 239 
 				foreach ($index as $key1 => $value1) {
240 
-					if(!isset($curIndexArg[$value1])){
240 
+					if (!isset($curIndexArg[$value1])) {
241 241 
 						$add = FALSE;
242 
-					}else{
242 
+					}else {
243 243 
 						$curIndexArg = $curIndexArg[$value1];
244 244 
 						$curkey = $value1;
245 245 
 					}
246 246 
 				}
247 
-				if(!empty($curIndexArg)&&$add){
248 
-					$request->body=$curIndexArg;
247 
+				if (!empty($curIndexArg) && $add) {
248 
+					$request->body = $curIndexArg;
249 249 
 				}
250 250 
 			}
251 251 
 		}
 
@@ -254,107 +254,107 @@  discard block
 
 block discarded – undo
254 254 
 		//TODO
255 255 
 		//sign request
256 256 
 		$signer = NULL;
257 
-		if(isset($api["signer"])){
258 
-			$signers = explode("->",$api["signer"]);
257 
+		if (isset($api["signer"])) {
258 
+			$signers = explode("->", $api["signer"]);
259 259 
 			foreach ($signers as $key => $value) {
260 260 
 				$signer = new $value();
261 
-				$log = $signer->sign($request,array("accessKey"=>$this->accessKey,"secretKey"=>$this->secretKey,"args"=>$args));
262 
-				if(!empty($log)){
263 
-					$holder->msg.=$log."\r\n";
261 
+				$log = $signer->sign($request, array("accessKey"=>$this->accessKey, "secretKey"=>$this->secretKey, "args"=>$args));
262 
+				if (!empty($log)) {
263 
+					$holder->msg .= $log."\r\n";
264 264 
 				}
265 265 
 			}
266 266 
 		}
267 267
268 
-		if($signer===NULL||!($signer instanceof QueryAuthSigner)){
268 
+		if ($signer === NULL || !($signer instanceof QueryAuthSigner)) {
269 269 
 			$url = $request->toUrl($this->endpoint);
270 
-			if($location!=NULL)
270 
+			if ($location != NULL)
271 271 
 				$url = $location;
272 272 
 			$httpRequest = new RequestCore($url);
273 
-			if(KS3_API_DEBUG_MODE===TRUE)
274 
-				$httpRequest->debug_mode=TRUE;
273 
+			if (KS3_API_DEBUG_MODE === TRUE)
274 
+				$httpRequest->debug_mode = TRUE;
275 275 
 			$httpRequest->set_method($request->method);
276 276 
 			foreach ($request->headers as $key => $value) {
277 
-				$httpRequest->add_header($key,$value);
277 
+				$httpRequest->add_header($key, $value);
278 278 
 			}
279 
-			$httpRequest->request_body=$request->body;
279 
+			$httpRequest->request_body = $request->body;
280 280
281 
-			if(isset($args["writeCallBack"])){
281 
+			if (isset($args["writeCallBack"])) {
282 282 
 				$httpRequest->register_streaming_write_callback($args["writeCallBack"]);
283 283 
 			}
284 
-			if(isset($args["readCallBack"])){
284 
+			if (isset($args["readCallBack"])) {
285 285 
 				$httpRequest->register_streaming_read_callback($args["readCallBack"]);
286 286 
 			}
287 287
288 288 
 			$read_stream = $request->read_stream;
289 289 
 			$read_length = $request->getHeader(Headers::$ContentLength);
290 290 
 			$seek_position = $request->seek_position;
291 
-			if(isset($read_stream))
291 
+			if (isset($read_stream))
292 292 
 			{
293 
-				$httpRequest->set_read_stream($read_stream,$read_length);
293 
+				$httpRequest->set_read_stream($read_stream, $read_length);
294 294 
 				$httpRequest->set_seek_position($seek_position);
295 295 
 				$httpRequest->remove_header(Headers::$ContentLength);
296 296 
 			}
297 297 
 			$write_stream = $request->write_stream;
298 
-			if(isset($write_stream)){
298 
+			if (isset($write_stream)) {
299 299 
 				$httpRequest->set_write_stream($write_stream);
300 300 
 			}
301 301
302 
-			$holder->msg.="request url->".serialize($httpRequest->request_url)."\r\n";
303 
-			$holder->msg.="request headers->".serialize($httpRequest->request_headers)."\r\n";
304 
-			$holder->msg.="request body->".$httpRequest->request_body."\r\n";
305 
-			$holder->msg.="request read stream length->".$read_length."\r\n";
306 
-			$holder->msg.="request read stream seek position->".$seek_position."\r\n";
302 
+			$holder->msg .= "request url->".serialize($httpRequest->request_url)."\r\n";
303 
+			$holder->msg .= "request headers->".serialize($httpRequest->request_headers)."\r\n";
304 
+			$holder->msg .= "request body->".$httpRequest->request_body."\r\n";
305 
+			$holder->msg .= "request read stream length->".$read_length."\r\n";
306 
+			$holder->msg .= "request read stream seek position->".$seek_position."\r\n";
307 307 
 			$httpRequest->send_request();
308 308 
 			//print_r($httpRequest);
309 
-			$body = $httpRequest->get_response_body ();
310 
-			$data =  new ResponseCore ( $httpRequest->get_response_header() , Utils::replaceNS2($body), $httpRequest->get_response_code () );
309 
+			$body = $httpRequest->get_response_body();
310 
+			$data = new ResponseCore($httpRequest->get_response_header(), Utils::replaceNS2($body), $httpRequest->get_response_code());
311 311
312 
-			if($data->status == 307){
312 
+			if ($data->status == 307) {
313 313 
 				$respHeaders = $httpRequest->get_response_header();
314 314 
 				$location = $respHeaders["location"];
315 
-				if(substr($location,0,4) == "http"){
316 
-					$holder->msg.="response code->".$httpRequest->get_response_code ()."\r\n";
317 
-					$holder->msg.="response headers->".serialize($httpRequest->get_response_header())."\r\n";
318 
-					$holder->msg.="response body->".$body."\r\n";
319 
-					$holder->msg.="retry request to ".$location."\r\n";
315 
+				if (substr($location, 0, 4) == "http") {
316 
+					$holder->msg .= "response code->".$httpRequest->get_response_code()."\r\n";
317 
+					$holder->msg .= "response headers->".serialize($httpRequest->get_response_header())."\r\n";
318 
+					$holder->msg .= "response body->".$body."\r\n";
319 
+					$holder->msg .= "retry request to ".$location."\r\n";
320 320 
 					//array($args)详见invoke开头
321 
-					return $this->invoke($method,array($args),$holder,$location);
321 
+					return $this->invoke($method, array($args), $holder, $location);
322 322 
 				}
323 323 
 			}
324 
-			$holder->msg.="response code->".$httpRequest->get_response_code ()."\r\n";
325 
-			$holder->msg.="response headers->".serialize($httpRequest->get_response_header())."\r\n";
326 
-			$holder->msg.="response body->".$body."\r\n";
327 
-			$handlers = explode("->",$api["handler"]);
324 
+			$holder->msg .= "response code->".$httpRequest->get_response_code()."\r\n";
325 
+			$holder->msg .= "response headers->".serialize($httpRequest->get_response_header())."\r\n";
326 
+			$holder->msg .= "response body->".$body."\r\n";
327 
+			$handlers = explode("->", $api["handler"]);
328 328 
 			foreach ($handlers as $key => $value) {
329 329 
 				$handler = new $value();
330 330 
 				$data = $handler->handle($data);
331 331 
 			}
332 332 
 			return $data;
333 
-		}else{
333 
+		}else {
334 334 
 			$url = $request->toUrl($this->endpoint);
335 
-			$holder->msg.=$url."\r\n";
335 
+			$holder->msg .= $url."\r\n";
336 336 
 			return $url;
337 337 
 		}
338 338 
 	}
339 339 
 	//用于生产表单上传时的签名信息
340 
-	public function postObject($bucket ,$postFormData=array(),$unknowValueFormFiled=array(),$filename=NULL,$expire=18000){
340 
+	public function postObject($bucket, $postFormData = array(), $unknowValueFormFiled = array(), $filename = NULL, $expire = 18000) {
341 341 
 		$policy = array();
342 342
343 343 
 		$expireTime = Utils::iso8601(time()+$expire);
344 344 
 		$policy["expiration"] = $expireTime;
345 
-		$postFormData["bucket"]=$bucket;
345 
+		$postFormData["bucket"] = $bucket;
346 346 
 		$conditions = array();
347 347 
 		foreach ($postFormData as $key => $value) {
348 348 
 			$condition = array();
349 
-			$condition[$key] = str_replace("\${filename}",$filename, $value);
350 
-			array_push($conditions,$condition);
349 
+			$condition[$key] = str_replace("\${filename}", $filename, $value);
350 
+			array_push($conditions, $condition);
351 351 
 		}
352 352 
 		foreach ($unknowValueFormFiled as $key => $value) {
353 353 
 			$condition = array();
354 
-			array_push($condition,"starts-with");
355 
-			array_push($condition,"\$".$value);
356 
-			array_push($condition,"");
357 
-			array_push($conditions,$condition);
354 
+			array_push($condition, "starts-with");
355 
+			array_push($condition, "\$".$value);
356 
+			array_push($condition, "");
357 
+			array_push($conditions, $condition);
358 358 
 		}
359 359 
 		$policy["conditions"] = $conditions;
360 360 
 		$json = json_encode($policy);
Please login to merge, or discard this patch.
src/service/ksyun/bin/config/Consts.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -3,14 +3,14 @@  discard block
 
 block discarded – undo
3 3
4 4 
 class Consts {
5 5 
 	// static $Ks3EndPoint = "kss.ksyun.com";
6 
-	static $SubResource = array("acl", "lifecycle", "location", "logging", "notification", "policy", "requestPayment", "torrent", "uploadId", "uploads", "versionId","versioning", "versions", "website", "delete", "thumbnail","cors","pfop","querypfop","adp","queryadp");
7 
-	static $QueryParam = array("partNumber","response-content-type","response-content-language","response-expires", "response-cache-control","response-content-disposition", "response-content-encoding", );
8 
-	static $Acl = array("private","public-read","public-read-write");
6 
+	static $SubResource = array("acl", "lifecycle", "location", "logging", "notification", "policy", "requestPayment", "torrent", "uploadId", "uploads", "versionId", "versioning", "versions", "website", "delete", "thumbnail", "cors", "pfop", "querypfop", "adp", "queryadp");
7 
+	static $QueryParam = array("partNumber", "response-content-type", "response-content-language", "response-expires", "response-cache-control", "response-content-disposition", "response-content-encoding",);
8 
+	static $Acl = array("private", "public-read", "public-read-write");
9 9 
 	static $KS3HeaderPrefix = "x-kss-";
10 
-	static $CORSElements = array("AllowedMethod","AllowedOrigin","AllowedHeader","MaxAgeSeconds","ExposeHeader");
11 
-	static $BucketLoggingElements = array("TargetBucket","TargetPrefix");
12 
-	static $ObjectMeta = array("Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires");
13 
-	static $MultipartObjectMeta = array("Cache-Control","Content-Disposition","Content-Encoding","Content-Type","Expires");
10 
+	static $CORSElements = array("AllowedMethod", "AllowedOrigin", "AllowedHeader", "MaxAgeSeconds", "ExposeHeader");
11 
+	static $BucketLoggingElements = array("TargetBucket", "TargetPrefix");
12 
+	static $ObjectMeta = array("Cache-Control", "Content-Disposition", "Content-Encoding", "Content-Length", "Content-MD5", "Content-Type", "Expires");
13 
+	static $MultipartObjectMeta = array("Cache-Control", "Content-Disposition", "Content-Encoding", "Content-Type", "Expires");
14 14 
 	static $UserMetaPrefix = "x-kss-meta";
15 15 
 	static $ResponseObjectMeta = array(
16 16 
 		"cache-control"=>"Cache-Control",
 
@@ -27,7 +27,7 @@  discard block
 
 block discarded – undo
27 27 
 		"x-kss-server-side-encryption-customer-algorithm"=>"SSECAlgm",
28 28 
 		"x-kss-server-side-encryption-customer-key-md5"=>"SSECKeyMD5"
29 29 
 		);
30 
-	static $PartsElement = array("PartNumber","ETag");
30 
+	static $PartsElement = array("PartNumber", "ETag");
31 31 
 	static $UploadHandler = array(
32 32 
 		"etag"=>"ETag",
33 33 
 		"taskid"=>"TaskID",
 
@@ -45,9 +45,9 @@  discard block
 
 block discarded – undo
45 45 
 	static $Permission_Read = "READ";
46 46 
 	static $Permission_Write = "WRITE";
47 47 
 	static $Grantee_Group_All = "http://acs.ksyun.com/groups/global/AllUsers";
48 
-	static $ResponseOverrides = array("response-expires","response-content-encoding","response-content-disposition",
49 
-		"response-content-language","response-content-type","response-cache-control");
50 
-	static $CallBackMagics = array("bucket","key","etag","objectSize","mimeType","createTime");
48 
+	static $ResponseOverrides = array("response-expires", "response-content-encoding", "response-content-disposition",
49 
+		"response-content-language", "response-content-type", "response-cache-control");
50 
+	static $CallBackMagics = array("bucket", "key", "etag", "objectSize", "mimeType", "createTime");
51 51 
 	static $UserAgent = "ks3-kss-php-sdk";
52 52 
 	static $SSEDefaultAlgm = "AES256";
53 53 
 }
Please login to merge, or discard this patch.