GC0202 / ThinkLibrary

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

Braces +22 added lines, -15 removed lines

@@ -104,10 +104,12 @@ 
 	);
 	$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,18 +121,22 @@ 
 		);
 	$client->copyObject($copyReq);
 
-	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")))
-		throw new Exception("not found ".$keyprefix."EOFileCopy.instruction");
+	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"))) {
+			throw new Exception("not found ".$keyprefix."EOFileCopy.instruction");
+	}
 
 	$client->deleteObject(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")))
-		throw new Exception("found ".$keyprefix."EOFileCopy.instruction");
-}
+	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"))) {
+			throw new Exception("found ".$keyprefix."EOFileCopy.instruction");
+	}
+	}
 function rangeGetAndCheckMd5($client,$bucket,$key,$file,$expectedMd5){
 	$args = array("Bucket"=>$bucket,"Key"=>$key);
 	$meta = $client->getObjectMeta($args);
@@ -164,7 +170,8 @@ 
 		@unlink($value);
 	}
 	$md5 = base64_encode(md5_file($file));
-	if($md5 != $expectedMd5)
-		throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
+	if($md5 != $expectedMd5) {
+			throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
+	}
 	@unlink($file);	
 }

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

Braces +66 added lines, -49 removed lines

@@ -39,7 +39,7 @@ 
 	public static function getKeyEncryptionAlgm($encryptionMaterials){
 		if(is_array($encryptionMaterials)){
 			return "RSA";
-		}else{
+		} else{
 			return "AES";
 		}
 	}
@@ -47,8 +47,9 @@ 
 		$a = $range["start"];
 		$b = $range["end"];
 		$a = $a - ($a%$blocksize)-$blocksize;
-		if($a < 0)
-			$a = 0;
+		if($a < 0) {
+					$a = 0;
+		}
 
 		$b = $b+$blocksize-$b%$blocksize+$blocksize;
 
@@ -59,13 +60,15 @@ 
 		if($encrypKeyAlg === "AES"){
 			$secretKey = $encryptionMaterials;
 			$encryptedSek = EncryptionUtil::encode_AES_ECB($cek,$secretKey);
-			if(empty($encryptedSek))
-				throw new Ks3ClientException("can not encode cek useing AES");
-		}else if($encrypKeyAlg === "RSA"){
+			if(empty($encryptedSek)) {
+							throw new Ks3ClientException("can not encode cek useing AES");
+			}
+		} else if($encrypKeyAlg === "RSA"){
 			$encryptedSek = "";
 			openssl_public_encrypt($cek,$encryptedSek, $encryptionMaterials[0]);
-			if(empty($encryptedSek))
-				throw new Ks3ClientException("can not encode cek useing RSA");
+			if(empty($encryptedSek)) {
+							throw new Ks3ClientException("can not encode cek useing RSA");
+			}
 		}
 		return $encryptedSek;
 	}
@@ -74,13 +77,15 @@ 
 		if($encrypKeyAlg === "AES"){
 			$secretKey = $encryptionMaterials;
 			$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"){
+			if(empty($cek)) {
+							throw new Ks3ClientException("can not decode cek useing AES,secret key maybe not correct");
+			}
+		} else if($encrypKeyAlg === "RSA"){
 			$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");
+			if(empty($cek)) {
+							throw new Ks3ClientException("can not decode cek useing RSA,public/private key pair maybe not correct");
+			}
 		}
 		return $cek;
 	}
@@ -97,39 +102,42 @@ 
 		return $data;
 	}
 	public static function updateContentMD5Header($req){
-		if(!is_array($req))
-			return $req;
+		if(!is_array($req)) {
+					return $req;
+		}
 		if(isset($req["ObjectMeta"])){
 			$meta = $req["ObjectMeta"];
-		}else{
+		} else{
 			return $req;
 		}
 		if(is_array($meta) && isset($meta["Content-MD5"])){
 			$md5 = $meta["Content-MD5"];
-		}else{
+		} else{
 			return $req;
 		}
 		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))
