GC0202 / ThinkLibrary

src/service/ksyun/bin/samples/TestEncryptionClientFile.php

Spacing +50 added lines, -50 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-define("ENCRYPTPTION_STORAGE_MODE","InstructionFile");
+define("ENCRYPTPTION_STORAGE_MODE", "InstructionFile");
 require_once "../Ks3EncryptionClient.class.php";
 require_once "../Ks3Client.class.php";
 $bucket = "test-encryption";
@@ -7,17 +7,17 @@ 
 
 $filename = "secret.key";
 $handle = fopen($filename, "r");
-$contents = fread($handle, filesize ($filename));
+$contents = fread($handle, filesize($filename));
 fclose($handle);
 
-$client = new Ks3EncryptionClient("lMQTr0hNlMpB0iOk/i+x","D4CsYLs75JcWEjbiI22zR3P7kJ/+5B1qdEje7A7I",$contents);
-putObjectByContentAndGetObjectUsingInstruction($client,$bucket,$keyprefix);
-putObjectByFileAndGetObjectUsingFile($client,$bucket,$keyprefix);
-multipartUpload($client,$bucket,$keyprefix);
-copyAnddeleteObject($client,$bucket,$keyprefix);
+$client = new Ks3EncryptionClient("lMQTr0hNlMpB0iOk/i+x", "D4CsYLs75JcWEjbiI22zR3P7kJ/+5B1qdEje7A7I", $contents);
+putObjectByContentAndGetObjectUsingInstruction($client, $bucket, $keyprefix);
+putObjectByFileAndGetObjectUsingFile($client, $bucket, $keyprefix);
+multipartUpload($client, $bucket, $keyprefix);
+copyAnddeleteObject($client, $bucket, $keyprefix);
 
-function putObjectByContentAndGetObjectUsingInstruction($client,$bucket,$keyprefix){
-	$content = EncryptionUtil::genereateOnceUsedKey(rand(100,1000));
+function putObjectByContentAndGetObjectUsingInstruction($client, $bucket, $keyprefix) {
+	$content = EncryptionUtil::genereateOnceUsedKey(rand(100, 1000));
 	$args = array(
 		"Bucket"=>$bucket,
 		"Key"=>$keyprefix."EOFile",
@@ -25,10 +25,10 @@ 
 		"Content"=>$content
 	);
 	$client->putObjectByContent($args);
-	rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOFile",
-			"D://testdown/down",base64_encode(md5($args["Content"])));
+	rangeGetAndCheckMd5($client, $bucket, $keyprefix."EOFile",
+			"D://testdown/down", base64_encode(md5($args["Content"])));
 }
-function putObjectByFileAndGetObjectUsingFile($client,$bucket,$keyprefix){
+function putObjectByFileAndGetObjectUsingFile($client, $bucket, $keyprefix) {
 
 	$args = array(
 		"Bucket"=>$bucket,
@@ -39,39 +39,39 @@ 
 			)
 	);
 	$client->putObjectByFile($args);
-	rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOFile",
-			"D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
+	rangeGetAndCheckMd5($client, $bucket, $keyprefix."EOFile",
+			"D://testdown/down", base64_encode(md5_file("D://IMG.jpg")));
 }