-			return -1;
+		if(!is_array($req)) {
+					return -1;
+		}
 		if(isset($req["ObjectMeta"])){
 			$meta = $req["ObjectMeta"];
-		}else{
+		} else{
 			return -1;
 		}
 		if(is_array($meta) && isset($meta["Content-Length"])){
 			$length = $meta["Content-Length"];
 			return $length;
-		}else
-			return -1;
+		} else {
+					return -1;
+		}
 	}
 	public static function plainTextLength($args){
 		if(isset($args["Content"])){
@@ -146,11 +154,12 @@ 
 					if(Utils::chk_chinese($content)&&!Utils::check_char($content)){
 						$content = iconv('utf-8','gbk',$content);
 					}
-					if(!file_exists($content))
-						throw new Ks3ClientException("the specified file does not exist ");
+					if(!file_exists($content)) {
+											throw new Ks3ClientException("the specified file does not exist ");
+					}
 					$length = Utils::getFileSize($content);
 					$content = fopen($content,"r");
-				}else{
+				} else{
 					$stats = fstat($content);
 					if ($stats && $stats["size"] >= 0){
 						$length = $stats["size"];	
@@ -160,10 +169,11 @@ 
 				//优先取用户设置seek_position，没有的话取ftell
 				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)
-						$seek_position = 0;
+					if($seek_position<0) {
+											$seek_position = 0;
+					}
 					fseek($content,0);
 				}
 
@@ -173,21 +183,23 @@ 
 				}
 				if($lengthInMeta > 0){
 					$length = $lengthInMeta;
-				}else if($resourceLength > 0){
+				} else if($resourceLength > 0){
 					//根据seek_position计算实际长度
 					$length = $resourceLength - $seek_position;
 				}
-				if($length <= 0)
-					throw new Ks3ClientException("calculate content length failed,unexpected contetn length ".$length);
+				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)
-					return $length;
-				else
-					return $lengthInMeta;
+				if($length<$lengthInMeta||$lengthInMeta <= 0) {
+									return $length;
+				} else {
+									return $lengthInMeta;
+				}
 			}
 		}
 		return -1;
@@ -195,10 +207,12 @@ 
 	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))
-			mkdir($cacheDir);
-		if(!is_dir($encryptionDir))
-			mkdir($encryptionDir);
+		if(!is_dir($cacheDir)) {
+					mkdir($cacheDir);
+		}
+		if(!is_dir($encryptionDir)) {
+					mkdir($encryptionDir);
+		}
 		if(is_array($matdesc)){
 			$matdesc = json_encode($matdesc);
 		}
@@ -225,8 +239,9 @@ 
 	}
 	public static function getMultipartUploadContext($UploadId){
 		$encryptionDir = KS3_API_PATH.DIRECTORY_SEPARATOR."cache".DIRECTORY_SEPARATOR."encryption".DIRECTORY_SEPARATOR;
-		if(!EncryptionUtil::multipartUploadContextExists($UploadId))
-			throw new Ks3ClientException("can not found multipart upload context in cache dir");
+		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);
 		return $arry;
@@ -241,10 +256,11 @@ 
 	}
 	public static function openfile($path,$mode){
 		$file = fopen($path, $mode);
-		if($file)
-			return $file;
-		else
-			throw new Ks3ClientException("open file ".$path." error");
+		if($file) {
+					return $file;
+		} else {
+					throw new Ks3ClientException("open file ".$path." error");
+		}
 	}
 	//matdesc为字符串或array数据类型。
 	public static function createInstructionFile($bucket,$key,$cek,$iv,$matdesc="{}"){
@@ -271,8 +287,9 @@ 
 	}
 	public static function isInstructionFile($s3Object){
 		$meta = $s3Object["Meta"];
-		if(isset($meta["UserMeta"]["x-kss-meta-x-kss-crypto-instr-file"]))
-			return TRUE;
+		if(isset($meta["UserMeta"]["x-kss-meta-x-kss-crypto-instr-file"])) {
+					return TRUE;
+		}
 		return FALSE;
 	}
 }

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

Braces +40 added lines, -30 removed lines

@@ -22,17 +22,19 @@ 
 		$sek = EncryptionUtil::genereateOnceUsedKey();
 		$encryptedSek = EncryptionUtil::encodeCek($this->encryptionMaterials,$sek);
 		$content = $args["Content"];
-		if(empty($content))
-			throw new Ks3ClientException("please specifie Content in request args");
+		if(empty($content)) {
+					throw new Ks3ClientException("please specifie Content in request args");
+		}
 		$metaContentLength = EncryptionUtil::metaTextLength($args);
 		$plainTextLength = strlen($content);
 		if($metaContentLength > 0 && $metaContentLength < $plainTextLength){
 			$plainTextLength = $metaContentLength;
 		}
-		if($plainTextLength > 0)
-			$args["UserMeta"]["x-kss-meta-x-kss-unencrypted-content-length"] = $plainTextLength;
-		else
-			throw new Ks3ClientException("unexpected content length ".$plainTextLength);
+		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);
 
@@ -73,8 +75,9 @@ 
 		$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");
+			||empty($args["Content"]["content"])) {
+					throw new Ks3ClientException("please specifie file content in request args");
+		}
 		$content = $args["Content"];
 		$plainTextLength = EncryptionUtil::plainTextLength($args);
 		if($plainTextLength <= 0){
@@ -117,7 +120,7 @@ 
 		$meta = $this->ks3client->getObjectMeta($args);
 		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;
@@ -128,7 +131,7 @@ 
 			$encryptionInfo["matdesc"] = $matdesc;
 			$cekEncrypted = base64_decode($meta["UserMeta"]["x-kss-meta-x-kss-key"]);
 			$encryptionInfo["cek"] = $cek = EncryptionUtil::decodeCek($this->encryptionMaterials,$cekEncrypted);
-		}else{
+		} else{
 			if($this->ks3client->objectExists(array(
 				"Bucket"=>$args["Bucket"],
 				"Key"=>$args["Key"].EncryptionUtil::$INSTRUCTION_SUFFIX)
@@ -140,8 +143,9 @@ 
 					"Key"=>$insKey,
 				);
 				$s3Object = $this->ks3client->getObject($getIns);
-				if(!EncryptionUtil::isInstructionFile($s3Object))
-					throw new Ks3ClientException($insKey." is not an InstructionFile");
+				if(!EncryptionUtil::isInstructionFile($s3Object)) {
+									throw new Ks3ClientException($insKey." is not an InstructionFile");
+				}
 
 				$content = $s3Object["Content"];
 				$content = json_decode($content,TRUE);
@@ -150,7 +154,7 @@ 
 				$encryptionInfo["matdesc"] = $matdesc;
 				$cekEncrypted = base64_decode($content["x-kss-key"]);
 				$encryptionInfo["cek"] = $cek = EncryptionUtil::decodeCek($this->encryptionMaterials,$cekEncrypted);
-			}else{
+			} else{
 				$encrypted =FALSE;
 			}
 		}
@@ -161,10 +165,12 @@ 
 			$iv = $encryptionInfo["iv"];
 			$cek = $encryptionInfo["cek"];
 
-			if(empty($iv))
-				throw new Ks3ClientException("can not find iv in UserMeta or InstructionFile");
-			if(empty($cek))
-				throw new Ks3ClientException("can not find cek in UserMeta or InstructionFile");
+			if(empty($iv)) {
+							throw new Ks3ClientException("can not find iv in UserMeta or InstructionFile");
+			}
+			if(empty($cek)) {
+							throw new Ks3ClientException("can not find cek in UserMeta or InstructionFile");
+			}
 
 			if(isset($args["Range"])){
 				$range = $args["Range"];
@@ -177,10 +183,10 @@ 
 							throw new Ks3ClientException("Invalid range ".$range);
 						}
 						$range = array("start"=>$a,"end"=>$b);
-					}else{
+					} else{
 						throw new Ks3ClientException("Invalid range ".$range);
 					}
-				}else{
+				} else{
 					if(!isset($range["start"])||!isset($range["end"])){
 						throw new Ks3ClientException("Invalid range ".serialize($range));
 					}
@@ -206,7 +212,7 @@ 
 				}
 				$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)){
@@ -229,7 +235,7 @@ 
 					$decoded = mdecrypt_generic($td,$content);
 					mcrypt_generic_deinit($td);
 					mcrypt_module_close($td);
-				}else{
+				} else{
 					$decoded = "";
 				}
 