-function multipartUpload($client,$bucket,$keyprefix){
+function multipartUpload($client, $bucket, $keyprefix) {
 	//初始化分开上传，获取uploadid
     $args = array(
         "Bucket"=>$bucket,
         "Key"=>$keyprefix."EOFile",
     );
     $uploadid = $client->initMultipartUpload($args);
-    $uploadid = $uploadid["UploadId"];//获取到uploadid
+    $uploadid = $uploadid["UploadId"]; //获取到uploadid
         //开始上传
 
-    $file = "D://IMG.jpg";//要上传的文件
+    $file = "D://IMG.jpg"; //要上传的文件
     $partsize = 1024*100;
-    $resource = fopen($file,"r");
+    $resource = fopen($file, "r");
     $stat = fstat($resource);
-    $total = $stat["size"];//获取文件的总大小
+    $total = $stat["size"]; //获取文件的总大小
     fclose($resource);
-    $count = (int)(($total-1)/$partsize)+1;//计算文件需要分几块上传
-    for($i = 0;$i < $count;$i++){
+    $count = (int)(($total-1)/$partsize)+1; //计算文件需要分几块上传
+    for ($i = 0; $i < $count; $i++) {
         //依次上传每一块
         echo "upload".$i."\r\n";
-        $args=array(
+        $args = array(
             "Bucket"=>$bucket,
         	"Key"=>$keyprefix."EOFile",
-        	"LastPart"=>($i===$count-1),
+        	"LastPart"=>($i === $count-1),
             "Options"=>array(
                 "partNumber"=>$i+1,
                 "uploadId"=>$uploadid
             ),
             "ObjectMeta"=>array(
-                "Content-Length"=>min($partsize,$total-$partsize*$i)//每次上传$partsize大小
+                "Content-Length"=>min($partsize, $total-$partsize*$i)//每次上传$partsize大小
             ),
             "Content"=>array(
                 "content"=>$file,
@@ -81,9 +81,9 @@ 
         $etag = $client->uploadPart($args);
         $etag = $etag["ETag"];
     }
-    $parts = $client->listParts(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFile","Options"=>array("uploadId"=>$uploadid)));
+    $parts = $client->listParts(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFile", "Options"=>array("uploadId"=>$uploadid)));
     //结束上传
-    $args=array(
+    $args = array(
         "Bucket"=>$bucket,
         "Key"=>$keyprefix."EOFile",
         "Options"=>array("uploadId"=>$uploadid),
@@ -91,11 +91,11 @@ 
     );
     $result = $client->completeMultipartUpload($args);
 
-    rangeGetAndCheckMd5($client,$bucket,$keyprefix."EOFile",
-    	"D://testdown/down",base64_encode(md5_file("D://IMG.jpg")));
+    rangeGetAndCheckMd5($client, $bucket, $keyprefix."EOFile",
+    	"D://testdown/down", base64_encode(md5_file("D://IMG.jpg")));
 }
-function copyAnddeleteObject($client,$bucket,$keyprefix){
-	$content = EncryptionUtil::genereateOnceUsedKey(rand(100,1000));
+function copyAnddeleteObject($client, $bucket, $keyprefix) {
+	$content = EncryptionUtil::genereateOnceUsedKey(rand(100, 1000));
 	$args = array(
 		"Bucket"=>$bucket,
 		"Key"=>$keyprefix."EOFile",
@@ -104,10 +104,10 @@ 
 	);
 	$client->putObjectByContent($args);
 
-	if($client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy")))
-		$client->deleteObject(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy"));
-	if($client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy.instruction")))
-		$client->deleteObject(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy.instruction"));
+	if ($client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy")))
+		$client->deleteObject(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy"));
+	if ($client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy.instruction")))
+		$client->deleteObject(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy.instruction"));
 
 	$copyReq = array(
 		"Bucket"=>$bucket,
@@ -119,30 +119,30 @@ 
 		);
 	$client->copyObject($copyReq);
 
-	if(!$client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy")))
+	if (!$client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy")))
 		throw new Exception("not found ".$keyprefix."EOFileCopy");
-	if(!$client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy.instruction")))
+	if (!$client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy.instruction")))
 		throw new Exception("not found ".$keyprefix."EOFileCopy.instruction");
 
-	$client->deleteObject(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy"));
+	$client->deleteObject(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy"));
 
-	if($client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy")))
+	if ($client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy")))
 		throw new Exception("found ".$keyprefix."EOFileCopy");
-	if($client->objectExists(array("Bucket"=>$bucket,"Key"=>$keyprefix."EOFileCopy.instruction")))
+	if ($client->objectExists(array("Bucket"=>$bucket, "Key"=>$keyprefix."EOFileCopy.instruction")))
 		throw new Exception("found ".$keyprefix."EOFileCopy.instruction");
 }
-function rangeGetAndCheckMd5($client,$bucket,$key,$file,$expectedMd5){
-	$args = array("Bucket"=>$bucket,"Key"=>$key);
+function rangeGetAndCheckMd5($client, $bucket, $key, $file, $expectedMd5) {
+	$args = array("Bucket"=>$bucket, "Key"=>$key);
 	$meta = $client->getObjectMeta($args);
 	$contentlength = $meta["ObjectMeta"]["Content-Length"];
 
 	$filelist = array();
 
-	for($begin = 0;$begin <$contentlength;){
-		$index = rand((int)($contentlength/20),(int)($contentlength/10));
-		$range = array("start"=>$begin,"end"=>$begin+$index);
+	for ($begin = 0; $begin < $contentlength;) {
+		$index = rand((int)($contentlength/20), (int)($contentlength/10));
+		$range = array("start"=>$begin, "end"=>$begin+$index);
 		$destFile = $file.$begin."-".($begin+$index);
-		array_push($filelist,$destFile);
+		array_push($filelist, $destFile);
 		$begin += ($index+1);
 		$args = array(
 			"Bucket"=>$bucket,
@@ -154,17 +154,17 @@ 
 	}
 
 	foreach ($filelist as $key => $value) {
-		$handle = fopen($value,"r");
+		$handle = fopen($value, "r");
 		$size = filesize($value);
-		if($size > 0){
-			$content = fread($handle,$size);
-			file_put_contents($file,$content,FILE_APPEND);
+		if ($size > 0) {
+			$content = fread($handle, $size);
+			file_put_contents($file, $content, FILE_APPEND);
 		}
 		fclose($handle);
 		@unlink($value);
 	}
 	$md5 = base64_encode(md5_file($file));
-	if($md5 != $expectedMd5)
+	if ($md5 != $expectedMd5)
 		throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
 	@unlink($file);	
 }

src/service/ksyun/bin/samples/Samples.php

Spacing +55 added lines, -55 removed lines

@@ -2,7 +2,7 @@ 
 require_once "../Ks3Client.class.php";
 require_once "../core/Utils.class.php";
 
-$client = new Ks3Client("","","kss.ksyun.com");//!!第三个参数endpoint需要对应bucket所在region!! 详见http://ks3.ksyun.com/doc/api/index.html  Region（区域）一节
+$client = new Ks3Client("", "", "kss.ksyun.com"); //!!第三个参数endpoint需要对应bucket所在region!! 详见http://ks3.ksyun.com/doc/api/index.html  Region（区域）一节
 //print_r(listBuckets($client));
 //print_r(deleteBucket($client));
 //print_r(deleteBucketCORS($client));
@@ -32,16 +32,16 @@ 
 //print_r(multipartUploadWithAdpAndCallBack($client));
 //print_r(putAdp($client));
 //print_r(postObject($client));
-function listBuckets($client){
+function listBuckets($client) {
 	return $client->listBuckets();
 }
-function deleteBucket($client){
+function deleteBucket($client) {
 	return $client->deleteBucket(array("Bucket"=>"ksc-scm"));
 }
-function deleteBucketCORS($client){
+function deleteBucketCORS($client) {
 	return $client->deleteBucketCORS(array("Bucket"=>"ksc-scm"));
 }
-function listObjects($client){
+function listObjects($client) {
 	$args = array(
 		"Bucket"=>"lijunwei.test",
 		"Options"=>array(
@@ -53,49 +53,49 @@ 
 		);
 	return $client->listObjects($args);
 }
-function getBucketAcl($client){
+function getBucketAcl($client) {
 	return $client->getBucketAcl(array("Bucket"=>"aaphp"));
 }
-function getBucketCORS($client){
+function getBucketCORS($client) {
 	return $client->getBucketCORS(array("Bucket"=>"ksc-scm"));
 }
-function getBucketLocation($client){
+function getBucketLocation($client) {
 	return $client->getBucketLocation(array("Bucket"=>"ksc-scm"));
 }
-function getBucketLogging($client){
+function getBucketLogging($client) {
 	return $client->getBucketLogging(array("Bucket"=>"ksc-scm"));
 }
-function bucketExists($client){
+function bucketExists($client) {
 	$args = array("Bucket"=>"ksc-scm");
 	return $client->bucketExists($args);
 }
-function createBucket($client){
+function createBucket($client) {
 	$args = array(
 		"Bucket"=>"ksc-scm",
 		"ACL"=>"private"
 		);
 	return $client->createBucket($args);
 }
-function setBucketAcl($client){
+function setBucketAcl($client) {
 	$args = array(
 		"Bucket"=>"ksc-scm",
 		"ACL"=>"private"
 		);
 	return $client->setBucketAcl($args);
 }
-function setBucketCORS($client){
+function setBucketCORS($client) {
 	$args = array(
 		"Bucket"=>"ksc-scm",
 		"CORS"=>array(
 			array(
-				"AllowedMethod"=>array("GET","PUT"),
+				"AllowedMethod"=>array("GET", "PUT"),
 				"AllowedOrigin"=>array("http://www.kingsoft.com"),
 				"AllowedHeader"=>array("*"),
 				"ExposeHeader"=>array("*"),
 				"MaxAgeSeconds"=>10
 			),
 			array(
-				"AllowedMethod"=>array("GET","PUT"),
+				"AllowedMethod"=>array("GET", "PUT"),
 				"AllowedOrigin"=>array("*"),
 				"AllowedHeader"=>array("*"),
 				"ExposeHeader"=>array("*"),
@@ -105,7 +105,7 @@ 
 	);
 	return $client->setBucketCORS($args);
 }
-function setBucketLogging($client){
+function setBucketLogging($client) {
 	$args = array(
 		"Bucket"=>"ksc-scm",
 		"BucketLogging"=>array(
@@ -116,21 +116,21 @@ 
 		);
 	return $client->setBucketLogging($args);
 }
-function deleteObject($client){
+function deleteObject($client) {
 	$args = array(
 		"Bucket"=>"ksc-scm",
 		"Key"=>"123.pdf"
 		);
 	return $client->deleteObject($args);
 }
-function deleteObjects($client){
+function deleteObjects($client) {
 	$args = array(
 		"Bucket"=>"ksc-scm",
-		"DeleteKeys"=>array("copy/test.zip","copy/123.doc")
+		"DeleteKeys"=>array("copy/test.zip", "copy/123.doc")
 		);
 	return $client->deleteObjects($args);
 }
-function getObject($client){
+function getObject($client) {
 	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.exe",
@@ -142,28 +142,28 @@ 
 		);
 	return $client->getObject($args);
 }
-function getObjectAcl($client){
+function getObjectAcl($client) {
 	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.exe"
 		);
 	return $client->getObjectAcl($args);
 }
-function objectExists($client){
+function objectExists($client) {
 	$args = array(
 		"Bucket"=>"ksc-scm",
 		"Key"=>"123.pdf"
 		);
 	return $client->objectExists($args);
 }
-function getObjectMeta($client){
+function getObjectMeta($client) {
 	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"test.zip"
 		);
 	return $client->getObjectMeta($args);
 }
-function setObjectAcl($client){
+function setObjectAcl($client) {
 	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"test.zip",
@@ -171,7 +171,7 @@ 
 		);
 	return $client->setObjectAcl($args);
 }
-function copyObject($client){
+function copyObject($client) {
 	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"copy/test.zip",
@@ -182,10 +182,10 @@ 
 		);
 	return $client->copyObject($args);
 }
-function putObjectByFile($client){
+function putObjectByFile($client) {
 	$file = "D://phpput";
-	if(Utils::chk_chinese($file)){
-		$file = iconv('utf-8','gbk',$file);
+	if (Utils::chk_chinese($file)) {
+		$file = iconv('utf-8', 'gbk', $file);
 	}
 	$content = $file;
 	$args = array(
@@ -193,7 +193,7 @@ 
 		"Key"=>"stream_upload1.txt",
 		"ACL"=>"public-read",
 		"ObjectMeta"=>array(
-			"Content-Type"=>"image/jpg",//只传0-10字节,
+			"Content-Type"=>"image/jpg", //只传0-10字节,
 			),
 		"Content"=>array(
 			"content"=>$file,
@@ -202,7 +202,7 @@ 
 	);
 	return $client->putObjectByFile($args);
 }
-function multipartUpload($client){
+function multipartUpload($client) {
 	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.zip",
@@ -220,16 +220,16 @@ 
 	//开始上传
 
 	$file = "D://新建文件夹.rar";
-	if(Utils::chk_chinese($file)){
-		$file = iconv('utf-8','gbk',$file);
+	if (Utils::chk_chinese($file)) {
+		$file = iconv('utf-8', 'gbk', $file);
 	}
 	$total = Utils::getFileSize($file);
 	$partsize = 1024*1024*5;
 	$count = (int)(($total-1)/$partsize)+1;
 	echo $count."\r\n";
-	for($i = 0;$i < $count;$i++){
+	for ($i = 0; $i < $count; $i++) {
 		echo "upload".$i."\r\n";
-		$args=array(
+		$args = array(
 			"Bucket"=>"aaphp",
 			"Key"=>"multi.zip",
 			"Options"=>array(
@@ -248,10 +248,10 @@ 
 		print_r($etag);
 		$etag = $etag["ETag"];
 	}
-	$parts = $client->listParts(array("Bucket"=>"aaphp","Key"=>"multi.zip","Options"=>array("uploadId"=>$uploadid)));
+	$parts = $client->listParts(array("Bucket"=>"aaphp", "Key"=>"multi.zip", "Options"=>array("uploadId"=>$uploadid)));
 	print_r($parts);
 	//结束上传
-	$args=array(
+	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.zip",
 		"Options"=>array("uploadId"=>$uploadid),
@@ -260,16 +260,16 @@ 
 	$result = $client->completeMultipartUpload($args);
 	print_r($result);
 }
-function abortMultipartUpload($client){
-	$args=array(
+function abortMultipartUpload($client) {
+	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.zip",
 		"Options"=>array("uploadId"=>"1234")
 		);
 	return $client->abortMultipartUpload($args);
 }
-function generatePresignedUrl($client){
-	$args=array(
+function generatePresignedUrl($client) {
+	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.zip",
 		"Options"=>array(
@@ -279,7 +279,7 @@ 
 		);
 	return $client->generatePresignedUrl($args);
 }
-function putObjectWithAdpAndCallBack($client){
+function putObjectWithAdpAndCallBack($client) {
 	$content = "D://野生动物.3gp";
 	$args = array(
 		"Bucket"=>"aaphp",
@@ -299,13 +299,13 @@ 
 		),
 		"CallBack"=>array(
 			"Url"=>"http://10.4.2.38:19090/",
-			"BodyMagicVariables"=>array("bucket"=>"bucket","key"=>"key"),
+			"BodyMagicVariables"=>array("bucket"=>"bucket", "key"=>"key"),
 			"BodyVariables"=>array("name"=>"lijunwei")
 		)
 	);
 	return $client->putObjectByFile($args);
 }
-function  multipartUploadWithAdpAndCallBack($client){
+function  multipartUploadWithAdpAndCallBack($client) {
 	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.zip",
@@ -323,16 +323,16 @@ 
 	//开始上传
 
 	$file = "D://野生动物.3gp";
-	if(Utils::chk_chinese($file)){
-		$file = iconv('utf-8','gbk',$file);
+	if (Utils::chk_chinese($file)) {
+		$file = iconv('utf-8', 'gbk', $file);
 	}
 	$partsize = 1024*1024*5;
 	$total = Utils::getFileSize($file);
 	$count = (int)(($total-1)/$partsize)+1;
 	echo $count."\r\n";
-	for($i = 0;$i < $count;$i++){
+	for ($i = 0; $i < $count; $i++) {
 		echo "upload".$i."\r\n";
-		$args=array(
+		$args = array(
 			"Bucket"=>"aaphp",
 			"Key"=>"multi.zip",
 			"Options"=>array(
@@ -351,10 +351,10 @@ 
 		print_r($etag);
 		$etag = $etag["ETag"];
 	}
-	$parts = $client->listParts(array("Bucket"=>"aaphp","Key"=>"multi.zip","Options"=>array("uploadId"=>$uploadid)));
+	$parts = $client->listParts(array("Bucket"=>"aaphp", "Key"=>"multi.zip", "Options"=>array("uploadId"=>$uploadid)));
 	print_r($parts);
 	//结束上传
-	$args=array(
+	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.zip",
 		"Options"=>array("uploadId"=>$uploadid),
@@ -370,7 +370,7 @@ 
 		),
 		"CallBack"=>array(
 			"Url"=>"http://10.4.2.38:19090/",
-			"BodyMagicVariables"=>array("bucket"=>"bucket","key"=>"key"),
+			"BodyMagicVariables"=>array("bucket"=>"bucket", "key"=>"key"),
 			"BodyVariables"=>array("name"=>"lijunwei")
 		)
 	);
@@ -380,8 +380,8 @@ 
 	$task = $client->getAdp(array("TaskID"=>$taskid));
 	print_r($task);
 }
-function putAdp($client){
-	$args=array(
+function putAdp($client) {
+	$args = array(
 		"Bucket"=>"aaphp",
 		"Key"=>"multi.zip",
 		"Adp"=>array(
@@ -400,14 +400,14 @@ 
 	$task = $client->getAdp(array("TaskID"=>$taskid));
 	print_r($task);
 }
-function postObject($client){
+function postObject($client) {
 
 	$postData = array(
 		"key"=>"~!@\\#$\%^&*()_+-=qw",
 		"acl"=>"public-read"
 		);
-	$unKnowData=array("122","334");
+	$unKnowData = array("122", "334");
 
-	print_r($client->postObject("ksc-scm",$postData,$unKnowData));
+	print_r($client->postObject("ksc-scm", $postData, $unKnowData));
 }
 ?>

src/service/ksyun/bin/encryption/EncryptionUtil.php

Spacing +92 added lines, -92 removed lines

@@ -1,7 +1,7 @@ 
 <?php
-class EncryptionUtil{
+class EncryptionUtil {
 	public static $INSTRUCTION_SUFFIX = ".instruction";
-	public static function genereateOnceUsedKey($length=32){
+	public static function genereateOnceUsedKey($length = 32) {
 		$randpwd = "";  
 		for ($i = 0; $i < $length; $i++)  
 		{  
@@ -9,24 +9,24 @@ 
 		}  
 		return $randpwd;   
 	}
-	public static function encode_AES_ECB($data,$secret_key){
-		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_ECB,'');
+	public static function encode_AES_ECB($data, $secret_key) {
+		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_ECB, '');
 
-		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_ECB);
-		$pad = $blocksize - (strlen($data) % $blocksize);
-		$data = $data . str_repeat(chr($pad), $pad);
+		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_ECB);
+		$pad = $blocksize-(strlen($data)%$blocksize);
+		$data = $data.str_repeat(chr($pad), $pad);
 
-		$iv = mcrypt_create_iv (mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
-		mcrypt_generic_init($td,$secret_key,$iv);
-		$encrypted = mcrypt_generic($td,$data);
+		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
+		mcrypt_generic_init($td, $secret_key, $iv);
+		$encrypted = mcrypt_generic($td, $data);
 		mcrypt_generic_deinit($td);
 		return $encrypted;
 	}
-	public static function decode_AES_ECB($data,$secret_key){
-		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_ECB,'');
-		$iv = mcrypt_create_iv (mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
-		mcrypt_generic_init($td,$secret_key,$iv);
-		$data = mdecrypt_generic($td,$data);
+	public static function decode_AES_ECB($data, $secret_key) {
+		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_ECB, '');
+		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
+		mcrypt_generic_init($td, $secret_key, $iv);
+		$data = mdecrypt_generic($td, $data);
 		mcrypt_generic_deinit($td);
 		mcrypt_module_close($td);
 
@@ -36,155 +36,155 @@ 
 
 		return trim($data);
 	}
-	public static function getKeyEncryptionAlgm($encryptionMaterials){
-		if(is_array($encryptionMaterials)){
+	public static function getKeyEncryptionAlgm($encryptionMaterials) {
+		if (is_array($encryptionMaterials)) {
 			return "RSA";
-		}else{
+		}else {
 			return "AES";
 		}
 	}
-	public static function getAdjustedRange($range,$blocksize){
+	public static function getAdjustedRange($range, $blocksize) {
 		$a = $range["start"];
 		$b = $range["end"];
-		$a = $a - ($a%$blocksize)-$blocksize;
-		if($a < 0)
+		$a = $a-($a%$blocksize)-$blocksize;
+		if ($a < 0)
 			$a = 0;
 
 		$b = $b+$blocksize-$b%$blocksize+$blocksize;
 
-		return array("start"=>$a,"end"=>$b);
+		return array("start"=>$a, "end"=>$b);
 	}
-	public static function encodeCek($encryptionMaterials,$cek){
+	public static function encodeCek($encryptionMaterials, $cek) {
 		$encrypKeyAlg = EncryptionUtil::getKeyEncryptionAlgm($encryptionMaterials);
-		if($encrypKeyAlg === "AES"){
+		if ($encrypKeyAlg === "AES") {
 			$secretKey = $encryptionMaterials;
-			$encryptedSek = EncryptionUtil::encode_AES_ECB($cek,$secretKey);
-			if(empty($encryptedSek))
+			$encryptedSek = EncryptionUtil::encode_AES_ECB($cek, $secretKey);
+			if (empty($encryptedSek))
 				throw new Ks3ClientException("can not encode cek useing AES");
-		}else if($encrypKeyAlg === "RSA"){
+		}else if ($encrypKeyAlg === "RSA") {
 			$encryptedSek = "";
-			openssl_public_encrypt($cek,$encryptedSek, $encryptionMaterials[0]);
-			if(empty($encryptedSek))
+			openssl_public_encrypt($cek, $encryptedSek, $encryptionMaterials[0]);
+			if (empty($encryptedSek))
 				throw new Ks3ClientException("can not encode cek useing RSA");
 		}
 		return $encryptedSek;
 	}
-	public static function decodeCek($encryptionMaterials,$cekEncrypted){
+	public static function decodeCek($encryptionMaterials, $cekEncrypted) {
 		$encrypKeyAlg = EncryptionUtil::getKeyEncryptionAlgm($encryptionMaterials);
-		if($encrypKeyAlg === "AES"){
+		if ($encrypKeyAlg === "AES") {
 			$secretKey = $encryptionMaterials;
-			$cek = EncryptionUtil::decode_AES_ECB($cekEncrypted,$secretKey);
-			if(empty($cek))
+			$cek = EncryptionUtil::decode_AES_ECB($cekEncrypted, $secretKey);
+			if (empty($cek))
 				throw new Ks3ClientException("can not decode cek useing AES,secret key maybe not correct");
-		}else if($encrypKeyAlg === "RSA"){
+		}else if ($encrypKeyAlg === "RSA") {
 			$cek = "";
-			openssl_private_decrypt($cekEncrypted,$cek, $encryptionMaterials[1]);
-			if(empty($cek))
+			openssl_private_decrypt($cekEncrypted, $cek, $encryptionMaterials[1]);
+			if (empty($cek))
 				throw new Ks3ClientException("can not decode cek useing RSA,public/private key pair maybe not correct");
 		}
 		return $cek;
 	}
-	public static function getPKCS5EncrypedLength($length,$blocksize){
-		$pad = $blocksize - $length%$blocksize;
+	public static function getPKCS5EncrypedLength($length, $blocksize) {
+		$pad = $blocksize-$length%$blocksize;
 		return $length+$pad;
 	}
 	//pkcs5填充
-	public static function PKCS5Padding($data,$blocksize){
-		$pad = $blocksize - strlen($data)%$blocksize;
-		for($i = 0;$i < $pad;$i++){
-			$data.= chr($pad);
+	public static function PKCS5Padding($data, $blocksize) {
+		$pad = $blocksize-strlen($data)%$blocksize;
+		for ($i = 0; $i < $pad; $i++) {
+			$data .= chr($pad);
 		}
 		return $data;
 	}
-	public static function updateContentMD5Header($req){
-		if(!is_array($req))
+	public static function updateContentMD5Header($req) {
+		if (!is_array($req))
 			return $req;
-		if(isset($req["ObjectMeta"])){
+		if (isset($req["ObjectMeta"])) {
 			$meta = $req["ObjectMeta"];
-		}else{
+		}else {
 			return $req;
 		}
-		if(is_array($meta) && isset($meta["Content-MD5"])){
+		if (is_array($meta) && isset($meta["Content-MD5"])) {
 			$md5 = $meta["Content-MD5"];
-		}else{
+		}else {
 			return $req;
 		}
-		if(empty($md5)){
+		if (empty($md5)) {
 			return $req;
-		}else{
+		}else {
 			$req["ObjectMeta"]["Content-MD5"] = NULL;
 			$req["UserMeta"]["x-kss-meta-x-kss-unencrypted-content-md5"] = $md5;
 		}
 		return $req;
 	}
-	public static function metaTextLength($req){
-		if(!is_array($req))
+	public static function metaTextLength($req) {
+		if (!is_array($req))
 			return -1;
-		if(isset($req["ObjectMeta"])){
+		if (isset($req["ObjectMeta"])) {
 			$meta = $req["ObjectMeta"];
-		}else{
+		}else {
 			return -1;
 		}
-		if(is_array($meta) && isset($meta["Content-Length"])){
+		if (is_array($meta) && isset($meta["Content-Length"])) {
 			$length = $meta["Content-Length"];
 			return $length;
 		}else
 			return -1;
 	}
-	public static function plainTextLength($args){
-		if(isset($args["Content"])){
-			if(is_array($args["Content"])){
+	public static function plainTextLength($args) {
+		if (isset($args["Content"])) {
+			if (is_array($args["Content"])) {
 				$content = $args["Content"]["content"];
 				$seek_position = 0;
 				$resourceLength = 0;
 				$length = -1;
 				$isFile = FALSE;
 
-				if (!is_resource($content)){
+				if (!is_resource($content)) {
 					$isFile = TRUE;
 					//如果之前用户已经转化为GBK则不转换
-					if(Utils::chk_chinese($content)&&!Utils::check_char($content)){
-						$content = iconv('utf-8','gbk',$content);
+					if (Utils::chk_chinese($content) && !Utils::check_char($content)) {
+						$content = iconv('utf-8', 'gbk', $content);
 					}
-					if(!file_exists($content))
+					if (!file_exists($content))
 						throw new Ks3ClientException("the specified file does not exist ");
 					$length = Utils::getFileSize($content);
-					$content = fopen($content,"r");
-				}else{
+					$content = fopen($content, "r");
+				}else {
 					$stats = fstat($content);
-					if ($stats && $stats["size"] >= 0){
+					if ($stats && $stats["size"] >= 0) {
 						$length = $stats["size"];	
 					}
 				}
 				$resourceLength = $length;
 				//优先取用户设置seek_position，没有的话取ftell
-				if(isset($args["Content"]["seek_position"])&&$args["Content"]["seek_position"]>0){
+				if (isset($args["Content"]["seek_position"]) && $args["Content"]["seek_position"] > 0) {
 					$seek_position = $args["Content"]["seek_position"];
-				}else if(!$isFile){
+				}else if (!$isFile) {
 					$seek_position = ftell($content);
-					if($seek_position<0)
+					if ($seek_position < 0)
 						$seek_position = 0;
-					fseek($content,0);
+					fseek($content, 0);
 				}
 
 				$lengthInMeta = -1;
-				if(isset($args["ObjectMeta"]["Content-Length"])){
+				if (isset($args["ObjectMeta"]["Content-Length"])) {
 					$lengthInMeta = $args["ObjectMeta"]["Content-Length"];
 				}
-				if($lengthInMeta > 0){
+				if ($lengthInMeta > 0) {
 					$length = $lengthInMeta;
-				}else if($resourceLength > 0){
+				}else if ($resourceLength > 0) {
 					//根据seek_position计算实际长度
-					$length = $resourceLength - $seek_position;
+					$length = $resourceLength-$seek_position;
 				}
-				if($length <= 0)
+				if ($length <= 0)
 					throw new Ks3ClientException("calculate content length failed,unexpected contetn length ".$length);
 				return $length;
-			}else{
+			}else {
 				$content = $args["Content"];
 				$lengthInMeta = EncryptionUtil::metaTextLength($args);
 				$length = strlen($content);
-				if($length<$lengthInMeta||$lengthInMeta <= 0)
+				if ($length < $lengthInMeta || $lengthInMeta <= 0)
 					return $length;
 				else
 					return $lengthInMeta;
@@ -192,14 +192,14 @@ 
 		}
 		return -1;
 	}
-	public static function initMultipartUploadContext($initResult,$iv,$cek,$encryptedCek,$matdesc="{}"){
+	public static function initMultipartUploadContext($initResult, $iv, $cek, $encryptedCek, $matdesc = "{}") {
 		$cacheDir = KS3_API_PATH.DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR;
 		$encryptionDir = KS3_API_PATH.DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR;
-		if(!is_dir($cacheDir))
+		if (!is_dir($cacheDir))
 			mkdir($cacheDir);
-		if(!is_dir($encryptionDir))
+		if (!is_dir($encryptionDir))
 			mkdir($encryptionDir);
-		if(is_array($matdesc)){
+		if (is_array($matdesc)) {
 			$matdesc = json_encode($matdesc);
 		}
 		$initResult["firstIv"] = base64_encode($iv);
@@ -213,7 +213,7 @@ 
 		fwrite($file, $json);
 		fclose($file);
 	}
-	public static function updateMultipartUploadContext($UploadId,$iv,$lastPart = FALSE){
+	public static function updateMultipartUploadContext($UploadId, $iv, $lastPart = FALSE) {
 		$encryptionDir = KS3_API_PATH.DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR;
 		$content = EncryptionUtil::getMultipartUploadContext($UploadId);
 		$content["nextIv"] = base64_encode($iv);
@@ -223,32 +223,32 @@ 
 		fwrite($file, $json);
 		fclose($file);
 	}
-	public static function getMultipartUploadContext($UploadId){
+	public static function getMultipartUploadContext($UploadId) {
 		$encryptionDir = KS3_API_PATH.DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR;
-		if(!EncryptionUtil::multipartUploadContextExists($UploadId))
+		if (!EncryptionUtil::multipartUploadContextExists($UploadId))
 			throw new Ks3ClientException("can not found multipart upload context in cache dir");
 		$jsonString = file_get_contents($encryptionDir.$UploadId);
-		$arry = json_decode($jsonString,TRUE);
+		$arry = json_decode($jsonString, TRUE);
 		return $arry;
 	}
-	public static function deleteMultipartUploadContext($UploadId){
+	public static function deleteMultipartUploadContext($UploadId) {
 		$encryptionDir = KS3_API_PATH.DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR;
 		@unlink($encryptionDir.$UploadId);
 	}
-	public static function multipartUploadContextExists($UploadId){
+	public static function multipartUploadContextExists($UploadId) {
 		$encryptionDir = KS3_API_PATH.DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR;
 		return file_exists($encryptionDir.$UploadId);
 	}
-	public static function openfile($path,$mode){
+	public static function openfile($path, $mode) {
 		$file = fopen($path, $mode);
-		if($file)
+		if ($file)
 			return $file;
 		else
 			throw new Ks3ClientException("open file ".$path." error");
 	}
 	//matdesc为字符串或array数据类型。
-	public static function createInstructionFile($bucket,$key,$cek,$iv,$matdesc="{}"){
-		if(is_array($matdesc)){
+	public static function createInstructionFile($bucket, $key, $cek, $iv, $matdesc = "{}") {
+		if (is_array($matdesc)) {
 			$matdesc = json_encode($matdesc);
 		}
 		$key = $key.EncryptionUtil::$INSTRUCTION_SUFFIX;
@@ -269,9 +269,9 @@ 
 			);
 		return $req;
 	}
-	public static function isInstructionFile($s3Object){
+	public static function isInstructionFile($s3Object) {
 		$meta = $s3Object["Meta"];
-		if(isset($meta["UserMeta"]["x-kss-meta-x-kss-crypto-instr-file"]))
+		if (isset($meta["UserMeta"]["x-kss-meta-x-kss-crypto-instr-file"]))
 			return TRUE;
 		return FALSE;
 	}

src/service/ksyun/bin/encryption/EncryptionHandlers.php

Spacing +124 added lines, -124 removed lines

@@ -2,47 +2,47 @@ 
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR."EncryptionUtil.php";
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR."EncryptionCallBack.php";
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."exceptions".DIRECTORY_SEPARATOR."Exceptions.php";
-interface EncryptionHandler{
-	public function putObjectByContentSecurely($args=array());
-	public function putObjectByFileSecurely($args=array());
-	public function getObjectSecurely($args=array());
-	public function initMultipartUploadSecurely($args=array());
-	public function uploadPartSecurely($args=array());
-	public function abortMultipartUploadSecurely($args=array());
-	public function completeMultipartUploadSecurely($args=array());
+interface EncryptionHandler {
+	public function putObjectByContentSecurely($args = array());
+	public function putObjectByFileSecurely($args = array());
+	public function getObjectSecurely($args = array());
+	public function initMultipartUploadSecurely($args = array());
+	public function uploadPartSecurely($args = array());
+	public function abortMultipartUploadSecurely($args = array());
+	public function completeMultipartUploadSecurely($args = array());
 }
-class EncryptionEO implements EncryptionHandler{
+class EncryptionEO implements EncryptionHandler {
 	private $encryptionMaterials = NULL;
 	private $ks3client = NULL;
-	public function __construct($ks3client,$encryptionMaterials){
+	public function __construct($ks3client, $encryptionMaterials) {
 		$this->encryptionMaterials = $encryptionMaterials;
 		$this->ks3client = $ks3client;
 	}
-	public function putObjectByContentSecurely($args=array()){
+	public function putObjectByContentSecurely($args = array()) {
 		$sek = EncryptionUtil::genereateOnceUsedKey();
-		$encryptedSek = EncryptionUtil::encodeCek($this->encryptionMaterials,$sek);
+		$encryptedSek = EncryptionUtil::encodeCek($this->encryptionMaterials, $sek);
 		$content = $args["Content"];
-		if(empty($content))
+		if (empty($content))
 			throw new Ks3ClientException("please specifie Content in request args");
 		$metaContentLength = EncryptionUtil::metaTextLength($args);
 		$plainTextLength = strlen($content);
-		if($metaContentLength > 0 && $metaContentLength < $plainTextLength){
+		if ($metaContentLength > 0 && $metaContentLength < $plainTextLength) {
 			$plainTextLength = $metaContentLength;
 		}
-		if($plainTextLength > 0)
+		if ($plainTextLength > 0)
 			$args["UserMeta"]["x-kss-meta-x-kss-unencrypted-content-length"] = $plainTextLength;
 		else
 			throw new Ks3ClientException("unexpected content length ".$plainTextLength);
 
-		$content =  substr($content, 0,$plainTextLength);
+		$content = substr($content, 0, $plainTextLength);
 
 
-		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_CBC,'');
-		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_RAND);
-		mcrypt_generic_init($td,$sek,$iv);
+		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, '');
+		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
+		mcrypt_generic_init($td, $sek, $iv);
 		//对content进行pkcs5填充
-		$content = EncryptionUtil::PKCS5Padding($content,mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_CBC));
-		$encrypted = mcrypt_generic($td,$content);
+		$content = EncryptionUtil::PKCS5Padding($content, mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC));
+		$encrypted = mcrypt_generic($td, $content);
 		mcrypt_generic_deinit($td);
 
 		$args["ObjectMeta"]["Content-Length"] = strlen($encrypted);
@@ -52,7 +52,7 @@ 
 
 		//TODO
 		$matdesc = "{}";
-		if(ENCRYPTPTION_STORAGE_MODE == "ObjectMetadata"){
+		if (ENCRYPTPTION_STORAGE_MODE == "ObjectMetadata") {
 			$args["UserMeta"]["x-kss-meta-x-kss-key"] = base64_encode($encryptedSek);
 			$args["UserMeta"]["x-kss-meta-x-kss-iv"] = base64_encode($iv);
 			$args["UserMeta"]["x-kss-meta-x-kss-matdesc"] = $matdesc;
@@ -60,31 +60,31 @@ 
 
 		$result = $this->ks3client->putObjectByContent($args);
 
-		if(ENCRYPTPTION_STORAGE_MODE == "InstructionFile"){
-			$req = EncryptionUtil::createInstructionFile($args["Bucket"],$args["Key"],
-			base64_encode($encryptedSek),base64_encode($iv),$matdesc);
+		if (ENCRYPTPTION_STORAGE_MODE == "InstructionFile") {
+			$req = EncryptionUtil::createInstructionFile($args["Bucket"], $args["Key"],
+			base64_encode($encryptedSek), base64_encode($iv), $matdesc);
 			$this->ks3client->putObjectByContent($req);
 		}
 
 		return $result;
 	}
-	public function putObjectByFileSecurely($args=array()){
+	public function putObjectByFileSecurely($args = array()) {
 		$sek = EncryptionUtil::genereateOnceUsedKey();
-		$encryptedSek = EncryptionUtil::encodeCek($this->encryptionMaterials,$sek);
-		if(!isset($args["Content"])||!is_array($args["Content"])
+		$encryptedSek = EncryptionUtil::encodeCek($this->encryptionMaterials, $sek);
+		if (!isset($args["Content"]) || !is_array($args["Content"])
 			||!isset($args["Content"]["content"])
 			||empty($args["Content"]["content"]))
 			throw new Ks3ClientException("please specifie file content in request args");
 		$content = $args["Content"];
 		$plainTextLength = EncryptionUtil::plainTextLength($args);
-		if($plainTextLength <= 0){
+		if ($plainTextLength <= 0) {
 			throw new Ks3ClientException("get content length failed ,unexpected content length ".$plainTextLength);
 		}
-		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_CBC,'');
-		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_RAND);
+		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, '');
+		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
 
 		$args = EncryptionUtil::updateContentMD5Header($args);
-		$encryptedLength = EncryptionUtil::getPKCS5EncrypedLength($plainTextLength,mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_CBC));
+		$encryptedLength = EncryptionUtil::getPKCS5EncrypedLength($plainTextLength, mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC));
 
 		$args["ObjectMeta"]["Content-Length"] = $encryptedLength;
 		$args["UserMeta"]["x-kss-meta-x-kss-unencrypted-content-length"] = $plainTextLength;
@@ -97,7 +97,7 @@ 
 
 		//TODO
 		$matdesc = "{}";
-		if(ENCRYPTPTION_STORAGE_MODE == "ObjectMetadata"){
+		if (ENCRYPTPTION_STORAGE_MODE == "ObjectMetadata") {
 			$args["UserMeta"]["x-kss-meta-x-kss-key"] = base64_encode($encryptedSek);
 			$args["UserMeta"]["x-kss-meta-x-kss-iv"] = base64_encode($iv);
 			$args["UserMeta"]["x-kss-meta-x-kss-matdesc"] = $matdesc;
@@ -105,86 +105,86 @@ 
 
 		$result = $this->ks3client->putObjectByFile($args);
 
-		if(ENCRYPTPTION_STORAGE_MODE == "InstructionFile"){
-			$req = EncryptionUtil::createInstructionFile($args["Bucket"],$args["Key"],
-			base64_encode($encryptedSek),base64_encode($iv),$matdesc);
+		if (ENCRYPTPTION_STORAGE_MODE == "InstructionFile") {
+			$req = EncryptionUtil::createInstructionFile($args["Bucket"], $args["Key"],
+			base64_encode($encryptedSek), base64_encode($iv), $matdesc);
 			$this->ks3client->putObjectByContent($req);
 		}
 
 		return $result;
 	}
-	public function getObjectSecurely($args=array()){
+	public function getObjectSecurely($args = array()) {
 		$meta = $this->ks3client->getObjectMeta($args);
-		if(isset($meta["UserMeta"]["x-kss-meta-x-kss-key"])&&isset($meta["UserMeta"]["x-kss-meta-x-kss-iv"])){
+		if (isset($meta["UserMeta"]["x-kss-meta-x-kss-key"]) && isset($meta["UserMeta"]["x-kss-meta-x-kss-iv"])) {
 			$encryptedInMeta = TRUE;
-		}else{
+		}else {
 			$encryptedInMeta = FALSE;
 		}
 		$encrypted = TRUE;
 		$encryptionInfo = array();
-		if($encryptedInMeta){
+		if ($encryptedInMeta) {
 			$encryptionInfo["iv"] = base64_decode($meta["UserMeta"]["x-kss-meta-x-kss-iv"]);
-			$matdesc =$meta["UserMeta"]["x-kss-meta-x-kss-matdesc"];
+			$matdesc = $meta["UserMeta"]["x-kss-meta-x-kss-matdesc"];
 			$encryptionInfo["matdesc"] = $matdesc;
 			$cekEncrypted = base64_decode($meta["UserMeta"]["x-kss-meta-x-kss-key"]);
-			$encryptionInfo["cek"] = $cek = EncryptionUtil::decodeCek($this->encryptionMaterials,$cekEncrypted);
-		}else{
-			if($this->ks3client->objectExists(array(
+			$encryptionInfo["cek"] = $cek = EncryptionUtil::decodeCek($this->encryptionMaterials, $cekEncrypted);
+		}else {
+			if ($this->ks3client->objectExists(array(
 				"Bucket"=>$args["Bucket"],
 				"Key"=>$args["Key"].EncryptionUtil::$INSTRUCTION_SUFFIX)
 				)
-			){
+			) {
 				$insKey = $args["Key"].EncryptionUtil::$INSTRUCTION_SUFFIX;
 				$getIns = array(
 					"Bucket"=>$args["Bucket"],
 					"Key"=>$insKey,
 				);
 				$s3Object = $this->ks3client->getObject($getIns);
-				if(!EncryptionUtil::isInstructionFile($s3Object))
+				if (!EncryptionUtil::isInstructionFile($s3Object))
 					throw new Ks3ClientException($insKey." is not an InstructionFile");
 
 				$content = $s3Object["Content"];
-				$content = json_decode($content,TRUE);
+				$content = json_decode($content, TRUE);
 				$encryptionInfo["iv"] = base64_decode($content["x-kss-iv"]);
-				$matdesc =$content["x-kss-matdesc"];
+				$matdesc = $content["x-kss-matdesc"];
 				$encryptionInfo["matdesc"] = $matdesc;
 				$cekEncrypted = base64_decode($content["x-kss-key"]);
-				$encryptionInfo["cek"] = $cek = EncryptionUtil::decodeCek($this->encryptionMaterials,$cekEncrypted);
-			}else{
-				$encrypted =FALSE;
+				$encryptionInfo["cek"] = $cek = EncryptionUtil::decodeCek($this->encryptionMaterials, $cekEncrypted);
+			}else {
+				$encrypted = FALSE;
 			}
 		}
 		//是否为下载到文件中
-		$isWriteToFile=FALSE;
-		if($encrypted)
+		$isWriteToFile = FALSE;
+		if ($encrypted)
 		{
 			$iv = $encryptionInfo["iv"];
 			$cek = $encryptionInfo["cek"];
 
-			if(empty($iv))
+			if (empty($iv))
 				throw new Ks3ClientException("can not find iv in UserMeta or InstructionFile");
-			if(empty($cek))
+			if (empty($cek))
 				throw new Ks3ClientException("can not find cek in UserMeta or InstructionFile");
 
-			if(isset($args["Range"])){
+			if (isset($args["Range"])) {
 				$range = $args["Range"];
-				if(!is_array($range)){
-					if(preg_match('/^bytes=[0-9]*-[0-9]*$/', $range)){
-						$ranges = explode("-",substr($range,strlen("bytes=")));
+				if (!is_array($range)) {
+					if (preg_match('/^bytes=[0-9]*-[0-9]*$/', $range)) {
+						$ranges = explode("-", substr($range, strlen("bytes=")));
 						$a = $ranges[0];
 						$b = $ranges[1];
-						if($a > $b){
+						if ($a > $b) {
 							throw new Ks3ClientException("Invalid range ".$range);
 						}
-						$range = array("start"=>$a,"end"=>$b);
-					}else{
+						$range = array("start"=>$a, "end"=>$b);
+					}else {
 						throw new Ks3ClientException("Invalid range ".$range);
 					}
-				}else{
-					if(!isset($range["start"])||!isset($range["end"])){
+				}else {
+					if (!isset($range["start"]) || !isset($range["end"])) {
 						throw new Ks3ClientException("Invalid range ".serialize($range));
 					}
-					if($range["start"] > $range["end"]){
+					if ($range["start"] > $range["end"]) {
 						throw new Ks3ClientException("Invalid range ".serialize($range));
 					}
 				}
@@ -192,97 +192,97 @@ 
 
 			$isWriteToFile = isset($args["WriteTo"]);
 			$contentLength = $meta["ObjectMeta"]["Content-Length"];
-			if($isWriteToFile){
+			if ($isWriteToFile) {
 				$writeCallBack = new AESCBCStreamWriteCallBack();
-				$writeCallBack->iv=$iv;
-				$writeCallBack->cek=$cek;
+				$writeCallBack->iv = $iv;
+				$writeCallBack->cek = $cek;
 				$writeCallBack->contentLength = $contentLength;
-				if(isset($range)){
-					$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_CBC);
-					$adjustedRange = EncryptionUtil::getAdjustedRange($range,$blocksize);
+				if (isset($range)) {
+					$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC);
+					$adjustedRange = EncryptionUtil::getAdjustedRange($range, $blocksize);
 					$writeCallBack->expectedRange = $range;
 					$writeCallBack->adjustedRange = $adjustedRange;
-					$args["Range"]=$adjustedRange;
+					$args["Range"] = $adjustedRange;
 				}
 				$args["writeCallBack"] = $writeCallBack;
 				return $this->ks3client->getObject($args);
-			}else{
+			}else {
 				$offset = 0;
-				$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_CBC);
-				if(isset($range)){
-					$adjustedRange = EncryptionUtil::getAdjustedRange($range,$blocksize);
-					$args["Range"]=$adjustedRange;
+				$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC);
+				if (isset($range)) {
+					$adjustedRange = EncryptionUtil::getAdjustedRange($range, $blocksize);
+					$args["Range"] = $adjustedRange;
 				}
 				$s3Object = $this->ks3client->getObject($args);
 				$content = $s3Object["Content"];
 
-				if(isset($range)){
-					if($adjustedRange["start"] > 0){
-						$iv = substr($content,0,$blocksize);
-						$content = substr($content,$blocksize);
+				if (isset($range)) {
+					if ($adjustedRange["start"] > 0) {
+						$iv = substr($content, 0, $blocksize);
+						$content = substr($content, $blocksize);
 						$offset = $blocksize+$adjustedRange["start"];
 					}
 				}
-				if(!empty($content)){
-					$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_CBC,'');
-					mcrypt_generic_init($td,$cek,$iv);
-					$decoded = mdecrypt_generic($td,$content);
+				if (!empty($content)) {
+					$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, '');
+					mcrypt_generic_init($td, $cek, $iv);
+					$decoded = mdecrypt_generic($td, $content);
 					mcrypt_generic_deinit($td);
 					mcrypt_module_close($td);
-				}else{
+				}else {
 					$decoded = "";
 				}
 
 				//判断是否需要删除最后填充的字符,以及获取填充的字符
 				$needRemovePad = FALSE;
 				$pad = NULL;
-				if($offset+strlen($decoded) >=$contentLength){
+				if ($offset+strlen($decoded) >= $contentLength) {
 					$needRemovePad = TRUE;
-					$pad = ord(substr($decoded,strlen($decoded)-1,1));
-					if($pad<=0||$pad>$blocksize)
+					$pad = ord(substr($decoded, strlen($decoded)-1, 1));
+					if ($pad <= 0 || $pad > $blocksize)
 					{
 						//invalid pad
 						$needRemovePad = FALSE;
 					}
 				}
 				$endOffset = 0;
-				if(isset($range)){
-					if($offset+strlen($decoded)>$range["end"]){
+				if (isset($range)) {
+					if ($offset+strlen($decoded) > $range["end"]) {
 						$preLength = strlen($decoded);
-						$decoded = substr($decoded, 0,$range["end"]-$offset+1);
+						$decoded = substr($decoded, 0, $range["end"]-$offset+1);
 						$endOffset = $preLength-strlen($decoded);
 					}
-					if($offset<$range["start"]){
-						$decoded = substr($decoded,$range["start"] - $offset);
+					if ($offset < $range["start"]) {
+						$decoded = substr($decoded, $range["start"]-$offset);
 					}
 				}
 				//再次根据截取的长度判断是否需要删除最后填充的字符
-				if($needRemovePad&&$endOffset > $pad){
+				if ($needRemovePad && $endOffset > $pad) {
 					$needRemovePad = FALSE;
 				}
-				if($needRemovePad){
+				if ($needRemovePad) {
 					$padOffset = $pad-$endOffset;
 					$actualWriteCount = strlen($decoded)-$padOffset;
-					if($actualWriteCount <= 0)//负数的情况就是用户期望的range里全是填充的
+					if ($actualWriteCount <= 0)//负数的情况就是用户期望的range里全是填充的
 						$decoded = "";
 					else
-						$decoded = substr($decoded,0,strlen($decoded)-$padOffset);
+						$decoded = substr($decoded, 0, strlen($decoded)-$padOffset);
 				}
 				$s3Object["Content"] = $decoded;
 				return $s3Object;
 			}
-		}else{
+		}else {
 			return $this->ks3client->getObject($args);
 		}
 	}
-	public function initMultipartUploadSecurely($args=array()){
+	public function initMultipartUploadSecurely($args = array()) {
 		$sek = EncryptionUtil::genereateOnceUsedKey();
-		$encryptedSek = EncryptionUtil::encodeCek($this->encryptionMaterials,$sek);
-		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_CBC,'');
-		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_RAND);
+		$encryptedSek = EncryptionUtil::encodeCek($this->encryptionMaterials, $sek);
+		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, '');
+		$iv = mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND);
 		
 		$matdesc = "{}";
-		if(ENCRYPTPTION_STORAGE_MODE == "ObjectMetadata"){
+		if (ENCRYPTPTION_STORAGE_MODE == "ObjectMetadata") {
 			$args["UserMeta"]["x-kss-meta-x-kss-key"] = base64_encode($encryptedSek);
 			$args["UserMeta"]["x-kss-meta-x-kss-iv"] = base64_encode($iv);
 			$args["UserMeta"]["x-kss-meta-x-kss-matdesc"] = $matdesc;
@@ -290,33 +290,33 @@ 
 
 		$initResult = $this->ks3client->initMultipartUpload($args);
 
-		EncryptionUtil::initMultipartUploadContext($initResult,$iv,$sek,$encryptedSek,$matdesc);
+		EncryptionUtil::initMultipartUploadContext($initResult, $iv, $sek, $encryptedSek, $matdesc);
 
 		return $initResult;
 	}
-	public function uploadPartSecurely($args=array()){
+	public function uploadPartSecurely($args = array()) {
 		$uploadId = $args["Options"]["uploadId"];
 		$isLastPart = FALSE;
-		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_CBC);
-		if(isset($args["LastPart"]))
+		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC);
+		if (isset($args["LastPart"]))
 			$isLastPart = $args["LastPart"];
 		$exists = EncryptionUtil::multipartUploadContextExists($uploadId);
-		if(!$exists){
+		if (!$exists) {
 			throw new Ks3ClientException("no such upload in cache/encryption/");
 		}
 		$context = EncryptionUtil::getMultipartUploadContext($uploadId);
-		if($context["lastPart"]){
-			throw new Ks3ClientException("this upload with uploadId ".$uploadId," has been upload last part");
+		if ($context["lastPart"]) {
+			throw new Ks3ClientException("this upload with uploadId ".$uploadId, " has been upload last part");
 		}
 		$plainTextLength = EncryptionUtil::plainTextLength($args);
-		if($plainTextLength <= 0){
+		if ($plainTextLength <= 0) {
 			throw new Ks3ClientException("get content length failed ,unexpected content length ".$plainTextLength);
 		}
-		if(!$isLastPart){
-			if($plainTextLength % $blocksize != 0)
+		if (!$isLastPart) {
+			if ($plainTextLength%$blocksize != 0)
 				throw new Ks3ClientException("Invalid part size,part size (".$plainTextLength.") must be multiples of the block size ".$blocksize);
-		}else{
-			$args["ObjectMeta"]["Content-Length"] = $plainTextLength + ($blocksize - $plainTextLength%$blocksize);
+		}else {
+			$args["ObjectMeta"]["Content-Length"] = $plainTextLength+($blocksize-$plainTextLength%$blocksize);
 		}
 		$readCallBack = new AESCBCStreamReadCallBack();
 		$readCallBack->iv = base64_decode($context["nextIv"]);
@@ -327,28 +327,28 @@ 
 		$args["readCallBack"] = $readCallBack;
 
 		$upResult = $this->ks3client->uploadPart($args);
-		EncryptionUtil::updateMultipartUploadContext($uploadId,$readCallBack->iv,$isLastPart);
+		EncryptionUtil::updateMultipartUploadContext($uploadId, $readCallBack->iv, $isLastPart);
 		return $upResult;
 	}
-	public function abortMultipartUploadSecurely($args=array()){
+	public function abortMultipartUploadSecurely($args = array()) {
 		$uploadId = $args["Options"]["uploadId"];
 		EncryptionUtil::deleteMultipartUploadContext($uploadId);
 		return $this->ks3client->abortMultipartUpload($args);
 	}
-	public function completeMultipartUploadSecurely($args=array()){
+	public function completeMultipartUploadSecurely($args = array()) {
 		$uploadId = $args["Options"]["uploadId"];
 		$exists = EncryptionUtil::multipartUploadContextExists($uploadId);
-		if(!$exists){
+		if (!$exists) {
 			throw new Ks3ClientException("no such upload in cache/encryption/");
 		}
 		$context = EncryptionUtil::getMultipartUploadContext($uploadId);
-		if(!$context["lastPart"]){
+		if (!$context["lastPart"]) {
 			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");
 		}
 		$result = $this->ks3client->completeMultipartUpload($args);
-		if(ENCRYPTPTION_STORAGE_MODE=="InstructionFile"){
-			$req = EncryptionUtil::createInstructionFile($args["Bucket"],$args["Key"],
-			$context["encryptedCek"],$context["firstIv"],$context["matdesc"]);
+		if (ENCRYPTPTION_STORAGE_MODE == "InstructionFile") {
+			$req = EncryptionUtil::createInstructionFile($args["Bucket"], $args["Key"],
+			$context["encryptedCek"], $context["firstIv"], $context["matdesc"]);
 			$this->ks3client->putObjectByContent($req);
 		}
 		EncryptionUtil::deleteMultipartUploadContext($uploadId);

src/service/ksyun/bin/encryption/EncryptionCallBack.php

Spacing +70 added lines, -70 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 require_once KS3_API_PATH.DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR."EncryptionUtil.php";
 //下载
-class AESCBCStreamWriteCallBack{
+class AESCBCStreamWriteCallBack {
 	private $iv;
 	private $cek;
 	private $contentLength;
@@ -11,13 +11,13 @@ 
 	private $adjustedRange;
 	//当前指针位置
 	private $currentIndex;
-	private $buffer;//上一次调用streaming_write_callback后，未解码的数据
+	private $buffer; //上一次调用streaming_write_callback后，未解码的数据
 	private $firstWrite = TRUE;
-	public function __set($property_name, $value){
-		$this->$property_name=$value;
+	public function __set($property_name, $value) {
+		$this->$property_name = $value;
 	}
-	public function __get($property_name){
-		if(isset($this->$property_name))
+	public function __get($property_name) {
+		if (isset($this->$property_name))
 		{
 			return($this->$property_name);
 		}else
@@ -26,59 +26,59 @@ 
 		}
 	}
 	//最后的数据大小肯定是blocksize的倍数，所以最后buffer中不会有未解密的内容。否则可以认为该文件是错误的
-	public function streaming_write_callback($curl_handle,$data,$write_stream){
+	public function streaming_write_callback($curl_handle, $data, $write_stream) {
 		$data = $this->buffer.$data;
 
 		$length = strlen($data);
 		//不能把上次的没读完的长度算在这次里,应该算在上次
 		$written_total = 0-strlen($this->buffer);
-		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_CBC);
-		if($length<$blocksize)
+		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC);
+		if ($length < $blocksize)
 			$this->buffer = $data;
-		else{
+		else {
 			//如果期望的范围之后还有数据，则认为数据已经接收完毕。不做任何处理
-			if($this->expectedRange["end"] < $this->expectedRange["start"]){
+			if ($this->expectedRange["end"] < $this->expectedRange["start"]) {
 				return $written_total+strlen($data);
 			}
-			$this->buffer = substr($data,$length - $length%$blocksize);
-			$data = substr($data,0,$length - $length%$blocksize);
+			$this->buffer = substr($data, $length-$length%$blocksize);
+			$data = substr($data, 0, $length-$length%$blocksize);
 		
 			$ivoffset = 0;
 			//range get时，如果不是从刚开始，则应该取加密后数据的前16个字节作为之后解密的iv
-			if($this->firstWrite){
+			if ($this->firstWrite) {
 				$this->firstWrite = FALSE;
-				if(!$this->isBegin()){
-					$this->iv = substr($data,0,$blocksize);
-					$data = substr($data,$blocksize);
+				if (!$this->isBegin()) {
+					$this->iv = substr($data, 0, $blocksize);
+					$data = substr($data, $blocksize);
 					$ivoffset = $blocksize;
 				}
 				//初始化当前位置
-				if(isset($this->adjustedRange))
+				if (isset($this->adjustedRange))
 					$this->currentIndex = $ivoffset+$this->adjustedRange["start"];
 				else
 					$this->currentIndex = $ivoffset;
 			}
-			$written_total+=$ivoffset;
-			if(strlen($data) == 0){
+			$written_total += $ivoffset;
+			if (strlen($data) == 0) {
 				$decoded = "";
 				return $written_total;
-			}else{
-				$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_CBC,'');
-				mcrypt_generic_init($td,$this->cek,$this->iv);
-				$decoded = mdecrypt_generic($td,$data);
+			}else {
+				$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, '');
+				mcrypt_generic_init($td, $this->cek, $this->iv);
+				$decoded = mdecrypt_generic($td, $data);
 				mcrypt_generic_deinit($td);
 				mcrypt_module_close($td);
 			}
 
-			$this->iv = substr($data,strlen($data)-$blocksize);
+			$this->iv = substr($data, strlen($data)-$blocksize);
 			//判断是否需要删除最后填充的字符,以及获取填充的字符
 			$needRemovePad = FALSE;
 			$pad = NULL;
 
-			if($this->currentIndex+strlen($decoded) >=$this->contentLength){
+			if ($this->currentIndex+strlen($decoded) >= $this->contentLength) {
 				$needRemovePad = TRUE;
-				$pad = ord(substr($decoded,strlen($decoded)-1,1));
-				if($pad<=0||$pad>$blocksize)
+				$pad = ord(substr($decoded, strlen($decoded)-1, 1));
+				if ($pad <= 0 || $pad > $blocksize)
 				{
 					//invalid pad
 					$needRemovePad = FALSE;
@@ -88,21 +88,21 @@ 
 			//将解密后的数据截取到期望的长度
 			$startOffset = 0;
 			$endOffset = 0;
-			if(isset($this->expectedRange)){
+			if (isset($this->expectedRange)) {
 				$trueEnd = $expectedEnd = $this->expectedRange["end"];
 
-				if($this->currentIndex+strlen($decoded)>$expectedEnd){
+				if ($this->currentIndex+strlen($decoded) > $expectedEnd) {
 					$preLength = strlen($decoded);
-					$decoded = substr($decoded, 0,$expectedEnd-$this->currentIndex+1);
+					$decoded = substr($decoded, 0, $expectedEnd-$this->currentIndex+1);
 					$endOffset = $preLength-strlen($decoded);
-				}else{
+				}else {
 					//因为range是开始结束都计算的，range=1-2。currentIndex=1,长度是2，end=currentIndex+2-1
 					$trueEnd = $this->currentIndex+strlen($decoded)-1; 
 				}
 				$expectedStart = $this->expectedRange["start"];
-				if($this->currentIndex<$expectedStart){
-					$decoded = substr($decoded,$expectedStart - $this->currentIndex);
-					$startOffset = $expectedStart - $this->currentIndex;
+				if ($this->currentIndex < $expectedStart) {
+					$decoded = substr($decoded, $expectedStart-$this->currentIndex);
+					$startOffset = $expectedStart-$this->currentIndex;
 				}
 				//调整下次期望的开始
 				$this->expectedRange["start"] = $trueEnd+1;
@@ -110,56 +110,56 @@ 
 
 			$padOffset = 0;
 			//再次根据截取的长度判断是否需要删除最后填充的字符
-			if($needRemovePad&&$endOffset > $pad){
+			if ($needRemovePad && $endOffset > $pad) {
 				$needRemovePad = FALSE;
 			}
 			$actualWriteCount = 0;
-			if($needRemovePad){
+			if ($needRemovePad) {
 				$padOffset = $pad-$endOffset;
 				$actualWriteCount = strlen($decoded)-$padOffset;
-				if($actualWriteCount <= 0)//负数的情况就是用户期望的range里全是填充的
+				if ($actualWriteCount <= 0)//负数的情况就是用户期望的range里全是填充的
 					$decoded = "";
 				else
-					$decoded = substr($decoded,0,strlen($decoded)-$padOffset);
+					$decoded = substr($decoded, 0, strlen($decoded)-$padOffset);
 			}
 			$count = fwrite($write_stream, $decoded);
-			if($count == 0)
+			if ($count == 0)
 				$count = $actualWriteCount;
 			$count += $padOffset;
 			$count += $startOffset;
 			$count += $endOffset;
 			$this->currentIndex += $count;
-			$written_total+=$count;
+			$written_total += $count;
 		}
 		//否则curl框架会报错
-		$written_total+=strlen($this->buffer);
+		$written_total += strlen($this->buffer);
 		return $written_total;
 	}
 	//是的话则使用初始化IV
-	private function isBegin(){
+	private function isBegin() {
 		$beginIndex = 0;
-		if(isset($this->adjustedRange["start"]))
+		if (isset($this->adjustedRange["start"]))
 			$beginIndex = $this->adjustedRange["start"];
-		if($beginIndex == 0)
+		if ($beginIndex == 0)
 			return TRUE;
 		else 
 			return FALSE;
 	}
 }
 //上传
-class AESCBCStreamReadCallBack{
+class AESCBCStreamReadCallBack {
 	private $iv;
 	private $cek;
 	private $contentLength;
 	private $buffer;
 	private $hasread = 0;
-	private $mutipartUpload =FALSE;
+	private $mutipartUpload = FALSE;
 	private $isLastPart = FALSE;
-	public function __set($property_name, $value){
-		$this->$property_name=$value;
+	public function __set($property_name, $value) {
+		$this->$property_name = $value;
 	}
-	public function __get($property_name){
-		if(isset($this->$property_name))
+	public function __get($property_name) {
+		if (isset($this->$property_name))
 		{
 			return($this->$property_name);
 		}else
@@ -167,7 +167,7 @@ 
 			return(NULL);
 		}
 	}
-	public function streaming_read_callback($curl_handle,$file_handle,$length,$read_stream,$seek_position){
+	public function streaming_read_callback($curl_handle, $file_handle, $length, $read_stream, $seek_position) {
 		// Once we've sent as much as we're supposed to send...
 		if ($this->hasread >= $this->contentLength)
 		{
@@ -175,7 +175,7 @@ 
 			return '';
 		}
 		// If we're at the beginning of an upload and need to seek...
-		if ($this->hasread == 0 && $seek_position>0 && $seek_position !== ftell($read_stream))
+		if ($this->hasread == 0 && $seek_position > 0 && $seek_position !== ftell($read_stream))
 		{
 			if (fseek($read_stream, $seek_position) !== 0)
 			{
@@ -184,38 +184,38 @@ 
 		}
 
 
-		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_ECB);
-		$needRead = min($this->contentLength - $this->hasread,$length);
-		$read = fread($read_stream,$needRead);
+		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_ECB);
+		$needRead = min($this->contentLength-$this->hasread, $length);
+		$read = fread($read_stream, $needRead);
 		$this->hasread += strlen($read);
 		$isLast = FALSE;
-		if($this->hasread >= $this->contentLength){
+		if ($this->hasread >= $this->contentLength) {
 			$isLast = TRUE;
 		}
 		$data = $this->buffer.$read;
 
 		$dataLength = strlen($data);
 
-		if(!$isLast){
-			$this->buffer = substr($data,$dataLength-$dataLength%$blocksize);
-			$data = substr($data, 0,$dataLength-$dataLength%$blocksize);
-		}else{
+		if (!$isLast) {
+			$this->buffer = substr($data, $dataLength-$dataLength%$blocksize);
+			$data = substr($data, 0, $dataLength-$dataLength%$blocksize);
+		}else {
 			//分块上传除最后一块外肯定是blocksize大小的倍数，所以不需要填充。
-			if($this->mutipartUpload){
-				if($this->isLastPart){
+			if ($this->mutipartUpload) {
+				if ($this->isLastPart) {
 					$this->buffer = NULL;
-					$data = EncryptionUtil::PKCS5Padding($data,$blocksize);
-				}else{
+					$data = EncryptionUtil::PKCS5Padding($data, $blocksize);
+				}else {
 					//donothing
 				}
-			}else{
+			}else {
 				$this->buffer = NULL;
-				$data = EncryptionUtil::PKCS5Padding($data,$blocksize);
+				$data = EncryptionUtil::PKCS5Padding($data, $blocksize);
 			}
 		}
-		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_CBC,'');
-		mcrypt_generic_init($td,$this->cek,$this->iv);
-		$encrypted = mcrypt_generic($td,$data);
+		$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128, '', MCRYPT_MODE_CBC, '');
+		mcrypt_generic_init($td, $this->cek, $this->iv);
+		$encrypted = mcrypt_generic($td, $data);
 		mcrypt_generic_deinit($td);
 		//去除自动填充的16个字节//php的当恰好为16的倍数时竟然不填充？
 		//$encrypted = substr($encrypted,0,strlen($encrypted)-$blocksize);

src/service/ksyun/bin/config/Consts.php

Spacing +11 added lines, -11 removed lines

@@ -3,14 +3,14 @@ 
 
 class Consts {
 	// static $Ks3EndPoint = "kss.ksyun.com";
-	static $SubResource = array("acl", "lifecycle", "location", "logging", "notification", "policy", "requestPayment", "torrent", "uploadId", "uploads", "versionId","versioning", "versions", "website", "delete", "thumbnail","cors","pfop","querypfop","adp","queryadp");	
-	static $QueryParam = array("partNumber","response-content-type","response-content-language","response-expires", "response-cache-control","response-content-disposition", "response-content-encoding", );
-	static $Acl = array("private","public-read","public-read-write");
+	static $SubResource = array("acl", "lifecycle", "location", "logging", "notification", "policy", "requestPayment", "torrent", "uploadId", "uploads", "versionId", "versioning", "versions", "website", "delete", "thumbnail", "cors", "pfop", "querypfop", "adp", "queryadp");	
+	static $QueryParam = array("partNumber", "response-content-type", "response-content-language", "response-expires", "response-cache-control", "response-content-disposition", "response-content-encoding",);
+	static $Acl = array("private", "public-read", "public-read-write");
 	static $KS3HeaderPrefix = "x-kss-";
-	static $CORSElements = array("AllowedMethod","AllowedOrigin","AllowedHeader","MaxAgeSeconds","ExposeHeader");
-	static $BucketLoggingElements = array("TargetBucket","TargetPrefix");
-	static $ObjectMeta = array("Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires");
-	static $MultipartObjectMeta = array("Cache-Control","Content-Disposition","Content-Encoding","Content-Type","Expires");
+	static $CORSElements = array("AllowedMethod", "AllowedOrigin", "AllowedHeader", "MaxAgeSeconds", "ExposeHeader");
+	static $BucketLoggingElements = array("TargetBucket", "TargetPrefix");
+	static $ObjectMeta = array("Cache-Control", "Content-Disposition", "Content-Encoding", "Content-Length", "Content-MD5", "Content-Type", "Expires");
+	static $MultipartObjectMeta = array("Cache-Control", "Content-Disposition", "Content-Encoding", "Content-Type", "Expires");
 	static $UserMetaPrefix = "x-kss-meta";
 	static $ResponseObjectMeta = array(
 		"cache-control"=>"Cache-Control",
@@ -27,7 +27,7 @@ 
 		"x-kss-server-side-encryption-customer-algorithm"=>"SSECAlgm",
 		"x-kss-server-side-encryption-customer-key-md5"=>"SSECKeyMD5"
 		);
-	static $PartsElement = array("PartNumber","ETag");
+	static $PartsElement = array("PartNumber", "ETag");
 	static $UploadHandler = array(
 		"etag"=>"ETag",
 		"taskid"=>"TaskID",
@@ -45,9 +45,9 @@ 
 	static $Permission_Read = "READ";
 	static $Permission_Write = "WRITE";
 	static $Grantee_Group_All = "http://acs.ksyun.com/groups/global/AllUsers";
-	static $ResponseOverrides = array("response-expires","response-content-encoding","response-content-disposition",
-		"response-content-language","response-content-type","response-cache-control");
-	static $CallBackMagics = array("bucket","key","etag","objectSize","mimeType","createTime");
+	static $ResponseOverrides = array("response-expires", "response-content-encoding", "response-content-disposition",
+		"response-content-language", "response-content-type", "response-cache-control");
+	static $CallBackMagics = array("bucket", "key", "etag", "objectSize", "mimeType", "createTime");
 	static $UserAgent = "ks3-kss-php-sdk";
 	static $SSEDefaultAlgm = "AES256";
 }

src/service/ksyun/bin/unit/Test.php

Spacing +258 added lines, -258 removed lines

@@ -1,12 +1,12 @@ 
 <?php
-define("ENCRYPTPTION_STORAGE_MODE","InstructionFile");
+define("ENCRYPTPTION_STORAGE_MODE", "InstructionFile");
 require_once "../encryption/EncryptionUtil.php";
 require_once "../Ks3Client.class.php";
 require_once "../Ks3EncryptionClient.class.php";
 require_once "TestUtil.php";
 require_once "PUnit.php";
 require_once "../lib/RequestCore.class.php";
-class SDKTest extends PUnit{
+class SDKTest extends PUnit {
 	protected $bucket = "php-sdk-test";
 	protected $key = "test==中/文？";
 	protected $key_copy = "test中/文_copy？";
@@ -16,64 +16,64 @@ 
     protected $encryptionClient;
 	protected $cachedir;
     protected $sseckey;
-	public function __construct(){
-		$this->client=new Ks3Client($this->accesskey,$this->secrectkey);
-		$this->cachedir=KS3_API_PATH.DIRECTORY_SEPARATOR."unit".DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR;
+	public function __construct() {
+		$this->client = new Ks3Client($this->accesskey, $this->secrectkey);
+		$this->cachedir = KS3_API_PATH.DIRECTORY_SEPARATOR."unit".DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR;
         $filename = "secret.key";
         $handle = fopen($filename, "r");
-        $sseckey = fread($handle, filesize ($filename));
+        $sseckey = fread($handle, filesize($filename));
         fclose($handle);
         $this->sseckey = $sseckey;
-        $this->encryptionClient = new Ks3EncryptionClient($this->accesskey,$this->secrectkey,$sseckey);
+        $this->encryptionClient = new Ks3EncryptionClient($this->accesskey, $this->secrectkey, $sseckey);
 	}
-	public function before(){
-		if($this->client->bucketExists(array("Bucket"=>$this->bucket))){
+	public function before() {
+		if ($this->client->bucketExists(array("Bucket"=>$this->bucket))) {
 			$keys = array();
 			$objects = $this->client->listObjects(array("Bucket"=>$this->bucket));
 			foreach ($objects["Contents"] as $object) {
 				array_push($keys, $object["Key"]);
 			}
-			$this->client->deleteObjects(array("Bucket"=>$this->bucket,"DeleteKeys"=>$keys));
-		}else{
+			$this->client->deleteObjects(array("Bucket"=>$this->bucket, "DeleteKeys"=>$keys));
+		}else {
 			$this->client->createBucket(array("Bucket"=>$this->bucket));
 		}
 	}
-	public function testListBuckets(){
+	public function testListBuckets() {
 		$buckets = $this->client->listBuckets();
 		$found = FALSE;
 		foreach ($buckets as $bucket) {
-			if($bucket["Name"] == $this->bucket)
+			if ($bucket["Name"] == $this->bucket)
 				$found = TRUE;
 		}
-		if(!$found)
+		if (!$found)
 			throw new Exception("list buckets expected found ".$this->bucket.",but not found");
 			
 	}
-	public function testDeleteBucket(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>"test","Content"=>""));
+	public function testDeleteBucket() {
+		$this->client->putObjectByContent(array("Bucket"=>$this->bucket, "Key"=>"test", "Content"=>""));
 		$ex = NULL;
-		try{
+		try {
 			$this->client->deleteBucket(array("Bucket"=>$this->bucket));
-		}catch(Exception $e){
+		} catch (Exception $e) {
 			$ex = $e;
 		}
-		if($ex == NULL||!($ex->errorCode === "BucketNotEmpty")){
+		if ($ex == NULL || !($ex->errorCode === "BucketNotEmpty")) {
 			throw new Exception("delete bucket expected BucketNotEmpty but ".$ex);
 		}
 	}
-	public function testBucketCORS(){
+	public function testBucketCORS() {
 		$this->client->setBucketCORS($args = array(
        		"Bucket"=>$this->bucket,
         	"CORS"=>array(
         		array(
-           			"AllowedMethod"=>array("GET","PUT"),
+           			"AllowedMethod"=>array("GET", "PUT"),
             		"AllowedOrigin"=>array("http://www.kingsoft.com"),
             		"AllowedHeader"=>array("*"),
             		"ExposeHeader"=>array("*"),
             		"MaxAgeSeconds"=>10
         		),
         		array(
-         		  "AllowedMethod"=>array("GET","PUT"),
+         		  "AllowedMethod"=>array("GET", "PUT"),
           		  "AllowedOrigin"=>array("*"),
           		  "AllowedHeader"=>array("*"),
           		  "ExposeHeader"=>array("*"),
@@ -81,28 +81,28 @@ 
         		)
     		)));
  	    $cors = $this->client->getBucketCORS(array("Bucket"=>$this->bucket));
- 	    $this->assertEquals(count($cors),2,"bucket cors count ");
+ 	    $this->assertEquals(count($cors), 2, "bucket cors count ");
    		$this->client->deleteBucketCORS(array("Bucket"=>$this->bucket));
    		$cors = $this->client->getBucketCORS(array("Bucket"=>$this->bucket));
-		$this->assertEquals(count($cors),0,"bucket cors count ");
+		$this->assertEquals(count($cors), 0, "bucket cors count ");
 	}
-	public function testCreateBucket(){
+	public function testCreateBucket() {
 		$ex = NULL;
-		try{
+		try {
 			$this->client->createBucket(array("Bucket"=>$this->bucket));
-		}catch(Exception $e){
+		} catch (Exception $e) {
 			$ex = $e;
 		}
-		if($ex == NULL||!($ex->errorCode === "BucketAlreadyExists")){
+		if ($ex == NULL || !($ex->errorCode === "BucketAlreadyExists")) {
 			throw new Exception("create bucket expected BucketAlreadyExists but ".$ex);
 		}
 	}
-	public function testACL(){
-		$this->client->setBucketAcl(array("Bucket"=>$this->bucket,"ACL"=>"public-read"));
+	public function testACL() {
+		$this->client->setBucketAcl(array("Bucket"=>$this->bucket, "ACL"=>"public-read"));
 		$acl = $this->client->getBucketAcl(array("Bucket"=>$this->bucket));
-		$this->assertEquals($acl,"public-read","bucket acl");
+		$this->assertEquals($acl, "public-read", "bucket acl");
 	}
-	public function testBucketLogging(){
+	public function testBucketLogging() {
 		$this->client->setBucketLogging(array(
         	"Bucket"=>$this->bucket,
         	"BucketLogging"=>array(
@@ -112,27 +112,27 @@ 
             )
         ));
     	$logging = $this->client->getBucketLogging(array("Bucket"=>$this->bucket));
-    	$this->assertEquals($logging["Enable"],TRUE,"bucket logging enable");
+    	$this->assertEquals($logging["Enable"], TRUE, "bucket logging enable");
 
     	$this->client->setBucketLogging(array(
     		"Bucket"=>$this->bucket,
     		"BucketLogging"=>array(
-        		"Enable"=>FALSE,//是否开启
+        		"Enable"=>FALSE, //是否开启
         	)
     	));
     	$logging = $this->client->getBucketLogging(array("Bucket"=>$this->bucket));
-    	$this->assertEquals($logging["Enable"],FALSE,"bucket logging enable");
+    	$this->assertEquals($logging["Enable"], FALSE, "bucket logging enable");
 	}
-	public function testBucketLocation(){
+	public function testBucketLocation() {
 		$location = $this->client->getBucketLocation(array("Bucket"=>$this->bucket));
-		$this->assertEquals($location,"HANGZHOU","bucket location ");
+		$this->assertEquals($location, "HANGZHOU", "bucket location ");
 	}
-	public function testPutObjectByContentAndGetObjectContent(){
+	public function testPutObjectByContentAndGetObjectContent() {
 		$args = array(
         	"Bucket"=>$this->bucket,
         	"Key"=>$this->key,
-        	"Content"=>"1234",//要上传的内容
-        	"ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+        	"Content"=>"1234", //要上传的内容
+        	"ACL"=>"public-read", //可以设置访问权限,合法值,private、public-read
         	"ObjectMeta"=>array(
             	"Content-Type"=>"application/xml",
             	"Content-Length"=>3
@@ -142,29 +142,29 @@ 
             )
         );
         $this->client->putObjectByContent($args);
-        $this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),TRUE,"object exists ");
-        $meta = $this->client->getObjectMeta(array("Bucket"=>$this->bucket,"Key"=>$this->key));
-        $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"],"test","x-kss-meta-test");
-        $this->assertEquals($meta["ObjectMeta"]["Content-Type"],"application/xml","Content-Type");
-        $this->assertEquals($meta["ObjectMeta"]["Content-Length"],3,"Content-Length");
-        $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"public-read","object acl ");
+        $this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket, "Key"=>$this->key)), TRUE, "object exists ");
+        $meta = $this->client->getObjectMeta(array("Bucket"=>$this->bucket, "Key"=>$this->key));
+        $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"], "test", "x-kss-meta-test");
+        $this->assertEquals($meta["ObjectMeta"]["Content-Type"], "application/xml", "Content-Type");
+        $this->assertEquals($meta["ObjectMeta"]["Content-Length"], 3, "Content-Length");
+        $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket, "Key"=>$this->key)), "public-read", "object acl ");
 
-        $s3Object = $this->client->getObject(array("Bucket"=>$this->bucket,"Key"=>$this->key));
-        $this->assertEquals($s3Object["Content"],"123","s3 object content");
+        $s3Object = $this->client->getObject(array("Bucket"=>$this->bucket, "Key"=>$this->key));
+        $this->assertEquals($s3Object["Content"], "123", "s3 object content");
         $meta = $s3Object["Meta"];
-        $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"],"test","x-kss-meta-test");
-        $this->assertEquals($meta["ObjectMeta"]["Content-Type"],"application/xml","Content-Type");
-        $this->assertEquals($meta["ObjectMeta"]["Content-Length"],3,"Content-Length");
+        $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"], "test", "x-kss-meta-test");
+        $this->assertEquals($meta["ObjectMeta"]["Content-Type"], "application/xml", "Content-Type");
+        $this->assertEquals($meta["ObjectMeta"]["Content-Length"], 3, "Content-Length");
 
 	}
-	public function testPutObjectByFile(){
+	public function testPutObjectByFile() {
 		$args = array(
         	"Bucket"=>$this->bucket,
         	"Key"=>$this->key,
         	"Content"=>array(
         		"content"=>$this->cachedir."test_file"
-        	),//要上传的内容
-        	"ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+        	), //要上传的内容
+        	"ACL"=>"public-read", //可以设置访问权限,合法值,private、public-read
         	"ObjectMeta"=>array(
             	"Content-Type"=>"application/xml",
             	"Content-Length"=>100
@@ -174,48 +174,48 @@ 
             )
         );
         $this->client->putObjectByFile($args);
-        $this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),TRUE,"object exists ");
-        $meta = $this->client->getObjectMeta(array("Bucket"=>$this->bucket,"Key"=>$this->key));
-        $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"],"test","x-kss-meta-test");
-        $this->assertEquals($meta["ObjectMeta"]["Content-Type"],"application/xml","Content-Type");
-        $this->assertEquals($meta["ObjectMeta"]["Content-Length"],100,"Content-Length");
-        $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"public-read","object acl ");
+        $this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket, "Key"=>$this->key)), TRUE, "object exists ");
+        $meta = $this->client->getObjectMeta(array("Bucket"=>$this->bucket, "Key"=>$this->key));
+        $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"], "test", "x-kss-meta-test");
+        $this->assertEquals($meta["ObjectMeta"]["Content-Type"], "application/xml", "Content-Type");
+        $this->assertEquals($meta["ObjectMeta"]["Content-Length"], 100, "Content-Length");
+        $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket, "Key"=>$this->key)), "public-read", "object acl ");
 	}
-	public function testObjectAcl(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
-"Content"=>"1234","ACL"=>"private"));
-		$this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"private","object acl");
-		$this->client->setObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key,"ACL"=>"public-read"));
-		$this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"public-read","object acl");
+	public function testObjectAcl() {
+		$this->client->putObjectByContent(array("Bucket"=>$this->bucket, "Key"=>$this->key,
+"Content"=>"1234", "ACL"=>"private"));
+		$this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket, "Key"=>$this->key)), "private", "object acl");
+		$this->client->setObjectAcl(array("Bucket"=>$this->bucket, "Key"=>$this->key, "ACL"=>"public-read"));
+		$this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket, "Key"=>$this->key)), "public-read", "object acl");
 	}
-	public function testDeleteObject(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
+	public function testDeleteObject() {
+		$this->client->putObjectByContent(array("Bucket"=>$this->bucket, "Key"=>$this->key,
 "Content"=>"1234"));
-		$this->client->deleteObject(array("Bucket"=>$this->bucket,"Key"=>$this->key));
-		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),FALSE,"object exits");
+		$this->client->deleteObject(array("Bucket"=>$this->bucket, "Key"=>$this->key));
+		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket, "Key"=>$this->key)), FALSE, "object exits");
 	}
-	public function testDeleteObjects(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
+	public function testDeleteObjects() {
+		$this->client->putObjectByContent(array("Bucket"=>$this->bucket, "Key"=>$this->key,
 "Content"=>"1234"));
-		$this->client->deleteObjects(array("Bucket"=>$this->bucket,"DeleteKeys"=>array($this->key)));
-		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),FALSE,"object exits");		
+		$this->client->deleteObjects(array("Bucket"=>$this->bucket, "DeleteKeys"=>array($this->key)));
+		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket, "Key"=>$this->key)), FALSE, "object exits");		
 	}
-	public function testCopyObject(){
-		$this->client->putObjectByContent(array("Bucket"=>$this->bucket,"Key"=>$this->key,
+	public function testCopyObject() {
+		$this->client->putObjectByContent(array("Bucket"=>$this->bucket, "Key"=>$this->key,
 "Content"=>"1234"));
-		$this->client->copyObject(array("Bucket"=>$this->bucket,"Key"=>$this->key_copy,"CopySource"=>array("Bucket"=>$this->bucket,"Key"=>$this->key)));
-		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key)),TRUE,"object exits");
-		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket,"Key"=>$this->key_copy)),TRUE
+		$this->client->copyObject(array("Bucket"=>$this->bucket, "Key"=>$this->key_copy, "CopySource"=>array("Bucket"=>$this->bucket, "Key"=>$this->key)));
+		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket, "Key"=>$this->key)), TRUE, "object exits");
+		$this->assertEquals($this->client->objectExists(array("Bucket"=>$this->bucket, "Key"=>$this->key_copy)), TRUE
 			,"object exits");
 	}
-	public function testPutAndGetObject(){
+	public function testPutAndGetObject() {
 		$args = array(
         	"Bucket"=>$this->bucket,
         	"Key"=>$this->key,
         	"Content"=>array(
         		"content"=>$this->cachedir."test_file"
-        	),//要上传的内容
-        	"ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+        	), //要上传的内容
+        	"ACL"=>"public-read", //可以设置访问权限,合法值,private、public-read
         	"ObjectMeta"=>array(
             	"Content-Type"=>"application/xml",
             ),
@@ -224,20 +224,20 @@ 
             )
         );
         $this->client->putObjectByFile($args);
-        $this->client->getObject(array("Bucket"=>$this->bucket,"Key"=>$this->key,"WriteTo"=>$this->cachedir."down"));
+        $this->client->getObject(array("Bucket"=>$this->bucket, "Key"=>$this->key, "WriteTo"=>$this->cachedir."down"));
         $md5 = md5_file($this->cachedir."down");
         $md5pre = md5_file($this->cachedir."test_file");
         @unlink($this->cachedir."down");
-        $this->assertEquals($md5,$md5pre,"contentmd5");
+        $this->assertEquals($md5, $md5pre, "contentmd5");
 	}
-	public function testPutAndGetObjectRanges(){
+	public function testPutAndGetObjectRanges() {
 		$args = array(
         	"Bucket"=>$this->bucket,
         	"Key"=>$this->key,
         	"Content"=>array(
         		"content"=>$this->cachedir."test_file"
-        	),//要上传的内容
-        	"ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+        	), //要上传的内容
+        	"ACL"=>"public-read", //可以设置访问权限,合法值,private、public-read
         	"ObjectMeta"=>array(
             	"Content-Type"=>"application/xml",
             ),
@@ -246,25 +246,25 @@ 
             )
         );
         $this->client->putObjectByFile($args);
-        rangeGetAndCheckMd5($this->client,$this->bucket,$this->key,$this->cachedir."down",md5_file($this->cachedir."test_file"));
+        rangeGetAndCheckMd5($this->client, $this->bucket, $this->key, $this->cachedir."down", md5_file($this->cachedir."test_file"));
 	}
-	public function testInitAndAbortMultipart(){
-		$initResult = $this->client->initMultipartUpload(array("Bucket"=>$this->bucket,"Key"=>$this->key));
+	public function testInitAndAbortMultipart() {
+		$initResult = $this->client->initMultipartUpload(array("Bucket"=>$this->bucket, "Key"=>$this->key));
 		$uid = $initResult["UploadId"];
-		$listParts = $this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
-		$this->client->abortMultipartUpload(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
+		$listParts = $this->client->listParts(array("Bucket"=>$this->bucket, "Key"=>$this->key, "Options"=>array("uploadId"=>$uid)));
+		$this->client->abortMultipartUpload(array("Bucket"=>$this->bucket, "Key"=>$this->key, "Options"=>array("uploadId"=>$uid)));
 		$ex = NULL;
-		try{
-			$this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
-		}catch(Exception $e){
+		try {
+			$this->client->listParts(array("Bucket"=>$this->bucket, "Key"=>$this->key, "Options"=>array("uploadId"=>$uid)));
+		} catch (Exception $e) {
 			$ex = $e;
 		}
-		if($ex == NULL||!($ex->errorCode === "NoSuchUpload")){
+		if ($ex == NULL || !($ex->errorCode === "NoSuchUpload")) {
 			throw new Exception("create bucket expected NoSuchUpload but ".$ex);
 		}
 	}
-	public function testMultipartUpload(){
-		generateFile(1024*1024,$this->cachedir."multi");
+	public function testMultipartUpload() {
+		generateFile(1024*1024, $this->cachedir."multi");
 		//初始化分开上传，获取uploadid
         $args = array(
             "Bucket"=>$this->bucket,
@@ -278,18 +278,18 @@ 
             )
         );
         $uploadid = $this->client->initMultipartUpload($args);
-        $uploadid = $uploadid["UploadId"];//获取到uploadid
+        $uploadid = $uploadid["UploadId"]; //获取到uploadid
         //开始上传
-        $file = $this->cachedir."multi";//要上传的文件
+        $file = $this->cachedir."multi"; //要上传的文件
         $partsize = 1024*100;
-        $resource = fopen($file,"r");
+        $resource = fopen($file, "r");
         $stat = fstat($resource);
-        $total = $stat["size"];//获取文件的总大小
+        $total = $stat["size"]; //获取文件的总大小
         fclose($resource);
-        $count = (int)(($total-1)/$partsize)+1;;//计算文件需要分几块上传
-        for($i = 0;$i < $count;$i++){
+        $count = (int)(($total-1)/$partsize)+1; ;//计算文件需要分几块上传
+        for ($i = 0; $i < $count; $i++) {
             //依次上传每一块
-            $args=array(
+            $args = array(
                 "Bucket"=>$this->bucket,
                 "Key"=>$this->key,
                 "Options"=>array(
@@ -297,7 +297,7 @@ 
                     "uploadId"=>$uploadid
                 ),
                 "ObjectMeta"=>array(
-                    "Content-Length"=>min($partsize,$total-$partsize*$i)//每次上传$partsize大小
+                    "Content-Length"=>min($partsize, $total-$partsize*$i)//每次上传$partsize大小
                 ),
                 "Content"=>array(
                     "content"=>$file,
@@ -307,24 +307,24 @@ 
             $etag = $this->client->uploadPart($args);
             $etag = $etag["ETag"];
         }
-        $parts = $this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uploadid)));
+        $parts = $this->client->listParts(array("Bucket"=>$this->bucket, "Key"=>$this->key, "Options"=>array("uploadId"=>$uploadid)));
         //结束上传
-        $args=array(
+        $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Options"=>array("uploadId"=>$uploadid),
             "Parts"=>$parts["Parts"]//使用之前列出的块完成分开上传
         );
         $result = $this->client->completeMultipartUpload($args);
-        $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket,"Key"=>$this->key)),"public-read","object acl");
-        $meta = $this->client->getObjectMeta(array("Bucket"=>$this->bucket,"Key"=>$this->key));
-        $this->assertEquals($meta["ObjectMeta"]["Content-Type"],"application/xml","Content-Type");
-        $this->assertEquals($meta["ObjectMeta"]["Content-Length"],filesize($this->cachedir."multi"),"Content-Length");
-        $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"],"example","x-kss-meta-test");
-        rangeGetAndCheckMd5($this->client,$this->bucket,$this->key,$this->cachedir."down",md5_file($this->cachedir."multi"));
+        $this->assertEquals($this->client->getObjectAcl(array("Bucket"=>$this->bucket, "Key"=>$this->key)), "public-read", "object acl");
+        $meta = $this->client->getObjectMeta(array("Bucket"=>$this->bucket, "Key"=>$this->key));
+        $this->assertEquals($meta["ObjectMeta"]["Content-Type"], "application/xml", "Content-Type");
+        $this->assertEquals($meta["ObjectMeta"]["Content-Length"], filesize($this->cachedir."multi"), "Content-Length");
+        $this->assertEquals($meta["UserMeta"]["x-kss-meta-test"], "example", "x-kss-meta-test");
+        rangeGetAndCheckMd5($this->client, $this->bucket, $this->key, $this->cachedir."down", md5_file($this->cachedir."multi"));
         @unlink($this->cachedir."multi");
 	}
-	public function testListBucketsPresignedUrl(){
+	public function testListBucketsPresignedUrl() {
 		$url = $this->client->generatePresignedUrl(
 			array(
 				"Method"=>"GET",
@@ -333,12 +333,12 @@ 
 				));
 		$httpRequest = new RequestCore($url);
 		$httpRequest->set_method("GET");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
 		$httpRequest->send_request();
-		$body = $httpRequest->get_response_body ();	
-		$this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"list buckets status code");
+		$body = $httpRequest->get_response_body();	
+		$this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "list buckets status code");
 	}
-    public function testHeadBucketPresignedUrl(){
+    public function testHeadBucketPresignedUrl() {
         $url = $this->client->generatePresignedUrl(
             array(
                 "Method"=>"HEAD",
@@ -349,12 +349,12 @@ 
             );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("HEAD");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"head bucket status code");
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "head bucket status code");
     }
-    public function testDeleteBucketPresignedUrl(){
+    public function testDeleteBucketPresignedUrl() {
         $this->client->putObjectByContent(array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
@@ -371,28 +371,28 @@ 
             );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("DELETE");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,409,"delete bucket status code");      
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 409, "delete bucket status code");      
     }
-    public function testGetBucketAclPresignedUrl(){
+    public function testGetBucketAclPresignedUrl() {
         $url = $this->client->generatePresignedUrl(
             array(
                 "Method"=>"GET",
                 "Bucket"=>$this->bucket,
-                "Options"=>array("Expires"=>60*10,"acl"=>NULL),
+                "Options"=>array("Expires"=>60*10, "acl"=>NULL),
                 "Headers"=>array("Content-Type"=>"text/plain")
                 )
             );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("GET");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"get bucket acl status code");      
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "get bucket acl status code");      
     }
-    public function testPutBucketPresignedUrl(){
+    public function testPutBucketPresignedUrl() {
         $url = $this->client->generatePresignedUrl(
             array(
                 "Method"=>"PUT",
@@ -403,96 +403,96 @@ 
             );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("PUT");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,409,"delete bucket status code");      
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 409, "delete bucket status code");      
     }
-    public function testPutBucketAclPresignedUrl(){
+    public function testPutBucketAclPresignedUrl() {
         $url = $this->client->generatePresignedUrl(
             array(
                 "Method"=>"PUT",
                 "Bucket"=>$this->bucket,
-                "Options"=>array("Expires"=>60*10,"acl"=>NULL),
-                "Headers"=>array("Content-Type"=>"text/plain","x-kss-acl"=>"public-read")
+                "Options"=>array("Expires"=>60*10, "acl"=>NULL),
+                "Headers"=>array("Content-Type"=>"text/plain", "x-kss-acl"=>"public-read")
                 )
             );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("PUT");
-        $httpRequest->add_header("Content-Type","text/plain");
-        $httpRequest->add_header("x-kss-acl","public-read");
+        $httpRequest->add_header("Content-Type", "text/plain");
+        $httpRequest->add_header("x-kss-acl", "public-read");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"put bucket acl status code"); 
-        $this->assertEquals($this->client->getBucketAcl(array("Bucket"=>$this->bucket)),"public-read","bucket acl");
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "put bucket acl status code"); 
+        $this->assertEquals($this->client->getBucketAcl(array("Bucket"=>$this->bucket)), "public-read", "bucket acl");
     }
-    public function testListObjectsPresignedUrl(){
+    public function testListObjectsPresignedUrl() {
         $url = $this->client->generatePresignedUrl(array(
             "Method"=>"GET",
             "Bucket"=>$this->bucket,
-            "Options"=>array("Expires"=>60*10,"delimiter"=>"/"),
+            "Options"=>array("Expires"=>60*10, "delimiter"=>"/"),
             "Headers"=>array("Content-Type"=>"text/plain")
             )
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("GET");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"list objects status code"); 
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "list objects status code"); 
     }
-    public function testGetBucketLoggingPresignedUrl(){
+    public function testGetBucketLoggingPresignedUrl() {
         $url = $this->client->generatePresignedUrl(array(
             "Method"=>"GET",
             "Bucket"=>$this->bucket,
-            "Options"=>array("Expires"=>60*10,"logging"=>""),
+            "Options"=>array("Expires"=>60*10, "logging"=>""),
             "Headers"=>array("Content-Type"=>"text/plain")
             )
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("GET");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"get bucket logging status code"); 
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "get bucket logging status code"); 
     }
-    public function testPutBucketLoggingPresignedUrl(){
+    public function testPutBucketLoggingPresignedUrl() {
         $xml = new SimpleXmlElement('<BucketLoggingStatus xmlns="http://s3.amazonaws.com/doc/2006-03-01/" />');
         $xml = $xml->asXml();
         $url = $this->client->generatePresignedUrl(
             array(
                 "Method"=>"PUT",
                 "Bucket"=>$this->bucket,
-                "Options"=>array("Expires"=>60*10,"logging"=>NULL),
+                "Options"=>array("Expires"=>60*10, "logging"=>NULL),
                 "Headers"=>array("Content-Type"=>"application/xml")
             )
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("PUT");
-        $httpRequest->add_header("Content-Type","application/xml");
-        $httpRequest->add_header("Content-Length",strlen($xml));
-        $httpRequest->request_body=$xml;
+        $httpRequest->add_header("Content-Type", "application/xml");
+        $httpRequest->add_header("Content-Length", strlen($xml));
+        $httpRequest->request_body = $xml;
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"put bucket logging status code"); 
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "put bucket logging status code"); 
     }
-    public function testGetBucketLocationPresignedUrl(){
+    public function testGetBucketLocationPresignedUrl() {
         $url = $this->client->generatePresignedUrl(
             array(
                 "Method"=>"GET",
                 "Bucket"=>$this->bucket,
-                "Options"=>array("Expires"=>60*10,"location"=>NULL),
+                "Options"=>array("Expires"=>60*10, "location"=>NULL),
                 "Headers"=>array("Content-Type"=>"text/plain")
             )
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("GET");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"get bucket location status code"); 
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "get bucket location status code"); 
     }
-    public function testDeleteObjectPresignedUrl(){
+    public function testDeleteObjectPresignedUrl() {
         $this->client->putObjectByContent(array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
@@ -510,12 +510,12 @@ 
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("DELETE");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,204,"delete object status code"); 
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 204, "delete object status code"); 
     }
-    public function testGetObjectPresignedUrl(){
+    public function testGetObjectPresignedUrl() {
         $this->client->putObjectByContent(array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
@@ -532,13 +532,13 @@ 
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("GET");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"get object status code"); 
-        $this->assertEquals($body,"123","get object body"); 
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "get object status code"); 
+        $this->assertEquals($body, "123", "get object body"); 
     }
-    public function testPutObjectPresignedUrl(){
+    public function testPutObjectPresignedUrl() {
         $body = "123";
         $url = $this->client->generatePresignedUrl(
             array(
@@ -551,14 +551,14 @@ 
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("PUT");
-        $httpRequest->add_header("Content-Type","application/ocet-stream");
-        $httpRequest->add_header("Content-Length",strlen($body));
-        $httpRequest->request_body=$body;
+        $httpRequest->add_header("Content-Type", "application/ocet-stream");
+        $httpRequest->add_header("Content-Length", strlen($body));
+        $httpRequest->request_body = $body;
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"put object status code"); 
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "put object status code"); 
     }
-    public function testHeadObjectPresignedUrl(){
+    public function testHeadObjectPresignedUrl() {
         $this->testPutObjectPresignedUrl();
         $url = $this->client->generatePresignedUrl(
             array(
@@ -571,54 +571,54 @@ 
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("HEAD");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"head object status code"); 
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "head object status code"); 
     }
-    public function testGetObjectAclPresignedUrl(){
+    public function testGetObjectAclPresignedUrl() {
         $this->testPutObjectPresignedUrl();
         $url = $this->client->generatePresignedUrl(
             array(
                 "Method"=>"GET",
                 "Bucket"=>$this->bucket,
                 "Key"=>$this->key,
-                "Options"=>array("Expires"=>60*10,"acl"=>NULL),
+                "Options"=>array("Expires"=>60*10, "acl"=>NULL),
                 "Headers"=>array("Content-Type"=>"text/plain")
             )
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("GET");
-        $httpRequest->add_header("Content-Type","text/plain");
+        $httpRequest->add_header("Content-Type", "text/plain");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"get object acl status code");         
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "get object acl status code");         
     }
-    public function testPutObjectAclPresignedUrl(){
+    public function testPutObjectAclPresignedUrl() {
         $this->testPutObjectPresignedUrl();
         $url = $this->client->generatePresignedUrl(
             array(
                 "Method"=>"PUT",
                 "Bucket"=>$this->bucket,
                 "Key"=>$this->key,
-                "Options"=>array("Expires"=>60*10,"acl"=>NULL),
-                "Headers"=>array("Content-Type"=>"text/plain","x-kss-acl"=>"public-read")
+                "Options"=>array("Expires"=>60*10, "acl"=>NULL),
+                "Headers"=>array("Content-Type"=>"text/plain", "x-kss-acl"=>"public-read")
             )
         );
         $httpRequest = new RequestCore($url);
         $httpRequest->set_method("PUT");
-        $httpRequest->add_header("Content-Type","text/plain");
-        $httpRequest->add_header("x-kss-acl","public-read");
+        $httpRequest->add_header("Content-Type", "text/plain");
+        $httpRequest->add_header("x-kss-acl", "public-read");
         $httpRequest->send_request();
-        $body = $httpRequest->get_response_body (); 
-        $this->assertEquals($httpRequest->get_response_code()." body:".$body,200,"put object acl status code");         
+        $body = $httpRequest->get_response_body(); 
+        $this->assertEquals($httpRequest->get_response_code()." body:".$body, 200, "put object acl status code");         
     }
-    public function testPutObjectSSEAndGetHeadObject(){
+    public function testPutObjectSSEAndGetHeadObject() {
         $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
-            "Content"=>"12345",//要上传的内容
-             "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+            "Content"=>"12345", //要上传的内容
+             "ACL"=>"public-read", //可以设置访问权限,合法值,private、public-read
              "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
                 "Content-Type"=>"binay/ocet-stream"
             ),
@@ -630,22 +630,22 @@ 
              )
         );
         $result = $this->client->putObjectByContent($args);
-        $this->assertEquals($result["SSEAlgm"],"AES256");
+        $this->assertEquals($result["SSEAlgm"], "AES256");
 
         $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key
             );
         $result = $this->client->getObjectMeta($args);
-        $this->assertEquals($result["ObjectMeta"]["SSEAlgm"],"AES256");
-        rangeGetAndCheckMd5($this->client,$this->bucket,$this->key,$this->cachedir."down",md5("12345"));
+        $this->assertEquals($result["ObjectMeta"]["SSEAlgm"], "AES256");
+        rangeGetAndCheckMd5($this->client, $this->bucket, $this->key, $this->cachedir."down", md5("12345"));
     }
-    public function testPutObjectSSECAndGetHeadObject(){
+    public function testPutObjectSSECAndGetHeadObject() {
         $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
-            "Content"=>"12345",//要上传的内容
-             "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+            "Content"=>"12345", //要上传的内容
+             "ACL"=>"public-read", //可以设置访问权限,合法值,private、public-read
              "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
                 "Content-Type"=>"binay/ocet-stream"
             ),
@@ -657,8 +657,8 @@ 
              )
         );
         $result = $this->client->putObjectByContent($args);
-        $this->assertEquals($result["SSECAlgm"],"AES256");
-        $this->assertEquals($result["SSECKeyMD5"],Utils::hex_to_base64(md5($this->sseckey)));
+        $this->assertEquals($result["SSECAlgm"], "AES256");
+        $this->assertEquals($result["SSECKeyMD5"], Utils::hex_to_base64(md5($this->sseckey)));
 
         $args = array(
             "Bucket"=>$this->bucket,
@@ -668,8 +668,8 @@ 
              )
             );
         $result = $this->client->getObjectMeta($args);
-        $this->assertEquals($result["ObjectMeta"]["SSECAlgm"],"AES256");
-        $this->assertEquals($result["ObjectMeta"]["SSECKeyMD5"],Utils::hex_to_base64(md5($this->sseckey)));
+        $this->assertEquals($result["ObjectMeta"]["SSECAlgm"], "AES256");
+        $this->assertEquals($result["ObjectMeta"]["SSECKeyMD5"], Utils::hex_to_base64(md5($this->sseckey)));
 
         $args = array(
             "Bucket"=>$this->bucket,
@@ -680,10 +680,10 @@ 
              )
         );
         $this->client->getObject($args);
-        $this->assertEquals("12345",file_get_contents($this->cachedir."down"));
+        $this->assertEquals("12345", file_get_contents($this->cachedir."down"));
         @unlink($this->cachedir."down");
     }
-    public function testMultipartUploadSSE(){
+    public function testMultipartUploadSSE() {
         $file = $this->cachedir."test_file";
         $args = array(
             "Bucket"=>$this->bucket,
@@ -694,11 +694,11 @@ 
         );
         $uploadid = $this->client->initMultipartUpload($args);
 
-        $this->assertEquals($uploadid["SSEAlgm"],"AES256");
+        $this->assertEquals($uploadid["SSEAlgm"], "AES256");
 
         $uploadid = $uploadid["UploadId"];
         //开始上传
-        $args=array(
+        $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Options"=>array(
@@ -711,21 +711,21 @@ 
             );
         $etag = $this->client->uploadPart($args);
 
-        $this->assertEquals($etag["SSEAlgm"],"AES256");
+        $this->assertEquals($etag["SSEAlgm"], "AES256");
         $etag = $etag["ETag"];
 
-        $parts = $this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uploadid)));
+        $parts = $this->client->listParts(array("Bucket"=>$this->bucket, "Key"=>$this->key, "Options"=>array("uploadId"=>$uploadid)));
         //结束上传
-        $args=array(
+        $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Options"=>array("uploadId"=>$uploadid),
             "Parts"=>$parts["Parts"],
         );
         $result = $this->client->completeMultipartUpload($args);
-        $this->assertEquals($result["SSEAlgm"],"AES256");
+        $this->assertEquals($result["SSEAlgm"], "AES256");
     }
-    public function testMultipartUploadSSEC(){
+    public function testMultipartUploadSSEC() {
         $file = $this->cachedir."test_file";
         $args = array(
             "Bucket"=>$this->bucket,
@@ -736,12 +736,12 @@ 
         );
         $uploadid = $this->client->initMultipartUpload($args);
 
-        $this->assertEquals($uploadid["SSECAlgm"],"AES256");
-        $this->assertEquals($uploadid["SSECKeyMD5"],Utils::hex_to_base64(md5($this->sseckey)));
+        $this->assertEquals($uploadid["SSECAlgm"], "AES256");
+        $this->assertEquals($uploadid["SSECKeyMD5"], Utils::hex_to_base64(md5($this->sseckey)));
 
         $uploadid = $uploadid["UploadId"];
         //开始上传
-        $args=array(
+        $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Options"=>array(
@@ -757,29 +757,29 @@ 
             );
         $etag = $this->client->uploadPart($args);
 
-        $this->assertEquals($etag["SSECAlgm"],"AES256");
-        $this->assertEquals($etag["SSECKeyMD5"],Utils::hex_to_base64(md5($this->sseckey)));
+        $this->assertEquals($etag["SSECAlgm"], "AES256");
+        $this->assertEquals($etag["SSECKeyMD5"], Utils::hex_to_base64(md5($this->sseckey)));
 
         $etag = $etag["ETag"];
 
-        $parts = $this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uploadid)));
+        $parts = $this->client->listParts(array("Bucket"=>$this->bucket, "Key"=>$this->key, "Options"=>array("uploadId"=>$uploadid)));
         //结束上传
-        $args=array(
+        $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Options"=>array("uploadId"=>$uploadid),
             "Parts"=>$parts["Parts"],
         );
         $result = $this->client->completeMultipartUpload($args);
-        $this->assertEquals($result["SSECAlgm"],"AES256");
-        $this->assertEquals($result["SSECKeyMD5"],Utils::hex_to_base64(md5($this->sseckey)));
+        $this->assertEquals($result["SSECAlgm"], "AES256");
+        $this->assertEquals($result["SSECKeyMD5"], Utils::hex_to_base64(md5($this->sseckey)));
     }
-    public function testCopySSECObject(){
+    public function testCopySSECObject() {
         $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
-            "Content"=>"12345",//要上传的内容
-             "ACL"=>"public-read",//可以设置访问权限,合法值,private、public-read
+            "Content"=>"12345", //要上传的内容
+             "ACL"=>"public-read", //可以设置访问权限,合法值,private、public-read
              "ObjectMeta"=>array(//设置object的元数据,可以设置"Cache-Control","Content-Disposition","Content-Encoding","Content-Length","Content-MD5","Content-Type","Expires"。当设置了Content-Length时，请勿大于实际长度，如果小于实际长度，将只上传部分内容。
                 "Content-Type"=>"binay/ocet-stream"
             ),
@@ -808,8 +808,8 @@ 
             );
         $result = $this->client->copyObject($args);
     }
-    public function testPutObjectByContentAndGetObjectUsingEncyptionMeta(){
-        for($i = 45 ;$i < 60;$i++){
+    public function testPutObjectByContentAndGetObjectUsingEncyptionMeta() {
+        for ($i = 45; $i < 60; $i++) {
 
             $content = EncryptionUtil::genereateOnceUsedKey($i);
 
@@ -820,11 +820,11 @@ 
                 "Content"=>$content
             );
             $this->encryptionClient->putObjectByContent($args);
-            rangeGetAndCheckMd5($this->encryptionClient,$this->bucket,$this->key,
-               $this->cachedir."down",md5($args["Content"]));
+            rangeGetAndCheckMd5($this->encryptionClient, $this->bucket, $this->key,
+               $this->cachedir."down", md5($args["Content"]));
         }
     }
-    public function testPutObjectByFileAndGetObjectUsingEncyptionMeta(){
+    public function testPutObjectByFileAndGetObjectUsingEncyptionMeta() {
         $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
@@ -834,40 +834,40 @@ 
             )
         );
         $this->encryptionClient->putObjectByFile($args);
-        rangeGetAndCheckMd5($this->encryptionClient,$this->bucket,$this->key,
-               $this->cachedir."down",md5_file($this->cachedir."test_file"));
+        rangeGetAndCheckMd5($this->encryptionClient, $this->bucket, $this->key,
+               $this->cachedir."down", md5_file($this->cachedir."test_file"));
     }
-    public function testMultipartUploadUsingEncyptionMeta(){
-        generateFile(1024*1024,$this->cachedir."multi");
+    public function testMultipartUploadUsingEncyptionMeta() {
+        generateFile(1024*1024, $this->cachedir."multi");
         //初始化分开上传，获取uploadid
         $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
         );
         $uploadid = $this->encryptionClient->initMultipartUpload($args);
-        $uploadid = $uploadid["UploadId"];//获取到uploadid
+        $uploadid = $uploadid["UploadId"]; //获取到uploadid
         //开始上传
 
-        $file = $this->cachedir."multi";//要上传的文件
+        $file = $this->cachedir."multi"; //要上传的文件
         $partsize = 1024*100;
-        $resource = fopen($file,"r");
+        $resource = fopen($file, "r");
         $stat = fstat($resource);
-        $total = $stat["size"];//获取文件的总大小
+        $total = $stat["size"]; //获取文件的总大小
         fclose($resource);
-        $count = (int)(($total-1)/$partsize)+1;//计算文件需要分几块上传
-        for($i = 0;$i < $count;$i++){
+        $count = (int)(($total-1)/$partsize)+1; //计算文件需要分几块上传
+        for ($i = 0; $i < $count; $i++) {
             //依次上传每一块
             echo "upload".$i."\r\n";
-            $args=array(
+            $args = array(
                 "Bucket"=>$this->bucket,
                 "Key"=>$this->key,
-                "LastPart"=>($i===$count-1),
+                "LastPart"=>($i === $count-1),
                 "Options"=>array(
                     "partNumber"=>$i+1,
                     "uploadId"=>$uploadid
                 ),
                 "ObjectMeta"=>array(
-                    "Content-Length"=>min($partsize,$total-$partsize*$i)//每次上传$partsize大小
+                    "Content-Length"=>min($partsize, $total-$partsize*$i)//每次上传$partsize大小
                 ),
                 "Content"=>array(
                     "content"=>$file,
@@ -877,9 +877,9 @@ 
             $etag = $this->encryptionClient->uploadPart($args);
             $etag = $etag["ETag"];
         }
-        $parts = $this->encryptionClient->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uploadid)));
+        $parts = $this->encryptionClient->listParts(array("Bucket"=>$this->bucket, "Key"=>$this->key, "Options"=>array("uploadId"=>$uploadid)));
         //结束上传
-        $args=array(
+        $args = array(
             "Bucket"=>$this->bucket,
             "Key"=>$this->key,
             "Options"=>array("uploadId"=>$uploadid),
@@ -887,11 +887,11 @@ 
         );
         $result = $this->encryptionClient->completeMultipartUpload($args);
 
-        rangeGetAndCheckMd5($this->encryptionClient,$this->bucket,$this->key,
-            $this->cachedir."down",md5_file($file));
+        rangeGetAndCheckMd5($this->encryptionClient, $this->bucket, $this->key,
+            $this->cachedir."down", md5_file($file));
         @unlink($this->cachedir."multi");
     }
-    public function testPutObjectByContentAndGetObject(){
+    public function testPutObjectByContentAndGetObject() {
         @unlink($this->cachedir."down");
         $content = EncryptionUtil::genereateOnceUsedKey(500);
         $args = array(
@@ -901,15 +901,15 @@ 
             "Content"=>$content
         );
         $this->encryptionClient->putObjectByContent($args);
-        $start = (int)rand(0,520);
-        $end = (int)rand($start,520);
+        $start = (int)rand(0, 520);
+        $end = (int)rand($start, 520);
         $s3Object = $this->encryptionClient->getObject(
-        array("Bucket"=>$this->bucket,"Key"=>$this->key,
+        array("Bucket"=>$this->bucket, "Key"=>$this->key,
             "Range"=>"bytes=".$start."-".$end)
         );
-        $this->assertEquals(substr($content,$start,$end-$start+1),$s3Object["Content"]);
+        $this->assertEquals(substr($content, $start, $end-$start+1), $s3Object["Content"]);
     }
-    public function test01(){
+    public function test01() {
         $this->client->listObjects(array("Bucket"=>$this->bucket));
     }
 }

src/service/ksyun/bin/unit/TestUtil.php

Spacing +14 added lines, -14 removed lines

@@ -1,16 +1,16 @@ 
 <?php
-function rangeGetAndCheckMd5($client,$bucket,$key,$file,$expectedMd5){
-	$args = array("Bucket"=>$bucket,"Key"=>$key);
+function rangeGetAndCheckMd5($client, $bucket, $key, $file, $expectedMd5) {
+	$args = array("Bucket"=>$bucket, "Key"=>$key);
 	$meta = $client->getObjectMeta($args);
 	$contentlength = $meta["ObjectMeta"]["Content-Length"];
 
 	$filelist = array();
 
-	for($begin = 0;$begin <$contentlength;){
-		$index = rand((int)($contentlength/20),(int)($contentlength/4));
-		$range = array("start"=>$begin,"end"=>$begin+$index);
+	for ($begin = 0; $begin < $contentlength;) {
+		$index = rand((int)($contentlength/20), (int)($contentlength/4));
+		$range = array("start"=>$begin, "end"=>$begin+$index);
 		$destFile = $file.$begin."-".($begin+$index);
-		array_push($filelist,$destFile);
+		array_push($filelist, $destFile);
 		$begin += ($index+1);
 		$args = array(
 			"Bucket"=>$bucket,
@@ -22,32 +22,32 @@ 
 	}
 
 	foreach ($filelist as $key => $value) {
-		$handle = fopen($value,"r");
+		$handle = fopen($value, "r");
 		$size = filesize($value);
-		if($size > 0){
-			$content = fread($handle,$size);
-			file_put_contents($file,$content,FILE_APPEND);
+		if ($size > 0) {
+			$content = fread($handle, $size);
+			file_put_contents($file, $content, FILE_APPEND);
 		}
 		fclose($handle);
 		//@unlink($value);
 	}
 	$md5 = md5_file($file);
 	//@unlink($file);	
-	if($md5 != $expectedMd5)
+	if ($md5 != $expectedMd5)
 		throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
 	foreach ($filelist as $key => $value) {
 		@unlink($value);
 	}
 	@unlink($file);
 }
-function generateFile($sizeInBytes,$destFile){
-	for($i = 0;$i < $sizeInBytes/10;$i++){
+function generateFile($sizeInBytes, $destFile) {
+	for ($i = 0; $i < $sizeInBytes/10; $i++) {
 		$randpwd = "";  
 		for ($j = 0; $j < 10; $j++)  
 		{  
 			$randpwd .= chr(mt_rand(33, 126));  
 		}  
-		file_put_contents($destFile,$randpwd,FILE_APPEND);
+		file_put_contents($destFile, $randpwd, FILE_APPEND);
 	}
 }
 ?>
\ No newline at end of file

src/service/ksyun/bin/unit/PUnit.php

Spacing +18 added lines, -18 removed lines

@@ -1,17 +1,17 @@ 
 <?php
 require_once "../core/Logger.php";
-class PUnit{
-	function assertEquals($value,$expected,$info = NULL){
-		if($value != $expected){
+class PUnit {
+	function assertEquals($value, $expected, $info = NULL) {
+		if ($value != $expected) {
 			throw new Exception($info." expected ".$expected." but ".$value);
 		}
 	}
-	function run($torun = NULL){
+	function run($torun = NULL) {
    		$r = new ReflectionClass($this);
-    	foreach($r->getMethods() as $key=>$methodObj){
-      	  if($methodObj->isPrivate())
+    	foreach ($r->getMethods() as $key=>$methodObj) {
+      	  if ($methodObj->isPrivate())
            		 $methods[$key]['type'] = 'private';
-        	elseif($methodObj->isProtected())
+        	elseif ($methodObj->isProtected())
         	     $methods[$key]['type'] = 'protected';
       		else
            		 $methods[$key]['type'] = 'public';
@@ -21,32 +21,32 @@ 
         $before = NULL;
         $after = NULL;
         foreach ($methods as $method) {
-          if($method["class"] != "PUnit"&&$method["name"] == "before"){
+          if ($method["class"] != "PUnit" && $method["name"] == "before") {
             $before = $method;
           }
-          if($method["class"] != "PUnit"&&$method["name"] == "after"){
+          if ($method["class"] != "PUnit" && $method["name"] == "after") {
             $after = $method;
           }
         }
        	$error = array();
        	$success = array();
        	foreach ($methods as $method) {
-       		if($method["class"] != "PUnit"&&substr($method["name"],0,4) == "test"){
-            if($torun !== NULL){
-              if(!in_array($method["name"],$torun))
+       		if ($method["class"] != "PUnit" && substr($method["name"], 0, 4) == "test") {
+            if ($torun !== NULL) {
+              if (!in_array($method["name"], $torun))
                 continue;
             }
-       			try{
-       				if($method["type"] == "public"){
+       			try {
+       				if ($method["type"] == "public") {
                 $log = new Logger();
                 $log->info("Run unit --->".$method["name"]);
-                if($before!=NULL)
+                if ($before != NULL)
                   $this->$before["name"]();
        					$this->$method["name"]();
-       					array_push($success,$method["name"]);
+       					array_push($success, $method["name"]);
        				}
-       			}catch(Exception $e){
-       				$error[$method["name"]]="".$e;
+       			} catch (Exception $e) {
+       				$error[$method["name"]] = "".$e;
        			}
        		}
        	}