@@ -263,15 +269,17 @@ 
 				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);
+					} else {
+											$decoded = substr($decoded,0,strlen($decoded)-$padOffset);
+					}
 				}
 				$s3Object["Content"] = $decoded;
 				return $s3Object;
 			}
-		}else{
+		} else{
 			return $this->ks3client->getObject($args);
 		}
 	}
@@ -298,8 +306,9 @@ 
 		$uploadId = $args["Options"]["uploadId"];
 		$isLastPart = FALSE;
 		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_CBC);
-		if(isset($args["LastPart"]))
-			$isLastPart = $args["LastPart"];
+		if(isset($args["LastPart"])) {
+					$isLastPart = $args["LastPart"];
+		}
 		$exists = EncryptionUtil::multipartUploadContextExists($uploadId);
 		if(!$exists){
 			throw new Ks3ClientException("no such upload in cache/encryption/");
@@ -313,9 +322,10 @@ 
 			throw new Ks3ClientException("get content length failed ,unexpected content length ".$plainTextLength);
 		}
 		if(!$isLastPart){
-			if($plainTextLength % $blocksize != 0)
-				throw new Ks3ClientException("Invalid part size,part size (".$plainTextLength.") must be multiples of the block size ".$blocksize);
-		}else{
+			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);
 		}
 		$readCallBack = new AESCBCStreamReadCallBack();

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

Braces +31 added lines, -25 removed lines

@@ -20,7 +20,7 @@ 
 		if(isset($this->$property_name))
 		{
 			return($this->$property_name);
-		}else
+		} else
 		{
 			return(NULL);
 		}
@@ -33,9 +33,9 @@ 
 		//不能把上次的没读完的长度算在这次里,应该算在上次
 		$written_total = 0-strlen($this->buffer);
 		$blocksize = mcrypt_get_block_size(MCRYPT_RIJNDAEL_128,MCRYPT_MODE_CBC);
-		if($length<$blocksize)
-			$this->buffer = $data;
-		else{
+		if($length<$blocksize) {
+					$this->buffer = $data;
+		} else{
 			//如果期望的范围之后还有数据，则认为数据已经接收完毕。不做任何处理
 			if($this->expectedRange["end"] < $this->expectedRange["start"]){
 				return $written_total+strlen($data);
@@ -53,16 +53,17 @@ 
 					$ivoffset = $blocksize;
 				}
 				//初始化当前位置
-				if(isset($this->adjustedRange))
-					$this->currentIndex = $ivoffset+$this->adjustedRange["start"];
-				else
-					$this->currentIndex = $ivoffset;
+				if(isset($this->adjustedRange)) {
+									$this->currentIndex = $ivoffset+$this->adjustedRange["start"];
+				} else {
+									$this->currentIndex = $ivoffset;
+				}
 			}
 			$written_total+=$ivoffset;
 			if(strlen($data) == 0){
 				$decoded = "";
 				return $written_total;
-			}else{
+			} else{
 				$td = mcrypt_module_open(MCRYPT_RIJNDAEL_128,'',MCRYPT_MODE_CBC,'');
 				mcrypt_generic_init($td,$this->cek,$this->iv);
 				$decoded = mdecrypt_generic($td,$data);
@@ -95,7 +96,7 @@ 
 					$preLength = strlen($decoded);
 					$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; 
 				}
@@ -117,14 +118,17 @@ 
 			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);
+				} else {
+									$decoded = substr($decoded,0,strlen($decoded)-$padOffset);
+				}
 			}
 			$count = fwrite($write_stream, $decoded);
-			if($count == 0)
-				$count = $actualWriteCount;
+			if($count == 0) {
+							$count = $actualWriteCount;
+			}
 			$count += $padOffset;
 			$count += $startOffset;
 			$count += $endOffset;
@@ -138,12 +142,14 @@ 
 	//是的话则使用初始化IV
 	private function isBegin(){
 		$beginIndex = 0;
-		if(isset($this->adjustedRange["start"]))
-			$beginIndex = $this->adjustedRange["start"];
-		if($beginIndex == 0)
-			return TRUE;
-		else 
-			return FALSE;
+		if(isset($this->adjustedRange["start"])) {
+					$beginIndex = $this->adjustedRange["start"];
+		}
+		if($beginIndex == 0) {
+					return TRUE;
+		} else {
+					return FALSE;
+		}
 	}
 }
 //上传
@@ -162,7 +168,7 @@ 
 		if(isset($this->$property_name))
 		{
 			return($this->$property_name);
-		}else
+		} else
 		{
 			return(NULL);
 		}
@@ -199,16 +205,16 @@ 
 		if(!$isLast){
 			$this->buffer = substr($data,$dataLength-$dataLength%$blocksize);
 			$data = substr($data, 0,$dataLength-$dataLength%$blocksize);
-		}else{
+		} else{
 			//分块上传除最后一块外肯定是blocksize大小的倍数，所以不需要填充。
 			if($this->mutipartUpload){
 				if($this->isLastPart){
 					$this->buffer = NULL;
 					$data = EncryptionUtil::PKCS5Padding($data,$blocksize);
-				}else{
+				} else{
 					//donothing
 				}
-			}else{
+			} else{
 				$this->buffer = NULL;
 				$data = EncryptionUtil::PKCS5Padding($data,$blocksize);
 			}

src/service/ksyun/bin/Ks3Client.class.php

Braces +50 added lines, -38 removed lines

@@ -4,26 +4,33 @@ 
 date_default_timezone_set('Asia/Shanghai');
 
 //检测API路径
-if(!defined("KS3_API_PATH"))
-define("KS3_API_PATH", dirname(__FILE__));
+if(!defined("KS3_API_PATH")) {
+    define("KS3_API_PATH", dirname(__FILE__));
+}
 //是否使用VHOST
-if(!defined("KS3_API_VHOST"))
-define("KS3_API_VHOST",TRUE);
+if(!defined("KS3_API_VHOST")) {
+    define("KS3_API_VHOST",TRUE);
+}
 //是否开启日志(写入日志文件)
-if(!defined("KS3_API_LOG"))
-define("KS3_API_LOG",TRUE);
+if(!defined("KS3_API_LOG")) {
+    define("KS3_API_LOG",TRUE);
+}
 //是否显示日志(直接输出日志)
-if(!defined("KS3_API_DISPLAY_LOG"))
-define("KS3_API_DISPLAY_LOG", TRUE);
+if(!defined("KS3_API_DISPLAY_LOG")) {
+    define("KS3_API_DISPLAY_LOG", TRUE);
+}
 //定义日志目录(默认是该项目log下)
-if(!defined("KS3_API_LOG_PATH"))
-define("KS3_API_LOG_PATH","");
+if(!defined("KS3_API_LOG_PATH")) {
+    define("KS3_API_LOG_PATH","");
+}
 //是否使用HTTPS
-if(!defined("KS3_API_USE_HTTPS"))
-define("KS3_API_USE_HTTPS",FALSE);
+if(!defined("KS3_API_USE_HTTPS")) {
+    define("KS3_API_USE_HTTPS",FALSE);
+}
 //是否开启curl debug模式
-if(!defined("KS3_API_DEBUG_MODE"))
-define("KS3_API_DEBUG_MODE",FALSE);
+if(!defined("KS3_API_DEBUG_MODE")) {
+    define("KS3_API_DEBUG_MODE",FALSE);
+}
 define("KS3_API_Author","lijunwei@kingsoft.com");
 define("KS3_API_Version","1.2");
 
@@ -49,10 +56,10 @@ 
 			throw new Ks3ClientException("please install mbstring extension");
 			
 		}
-	}else{
+	} else{
 		throw new Ks3ClientException("please install extensions");
 	}
-}else{
+} else{
 	throw new Ks3ClientException();
 }
 
@@ -116,14 +123,15 @@ 
 		$ex = NULL;
 		try{
 			$result = $this->invoke($method,$args,$holder);
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$holder->msg.=$e."\r\n";
 			$ex = $e;
 		}
 		$holder->msg .= "------------------Logging End-------------------------\r\n";
 		$this->log->info($holder->msg);
-		if($ex !=NULL)
-			throw $ex;
+		if($ex !=NULL) {
+					throw $ex;
+		}
 		return $result;
 	}
 	private function invoke($method,$args=array(),$holder,$location=NULL){
@@ -145,7 +153,7 @@ 
 			if($api["needBucket"]){
 				throw new Ks3ClientException($method." this api need bucket");
 			}
-		}else{
+		} else{
 			$request->bucket = $args["Bucket"];
 		}
 		$position = "Key";
@@ -157,7 +165,7 @@ 
 			if($api["needObject"]){
 				throw new Ks3ClientException($method." this api need ".$position);
 			}
-		}else{
+		} else{
 			$key = $args[$position];
 			$preEncoding = mb_detect_encoding($key, array("ASCII","UTF-8","GB2312","GBK","BIG5"));
 			$holder->msg.="key encoding ".$preEncoding."\r\n";
@@ -170,16 +178,17 @@ 
 		if($method == "Method"){
 			if(empty($args["Method"])){
 				$request->method="GET";
-			}else{
+			} else{
 				$request->method=$args["Method"];
 			}
-		}else{
+		} else{
 			$request->method=$api["method"];
 		}
-		if(KS3_API_USE_HTTPS)
-			$request->scheme="https://";
-		else
-			$request->scheme="http://";
+		if(KS3_API_USE_HTTPS) {
+					$request->scheme="https://";
+		} else {
+					$request->scheme="http://";
+		}
 		$request->endpoint=$this->endpoint;
 		//add subresource
 		if(!empty($api["subResource"])){
@@ -200,7 +209,7 @@ 
 				foreach ($index as $key1 => $value1) {
 					if(!isset($curIndexArg[$value1])&&$value1 !== "*"){
 						$add = FALSE;
-					}else{
+					} else{
 						$curkey = $value1;
 						//星号表示所有,按照暂时的业务，默认星号后面就没了
 						if($curkey == "*"){
@@ -212,7 +221,7 @@ 
 							$add = FALSE;
 							$required = FALSE;
 							break;
-						}else{
+						} else{
 							$curIndexArg = $curIndexArg[$value1];
 						}
 					}
@@ -221,8 +230,9 @@ 
 					$request->addQueryParams($curkey,$curIndexArg);
 					continue;
 				}
-				if($required)
-					throw new Ks3ClientException($method." param ".$value." is required");
+				if($required) {
+									throw new Ks3ClientException($method." param ".$value." is required");
+				}
 			}
 		}
 		if(isset($api["body"])){
@@ -230,7 +240,7 @@ 
 				$builderName = $api["body"]["builder"];
 				$builder = new $builderName();
 				$request->body = $builder->build($args);
-			}else if(isset($api["body"]["position"])){
+			} else if(isset($api["body"]["position"])){
 				$position = $api["body"]["position"];
 				$index = explode("->",$position);
 				$curIndexArg = $args;
@@ -239,7 +249,7 @@ 
 				foreach ($index as $key1 => $value1) {
 					if(!isset($curIndexArg[$value1])){
 						$add = FALSE;
-					}else{
+					} else{
 						$curIndexArg = $curIndexArg[$value1];
 						$curkey = $value1;
 					}
@@ -267,11 +277,13 @@ 
 
 		if($signer===NULL||!($signer instanceof QueryAuthSigner)){
 			$url = $request->toUrl($this->endpoint);
-			if($location!=NULL)
-				$url = $location;
+			if($location!=NULL) {
+							$url = $location;
+			}
 			$httpRequest = new RequestCore($url);
-			if(KS3_API_DEBUG_MODE===TRUE)
-				$httpRequest->debug_mode=TRUE;
+			if(KS3_API_DEBUG_MODE===TRUE) {
+							$httpRequest->debug_mode=TRUE;
+			}
 			$httpRequest->set_method($request->method);
 			foreach ($request->headers as $key => $value) {
 				$httpRequest->add_header($key,$value);
@@ -330,7 +342,7 @@ 
 				$data = $handler->handle($data);
 			}
 			return $data;
-		}else{
+		} else{
 			$url = $request->toUrl($this->endpoint);
 			$holder->msg.=$url."\r\n";
 			return $url;

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

Braces +10 added lines, -8 removed lines

@@ -34,7 +34,7 @@ 
 				array_push($keys, $object["Key"]);
 			}
 			$this->client->deleteObjects(array("Bucket"=>$this->bucket,"DeleteKeys"=>$keys));
-		}else{
+		} else{
 			$this->client->createBucket(array("Bucket"=>$this->bucket));
 		}
 	}
@@ -42,11 +42,13 @@ 
 		$buckets = $this->client->listBuckets();
 		$found = FALSE;
 		foreach ($buckets as $bucket) {
-			if($bucket["Name"] == $this->bucket)
-				$found = TRUE;
+			if($bucket["Name"] == $this->bucket) {
+							$found = TRUE;
+			}
+		}
+		if(!$found) {
+					throw new Exception("list buckets expected found ".$this->bucket.",but not found");
 		}
-		if(!$found)
-			throw new Exception("list buckets expected found ".$this->bucket.",but not found");
 			
 	}
 	public function testDeleteBucket(){
@@ -54,7 +56,7 @@ 
 		$ex = NULL;
 		try{
 			$this->client->deleteBucket(array("Bucket"=>$this->bucket));
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$ex = $e;
 		}
 		if($ex == NULL||!($ex->errorCode === "BucketNotEmpty")){
@@ -90,7 +92,7 @@ 
 		$ex = NULL;
 		try{
 			$this->client->createBucket(array("Bucket"=>$this->bucket));
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$ex = $e;
 		}
 		if($ex == NULL||!($ex->errorCode === "BucketAlreadyExists")){
@@ -256,7 +258,7 @@ 
 		$ex = NULL;
 		try{
 			$this->client->listParts(array("Bucket"=>$this->bucket,"Key"=>$this->key,"Options"=>array("uploadId"=>$uid)));
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$ex = $e;
 		}
 		if($ex == NULL||!($ex->errorCode === "NoSuchUpload")){

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

Braces +3 added lines, -2 removed lines

@@ -33,8 +33,9 @@
 	}
 	$md5 = md5_file($file);
 	//@unlink($file);	
-	if($md5 != $expectedMd5)
-		throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
+	if($md5 != $expectedMd5) {
+			throw new Exception("file md5 check error expected ".$expectedMd5." ,actual ".$md5, 1);
+	}
 	foreach ($filelist as $key => $value) {
 		@unlink($value);
 	}

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

Braces +14 added lines, -11 removed lines

@@ -9,12 +9,13 @@ 
 	function run($torun = NULL){
    		$r = new ReflectionClass($this);
     	foreach($r->getMethods() as $key=>$methodObj){
-      	  if($methodObj->isPrivate())
-           		 $methods[$key]['type'] = 'private';
-        	elseif($methodObj->isProtected())
-        	     $methods[$key]['type'] = 'protected';
-      		else
-           		 $methods[$key]['type'] = 'public';
+      	  if($methodObj->isPrivate()) {
+      	             		 $methods[$key]['type'] = 'private';
+      	  } elseif($methodObj->isProtected()) {
+        	        	     $methods[$key]['type'] = 'protected';
+        	} else {
+      		           		 $methods[$key]['type'] = 'public';
+      		}
         	$methods[$key]['name'] = $methodObj->name;
        		$methods[$key]['class'] = $methodObj->class;
        	}
@@ -33,19 +34,21 @@ 
        	foreach ($methods as $method) {
        		if($method["class"] != "PUnit"&&substr($method["name"],0,4) == "test"){
             if($torun !== NULL){
-              if(!in_array($method["name"],$torun))
-                continue;
+              if(!in_array($method["name"],$torun)) {
+                              continue;
+              }
             }
        			try{
        				if($method["type"] == "public"){
                 $log = new Logger();
                 $log->info("Run unit --->".$method["name"]);
-                if($before!=NULL)
-                  $this->$before["name"]();
+                if($before!=NULL) {
+                                  $this->$before["name"]();
+                }
        					$this->$method["name"]();
        					array_push($success,$method["name"]);
        				}
-       			}catch(Exception $e){
+       			} catch(Exception $e){
        				$error[$method["name"]]="".$e;
        			}
        		}