GC0202 / ThinkLibrary

src/service/taobao/bin/top/security/iCache.php

Indentation +4 added lines, -4 removed lines

@@ -4,11 +4,11 @@
 */
 interface iCache
 {
-	//获取缓存
-	public function getCache($key);
+    //获取缓存
+    public function getCache($key);
 
-	//更新缓存
-	public function setCache($key,$var);
+    //更新缓存
+    public function setCache($key,$var);
 
 }
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 	public function getCache($key);
 
 	//更新缓存
-	public function setCache($key,$var);
+	public function setCache($key, $var);
 
 }
 ?>
\ No newline at end of file

src/service/taobao/bin/top/security/YacCache.php

Indentation +26 added lines, -26 removed lines

@@ -4,35 +4,35 @@
 */
 class YacCache implements iCache
 {
-	public $isEnable = true;
+    public $isEnable = true;
 
-	function __construct()
-	{
-		if (!extension_loaded("yac"))
-			$this->isEnable = false;
-	}
+    function __construct()
+    {
+        if (!extension_loaded("yac"))
+            $this->isEnable = false;
+    }
 
-	public function getCache($key)
-	{
-		$key = md5($key);
-		if($this->isEnable){
-			$yac = new Yac();
-			return $yac->get($key);
-		}else{
-			echo "yac is not enable ,skip getCache";
-		}
-	}
+    public function getCache($key)
+    {
+        $key = md5($key);
+        if($this->isEnable){
+            $yac = new Yac();
+            return $yac->get($key);
+        }else{
+            echo "yac is not enable ,skip getCache";
+        }
+    }
 
-	public function setCache($key,$var)
-	{
-		$key = md5($key);
-		if($this->isEnable){
-			$yac = new Yac();
-			$yac->set($key, $var);
-		}else{
-			echo "yac is not enable ,skip setCache";
-		}
-	}
+    public function setCache($key,$var)
+    {
+        $key = md5($key);
+        if($this->isEnable){
+            $yac = new Yac();
+            $yac->set($key, $var);
+        }else{
+            echo "yac is not enable ,skip setCache";
+        }
+    }
 }
 
 ?>
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -15,21 +15,21 @@
 	public function getCache($key)
 	{
 		$key = md5($key);
-		if($this->isEnable){
+		if ($this->isEnable) {
 			$yac = new Yac();
 			return $yac->get($key);
-		}else{
+		}else {
 			echo "yac is not enable ,skip getCache";
 		}
 	}
 
-	public function setCache($key,$var)
+	public function setCache($key, $var)
 	{
 		$key = md5($key);
-		if($this->isEnable){
+		if ($this->isEnable) {
 			$yac = new Yac();
 			$yac->set($key, $var);
-		}else{
+		}else {
 			echo "yac is not enable ,skip setCache";
 		}
 	}

Braces +5 added lines, -4 removed lines

@@ -8,8 +8,9 @@ 
 
 	function __construct()
 	{
-		if (!extension_loaded("yac"))
-			$this->isEnable = false;
+		if (!extension_loaded("yac")) {
+					$this->isEnable = false;
+		}
 	}
 
 	public function getCache($key)
@@ -18,7 +19,7 @@ 
 		if($this->isEnable){
 			$yac = new Yac();
 			return $yac->get($key);
-		}else{
+		} else{
 			echo "yac is not enable ,skip getCache";
 		}
 	}
@@ -29,7 +30,7 @@ 
 		if($this->isEnable){
 			$yac = new Yac();
 			$yac->set($key, $var);
-		}else{
+		} else{
 			echo "yac is not enable ,skip setCache";
 		}
 	}

src/service/taobao/bin/top/security/MagicCrypt.php

Spacing +5 added lines, -5 removed lines

@@ -20,12 +20,12 @@ 
 
         public static function hmac_md5($input, $key) {
             $key = base64_decode($key);
-            return hash_hmac('md5', $input, $key,true);
+            return hash_hmac('md5', $input, $key, true);
         }
      
-        private static function pkcs5_pad ($text, $blocksize) {
-            $pad = $blocksize - (strlen($text) % $blocksize);
-            return $text . str_repeat(chr($pad), $pad);
+        private static function pkcs5_pad($text, $blocksize) {
+            $pad = $blocksize-(strlen($text)%$blocksize);
+            return $text.str_repeat(chr($pad), $pad);
         }
      
         public static function decrypt($sStr, $key) {
@@ -42,7 +42,7 @@ 
 
             mcrypt_generic_deinit($module);
             mcrypt_module_close($module);
-            if(!$decrypted){
+            if (!$decrypted) {
                 throw new Exception("Decrypt Error,Please Check SecretKey");
             }
             return $decrypted;

src/service/taobao/bin/top/security/SecurityUtil.php

Indentation +557 added lines, -557 removed lines

@@ -1,589 +1,589 @@
 <?php
 
-	include './SecretContext.php';
-	include './MagicCrypt.php';
-
-	class SecurityUtil
-	{
-
-		private $BASE64_ARRAY = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
-		private $SEPARATOR_CHAR_MAP;
-
-		function __construct()
-		{
-			if(!defined("PHONE_SEPARATOR_CHAR"))
-			{
-				define('PHONE_SEPARATOR_CHAR','$');
-			}
-			if(!defined("NICK_SEPARATOR_CHAR"))
-			{
-				define('NICK_SEPARATOR_CHAR','~');
-			}
-			if(!defined("NORMAL_SEPARATOR_CHAR"))
-			{
-				define('NORMAL_SEPARATOR_CHAR',chr(1));
-			}
-
-			$this->SEPARATOR_CHAR_MAP['nick'] = NICK_SEPARATOR_CHAR;
-			$this->SEPARATOR_CHAR_MAP['simple'] = NICK_SEPARATOR_CHAR;
-			$this->SEPARATOR_CHAR_MAP['receiver_name'] = NICK_SEPARATOR_CHAR;
-			$this->SEPARATOR_CHAR_MAP['search'] = NICK_SEPARATOR_CHAR;
-			$this->SEPARATOR_CHAR_MAP['normal'] = NORMAL_SEPARATOR_CHAR;
-			$this->SEPARATOR_CHAR_MAP['phone'] = PHONE_SEPARATOR_CHAR;
-
-		}
-
-		/*
+    include './SecretContext.php';
+    include './MagicCrypt.php';
+
+    class SecurityUtil
+    {
+
+        private $BASE64_ARRAY = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+        private $SEPARATOR_CHAR_MAP;
+
+        function __construct()
+        {
+            if(!defined("PHONE_SEPARATOR_CHAR"))
+            {
+                define('PHONE_SEPARATOR_CHAR','$');
+            }
+            if(!defined("NICK_SEPARATOR_CHAR"))
+            {
+                define('NICK_SEPARATOR_CHAR','~');
+            }
+            if(!defined("NORMAL_SEPARATOR_CHAR"))
+            {
+                define('NORMAL_SEPARATOR_CHAR',chr(1));
+            }
+
+            $this->SEPARATOR_CHAR_MAP['nick'] = NICK_SEPARATOR_CHAR;
+            $this->SEPARATOR_CHAR_MAP['simple'] = NICK_SEPARATOR_CHAR;
+            $this->SEPARATOR_CHAR_MAP['receiver_name'] = NICK_SEPARATOR_CHAR;
+            $this->SEPARATOR_CHAR_MAP['search'] = NICK_SEPARATOR_CHAR;
+            $this->SEPARATOR_CHAR_MAP['normal'] = NORMAL_SEPARATOR_CHAR;
+            $this->SEPARATOR_CHAR_MAP['phone'] = PHONE_SEPARATOR_CHAR;
+
+        }
+
+        /*
 		* 判断是否是base64格式的数据
 		*/
-		function isBase64Str($str)
-		{
-			$strLen = strlen($str);
-			for($i = 0; $i < $strLen ; $i++)
-			{
-				if(!$this->isBase64Char($str[$i]))
-				{
-					return false;
-				}
-			}
-			return true;
-		}
-
-		/*
+        function isBase64Str($str)
+        {
+            $strLen = strlen($str);
+            for($i = 0; $i < $strLen ; $i++)
+            {
+                if(!$this->isBase64Char($str[$i]))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        /*
 		* 判断是否是base64格式的字符
 		*/
-		function isBase64Char($char)
-		{
-			return strpos($this->BASE64_ARRAY,$char) !== false;
-		}
+        function isBase64Char($char)
+        {
+            return strpos($this->BASE64_ARRAY,$char) !== false;
+        }
 
-		/*
+        /*
 		* 使用sep字符进行trim
 		*/
-		function trimBySep($str,$sep)
-		{
-			$start = 0;
-			$end = strlen($str);
-			for($i = 0; $i < $end; $i++)
-			{
-				if($str[$i] == $sep)
-				{
-					$start = $i + 1;
-				}
-				else
-				{
-					break;
-				}
-			}
-			for($i = $end -1 ; $i >= 0; $i--)
-			{
-				if($str[$i] == $sep)
-				{
-					$end = $i - 1;
-				}
-				else
-				{
-					break;
-				}
-			}
-			return substr($str,$start,$end);
-		}
-
-		function checkEncryptData($dataArray)
-		{
-			if(count($dataArray) == 2){
-				return  $this->isBase64Str($dataArray[0]);
-			}else{
-				return  $this->isBase64Str($dataArray[0]) && $this->isBase64Str($dataArray[1]);
-			}
-		}
-
-		/*
+        function trimBySep($str,$sep)
+        {
+            $start = 0;
+            $end = strlen($str);
+            for($i = 0; $i < $end; $i++)
+            {
+                if($str[$i] == $sep)
+                {
+                    $start = $i + 1;
+                }
+                else
+                {
+                    break;
+                }
+            }
+            for($i = $end -1 ; $i >= 0; $i--)
+            {
+                if($str[$i] == $sep)
+                {
+                    $end = $i - 1;
+                }
+                else
+                {
+                    break;
+                }
+            }
+            return substr($str,$start,$end);
+        }
+
+        function checkEncryptData($dataArray)
+        {
+            if(count($dataArray) == 2){
+                return  $this->isBase64Str($dataArray[0]);
+            }else{
+                return  $this->isBase64Str($dataArray[0]) && $this->isBase64Str($dataArray[1]);
+            }
+        }
+
+        /*
 		* 判断是否是加密数据
 		*/
-		function isEncryptDataArray($array,$type)
-		{
-			foreach ($array as $value) {
-				if(!$this->isEncryptData($value,$type)){
-					return false;
-				}
-			}
-			return true;
-		}
-
-		/**
-		* 判断是否是已加密的数据，数据必须是同一个类型
-		*/
-		function isPartEncryptData($array,$type)
-		{
-			$result = false;
-			foreach ($array as $value) {
-				if($this->isEncryptData($value,$type)){
-					$result = true;
-					break;
-				}
-			}
-			return $result;
-		}
-
-		/*
+        function isEncryptDataArray($array,$type)
+        {
+            foreach ($array as $value) {
+                if(!$this->isEncryptData($value,$type)){
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        /**
+         * 判断是否是已加密的数据，数据必须是同一个类型
+         */
+        function isPartEncryptData($array,$type)
+        {
+            $result = false;
+            foreach ($array as $value) {
+                if($this->isEncryptData($value,$type)){
+                    $result = true;
+                    break;
+                }
+            }
+            return $result;
+        }
+
+        /*
 		* 判断是否是加密数据
 		*/
-		function isEncryptData($data,$type)
-		{
-			if(!is_string($data) || strlen($data) < 4)
-			{
-				return false;
-			}
-
-			$separator = $this->SEPARATOR_CHAR_MAP[$type];
-			$strlen = strlen($data);
-			if($data[0] != $separator || $data[$strlen -1] != $separator)
-			{
-				return false;
-			}
-
-			$dataArray = explode($separator,$this->trimBySep($data,$separator));
-			$arrayLength = count($dataArray);
-
-			if($separator == PHONE_SEPARATOR_CHAR)
-			{
-				if($arrayLength != 3)
-				{
-					return false;
-				}
-				if($data[$strlen - 2] == $separator)
-				{
-					return $this->checkEncryptData($dataArray);
-				} 
-				else
-				{
-					$version = $dataArray[$arrayLength -1];
-					if(is_numeric($version))
-					{
-						$base64Val = $dataArray[$arrayLength -2];
-						return $this->isBase64Str($base64Val);
-					}
-				}
-			}else{
-				if($data[strlen($data) - 2] == $separator && $arrayLength == 3)
-				{
-					return $this->checkEncryptData($dataArray);
-				}
-				else if($arrayLength == 2)
-				{
-					return $this->checkEncryptData($dataArray);
-				}
-				else
-				{
-					return false;
-				}
-			}
-		}
-
-		function search($data, $type,$secretContext)
-		{
-			$separator = $this->SEPARATOR_CHAR_MAP[$type];
-			if('phone' == $type) {
-		        if (strlen($data) != 4 ) {
-		            throw new Exception("phoneNumber error");
-		        }
-		        return $separator.$this->hmacMD5EncryptToBase64($data, $secretContext->secret).$separator;
-			} else {
-				$compressLen = $this->getArrayValue($secretContext->appConfig,'encrypt_index_compress_len',3);
-				$slideSize = $this->getArrayValue($secretContext->appConfig,'encrypt_slide_size',4);
-
-				$slideList = $this->getSlideWindows($data, $slideSize);
-		        $builder = '';
-		        foreach ($slideList as $slide) {
-					$builder .= $this->hmacMD5EncryptToBase64($slide,$secretContext->secret,$compressLen);
-				}
-		        return $builder;
-			}
-		}
-
-		/*
+        function isEncryptData($data,$type)
+        {
+            if(!is_string($data) || strlen($data) < 4)
+            {
+                return false;
+            }
+
+            $separator = $this->SEPARATOR_CHAR_MAP[$type];
+            $strlen = strlen($data);
+            if($data[0] != $separator || $data[$strlen -1] != $separator)
+            {
+                return false;
+            }
+
+            $dataArray = explode($separator,$this->trimBySep($data,$separator));
+            $arrayLength = count($dataArray);
+
+            if($separator == PHONE_SEPARATOR_CHAR)
+            {
+                if($arrayLength != 3)
+                {
+                    return false;
+                }
+                if($data[$strlen - 2] == $separator)
+                {
+                    return $this->checkEncryptData($dataArray);
+                } 
+                else
+                {
+                    $version = $dataArray[$arrayLength -1];
+                    if(is_numeric($version))
+                    {
+                        $base64Val = $dataArray[$arrayLength -2];
+                        return $this->isBase64Str($base64Val);
+                    }
+                }
+            }else{
+                if($data[strlen($data) - 2] == $separator && $arrayLength == 3)
+                {
+                    return $this->checkEncryptData($dataArray);
+                }
+                else if($arrayLength == 2)
+                {
+                    return $this->checkEncryptData($dataArray);
+                }
+                else
+                {
+                    return false;
+                }
+            }
+        }
+
+        function search($data, $type,$secretContext)
+        {
+            $separator = $this->SEPARATOR_CHAR_MAP[$type];
+            if('phone' == $type) {
+                if (strlen($data) != 4 ) {
+                    throw new Exception("phoneNumber error");
+                }
+                return $separator.$this->hmacMD5EncryptToBase64($data, $secretContext->secret).$separator;
+            } else {
+                $compressLen = $this->getArrayValue($secretContext->appConfig,'encrypt_index_compress_len',3);
+                $slideSize = $this->getArrayValue($secretContext->appConfig,'encrypt_slide_size',4);
+
+                $slideList = $this->getSlideWindows($data, $slideSize);
+                $builder = '';
+                foreach ($slideList as $slide) {
+                    $builder .= $this->hmacMD5EncryptToBase64($slide,$secretContext->secret,$compressLen);
+                }
+                return $builder;
+            }
+        }
+
+        /*
 		* 加密逻辑
 		*/
-		function encrypt($data,$type,$version,$secretContext)
-		{
-			if(!is_string($data))
-			{
-				return false;
-			}
-
-			$separator = $this->SEPARATOR_CHAR_MAP[$type];
-			$isIndexEncrypt = $this->isIndexEncrypt($type,$version,$secretContext);
-			if($isIndexEncrypt || $type == "search"){
-				if('phone' == $type) {
-					return $this->encryptPhoneIndex($data,$separator,$secretContext);
-				} else {
-					$compressLen = $this->getArrayValue($secretContext->appConfig,'encrypt_index_compress_len',3);
-					$slideSize = $this->getArrayValue($secretContext->appConfig,'encrypt_slide_size',4);
-					return $this->encryptNormalIndex($data,$compressLen,$slideSize,$separator,$secretContext);
-				}
-			}else{
-				if('phone' == $type) {
-					return $this->encryptPhone($data,$separator,$secretContext);
-				} else {
-					return $this->encryptNormal($data,$separator,$secretContext);
-				}
-			}
-
-		}
-
-		/*
+        function encrypt($data,$type,$version,$secretContext)
+        {
+            if(!is_string($data))
+            {
+                return false;
+            }
+
+            $separator = $this->SEPARATOR_CHAR_MAP[$type];
+            $isIndexEncrypt = $this->isIndexEncrypt($type,$version,$secretContext);
+            if($isIndexEncrypt || $type == "search"){
+                if('phone' == $type) {
+                    return $this->encryptPhoneIndex($data,$separator,$secretContext);
+                } else {
+                    $compressLen = $this->getArrayValue($secretContext->appConfig,'encrypt_index_compress_len',3);
+                    $slideSize = $this->getArrayValue($secretContext->appConfig,'encrypt_slide_size',4);
+                    return $this->encryptNormalIndex($data,$compressLen,$slideSize,$separator,$secretContext);
+                }
+            }else{
+                if('phone' == $type) {
+                    return $this->encryptPhone($data,$separator,$secretContext);
+                } else {
+                    return $this->encryptNormal($data,$separator,$secretContext);
+                }
+            }
+
+        }
+
+        /*
 		* 加密逻辑,手机号码格式
 		*/
-		function encryptPhone($data,$separator,$secretContext)
-		{
-			$len = strlen($data);
-			if($len < 11)
-			{
-				return $data;
-			}
-			$prefixNumber = substr($data,0,$len -8);
-			$last8Number =  substr($data,$len -8,$len);
-
-			return $separator.$prefixNumber.$separator.Security::encrypt($last8Number,$secretContext->secret)
-				  .$separator.$secretContext->secretVersion.$separator ;
-		}
-
-		/*
+        function encryptPhone($data,$separator,$secretContext)
+        {
+            $len = strlen($data);
+            if($len < 11)
+            {
+                return $data;
+            }
+            $prefixNumber = substr($data,0,$len -8);
+            $last8Number =  substr($data,$len -8,$len);
+
+            return $separator.$prefixNumber.$separator.Security::encrypt($last8Number,$secretContext->secret)
+                    .$separator.$secretContext->secretVersion.$separator ;
+        }
+
+        /*
 		* 加密逻辑,非手机号码格式
 		*/
-		function encryptNormal($data,$separator,$secretContext)
-		{
-			return $separator.Security::encrypt($data,$secretContext->secret)
-							 .$separator.$secretContext->secretVersion.$separator;
-		}
+        function encryptNormal($data,$separator,$secretContext)
+        {
+            return $separator.Security::encrypt($data,$secretContext->secret)
+                                .$separator.$secretContext->secretVersion.$separator;
+        }
 
-		/*
+        /*
 		* 解密逻辑
 		*/
-		function decrypt($data,$type,$secretContext)
-		{			
-			if(!$this->isEncryptData($data,$type))
-			{
-				throw new Exception("数据[".$data."]不是类型为[".$type."]的加密数据");
-			}
-			$dataLen = strlen($data);
-			$separator = $this->SEPARATOR_CHAR_MAP[$type];
-
-			$secretData = null;
-			if($data[$dataLen - 2] == $separator){
-				$secretData = $this->getIndexSecretData($data,$separator);
-			}else{
-				$secretData = $this->getSecretData($data,$separator);
-			}
+        function decrypt($data,$type,$secretContext)
+        {			
+            if(!$this->isEncryptData($data,$type))
+            {
+                throw new Exception("数据[".$data."]不是类型为[".$type."]的加密数据");
+            }
+            $dataLen = strlen($data);
+            $separator = $this->SEPARATOR_CHAR_MAP[$type];
+
+            $secretData = null;
+            if($data[$dataLen - 2] == $separator){
+                $secretData = $this->getIndexSecretData($data,$separator);
+            }else{
+                $secretData = $this->getSecretData($data,$separator);
+            }
 			
-			if($secretData == null){
-				return $data;
-			}
+            if($secretData == null){
+                return $data;
+            }
 
-			$result = Security::decrypt($secretData->originalBase64Value,$secretContext->secret);
+            $result = Security::decrypt($secretData->originalBase64Value,$secretContext->secret);
 
-			if($separator == PHONE_SEPARATOR_CHAR && !$secretData->search)
-			{
-				return $secretData->originalValue.$result;
-			}
-			return $result;
-		}
+            if($separator == PHONE_SEPARATOR_CHAR && !$secretData->search)
+            {
+                return $secretData->originalValue.$result;
+            }
+            return $result;
+        }
 
-		/*
+        /*
 		* 判断是否是公钥数据
 		*/
-		function isPublicData($data,$type)
-		{
-			$secretData = $this->getSecretDataByType($data,$type);
-			if(empty($secretData)){
-				return false;
-			}
-			if(intval($secretData->secretVersion) < 0){
-				return true;
-			}
-			return false;
-		}
-
-		function getSecretDataByType($data,$type)
-		{
-			$separator = $this->SEPARATOR_CHAR_MAP[$type];
-			$dataLen = strlen($data);
-
-			if($data[$dataLen - 2] == $separator){
-				return $secretData = $this->getIndexSecretData($data,$separator);
-			}else{
-				return  $secretData = $this->getSecretData($data,$separator);
-			}
-		}
-
-		/*
+        function isPublicData($data,$type)
+        {
+            $secretData = $this->getSecretDataByType($data,$type);
+            if(empty($secretData)){
+                return false;
+            }
+            if(intval($secretData->secretVersion) < 0){
+                return true;
+            }
+            return false;
+        }
+
+        function getSecretDataByType($data,$type)
+        {
+            $separator = $this->SEPARATOR_CHAR_MAP[$type];
+            $dataLen = strlen($data);
+
+            if($data[$dataLen - 2] == $separator){
+                return $secretData = $this->getIndexSecretData($data,$separator);
+            }else{
+                return  $secretData = $this->getSecretData($data,$separator);
+            }
+        }
+
+        /*
 		* 分解密文
 		*/
-		function getSecretData($data,$separator)
-		{
-			$secretData = new SecretData;
-			$dataArray = explode($separator,$this->trimBySep($data,$separator));
-			$arrayLength = count($dataArray);
-
-			if($separator == PHONE_SEPARATOR_CHAR)
-			{
-				if($arrayLength != 3){
-					return null;
-				}else{
-					$version = $dataArray[2];
-					if(is_numeric($version))
-					{
-						$secretData->originalValue = $dataArray[0];
-						$secretData->originalBase64Value = $dataArray[1];
-						$secretData->secretVersion = $version;
-					}
-				}
-			}
-			else
-			{
-				if($arrayLength != 2){
-					return null;
-				}else{
-					$version = $dataArray[1];
-					if(is_numeric($version))
-					{
-						$secretData->originalBase64Value = $dataArray[0];
-						$secretData->secretVersion = $version;
-					}
-				}
-			}
-			return $secretData;
-		}
-
-		function getIndexSecretData($data,$separator) {
-			$secretData = new SecretData;
-			$dataArray = explode($separator,$this->trimBySep($data,$separator));
-			$arrayLength = count($dataArray);
-
-	        if($separator == PHONE_SEPARATOR_CHAR) {
-	            if ($arrayLength != 3) {
-	                return null;
-	            }else{
-					$version = $dataArray[2];
-					if(is_numeric($version))
-					{
-						$secretData->originalValue = $dataArray[0];
-						$secretData->originalBase64Value = $dataArray[1];
-						$secretData->secretVersion = $version;
-					}
-	            }
+        function getSecretData($data,$separator)
+        {
+            $secretData = new SecretData;
+            $dataArray = explode($separator,$this->trimBySep($data,$separator));
+            $arrayLength = count($dataArray);
+
+            if($separator == PHONE_SEPARATOR_CHAR)
+            {
+                if($arrayLength != 3){
+                    return null;
+                }else{
+                    $version = $dataArray[2];
+                    if(is_numeric($version))
+                    {
+                        $secretData->originalValue = $dataArray[0];
+                        $secretData->originalBase64Value = $dataArray[1];
+                        $secretData->secretVersion = $version;
+                    }
+                }
+            }
+            else
+            {
+                if($arrayLength != 2){
+                    return null;
+                }else{
+                    $version = $dataArray[1];
+                    if(is_numeric($version))
+                    {
+                        $secretData->originalBase64Value = $dataArray[0];
+                        $secretData->secretVersion = $version;
+                    }
+                }
+            }
+            return $secretData;
+        }
+
+        function getIndexSecretData($data,$separator) {
+            $secretData = new SecretData;
+            $dataArray = explode($separator,$this->trimBySep($data,$separator));
+            $arrayLength = count($dataArray);
+
+            if($separator == PHONE_SEPARATOR_CHAR) {
+                if ($arrayLength != 3) {
+                    return null;
+                }else{
+                    $version = $dataArray[2];
+                    if(is_numeric($version))
+                    {
+                        $secretData->originalValue = $dataArray[0];
+                        $secretData->originalBase64Value = $dataArray[1];
+                        $secretData->secretVersion = $version;
+                    }
+                }
 	            
-	        } else {
-	        	if($arrayLength != 3){
-					return null;
-				} else {
-					$version = $dataArray[2];
-					if(is_numeric($version))
-					{
-						$secretData->originalBase64Value = $dataArray[0];
-						$secretData->originalValue = $dataArray[1];
-						$secretData->secretVersion = $version;
-					}
-				}
-	        }
-
-	        $secretData->search = true;
-	        return $secretData;
-		}
-
-		/**
-	     * 判断密文是否支持检索
-	     * 
-	     * @param key
-	     * @param version
-	     * @return
-	     */
-		function isIndexEncrypt($key,$version,$secretContext)
-		{
-	        if ($version != null && $version < 0) {
-	            $key = "previous_".$key;
-	        } else {
-	            $key = "current_".$key;
-	        }
-
-	        return $secretContext->appConfig != null && 
-	               array_key_exists($key,$secretContext->appConfig) && 
-	               $secretContext->appConfig[$key] == "2";
-		}
-
-		function isLetterOrDigit($ch)
-		{
-			$code = ord($ch);
-			if (0 <= $code && $code <= 127) {
-            	return true;
-        	}
-        	return false;
-		}
-
-		function utf8_strlen($string = null) {
-			// 将字符串分解为单元
-			preg_match_all("/./us", $string, $match);
-			// 返回单元个数
-			return count($match[0]);
-		}
-
-		function utf8_substr($string,$start,$end) {
-			// 将字符串分解为单元
-			preg_match_all("/./us", $string, $match);
-			// 返回单元个数
-			$result = "";
-			for($i = $start; $i < $end; $i++){
-				$result .= $match[0][$i];
-			}
-			return $result;
-		}
-
-		function utf8_str_at($string,$index) {
-			// 将字符串分解为单元
-			preg_match_all("/./us", $string, $match);
-			// 返回单元个数
-			return $match[0][$index];
-		}
-
-		function compress($input,$toLength) {
-			if($toLength < 0) {
-				return null;
-			}
-			$output = array();
-			for($i = 0; $i < $toLength; $i++) {
-				$output[$i] = chr(0);
-			}
-			$input = $this->getBytes($input);
-			$inputLength = count($input);
-			for ($i = 0; $i < $inputLength; $i++) {
-	            $index_output = $i % $toLength;
-	            $output[$index_output] = $output[$index_output] ^ $input[$i];
-	        }
-	        return $output;
-		}
-
-	    /**
-	     * @see #hmacMD5Encrypt
-	     * 
-	     * @param encryptText
-	     *            被签名的字符串
-	     * @param encryptKey
-	     *            密钥
-	     * @param compressLen压缩长度
-	     * @return
-	     * @throws Exception
-	     */
-		function hmacMD5EncryptToBase64($encryptText,$encryptKey,$compressLen = 0) {
-			$encryptResult = Security::hmac_md5($encryptText,$encryptKey);
-			if($compressLen != 0){
-				$encryptResult = $this->compress($encryptResult,$compressLen);
-			}
-			return base64_encode($this->toStr($encryptResult));
-		}
-
-
-	    /**
-	     * 生成滑动窗口
-	     * 
-	     * @param input
-	     * @param slideSize
-	     * @return
-	     */
-		function getSlideWindows($input,$slideSize = 4)
-		{
-			$endIndex = 0;
-			$startIndex = 0;
-			$currentWindowSize = 0;
-			$currentWindow = null;
-			$dataLength = $this->utf8_strlen($input);
-			$windows = array();
-			while($endIndex < $dataLength || $currentWindowSize > $slideSize) 
-			{
-				$startsWithLetterOrDigit = false;
-				if(!empty($currentWindow)){
-					$startsWithLetterOrDigit = $this->isLetterOrDigit($this->utf8_str_at($currentWindow,0));
-				}
-				if($endIndex == $dataLength && $startsWithLetterOrDigit == false){
-					break;
-				}
-				if($currentWindowSize == $slideSize && 
-				   $startsWithLetterOrDigit == false && 
-				   $this->isLetterOrDigit($this->utf8_str_at($input,$endIndex))) {
-				   $endIndex ++;
-				   $currentWindow = $this->utf8_substr($input,$startIndex,$endIndex);
-				   $currentWindowSize = 5;
-				} else {
-				    if($endIndex != 0){
-				    	if($startsWithLetterOrDigit){
-				    		$currentWindowSize -= 1;
-				    	}else{
-				    		$currentWindowSize -= 2;
-				    	}
-				    	$startIndex ++;
-				    }
-
-	                while ($currentWindowSize < $slideSize && $endIndex < $dataLength) {
-	                    $currentChar = $this->utf8_str_at($input,$endIndex);
-	                    if ($this->isLetterOrDigit($currentChar)) {
-	                        $currentWindowSize += 1;
-	                    } else {
-	                        $currentWindowSize += 2;
-	                    }
-	                    $endIndex++;
-	                }
-	                $currentWindow = $this->utf8_substr($input,$startIndex,$endIndex);
-				}
-				array_push($windows,$currentWindow);
-			}
-			return $windows;
-		}
-
-		function encryptPhoneIndex($data,$separator,$secretContext) {
-			$dataLength = strlen($data);
-			if($dataLength < 11) {
-				return $data;
-			}
-			$last4Number = substr($data,$dataLength -4 ,$dataLength);
-			return $separator.$this->hmacMD5EncryptToBase64($last4Number,$secretContext->secret).$separator
-				   .Security::encrypt($data,$secretContext->secret).$separator.$secretContext->secretVersion
-				   .$separator.$separator;
-		}
-
-		function encryptNormalIndex($data,$compressLen,$slideSize,$separator,$secretContext) {
-			$slideList = $this->getSlideWindows($data, $slideSize);
-			$builder = "";
-			foreach ($slideList as $slide) {
-				$builder .= $this->hmacMD5EncryptToBase64($slide,$secretContext->secret,$compressLen);
-			}
-			return $separator.Security::encrypt($data,$secretContext->secret).$separator.$builder.$separator
-				   .$secretContext->secretVersion.$separator.$separator;
-		}
-
-		function getArrayValue($array,$key,$default) {
-			if(array_key_exists($key, $array)){
-				return $array[$key];
-			}
-			return $default;
-		}
-
-		function getBytes($string) {  
-	        $bytes = array();  
-	        for($i = 0; $i < strlen($string); $i++){  
-	             $bytes[] = ord($string[$i]);  
-	        }  
-	        return $bytes;  
-	    }  
-
-		function toStr($bytes) {
-			if(!is_array($bytes)){
-				return $bytes;
-			}
-	        $str = '';	        
-	        foreach($bytes as $ch) {
-	            $str .= chr($ch);
-	        }
-	        return $str;
-	    }
-	}
+            } else {
+                if($arrayLength != 3){
+                    return null;
+                } else {
+                    $version = $dataArray[2];
+                    if(is_numeric($version))
+                    {
+                        $secretData->originalBase64Value = $dataArray[0];
+                        $secretData->originalValue = $dataArray[1];
+                        $secretData->secretVersion = $version;
+                    }
+                }
+            }
+
+            $secretData->search = true;
+            return $secretData;
+        }
+
+        /**
+         * 判断密文是否支持检索
+         * 
+         * @param key
+         * @param version
+         * @return
+         */
+        function isIndexEncrypt($key,$version,$secretContext)
+        {
+            if ($version != null && $version < 0) {
+                $key = "previous_".$key;
+            } else {
+                $key = "current_".$key;
+            }
+
+            return $secretContext->appConfig != null && 
+                   array_key_exists($key,$secretContext->appConfig) && 
+                   $secretContext->appConfig[$key] == "2";
+        }
+
+        function isLetterOrDigit($ch)
+        {
+            $code = ord($ch);
+            if (0 <= $code && $code <= 127) {
+                return true;
+            }
+            return false;
+        }
+
+        function utf8_strlen($string = null) {
+            // 将字符串分解为单元
+            preg_match_all("/./us", $string, $match);
+            // 返回单元个数
+            return count($match[0]);
+        }
+
+        function utf8_substr($string,$start,$end) {
+            // 将字符串分解为单元
+            preg_match_all("/./us", $string, $match);
+            // 返回单元个数
+            $result = "";
+            for($i = $start; $i < $end; $i++){
+                $result .= $match[0][$i];
+            }
+            return $result;
+        }
+
+        function utf8_str_at($string,$index) {
+            // 将字符串分解为单元
+            preg_match_all("/./us", $string, $match);
+            // 返回单元个数
+            return $match[0][$index];
+        }
+
+        function compress($input,$toLength) {
+            if($toLength < 0) {
+                return null;
+            }
+            $output = array();
+            for($i = 0; $i < $toLength; $i++) {
+                $output[$i] = chr(0);
+            }
+            $input = $this->getBytes($input);
+            $inputLength = count($input);
+            for ($i = 0; $i < $inputLength; $i++) {
+                $index_output = $i % $toLength;
+                $output[$index_output] = $output[$index_output] ^ $input[$i];
+            }
+            return $output;
+        }
+
+        /**
+         * @see #hmacMD5Encrypt
+         * 
+         * @param encryptText
+         *            被签名的字符串
+         * @param encryptKey
+         *            密钥
+         * @param compressLen压缩长度
+         * @return
+         * @throws Exception
+         */
+        function hmacMD5EncryptToBase64($encryptText,$encryptKey,$compressLen = 0) {
+            $encryptResult = Security::hmac_md5($encryptText,$encryptKey);
+            if($compressLen != 0){
+                $encryptResult = $this->compress($encryptResult,$compressLen);
+            }
+            return base64_encode($this->toStr($encryptResult));
+        }
+
+
+        /**
+         * 生成滑动窗口
+         * 
+         * @param input
+         * @param slideSize
+         * @return
+         */
+        function getSlideWindows($input,$slideSize = 4)
+        {
+            $endIndex = 0;
+            $startIndex = 0;
+            $currentWindowSize = 0;
+            $currentWindow = null;
+            $dataLength = $this->utf8_strlen($input);
+            $windows = array();
+            while($endIndex < $dataLength || $currentWindowSize > $slideSize) 
+            {
+                $startsWithLetterOrDigit = false;
+                if(!empty($currentWindow)){
+                    $startsWithLetterOrDigit = $this->isLetterOrDigit($this->utf8_str_at($currentWindow,0));
+                }
+                if($endIndex == $dataLength && $startsWithLetterOrDigit == false){
+                    break;
+                }
+                if($currentWindowSize == $slideSize && 
+                   $startsWithLetterOrDigit == false && 
+                   $this->isLetterOrDigit($this->utf8_str_at($input,$endIndex))) {
+                    $endIndex ++;
+                    $currentWindow = $this->utf8_substr($input,$startIndex,$endIndex);
+                    $currentWindowSize = 5;
+                } else {
+                    if($endIndex != 0){
+                        if($startsWithLetterOrDigit){
+                            $currentWindowSize -= 1;
+                        }else{
+                            $currentWindowSize -= 2;
+                        }
+                        $startIndex ++;
+                    }
+
+                    while ($currentWindowSize < $slideSize && $endIndex < $dataLength) {
+                        $currentChar = $this->utf8_str_at($input,$endIndex);
+                        if ($this->isLetterOrDigit($currentChar)) {
+                            $currentWindowSize += 1;
+                        } else {
+                            $currentWindowSize += 2;
+                        }
+                        $endIndex++;
+                    }
+                    $currentWindow = $this->utf8_substr($input,$startIndex,$endIndex);
+                }
+                array_push($windows,$currentWindow);
+            }
+            return $windows;
+        }
+
+        function encryptPhoneIndex($data,$separator,$secretContext) {
+            $dataLength = strlen($data);
+            if($dataLength < 11) {
+                return $data;
+            }
+            $last4Number = substr($data,$dataLength -4 ,$dataLength);
+            return $separator.$this->hmacMD5EncryptToBase64($last4Number,$secretContext->secret).$separator
+                    .Security::encrypt($data,$secretContext->secret).$separator.$secretContext->secretVersion
+                    .$separator.$separator;
+        }
+
+        function encryptNormalIndex($data,$compressLen,$slideSize,$separator,$secretContext) {
+            $slideList = $this->getSlideWindows($data, $slideSize);
+            $builder = "";
+            foreach ($slideList as $slide) {
+                $builder .= $this->hmacMD5EncryptToBase64($slide,$secretContext->secret,$compressLen);
+            }
+            return $separator.Security::encrypt($data,$secretContext->secret).$separator.$builder.$separator
+                    .$secretContext->secretVersion.$separator.$separator;
+        }
+
+        function getArrayValue($array,$key,$default) {
+            if(array_key_exists($key, $array)){
+                return $array[$key];
+            }
+            return $default;
+        }
+
+        function getBytes($string) {  
+            $bytes = array();  
+            for($i = 0; $i < strlen($string); $i++){  
+                    $bytes[] = ord($string[$i]);  
+            }  
+            return $bytes;  
+        }  
+
+        function toStr($bytes) {
+            if(!is_array($bytes)){
+                return $bytes;
+            }
+            $str = '';	        
+            foreach($bytes as $ch) {
+                $str .= chr($ch);
+            }
+            return $str;
+        }
+    }
 ?>
\ No newline at end of file

Spacing +147 added lines, -147 removed lines

@@ -11,17 +11,17 @@ 
 
 		function __construct()
 		{
-			if(!defined("PHONE_SEPARATOR_CHAR"))
+			if (!defined("PHONE_SEPARATOR_CHAR"))
 			{
-				define('PHONE_SEPARATOR_CHAR','$');
+				define('PHONE_SEPARATOR_CHAR', '$');
 			}
-			if(!defined("NICK_SEPARATOR_CHAR"))
+			if (!defined("NICK_SEPARATOR_CHAR"))
 			{
-				define('NICK_SEPARATOR_CHAR','~');
+				define('NICK_SEPARATOR_CHAR', '~');
 			}
-			if(!defined("NORMAL_SEPARATOR_CHAR"))
+			if (!defined("NORMAL_SEPARATOR_CHAR"))
 			{
-				define('NORMAL_SEPARATOR_CHAR',chr(1));
+				define('NORMAL_SEPARATOR_CHAR', chr(1));
 			}
 
 			$this->SEPARATOR_CHAR_MAP['nick'] = NICK_SEPARATOR_CHAR;
@@ -39,9 +39,9 @@ 
 		function isBase64Str($str)
 		{
 			$strLen = strlen($str);
-			for($i = 0; $i < $strLen ; $i++)
+			for ($i = 0; $i < $strLen; $i++)
 			{
-				if(!$this->isBase64Char($str[$i]))
+				if (!$this->isBase64Char($str[$i]))
 				{
 					return false;
 				}
@@ -54,46 +54,46 @@ 
 		*/
 		function isBase64Char($char)
 		{
-			return strpos($this->BASE64_ARRAY,$char) !== false;
+			return strpos($this->BASE64_ARRAY, $char) !== false;
 		}
 
 		/*
 		* 使用sep字符进行trim
 		*/
-		function trimBySep($str,$sep)
+		function trimBySep($str, $sep)
 		{
 			$start = 0;
 			$end = strlen($str);
-			for($i = 0; $i < $end; $i++)
+			for ($i = 0; $i < $end; $i++)
 			{
-				if($str[$i] == $sep)
+				if ($str[$i] == $sep)
 				{
-					$start = $i + 1;
+					$start = $i+1;
 				}
 				else
 				{
 					break;
 				}
 			}
-			for($i = $end -1 ; $i >= 0; $i--)
+			for ($i = $end-1; $i >= 0; $i--)
 			{
-				if($str[$i] == $sep)
+				if ($str[$i] == $sep)
 				{
-					$end = $i - 1;
+					$end = $i-1;
 				}
 				else
 				{
 					break;
 				}
 			}
-			return substr($str,$start,$end);
+			return substr($str, $start, $end);
 		}
 
 		function checkEncryptData($dataArray)
 		{
-			if(count($dataArray) == 2){
+			if (count($dataArray) == 2) {
 				return  $this->isBase64Str($dataArray[0]);
-			}else{
+			}else {
 				return  $this->isBase64Str($dataArray[0]) && $this->isBase64Str($dataArray[1]);
 			}
 		}
@@ -101,10 +101,10 @@ 
 		/*
 		* 判断是否是加密数据
 		*/
-		function isEncryptDataArray($array,$type)
+		function isEncryptDataArray($array, $type)
 		{
 			foreach ($array as $value) {
-				if(!$this->isEncryptData($value,$type)){
+				if (!$this->isEncryptData($value, $type)) {
 					return false;
 				}
 			}
@@ -114,11 +114,11 @@ 
 		/**
 		* 判断是否是已加密的数据，数据必须是同一个类型
 		*/
-		function isPartEncryptData($array,$type)
+		function isPartEncryptData($array, $type)
 		{
 			$result = false;
 			foreach ($array as $value) {
-				if($this->isEncryptData($value,$type)){
+				if ($this->isEncryptData($value, $type)) {
 					$result = true;
 					break;
 				}
@@ -129,48 +129,48 @@ 
 		/*
 		* 判断是否是加密数据
 		*/
-		function isEncryptData($data,$type)
+		function isEncryptData($data, $type)
 		{
-			if(!is_string($data) || strlen($data) < 4)
+			if (!is_string($data) || strlen($data) < 4)
 			{
 				return false;
 			}
 
 			$separator = $this->SEPARATOR_CHAR_MAP[$type];
 			$strlen = strlen($data);
-			if($data[0] != $separator || $data[$strlen -1] != $separator)
+			if ($data[0] != $separator || $data[$strlen-1] != $separator)
 			{
 				return false;
 			}
 
-			$dataArray = explode($separator,$this->trimBySep($data,$separator));
+			$dataArray = explode($separator, $this->trimBySep($data, $separator));
 			$arrayLength = count($dataArray);
 
-			if($separator == PHONE_SEPARATOR_CHAR)
+			if ($separator == PHONE_SEPARATOR_CHAR)
 			{
-				if($arrayLength != 3)
+				if ($arrayLength != 3)
 				{
 					return false;
 				}
-				if($data[$strlen - 2] == $separator)
+				if ($data[$strlen-2] == $separator)
 				{
 					return $this->checkEncryptData($dataArray);
 				} 
 				else
 				{
-					$version = $dataArray[$arrayLength -1];
-					if(is_numeric($version))
+					$version = $dataArray[$arrayLength-1];
+					if (is_numeric($version))
 					{
-						$base64Val = $dataArray[$arrayLength -2];
+						$base64Val = $dataArray[$arrayLength-2];
 						return $this->isBase64Str($base64Val);
 					}
 				}
-			}else{
-				if($data[strlen($data) - 2] == $separator && $arrayLength == 3)
+			}else {
+				if ($data[strlen($data)-2] == $separator && $arrayLength == 3)
 				{
 					return $this->checkEncryptData($dataArray);
 				}
-				else if($arrayLength == 2)
+				else if ($arrayLength == 2)
 				{
 					return $this->checkEncryptData($dataArray);
 				}
@@ -181,22 +181,22 @@ 
 			}
 		}
 
-		function search($data, $type,$secretContext)
+		function search($data, $type, $secretContext)
 		{
 			$separator = $this->SEPARATOR_CHAR_MAP[$type];
-			if('phone' == $type) {
-		        if (strlen($data) != 4 ) {
+			if ('phone' == $type) {
+		        if (strlen($data) != 4) {
 		            throw new Exception("phoneNumber error");
 		        }
 		        return $separator.$this->hmacMD5EncryptToBase64($data, $secretContext->secret).$separator;
-			} else {
-				$compressLen = $this->getArrayValue($secretContext->appConfig,'encrypt_index_compress_len',3);
-				$slideSize = $this->getArrayValue($secretContext->appConfig,'encrypt_slide_size',4);
+			}else {
+				$compressLen = $this->getArrayValue($secretContext->appConfig, 'encrypt_index_compress_len', 3);
+				$slideSize = $this->getArrayValue($secretContext->appConfig, 'encrypt_slide_size', 4);
 
 				$slideList = $this->getSlideWindows($data, $slideSize);
 		        $builder = '';
 		        foreach ($slideList as $slide) {
-					$builder .= $this->hmacMD5EncryptToBase64($slide,$secretContext->secret,$compressLen);
+					$builder .= $this->hmacMD5EncryptToBase64($slide, $secretContext->secret, $compressLen);
 				}
 		        return $builder;
 			}
@@ -205,28 +205,28 @@ 
 		/*
 		* 加密逻辑
 		*/
-		function encrypt($data,$type,$version,$secretContext)
+		function encrypt($data, $type, $version, $secretContext)
 		{
-			if(!is_string($data))
+			if (!is_string($data))
 			{
 				return false;
 			}
 
 			$separator = $this->SEPARATOR_CHAR_MAP[$type];
-			$isIndexEncrypt = $this->isIndexEncrypt($type,$version,$secretContext);
-			if($isIndexEncrypt || $type == "search"){
-				if('phone' == $type) {
-					return $this->encryptPhoneIndex($data,$separator,$secretContext);
-				} else {
-					$compressLen = $this->getArrayValue($secretContext->appConfig,'encrypt_index_compress_len',3);
-					$slideSize = $this->getArrayValue($secretContext->appConfig,'encrypt_slide_size',4);
-					return $this->encryptNormalIndex($data,$compressLen,$slideSize,$separator,$secretContext);
+			$isIndexEncrypt = $this->isIndexEncrypt($type, $version, $secretContext);
+			if ($isIndexEncrypt || $type == "search") {
+				if ('phone' == $type) {
+					return $this->encryptPhoneIndex($data, $separator, $secretContext);
+				}else {
+					$compressLen = $this->getArrayValue($secretContext->appConfig, 'encrypt_index_compress_len', 3);
+					$slideSize = $this->getArrayValue($secretContext->appConfig, 'encrypt_slide_size', 4);
+					return $this->encryptNormalIndex($data, $compressLen, $slideSize, $separator, $secretContext);
 				}
-			}else{
-				if('phone' == $type) {
-					return $this->encryptPhone($data,$separator,$secretContext);
-				} else {
-					return $this->encryptNormal($data,$separator,$secretContext);
+			}else {
+				if ('phone' == $type) {
+					return $this->encryptPhone($data, $separator, $secretContext);
+				}else {
+					return $this->encryptNormal($data, $separator, $secretContext);
 				}
 			}
 
@@ -235,35 +235,35 @@ 
 		/*
 		* 加密逻辑,手机号码格式
 		*/
-		function encryptPhone($data,$separator,$secretContext)
+		function encryptPhone($data, $separator, $secretContext)
 		{
 			$len = strlen($data);
-			if($len < 11)
+			if ($len < 11)
 			{
 				return $data;
 			}
-			$prefixNumber = substr($data,0,$len -8);
-			$last8Number =  substr($data,$len -8,$len);
+			$prefixNumber = substr($data, 0, $len-8);
+			$last8Number = substr($data, $len-8, $len);
 
-			return $separator.$prefixNumber.$separator.Security::encrypt($last8Number,$secretContext->secret)
-				  .$separator.$secretContext->secretVersion.$separator ;
+			return $separator.$prefixNumber.$separator.Security::encrypt($last8Number, $secretContext->secret)
+				  .$separator.$secretContext->secretVersion.$separator;
 		}
 
 		/*
 		* 加密逻辑,非手机号码格式
 		*/
-		function encryptNormal($data,$separator,$secretContext)
+		function encryptNormal($data, $separator, $secretContext)
 		{
-			return $separator.Security::encrypt($data,$secretContext->secret)
+			return $separator.Security::encrypt($data, $secretContext->secret)
 							 .$separator.$secretContext->secretVersion.$separator;
 		}
 
 		/*
 		* 解密逻辑
 		*/
-		function decrypt($data,$type,$secretContext)
+		function decrypt($data, $type, $secretContext)
 		{			
-			if(!$this->isEncryptData($data,$type))
+			if (!$this->isEncryptData($data, $type))
 			{
 				throw new Exception("数据[".$data."]不是类型为[".$type."]的加密数据");
 			}
@@ -271,19 +271,19 @@ 
 			$separator = $this->SEPARATOR_CHAR_MAP[$type];
 
 			$secretData = null;
-			if($data[$dataLen - 2] == $separator){
-				$secretData = $this->getIndexSecretData($data,$separator);
-			}else{
-				$secretData = $this->getSecretData($data,$separator);
+			if ($data[$dataLen-2] == $separator) {
+				$secretData = $this->getIndexSecretData($data, $separator);
+			}else {
+				$secretData = $this->getSecretData($data, $separator);
 			}
 			
-			if($secretData == null){
+			if ($secretData == null) {
 				return $data;
 			}
 
-			$result = Security::decrypt($secretData->originalBase64Value,$secretContext->secret);
+			$result = Security::decrypt($secretData->originalBase64Value, $secretContext->secret);
 
-			if($separator == PHONE_SEPARATOR_CHAR && !$secretData->search)
+			if ($separator == PHONE_SEPARATOR_CHAR && !$secretData->search)
 			{
 				return $secretData->originalValue.$result;
 			}
@@ -293,46 +293,46 @@ 
 		/*
 		* 判断是否是公钥数据
 		*/
-		function isPublicData($data,$type)
+		function isPublicData($data, $type)
 		{
-			$secretData = $this->getSecretDataByType($data,$type);
-			if(empty($secretData)){
+			$secretData = $this->getSecretDataByType($data, $type);
+			if (empty($secretData)) {
 				return false;
 			}
-			if(intval($secretData->secretVersion) < 0){
+			if (intval($secretData->secretVersion) < 0) {
 				return true;
 			}
 			return false;
 		}
 
-		function getSecretDataByType($data,$type)
+		function getSecretDataByType($data, $type)
 		{
 			$separator = $this->SEPARATOR_CHAR_MAP[$type];
 			$dataLen = strlen($data);
 
-			if($data[$dataLen - 2] == $separator){
-				return $secretData = $this->getIndexSecretData($data,$separator);
-			}else{
-				return  $secretData = $this->getSecretData($data,$separator);
+			if ($data[$dataLen-2] == $separator) {
+				return $secretData = $this->getIndexSecretData($data, $separator);
+			}else {
+				return  $secretData = $this->getSecretData($data, $separator);
 			}
 		}
 
 		/*
 		* 分解密文
 		*/
-		function getSecretData($data,$separator)
+		function getSecretData($data, $separator)
 		{
 			$secretData = new SecretData;
-			$dataArray = explode($separator,$this->trimBySep($data,$separator));
+			$dataArray = explode($separator, $this->trimBySep($data, $separator));
 			$arrayLength = count($dataArray);
 
-			if($separator == PHONE_SEPARATOR_CHAR)
+			if ($separator == PHONE_SEPARATOR_CHAR)
 			{
-				if($arrayLength != 3){
+				if ($arrayLength != 3) {
 					return null;
-				}else{
+				}else {
 					$version = $dataArray[2];
-					if(is_numeric($version))
+					if (is_numeric($version))
 					{
 						$secretData->originalValue = $dataArray[0];
 						$secretData->originalBase64Value = $dataArray[1];
@@ -342,11 +342,11 @@ 
 			}
 			else
 			{
-				if($arrayLength != 2){
+				if ($arrayLength != 2) {
 					return null;
-				}else{
+				}else {
 					$version = $dataArray[1];
-					if(is_numeric($version))
+					if (is_numeric($version))
 					{
 						$secretData->originalBase64Value = $dataArray[0];
 						$secretData->secretVersion = $version;
@@ -356,17 +356,17 @@ 
 			return $secretData;
 		}
 
-		function getIndexSecretData($data,$separator) {
+		function getIndexSecretData($data, $separator) {
 			$secretData = new SecretData;
-			$dataArray = explode($separator,$this->trimBySep($data,$separator));
+			$dataArray = explode($separator, $this->trimBySep($data, $separator));
 			$arrayLength = count($dataArray);
 
-	        if($separator == PHONE_SEPARATOR_CHAR) {
+	        if ($separator == PHONE_SEPARATOR_CHAR) {
 	            if ($arrayLength != 3) {
 	                return null;
-	            }else{
+	            }else {
 					$version = $dataArray[2];
-					if(is_numeric($version))
+					if (is_numeric($version))
 					{
 						$secretData->originalValue = $dataArray[0];
 						$secretData->originalBase64Value = $dataArray[1];
@@ -374,12 +374,12 @@ 
 					}
 	            }
 	            
-	        } else {
-	        	if($arrayLength != 3){
+	        }else {
+	        	if ($arrayLength != 3) {
 					return null;
-				} else {
+				}else {
 					$version = $dataArray[2];
-					if(is_numeric($version))
+					if (is_numeric($version))
 					{
 						$secretData->originalBase64Value = $dataArray[0];
 						$secretData->originalValue = $dataArray[1];
@@ -399,16 +399,16 @@ 
 	     * @param version
 	     * @return
 	     */
-		function isIndexEncrypt($key,$version,$secretContext)
+		function isIndexEncrypt($key, $version, $secretContext)
 		{
 	        if ($version != null && $version < 0) {
 	            $key = "previous_".$key;
-	        } else {
+	        }else {
 	            $key = "current_".$key;
 	        }
 
 	        return $secretContext->appConfig != null && 
-	               array_key_exists($key,$secretContext->appConfig) && 
+	               array_key_exists($key, $secretContext->appConfig) && 
 	               $secretContext->appConfig[$key] == "2";
 		}
 
@@ -428,36 +428,36 @@ 
 			return count($match[0]);
 		}
 
-		function utf8_substr($string,$start,$end) {
+		function utf8_substr($string, $start, $end) {
 			// 将字符串分解为单元
 			preg_match_all("/./us", $string, $match);
 			// 返回单元个数
 			$result = "";
-			for($i = $start; $i < $end; $i++){
+			for ($i = $start; $i < $end; $i++) {
 				$result .= $match[0][$i];
 			}
 			return $result;
 		}
 
-		function utf8_str_at($string,$index) {
+		function utf8_str_at($string, $index) {
 			// 将字符串分解为单元
 			preg_match_all("/./us", $string, $match);
 			// 返回单元个数
 			return $match[0][$index];
 		}
 
-		function compress($input,$toLength) {
-			if($toLength < 0) {
+		function compress($input, $toLength) {
+			if ($toLength < 0) {
 				return null;
 			}
 			$output = array();
-			for($i = 0; $i < $toLength; $i++) {
+			for ($i = 0; $i < $toLength; $i++) {
 				$output[$i] = chr(0);
 			}
 			$input = $this->getBytes($input);
 			$inputLength = count($input);
 			for ($i = 0; $i < $inputLength; $i++) {
-	            $index_output = $i % $toLength;
+	            $index_output = $i%$toLength;
 	            $output[$index_output] = $output[$index_output] ^ $input[$i];
 	        }
 	        return $output;
@@ -474,10 +474,10 @@ 
 	     * @return
 	     * @throws Exception
 	     */
-		function hmacMD5EncryptToBase64($encryptText,$encryptKey,$compressLen = 0) {
-			$encryptResult = Security::hmac_md5($encryptText,$encryptKey);
-			if($compressLen != 0){
-				$encryptResult = $this->compress($encryptResult,$compressLen);
+		function hmacMD5EncryptToBase64($encryptText, $encryptKey, $compressLen = 0) {
+			$encryptResult = Security::hmac_md5($encryptText, $encryptKey);
+			if ($compressLen != 0) {
+				$encryptResult = $this->compress($encryptResult, $compressLen);
 			}
 			return base64_encode($this->toStr($encryptResult));
 		}
@@ -490,7 +490,7 @@ 
 	     * @param slideSize
 	     * @return
 	     */
-		function getSlideWindows($input,$slideSize = 4)
+		function getSlideWindows($input, $slideSize = 4)
 		{
 			$endIndex = 0;
 			$startIndex = 0;
@@ -498,70 +498,70 @@ 
 			$currentWindow = null;
 			$dataLength = $this->utf8_strlen($input);
 			$windows = array();
-			while($endIndex < $dataLength || $currentWindowSize > $slideSize) 
+			while ($endIndex < $dataLength || $currentWindowSize > $slideSize) 
 			{
 				$startsWithLetterOrDigit = false;
-				if(!empty($currentWindow)){
-					$startsWithLetterOrDigit = $this->isLetterOrDigit($this->utf8_str_at($currentWindow,0));
+				if (!empty($currentWindow)) {
+					$startsWithLetterOrDigit = $this->isLetterOrDigit($this->utf8_str_at($currentWindow, 0));
 				}
-				if($endIndex == $dataLength && $startsWithLetterOrDigit == false){
+				if ($endIndex == $dataLength && $startsWithLetterOrDigit == false) {
 					break;
 				}
-				if($currentWindowSize == $slideSize && 
+				if ($currentWindowSize == $slideSize && 
 				   $startsWithLetterOrDigit == false && 
-				   $this->isLetterOrDigit($this->utf8_str_at($input,$endIndex))) {
-				   $endIndex ++;
-				   $currentWindow = $this->utf8_substr($input,$startIndex,$endIndex);
+				   $this->isLetterOrDigit($this->utf8_str_at($input, $endIndex))) {
+				   $endIndex++;
+				   $currentWindow = $this->utf8_substr($input, $startIndex, $endIndex);
 				   $currentWindowSize = 5;
-				} else {
-				    if($endIndex != 0){
-				    	if($startsWithLetterOrDigit){
+				}else {
+				    if ($endIndex != 0) {
+				    	if ($startsWithLetterOrDigit) {
 				    		$currentWindowSize -= 1;
-				    	}else{
+				    	}else {
 				    		$currentWindowSize -= 2;
 				    	}
-				    	$startIndex ++;
+				    	$startIndex++;
 				    }
 
 	                while ($currentWindowSize < $slideSize && $endIndex < $dataLength) {
-	                    $currentChar = $this->utf8_str_at($input,$endIndex);
+	                    $currentChar = $this->utf8_str_at($input, $endIndex);
 	                    if ($this->isLetterOrDigit($currentChar)) {
 	                        $currentWindowSize += 1;
-	                    } else {
+	                    }else {
 	                        $currentWindowSize += 2;
 	                    }
 	                    $endIndex++;
 	                }
-	                $currentWindow = $this->utf8_substr($input,$startIndex,$endIndex);
+	                $currentWindow = $this->utf8_substr($input, $startIndex, $endIndex);
 				}
-				array_push($windows,$currentWindow);
+				array_push($windows, $currentWindow);
 			}
 			return $windows;
 		}
 
-		function encryptPhoneIndex($data,$separator,$secretContext) {
+		function encryptPhoneIndex($data, $separator, $secretContext) {
 			$dataLength = strlen($data);
-			if($dataLength < 11) {
+			if ($dataLength < 11) {
 				return $data;
 			}
-			$last4Number = substr($data,$dataLength -4 ,$dataLength);
-			return $separator.$this->hmacMD5EncryptToBase64($last4Number,$secretContext->secret).$separator
-				   .Security::encrypt($data,$secretContext->secret).$separator.$secretContext->secretVersion
+			$last4Number = substr($data, $dataLength-4, $dataLength);
+			return $separator.$this->hmacMD5EncryptToBase64($last4Number, $secretContext->secret).$separator
+				   .Security::encrypt($data, $secretContext->secret).$separator.$secretContext->secretVersion
 				   .$separator.$separator;
 		}
 
-		function encryptNormalIndex($data,$compressLen,$slideSize,$separator,$secretContext) {
+		function encryptNormalIndex($data, $compressLen, $slideSize, $separator, $secretContext) {
 			$slideList = $this->getSlideWindows($data, $slideSize);
 			$builder = "";
 			foreach ($slideList as $slide) {
-				$builder .= $this->hmacMD5EncryptToBase64($slide,$secretContext->secret,$compressLen);
+				$builder .= $this->hmacMD5EncryptToBase64($slide, $secretContext->secret, $compressLen);
 			}
-			return $separator.Security::encrypt($data,$secretContext->secret).$separator.$builder.$separator
+			return $separator.Security::encrypt($data, $secretContext->secret).$separator.$builder.$separator
 				   .$secretContext->secretVersion.$separator.$separator;
 		}
 
-		function getArrayValue($array,$key,$default) {
-			if(array_key_exists($key, $array)){
+		function getArrayValue($array, $key, $default) {
+			if (array_key_exists($key, $array)) {
 				return $array[$key];
 			}
 			return $default;
@@ -569,18 +569,18 @@ 
 
 		function getBytes($string) {  
 	        $bytes = array();  
-	        for($i = 0; $i < strlen($string); $i++){  
+	        for ($i = 0; $i < strlen($string); $i++) {  
 	             $bytes[] = ord($string[$i]);  
 	        }  
 	        return $bytes;  
 	    }  
 
 		function toStr($bytes) {
-			if(!is_array($bytes)){
+			if (!is_array($bytes)) {
 				return $bytes;
 			}
 	        $str = '';	        
-	        foreach($bytes as $ch) {
+	        foreach ($bytes as $ch) {
 	            $str .= chr($ch);
 	        }
 	        return $str;

Braces +15 added lines, -21 removed lines

@@ -69,8 +69,7 @@ 
 				if($str[$i] == $sep)
 				{
 					$start = $i + 1;
-				}
-				else
+				} else
 				{
 					break;
 				}
@@ -80,8 +79,7 @@ 
 				if($str[$i] == $sep)
 				{
 					$end = $i - 1;
-				}
-				else
+				} else
 				{
 					break;
 				}
@@ -93,7 +91,7 @@ 
 		{
 			if(count($dataArray) == 2){
 				return  $this->isBase64Str($dataArray[0]);
-			}else{
+			} else{
 				return  $this->isBase64Str($dataArray[0]) && $this->isBase64Str($dataArray[1]);
 			}
 		}
@@ -155,8 +153,7 @@ 
 				if($data[$strlen - 2] == $separator)
 				{
 					return $this->checkEncryptData($dataArray);
-				} 
-				else
+				} else
 				{
 					$version = $dataArray[$arrayLength -1];
 					if(is_numeric($version))
@@ -165,16 +162,14 @@ 
 						return $this->isBase64Str($base64Val);
 					}
 				}
-			}else{
+			} else{
 				if($data[strlen($data) - 2] == $separator && $arrayLength == 3)
 				{
 					return $this->checkEncryptData($dataArray);
-				}
-				else if($arrayLength == 2)
+				} else if($arrayLength == 2)
 				{
 					return $this->checkEncryptData($dataArray);
-				}
-				else
+				} else
 				{
 					return false;
 				}
@@ -222,7 +217,7 @@ 
 					$slideSize = $this->getArrayValue($secretContext->appConfig,'encrypt_slide_size',4);
 					return $this->encryptNormalIndex($data,$compressLen,$slideSize,$separator,$secretContext);
 				}
-			}else{
+			} else{
 				if('phone' == $type) {
 					return $this->encryptPhone($data,$separator,$secretContext);
 				} else {
@@ -273,7 +268,7 @@ 
 			$secretData = null;
 			if($data[$dataLen - 2] == $separator){
 				$secretData = $this->getIndexSecretData($data,$separator);
-			}else{
+			} else{
 				$secretData = $this->getSecretData($data,$separator);
 			}
 			
@@ -312,7 +307,7 @@ 
 
 			if($data[$dataLen - 2] == $separator){
 				return $secretData = $this->getIndexSecretData($data,$separator);
-			}else{
+			} else{
 				return  $secretData = $this->getSecretData($data,$separator);
 			}
 		}
@@ -330,7 +325,7 @@ 
 			{
 				if($arrayLength != 3){
 					return null;
-				}else{
+				} else{
 					$version = $dataArray[2];
 					if(is_numeric($version))
 					{
@@ -339,12 +334,11 @@ 
 						$secretData->secretVersion = $version;
 					}
 				}
-			}
-			else
+			} else
 			{
 				if($arrayLength != 2){
 					return null;
-				}else{
+				} else{
 					$version = $dataArray[1];
 					if(is_numeric($version))
 					{
@@ -364,7 +358,7 @@ 
 	        if($separator == PHONE_SEPARATOR_CHAR) {
 	            if ($arrayLength != 3) {
 	                return null;
-	            }else{
+	            } else{
 					$version = $dataArray[2];
 					if(is_numeric($version))
 					{
@@ -517,7 +511,7 @@ 
 				    if($endIndex != 0){
 				    	if($startsWithLetterOrDigit){
 				    		$currentWindowSize -= 1;
-				    	}else{
+				    	} else{
 				    		$currentWindowSize -= 2;
 				    	}
 				    	$startIndex ++;

src/service/taobao/bin/top/security/SecurityClient.php

Indentation +535 added lines, -535 removed lines

@@ -1,543 +1,543 @@
 <?php
 
-	include './SecurityUtil.php';
-	include './SecretGetRequest.php';
-	include './TopSdkFeedbackUploadRequest.php';
-	include './iCache.php';
-	include '../../TopSdk.php';
-
-	class SecurityClient
-	{
-		private $topClient ;
-		private $randomNum ;
-		private $securityUtil;
-		private $cacheClient = null;
-
-		function __construct($client, $random)
-		{
-
-			define('APP_SECRET_TYPE','2');
-			define('APP_USER_SECRET_TYPE','3');
-
-			$this->topClient = $client;
-			$this->randomNum = $random;
-			$this->securityUtil = new SecurityUtil();
-		}
-
-		/**
-		* 设置缓存处理器
-		*/
-		function setCacheClient($cache)
-		{
-			$this->cacheClient = $cache;
-		}
-
-	    /**
-	     * 密文检索,在秘钥升级场景下兼容查询
-	     * 
-	     * @see #search(String, String, String, Long)
-	     * @return
-	     */
-		function searchPrevious($data,$type,$session = null)
-		{
-			return $this->searchInner($data,$type,$session,-1);
-		}
-
-	    /**
-	     * 密文检索（每个用户单独分配秘钥）
-	     * 
-	     * @see #search(String, String, String, Long)
-	     * @return
-	     */
-		function search($data,$type,$session = null)
-		{
-			return $this->searchInner($data,$type,$session,null);
-		}
-
-	    /**
-	     * 密文检索。 手机号码格式：$base64(H-MAC(phone后4位))$ simple格式：base64(H-MAC(滑窗))
-	     * 
-	     * @param data
-	     *            明文数据
-	     * @param type
-	     *            加密字段类型(例如：simple\phone)
-	     * @param session
-	     *            用户身份,用户级加密必填
-	     * @param version
-	     *            秘钥历史版本
-	     * @return
-	     */
-		function searchInner($data, $type, $session,$version)
-		{
-			if(empty($data) || empty($type)){
-				return $data;
-			}
-
-			$secretContext = null;
+    include './SecurityUtil.php';
+    include './SecretGetRequest.php';
+    include './TopSdkFeedbackUploadRequest.php';
+    include './iCache.php';
+    include '../../TopSdk.php';
+
+    class SecurityClient
+    {
+        private $topClient ;
+        private $randomNum ;
+        private $securityUtil;
+        private $cacheClient = null;
+
+        function __construct($client, $random)
+        {
+
+            define('APP_SECRET_TYPE','2');
+            define('APP_USER_SECRET_TYPE','3');
+
+            $this->topClient = $client;
+            $this->randomNum = $random;
+            $this->securityUtil = new SecurityUtil();
+        }
+
+        /**
+         * 设置缓存处理器
+         */
+        function setCacheClient($cache)
+        {
+            $this->cacheClient = $cache;
+        }
+
+        /**
+         * 密文检索,在秘钥升级场景下兼容查询
+         * 
+         * @see #search(String, String, String, Long)
+         * @return
+         */
+        function searchPrevious($data,$type,$session = null)
+        {
+            return $this->searchInner($data,$type,$session,-1);
+        }
+
+        /**
+         * 密文检索（每个用户单独分配秘钥）
+         * 
+         * @see #search(String, String, String, Long)
+         * @return
+         */
+        function search($data,$type,$session = null)
+        {
+            return $this->searchInner($data,$type,$session,null);
+        }
+
+        /**
+         * 密文检索。 手机号码格式：$base64(H-MAC(phone后4位))$ simple格式：base64(H-MAC(滑窗))
+         * 
+         * @param data
+         *            明文数据
+         * @param type
+         *            加密字段类型(例如：simple\phone)
+         * @param session
+         *            用户身份,用户级加密必填
+         * @param version
+         *            秘钥历史版本
+         * @return
+         */
+        function searchInner($data, $type, $session,$version)
+        {
+            if(empty($data) || empty($type)){
+                return $data;
+            }
+
+            $secretContext = null;
 			
-			$secretContext = $this->callSecretApiWithCache($session,$version);
-			$this->incrCounter(3,$type,$secretContext,true);
-
-			if(empty($secretContext) || empty($secretContext->secret)) {
-				return $data;
-			}
-
-			return $this->securityUtil->search($data, $type,$secretContext);
-		}
-
-
-		/**
-		* 单条数据解密,使用appkey级别公钥
-		* 非加密数据直接返回原文
-		*/
-		function decryptPublic($data,$type)
-		{
-			return $this->decrypt($data,$type,null);
-		}
-		/**
-		* 单条数据解密
-		* 非加密数据直接返回原文
-		*/
-		function decrypt($data,$type,$session)
-		{
-			if(empty($data) || empty($type)){
-				return $data;
-			}			
-			$secretData = $this->securityUtil->getSecretDataByType($data,$type);
-			if(empty($secretData)){
-				return $data;
-			}
-
-			if($this->securityUtil->isPublicData($data,$type)){
-				$secretContext = $this->callSecretApiWithCache(null,$secretData->secretVersion);
-			} else {
-				$secretContext = $this->callSecretApiWithCache($session,$secretData->secretVersion);
-			}
-			$this->incrCounter(2,$type,$secretContext,true);
+            $secretContext = $this->callSecretApiWithCache($session,$version);
+            $this->incrCounter(3,$type,$secretContext,true);
+
+            if(empty($secretContext) || empty($secretContext->secret)) {
+                return $data;
+            }
+
+            return $this->securityUtil->search($data, $type,$secretContext);
+        }
+
+
+        /**
+         * 单条数据解密,使用appkey级别公钥
+         * 非加密数据直接返回原文
+         */
+        function decryptPublic($data,$type)
+        {
+            return $this->decrypt($data,$type,null);
+        }
+        /**
+         * 单条数据解密
+         * 非加密数据直接返回原文
+         */
+        function decrypt($data,$type,$session)
+        {
+            if(empty($data) || empty($type)){
+                return $data;
+            }			
+            $secretData = $this->securityUtil->getSecretDataByType($data,$type);
+            if(empty($secretData)){
+                return $data;
+            }
+
+            if($this->securityUtil->isPublicData($data,$type)){
+                $secretContext = $this->callSecretApiWithCache(null,$secretData->secretVersion);
+            } else {
+                $secretContext = $this->callSecretApiWithCache($session,$secretData->secretVersion);
+            }
+            $this->incrCounter(2,$type,$secretContext,true);
 			
-			return $this->securityUtil->decrypt($data,$type,$secretContext);
-		}
-
-		/**
-		* 多条数据解密，使用appkey级别公钥
-		* 非加密数据直接返回原文
-		*/
-		function decryptBatchPublic($array,$type)
-		{
-			if(empty($array) || empty($type)){
-				return null;
-			}
-
-			$result = array();
-			foreach ($array as $value) {
-				$secretData = $this->securityUtil->getSecretDataByType($value,$type);
-				$secretContext = $this->callSecretApiWithCache(null,$secretData->secretVersion);
-
-				if(empty($secretData)){
-					$result[$value] = $value;
-				}else{
-					$result[$value] = $this->securityUtil->decrypt($value,$type,$secretContext);
-					$this->incrCounter(2,$type,$secretContext,true);
-				}
-
-				$this->flushCounter($secretContext);
-			}
-
-			return $result;
-		}
-
-		/**
-		* 多条数据解密，必须是同一个type和用户,返回结果是 KV结果
-		* 非加密数据直接返回原文
-		*/
-		function decryptBatch($array,$type,$session)
-		{
-			if(empty($array) || empty($type)){
-				return null;
-			}
-
-			$result = array();
-			foreach ($array as $value) {
-				$secretData = $this->securityUtil->getSecretDataByType($value,$type);
-				if(empty($secretData)){
-					$result[$value] = $value;
-				} else if($this->securityUtil->isPublicData($value,$type)){
-					$appContext = $this->callSecretApiWithCache(null,$secretData->secretVersion);
-					$result[$value] = $this->securityUtil->decrypt($value,$type,$appContext);
-					$this->incrCounter(2,$type,$appContext,false);
-					$this->flushCounter($appContext);
-				} else {
-					$secretContext = $this->callSecretApiWithCache($session,$secretData->secretVersion);
-					$result[$value] = $this->securityUtil->decrypt($value,$type,$secretContext);
-					$this->incrCounter(2,$type,$secretContext,false);
-					$this->flushCounter($secretContext);
-				}
-			}
-
-			return $result;
-		}
-
-		/**
-		* 使用上一版本秘钥解密，app级别公钥
-		*/
-		function decryptPreviousPublic($data,$type)
-		{
-			$secretContext = $this->callSecretApiWithCache(null,-1);
-			return $this->securityUtil->decrypt($data,$type,$secretContext);
-		}
-		/**
-		* 使用上一版本秘钥解密，一般只用于更新秘钥
-		*/
-		function decryptPrevious($data,$type,$session)
-		{
-			if($this->securityUtil->isPublicData($data,$type)){
-				$secretContext = $this->callSecretApiWithCache(null,-1);
-			} else {
-				$secretContext = $this->callSecretApiWithCache($session,-1);
-			}
-			return $this->securityUtil->decrypt($data,$type,$secretContext);
-		}
-
-		/**
-		* 加密单条数据,使用app级别公钥
-		*/
-		function encryptPublic($data,$type,$version = null)
-		{
-			return $this->encrypt($data,$type,null,$version);
-		}
-		/**
-		* 加密单条数据
-		*/
-		function encrypt($data,$type,$session = null,$version = null)
-		{
-			if(empty($data) || empty($type)){
-				return null;
-			}
-			$secretContext = $this->callSecretApiWithCache($session,null);
-			$this->incrCounter(1,$type,$secretContext,true);
-
-			return $this->securityUtil->encrypt($data,$type,$version,$secretContext);
-		}
-
-		/**
-		* 加密多条数据，使用app级别公钥
-		*/
-		function encryptBatchPublic($array,$type,$version = null)
-		{
-			if(empty($array) || empty($type)){
-				return null;
-			}
-			$secretContext = $this->callSecretApiWithCache(null,null);
-			$result = array();
-			foreach ($array as $value) {
-				$result[$value] = $this->securityUtil->encrypt($value,$type,$version,$secretContext);
-				$this->incrCounter(1,$type,$secretContext,false);
-			}
-			$this->flushCounter($secretContext);
-
-			return $result;
-		}
-
-		/**
-		* 加密多条数据，必须是同一个type和用户,返回结果是 KV结果
-		*/
-		function encryptBatch($array,$type,$session,$version = null)
-		{
-			if(empty($array) || empty($type)){
-				return null;
-			}
-			$secretContext = $this->callSecretApiWithCache($session,null);
-			$result = array();
-			foreach ($array as $value) {
-				$result[$value] = $this->securityUtil->encrypt($value,$type,$version,$secretContext);
-				$this->incrCounter(1,$type,$secretContext,false);
-			}
-			$this->flushCounter($secretContext);
-			return $result;
-		}
-
-		/**
-		* 使用上一版本秘钥加密，使用app级别公钥
-		*/
-		function encryptPreviousPublic($data,$type)
-		{
-			$secretContext = $this->callSecretApiWithCache(null,-1);
-			$this->incrCounter(1,$type,$secretContext,true);
-
-			return $this->securityUtil->encrypt($data,$type,$secretContext->version,$secretContext);
-		}
-		/**
-		* 使用上一版本秘钥加密，一般只用于更新秘钥
-		*/
-		function encryptPrevious($data,$type,$session)
-		{
-			$secretContext = $this->callSecretApiWithCache($session,-1);
-			$this->incrCounter(1,$type,$secretContext,true);
-
-			return $this->securityUtil->encrypt($data,$type,$secretContext);
-		}
-
-		/**
-		* 根据session生成秘钥
-		*/
-		function initSecret($session)
-		{
-			return $this->callSecretApiWithCache($session,null);
-		}
-
-		function buildCacheKey($session,$secretVersion)
-		{
-			if(empty($session)){
-				return $this->topClient->getAppkey();
-			}
-			if(empty($secretVersion)){
-				return $session ;
-			}
-			return $session.'_'.$secretVersion ;
-		}
-
-
-		function generateCustomerSession($userId)
-		{
-			return '_'.$userId ;
-		}
-
-		/**
-		* 判断是否是已加密的数据
-		*/
-		function isEncryptData($data,$type)
-		{
-			if(empty($data) || empty($type)){
-				return false;
-			}
-			return $this->securityUtil->isEncryptData($data,$type);
-		}
-
-		/**
-		* 判断是否是已加密的数据，数据必须是同一个类型
-		*/
-		function isEncryptDataArray($array,$type)
-		{
-			if(empty($array) || empty($type)){
-				return false;
-			}
-			return $this->securityUtil->isEncryptDataArray($array,$type);
-		}
-
-		/**
-		* 判断数组中的数据是否存在密文，存在任何一个返回true,否则false
-		*/
-		function isPartEncryptData($array,$type)
-		{
-			if(empty($array) || empty($type)){
-				return false;
-			}
-			return $this->securityUtil->isPartEncryptData($array,$type);
-		}
-
-		/**
-		* 获取秘钥，使用缓存
-		*/
-		function callSecretApiWithCache($session,$secretVersion)
-		{
-			if($this->cacheClient)
-			{
-				$time = time();
-				$cacheKey = $this->buildCacheKey($session,$secretVersion);
-				$secretContext = $this->cacheClient->getCache($cacheKey);
-
-				if($secretContext)
-				{
-					if($this->canUpload($secretContext)){
-						if($this->report($secretContext)){
-							$this->clearReport($secretContext);
-						}
-					}
-				}
-
-				if($secretContext && $secretContext->invalidTime > $time)
-				{
-					return $secretContext;
-				}
-			}
-
-			$secretContext = $this->callSecretApi($session,$secretVersion);
-
-			if($this->cacheClient)
-			{
-				$secretContext->cacheKey = $cacheKey;
-				$this->cacheClient->setCache($cacheKey,$secretContext);
-			}
-
-			return $secretContext;
-		}
-
-		function incrCounter($op,$type,$secretContext,$flush)
-		{
-			if($op == 1){
-				switch ($type) {
-					case 'nick':
-					$secretContext->encryptNickNum ++ ;
-						break;
-					case 'simple':
-						$secretContext->encryptSimpleNum ++ ;
-						break;
-					case 'receiver_name':
-						$secretContext->encryptReceiverNameNum ++ ;
-						break;
-					case 'phone':
-						$secretContext->encryptPhoneNum ++ ;
-						break;
-					default:
-						break;
-				}
-			}else if($op == 2){
-				switch ($type) {
-					case 'nick':
-					$secretContext->decryptNickNum ++ ;
-						break;
-					case 'simple':
-						$secretContext->decryptSimpleNum ++ ;
-						break;
-					case 'receiver_name':
-						$secretContext->decryptReceiverNameNum ++ ;
-						break;
-					case 'phone':
-						$secretContext->decryptPhoneNum ++ ;
-						break;
-					default:
-						break;
-				}
-			}else{
-				switch ($type) {
-					case 'nick':
-					$secretContext->searchNickNum ++ ;
-						break;
-					case 'simple':
-						$secretContext->searchSimpleNum ++ ;
-						break;
-					case 'receiver_name':
-						$secretContext->searchReceiverNameNum ++ ;
-						break;
-					case 'phone':
-						$secretContext->searchPhoneNum ++ ;
-						break;
-					default:
-						break;
-				}
-			}
-
-			if($flush && $this->cacheClient){
-				$this->cacheClient->setCache($secretContext->cacheKey,$secretContext);
-			}
-		}
-
-		function flushCounter($secretContext)
-		{
-			if($this->cacheClient){
-				$this->cacheClient->setCache($secretContext->cacheKey,$secretContext);
-			}			
-		}
-
-		function clearReport($secretContext)
-		{
-			$secretContext->encryptPhoneNum = 0;
-			$secretContext->encryptNickNum = 0;
-			$secretContext->encryptReceiverNameNum = 0;
-			$secretContext->encryptSimpleNum = 0;
-			$secretContext->encryptSearchNum = 0;
-			$secretContext->decryptPhoneNum = 0;
-			$secretContext->decryptNickNum = 0;
-			$secretContext->decryptReceiverNameNum = 0;
-			$secretContext->decryptSimpleNum = 0;
-			$secretContext->decryptSearchNum = 0;
-			$secretContext->searchPhoneNum = 0;
-			$secretContext->searchNickNum = 0;
-			$secretContext->searchReceiverNameNum = 0;
-			$secretContext->searchSimpleNum = 0;
-			$secretContext->searchSearchNum = 0;
-			$secretContext->lastUploadTime = time();
-		}
-
-		function canUpload($secretContext)
-		{
-			$current = time();
-			if($current - $secretContext->lastUploadTime > 300){
-				return true;
-			}
-			return false;
-		}
-
-		/*
+            return $this->securityUtil->decrypt($data,$type,$secretContext);
+        }
+
+        /**
+         * 多条数据解密，使用appkey级别公钥
+         * 非加密数据直接返回原文
+         */
+        function decryptBatchPublic($array,$type)
+        {
+            if(empty($array) || empty($type)){
+                return null;
+            }
+
+            $result = array();
+            foreach ($array as $value) {
+                $secretData = $this->securityUtil->getSecretDataByType($value,$type);
+                $secretContext = $this->callSecretApiWithCache(null,$secretData->secretVersion);
+
+                if(empty($secretData)){
+                    $result[$value] = $value;
+                }else{
+                    $result[$value] = $this->securityUtil->decrypt($value,$type,$secretContext);
+                    $this->incrCounter(2,$type,$secretContext,true);
+                }
+
+                $this->flushCounter($secretContext);
+            }
+
+            return $result;
+        }
+
+        /**
+         * 多条数据解密，必须是同一个type和用户,返回结果是 KV结果
+         * 非加密数据直接返回原文
+         */
+        function decryptBatch($array,$type,$session)
+        {
+            if(empty($array) || empty($type)){
+                return null;
+            }
+
+            $result = array();
+            foreach ($array as $value) {
+                $secretData = $this->securityUtil->getSecretDataByType($value,$type);
+                if(empty($secretData)){
+                    $result[$value] = $value;
+                } else if($this->securityUtil->isPublicData($value,$type)){
+                    $appContext = $this->callSecretApiWithCache(null,$secretData->secretVersion);
+                    $result[$value] = $this->securityUtil->decrypt($value,$type,$appContext);
+                    $this->incrCounter(2,$type,$appContext,false);
+                    $this->flushCounter($appContext);
+                } else {
+                    $secretContext = $this->callSecretApiWithCache($session,$secretData->secretVersion);
+                    $result[$value] = $this->securityUtil->decrypt($value,$type,$secretContext);
+                    $this->incrCounter(2,$type,$secretContext,false);
+                    $this->flushCounter($secretContext);
+                }
+            }
+
+            return $result;
+        }
+
+        /**
+         * 使用上一版本秘钥解密，app级别公钥
+         */
+        function decryptPreviousPublic($data,$type)
+        {
+            $secretContext = $this->callSecretApiWithCache(null,-1);
+            return $this->securityUtil->decrypt($data,$type,$secretContext);
+        }
+        /**
+         * 使用上一版本秘钥解密，一般只用于更新秘钥
+         */
+        function decryptPrevious($data,$type,$session)
+        {
+            if($this->securityUtil->isPublicData($data,$type)){
+                $secretContext = $this->callSecretApiWithCache(null,-1);
+            } else {
+                $secretContext = $this->callSecretApiWithCache($session,-1);
+            }
+            return $this->securityUtil->decrypt($data,$type,$secretContext);
+        }
+
+        /**
+         * 加密单条数据,使用app级别公钥
+         */
+        function encryptPublic($data,$type,$version = null)
+        {
+            return $this->encrypt($data,$type,null,$version);
+        }
+        /**
+         * 加密单条数据
+         */
+        function encrypt($data,$type,$session = null,$version = null)
+        {
+            if(empty($data) || empty($type)){
+                return null;
+            }
+            $secretContext = $this->callSecretApiWithCache($session,null);
+            $this->incrCounter(1,$type,$secretContext,true);
+
+            return $this->securityUtil->encrypt($data,$type,$version,$secretContext);
+        }
+
+        /**
+         * 加密多条数据，使用app级别公钥
+         */
+        function encryptBatchPublic($array,$type,$version = null)
+        {
+            if(empty($array) || empty($type)){
+                return null;
+            }
+            $secretContext = $this->callSecretApiWithCache(null,null);
+            $result = array();
+            foreach ($array as $value) {
+                $result[$value] = $this->securityUtil->encrypt($value,$type,$version,$secretContext);
+                $this->incrCounter(1,$type,$secretContext,false);
+            }
+            $this->flushCounter($secretContext);
+
+            return $result;
+        }
+
+        /**
+         * 加密多条数据，必须是同一个type和用户,返回结果是 KV结果
+         */
+        function encryptBatch($array,$type,$session,$version = null)
+        {
+            if(empty($array) || empty($type)){
+                return null;
+            }
+            $secretContext = $this->callSecretApiWithCache($session,null);
+            $result = array();
+            foreach ($array as $value) {
+                $result[$value] = $this->securityUtil->encrypt($value,$type,$version,$secretContext);
+                $this->incrCounter(1,$type,$secretContext,false);
+            }
+            $this->flushCounter($secretContext);
+            return $result;
+        }
+
+        /**
+         * 使用上一版本秘钥加密，使用app级别公钥
+         */
+        function encryptPreviousPublic($data,$type)
+        {
+            $secretContext = $this->callSecretApiWithCache(null,-1);
+            $this->incrCounter(1,$type,$secretContext,true);
+
+            return $this->securityUtil->encrypt($data,$type,$secretContext->version,$secretContext);
+        }
+        /**
+         * 使用上一版本秘钥加密，一般只用于更新秘钥
+         */
+        function encryptPrevious($data,$type,$session)
+        {
+            $secretContext = $this->callSecretApiWithCache($session,-1);
+            $this->incrCounter(1,$type,$secretContext,true);
+
+            return $this->securityUtil->encrypt($data,$type,$secretContext);
+        }
+
+        /**
+         * 根据session生成秘钥
+         */
+        function initSecret($session)
+        {
+            return $this->callSecretApiWithCache($session,null);
+        }
+
+        function buildCacheKey($session,$secretVersion)
+        {
+            if(empty($session)){
+                return $this->topClient->getAppkey();
+            }
+            if(empty($secretVersion)){
+                return $session ;
+            }
+            return $session.'_'.$secretVersion ;
+        }
+
+
+        function generateCustomerSession($userId)
+        {
+            return '_'.$userId ;
+        }
+
+        /**
+         * 判断是否是已加密的数据
+         */
+        function isEncryptData($data,$type)
+        {
+            if(empty($data) || empty($type)){
+                return false;
+            }
+            return $this->securityUtil->isEncryptData($data,$type);
+        }
+
+        /**
+         * 判断是否是已加密的数据，数据必须是同一个类型
+         */
+        function isEncryptDataArray($array,$type)
+        {
+            if(empty($array) || empty($type)){
+                return false;
+            }
+            return $this->securityUtil->isEncryptDataArray($array,$type);
+        }
+
+        /**
+         * 判断数组中的数据是否存在密文，存在任何一个返回true,否则false
+         */
+        function isPartEncryptData($array,$type)
+        {
+            if(empty($array) || empty($type)){
+                return false;
+            }
+            return $this->securityUtil->isPartEncryptData($array,$type);
+        }
+
+        /**
+         * 获取秘钥，使用缓存
+         */
+        function callSecretApiWithCache($session,$secretVersion)
+        {
+            if($this->cacheClient)
+            {
+                $time = time();
+                $cacheKey = $this->buildCacheKey($session,$secretVersion);
+                $secretContext = $this->cacheClient->getCache($cacheKey);
+
+                if($secretContext)
+                {
+                    if($this->canUpload($secretContext)){
+                        if($this->report($secretContext)){
+                            $this->clearReport($secretContext);
+                        }
+                    }
+                }
+
+                if($secretContext && $secretContext->invalidTime > $time)
+                {
+                    return $secretContext;
+                }
+            }
+
+            $secretContext = $this->callSecretApi($session,$secretVersion);
+
+            if($this->cacheClient)
+            {
+                $secretContext->cacheKey = $cacheKey;
+                $this->cacheClient->setCache($cacheKey,$secretContext);
+            }
+
+            return $secretContext;
+        }
+
+        function incrCounter($op,$type,$secretContext,$flush)
+        {
+            if($op == 1){
+                switch ($type) {
+                    case 'nick':
+                    $secretContext->encryptNickNum ++ ;
+                        break;
+                    case 'simple':
+                        $secretContext->encryptSimpleNum ++ ;
+                        break;
+                    case 'receiver_name':
+                        $secretContext->encryptReceiverNameNum ++ ;
+                        break;
+                    case 'phone':
+                        $secretContext->encryptPhoneNum ++ ;
+                        break;
+                    default:
+                        break;
+                }
+            }else if($op == 2){
+                switch ($type) {
+                    case 'nick':
+                    $secretContext->decryptNickNum ++ ;
+                        break;
+                    case 'simple':
+                        $secretContext->decryptSimpleNum ++ ;
+                        break;
+                    case 'receiver_name':
+                        $secretContext->decryptReceiverNameNum ++ ;
+                        break;
+                    case 'phone':
+                        $secretContext->decryptPhoneNum ++ ;
+                        break;
+                    default:
+                        break;
+                }
+            }else{
+                switch ($type) {
+                    case 'nick':
+                    $secretContext->searchNickNum ++ ;
+                        break;
+                    case 'simple':
+                        $secretContext->searchSimpleNum ++ ;
+                        break;
+                    case 'receiver_name':
+                        $secretContext->searchReceiverNameNum ++ ;
+                        break;
+                    case 'phone':
+                        $secretContext->searchPhoneNum ++ ;
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            if($flush && $this->cacheClient){
+                $this->cacheClient->setCache($secretContext->cacheKey,$secretContext);
+            }
+        }
+
+        function flushCounter($secretContext)
+        {
+            if($this->cacheClient){
+                $this->cacheClient->setCache($secretContext->cacheKey,$secretContext);
+            }			
+        }
+
+        function clearReport($secretContext)
+        {
+            $secretContext->encryptPhoneNum = 0;
+            $secretContext->encryptNickNum = 0;
+            $secretContext->encryptReceiverNameNum = 0;
+            $secretContext->encryptSimpleNum = 0;
+            $secretContext->encryptSearchNum = 0;
+            $secretContext->decryptPhoneNum = 0;
+            $secretContext->decryptNickNum = 0;
+            $secretContext->decryptReceiverNameNum = 0;
+            $secretContext->decryptSimpleNum = 0;
+            $secretContext->decryptSearchNum = 0;
+            $secretContext->searchPhoneNum = 0;
+            $secretContext->searchNickNum = 0;
+            $secretContext->searchReceiverNameNum = 0;
+            $secretContext->searchSimpleNum = 0;
+            $secretContext->searchSearchNum = 0;
+            $secretContext->lastUploadTime = time();
+        }
+
+        function canUpload($secretContext)
+        {
+            $current = time();
+            if($current - $secretContext->lastUploadTime > 300){
+                return true;
+            }
+            return false;
+        }
+
+        /*
 		* 上报信息
 		*/
-		function report($secretContext)
-		{
-			$request = new TopSdkFeedbackUploadRequest;
-			$request->setContent($secretContext->toLogString());
-
-			if(empty($secretContext->session)){
-				$request->setType(APP_SECRET_TYPE);
-			}else{
-				$request->setType(APP_USER_SECRET_TYPE);				
-			}
-
-			$response = $this->topClient->execute($request,$secretContext->session);
-			if($response->code == 0){
-				return true;
-			}
-			return false;
-		}
-
-		/**
-		* 获取秘钥，不使用缓存
-		*/
-		function callSecretApi($session,$secretVersion)
-		{
-			$request = new TopSecretGetRequest;
-			$request->setRandomNum($this->randomNum);
-			if($secretVersion)
-			{
-				if(intval($secretVersion) < 0 || $session == null){
-					$session = null;
-					$secretVersion = -1 * intval($secretVersion < 0);
-				}
-				$request->setSecretVersion($secretVersion);
-			}
+        function report($secretContext)
+        {
+            $request = new TopSdkFeedbackUploadRequest;
+            $request->setContent($secretContext->toLogString());
+
+            if(empty($secretContext->session)){
+                $request->setType(APP_SECRET_TYPE);
+            }else{
+                $request->setType(APP_USER_SECRET_TYPE);				
+            }
+
+            $response = $this->topClient->execute($request,$secretContext->session);
+            if($response->code == 0){
+                return true;
+            }
+            return false;
+        }
+
+        /**
+         * 获取秘钥，不使用缓存
+         */
+        function callSecretApi($session,$secretVersion)
+        {
+            $request = new TopSecretGetRequest;
+            $request->setRandomNum($this->randomNum);
+            if($secretVersion)
+            {
+                if(intval($secretVersion) < 0 || $session == null){
+                    $session = null;
+                    $secretVersion = -1 * intval($secretVersion < 0);
+                }
+                $request->setSecretVersion($secretVersion);
+            }
 			
-			$topSession = $session;
-			if($session != null && $session[0] == '_')
-			{
-				$request->setCustomerUserId(substr($session,1));
-				$topSession = null;
-			}
-
-			$response = $this->topClient->execute($request,$topSession);
-			if($response->code != 0){
-				throw new Exception($response->msg);
-			}
-
-			$time = time();
-			$secretContext = new SecretContext();
-			$secretContext->maxInvalidTime = $time + intval($response->max_interval);
-			$secretContext->invalidTime = $time + intval($response->interval);
-			$secretContext->secret = strval($response->secret);
-			$secretContext->session = $session;
-			if(!empty($response->app_config)){
-				$tmpJson = json_decode($response->app_config);
-				$appConfig = array();
-				foreach ($tmpJson as $key => $value){
-					$appConfig[$key] = $value;
-				}
-				$secretContext->appConfig = $appConfig;
-			}
-
-			if(empty($session)){
-				$secretContext->secretVersion = -1 * intval($response->secret_version);
-			}else{
-				$secretContext->secretVersion = intval($response->secret_version);
-			}
-			return $secretContext;
-		}
-	}    
+            $topSession = $session;
+            if($session != null && $session[0] == '_')
+            {
+                $request->setCustomerUserId(substr($session,1));
+                $topSession = null;
+            }
+
+            $response = $this->topClient->execute($request,$topSession);
+            if($response->code != 0){
+                throw new Exception($response->msg);
+            }
+
+            $time = time();
+            $secretContext = new SecretContext();
+            $secretContext->maxInvalidTime = $time + intval($response->max_interval);
+            $secretContext->invalidTime = $time + intval($response->interval);
+            $secretContext->secret = strval($response->secret);
+            $secretContext->session = $session;
+            if(!empty($response->app_config)){
+                $tmpJson = json_decode($response->app_config);
+                $appConfig = array();
+                foreach ($tmpJson as $key => $value){
+                    $appConfig[$key] = $value;
+                }
+                $secretContext->appConfig = $appConfig;
+            }
+
+            if(empty($session)){
+                $secretContext->secretVersion = -1 * intval($response->secret_version);
+            }else{
+                $secretContext->secretVersion = intval($response->secret_version);
+            }
+            return $secretContext;
+        }
+    }    
 ?>
\ No newline at end of file

Spacing +146 added lines, -146 removed lines

@@ -8,16 +8,16 @@ 
 
 	class SecurityClient
 	{
-		private $topClient ;
-		private $randomNum ;
+		private $topClient;
+		private $randomNum;
 		private $securityUtil;
 		private $cacheClient = null;
 
 		function __construct($client, $random)
 		{
 
-			define('APP_SECRET_TYPE','2');
-			define('APP_USER_SECRET_TYPE','3');
+			define('APP_SECRET_TYPE', '2');
+			define('APP_USER_SECRET_TYPE', '3');
 
 			$this->topClient = $client;
 			$this->randomNum = $random;
@@ -38,9 +38,9 @@ 
 	     * @see #search(String, String, String, Long)
 	     * @return
 	     */
-		function searchPrevious($data,$type,$session = null)
+		function searchPrevious($data, $type, $session = null)
 		{
-			return $this->searchInner($data,$type,$session,-1);
+			return $this->searchInner($data, $type, $session, -1);
 		}
 
 	    /**
@@ -49,9 +49,9 @@ 
 	     * @see #search(String, String, String, Long)
 	     * @return
 	     */
-		function search($data,$type,$session = null)
+		function search($data, $type, $session = null)
 		{
-			return $this->searchInner($data,$type,$session,null);
+			return $this->searchInner($data, $type, $session, null);
 		}
 
 	    /**
@@ -67,22 +67,22 @@ 
 	     *            秘钥历史版本
 	     * @return
 	     */
-		function searchInner($data, $type, $session,$version)
+		function searchInner($data, $type, $session, $version)
 		{
-			if(empty($data) || empty($type)){
+			if (empty($data) || empty($type)) {
 				return $data;
 			}
 
 			$secretContext = null;
 			
-			$secretContext = $this->callSecretApiWithCache($session,$version);
-			$this->incrCounter(3,$type,$secretContext,true);
+			$secretContext = $this->callSecretApiWithCache($session, $version);
+			$this->incrCounter(3, $type, $secretContext, true);
 
-			if(empty($secretContext) || empty($secretContext->secret)) {
+			if (empty($secretContext) || empty($secretContext->secret)) {
 				return $data;
 			}
 
-			return $this->securityUtil->search($data, $type,$secretContext);
+			return $this->securityUtil->search($data, $type, $secretContext);
 		}
 
 
@@ -90,54 +90,54 @@ 
 		* 单条数据解密,使用appkey级别公钥
 		* 非加密数据直接返回原文
 		*/
-		function decryptPublic($data,$type)
+		function decryptPublic($data, $type)
 		{
-			return $this->decrypt($data,$type,null);
+			return $this->decrypt($data, $type, null);
 		}
 		/**
 		* 单条数据解密
 		* 非加密数据直接返回原文
 		*/
-		function decrypt($data,$type,$session)
+		function decrypt($data, $type, $session)
 		{
-			if(empty($data) || empty($type)){
+			if (empty($data) || empty($type)) {
 				return $data;
 			}			
-			$secretData = $this->securityUtil->getSecretDataByType($data,$type);
-			if(empty($secretData)){
+			$secretData = $this->securityUtil->getSecretDataByType($data, $type);
+			if (empty($secretData)) {
 				return $data;
 			}
 
-			if($this->securityUtil->isPublicData($data,$type)){
-				$secretContext = $this->callSecretApiWithCache(null,$secretData->secretVersion);
-			} else {
-				$secretContext = $this->callSecretApiWithCache($session,$secretData->secretVersion);
+			if ($this->securityUtil->isPublicData($data, $type)) {
+				$secretContext = $this->callSecretApiWithCache(null, $secretData->secretVersion);
+			}else {
+				$secretContext = $this->callSecretApiWithCache($session, $secretData->secretVersion);
 			}
-			$this->incrCounter(2,$type,$secretContext,true);
+			$this->incrCounter(2, $type, $secretContext, true);
 			
-			return $this->securityUtil->decrypt($data,$type,$secretContext);
+			return $this->securityUtil->decrypt($data, $type, $secretContext);
 		}
 
 		/**
 		* 多条数据解密，使用appkey级别公钥
 		* 非加密数据直接返回原文
 		*/
-		function decryptBatchPublic($array,$type)
+		function decryptBatchPublic($array, $type)
 		{
-			if(empty($array) || empty($type)){
+			if (empty($array) || empty($type)) {
 				return null;
 			}
 
 			$result = array();
 			foreach ($array as $value) {
-				$secretData = $this->securityUtil->getSecretDataByType($value,$type);
-				$secretContext = $this->callSecretApiWithCache(null,$secretData->secretVersion);
+				$secretData = $this->securityUtil->getSecretDataByType($value, $type);
+				$secretContext = $this->callSecretApiWithCache(null, $secretData->secretVersion);
 
-				if(empty($secretData)){
+				if (empty($secretData)) {
 					$result[$value] = $value;
-				}else{
-					$result[$value] = $this->securityUtil->decrypt($value,$type,$secretContext);
-					$this->incrCounter(2,$type,$secretContext,true);
+				}else {
+					$result[$value] = $this->securityUtil->decrypt($value, $type, $secretContext);
+					$this->incrCounter(2, $type, $secretContext, true);
 				}
 
 				$this->flushCounter($secretContext);
@@ -150,26 +150,26 @@ 
 		* 多条数据解密，必须是同一个type和用户,返回结果是 KV结果
 		* 非加密数据直接返回原文
 		*/
-		function decryptBatch($array,$type,$session)
+		function decryptBatch($array, $type, $session)
 		{
-			if(empty($array) || empty($type)){
+			if (empty($array) || empty($type)) {
 				return null;
 			}
 
 			$result = array();
 			foreach ($array as $value) {
-				$secretData = $this->securityUtil->getSecretDataByType($value,$type);
-				if(empty($secretData)){
+				$secretData = $this->securityUtil->getSecretDataByType($value, $type);
+				if (empty($secretData)) {
 					$result[$value] = $value;
-				} else if($this->securityUtil->isPublicData($value,$type)){
-					$appContext = $this->callSecretApiWithCache(null,$secretData->secretVersion);
-					$result[$value] = $this->securityUtil->decrypt($value,$type,$appContext);
-					$this->incrCounter(2,$type,$appContext,false);
+				}else if ($this->securityUtil->isPublicData($value, $type)) {
+					$appContext = $this->callSecretApiWithCache(null, $secretData->secretVersion);
+					$result[$value] = $this->securityUtil->decrypt($value, $type, $appContext);
+					$this->incrCounter(2, $type, $appContext, false);
 					$this->flushCounter($appContext);
-				} else {
-					$secretContext = $this->callSecretApiWithCache($session,$secretData->secretVersion);
-					$result[$value] = $this->securityUtil->decrypt($value,$type,$secretContext);
-					$this->incrCounter(2,$type,$secretContext,false);
+				}else {
+					$secretContext = $this->callSecretApiWithCache($session, $secretData->secretVersion);
+					$result[$value] = $this->securityUtil->decrypt($value, $type, $secretContext);
+					$this->incrCounter(2, $type, $secretContext, false);
 					$this->flushCounter($secretContext);
 				}
 			}
@@ -180,58 +180,58 @@ 
 		/**
 		* 使用上一版本秘钥解密，app级别公钥
 		*/
-		function decryptPreviousPublic($data,$type)
+		function decryptPreviousPublic($data, $type)
 		{
-			$secretContext = $this->callSecretApiWithCache(null,-1);
-			return $this->securityUtil->decrypt($data,$type,$secretContext);
+			$secretContext = $this->callSecretApiWithCache(null, -1);
+			return $this->securityUtil->decrypt($data, $type, $secretContext);
 		}
 		/**
 		* 使用上一版本秘钥解密，一般只用于更新秘钥
 		*/
-		function decryptPrevious($data,$type,$session)
+		function decryptPrevious($data, $type, $session)
 		{
-			if($this->securityUtil->isPublicData($data,$type)){
-				$secretContext = $this->callSecretApiWithCache(null,-1);
-			} else {
-				$secretContext = $this->callSecretApiWithCache($session,-1);
+			if ($this->securityUtil->isPublicData($data, $type)) {
+				$secretContext = $this->callSecretApiWithCache(null, -1);
+			}else {
+				$secretContext = $this->callSecretApiWithCache($session, -1);
 			}
-			return $this->securityUtil->decrypt($data,$type,$secretContext);
+			return $this->securityUtil->decrypt($data, $type, $secretContext);
 		}
 
 		/**
 		* 加密单条数据,使用app级别公钥
 		*/
-		function encryptPublic($data,$type,$version = null)
+		function encryptPublic($data, $type, $version = null)
 		{
-			return $this->encrypt($data,$type,null,$version);
+			return $this->encrypt($data, $type, null, $version);
 		}
 		/**
 		* 加密单条数据
 		*/
-		function encrypt($data,$type,$session = null,$version = null)
+		function encrypt($data, $type, $session = null, $version = null)
 		{
-			if(empty($data) || empty($type)){
+			if (empty($data) || empty($type)) {
 				return null;
 			}
-			$secretContext = $this->callSecretApiWithCache($session,null);
-			$this->incrCounter(1,$type,$secretContext,true);
+			$secretContext = $this->callSecretApiWithCache($session, null);
+			$this->incrCounter(1, $type, $secretContext, true);
 
-			return $this->securityUtil->encrypt($data,$type,$version,$secretContext);
+			return $this->securityUtil->encrypt($data, $type, $version, $secretContext);
 		}
 
 		/**
 		* 加密多条数据，使用app级别公钥
 		*/
-		function encryptBatchPublic($array,$type,$version = null)
+		function encryptBatchPublic($array, $type, $version = null)
 		{
-			if(empty($array) || empty($type)){
+			if (empty($array) || empty($type)) {
 				return null;
 			}
-			$secretContext = $this->callSecretApiWithCache(null,null);
+			$secretContext = $this->callSecretApiWithCache(null, null);
 			$result = array();
 			foreach ($array as $value) {
-				$result[$value] = $this->securityUtil->encrypt($value,$type,$version,$secretContext);
-				$this->incrCounter(1,$type,$secretContext,false);
+				$result[$value] = $this->securityUtil->encrypt($value, $type, $version, $secretContext);
+				$this->incrCounter(1, $type, $secretContext, false);
 			}
 			$this->flushCounter($secretContext);
 
@@ -241,16 +241,16 @@ 
 		/**
 		* 加密多条数据，必须是同一个type和用户,返回结果是 KV结果
 		*/
-		function encryptBatch($array,$type,$session,$version = null)
+		function encryptBatch($array, $type, $session, $version = null)
 		{
-			if(empty($array) || empty($type)){
+			if (empty($array) || empty($type)) {
 				return null;
 			}
-			$secretContext = $this->callSecretApiWithCache($session,null);
+			$secretContext = $this->callSecretApiWithCache($session, null);
 			$result = array();
 			foreach ($array as $value) {
-				$result[$value] = $this->securityUtil->encrypt($value,$type,$version,$secretContext);
-				$this->incrCounter(1,$type,$secretContext,false);
+				$result[$value] = $this->securityUtil->encrypt($value, $type, $version, $secretContext);
+				$this->incrCounter(1, $type, $secretContext, false);
 			}
 			$this->flushCounter($secretContext);
 			return $result;
@@ -259,22 +259,22 @@ 
 		/**
 		* 使用上一版本秘钥加密，使用app级别公钥
 		*/
-		function encryptPreviousPublic($data,$type)
+		function encryptPreviousPublic($data, $type)
 		{
-			$secretContext = $this->callSecretApiWithCache(null,-1);
-			$this->incrCounter(1,$type,$secretContext,true);
+			$secretContext = $this->callSecretApiWithCache(null, -1);
+			$this->incrCounter(1, $type, $secretContext, true);
 
-			return $this->securityUtil->encrypt($data,$type,$secretContext->version,$secretContext);
+			return $this->securityUtil->encrypt($data, $type, $secretContext->version, $secretContext);
 		}
 		/**
 		* 使用上一版本秘钥加密，一般只用于更新秘钥
 		*/
-		function encryptPrevious($data,$type,$session)
+		function encryptPrevious($data, $type, $session)
 		{
-			$secretContext = $this->callSecretApiWithCache($session,-1);
-			$this->incrCounter(1,$type,$secretContext,true);
+			$secretContext = $this->callSecretApiWithCache($session, -1);
+			$this->incrCounter(1, $type, $secretContext, true);
 
-			return $this->securityUtil->encrypt($data,$type,$secretContext);
+			return $this->securityUtil->encrypt($data, $type, $secretContext);
 		}
 
 		/**
@@ -282,160 +282,160 @@ 
 		*/
 		function initSecret($session)
 		{
-			return $this->callSecretApiWithCache($session,null);
+			return $this->callSecretApiWithCache($session, null);
 		}
 
-		function buildCacheKey($session,$secretVersion)
+		function buildCacheKey($session, $secretVersion)
 		{
-			if(empty($session)){
+			if (empty($session)) {
 				return $this->topClient->getAppkey();
 			}
-			if(empty($secretVersion)){
-				return $session ;
+			if (empty($secretVersion)) {
+				return $session;
 			}
-			return $session.'_'.$secretVersion ;
+			return $session.'_'.$secretVersion;
 		}
 
 
 		function generateCustomerSession($userId)
 		{
-			return '_'.$userId ;
+			return '_'.$userId;
 		}
 
 		/**
 		* 判断是否是已加密的数据
 		*/
-		function isEncryptData($data,$type)
+		function isEncryptData($data, $type)
 		{
-			if(empty($data) || empty($type)){
+			if (empty($data) || empty($type)) {
 				return false;
 			}
-			return $this->securityUtil->isEncryptData($data,$type);
+			return $this->securityUtil->isEncryptData($data, $type);
 		}
 
 		/**
 		* 判断是否是已加密的数据，数据必须是同一个类型
 		*/
-		function isEncryptDataArray($array,$type)
+		function isEncryptDataArray($array, $type)
 		{
-			if(empty($array) || empty($type)){
+			if (empty($array) || empty($type)) {
 				return false;
 			}
-			return $this->securityUtil->isEncryptDataArray($array,$type);
+			return $this->securityUtil->isEncryptDataArray($array, $type);
 		}
 
 		/**
 		* 判断数组中的数据是否存在密文，存在任何一个返回true,否则false
 		*/
-		function isPartEncryptData($array,$type)
+		function isPartEncryptData($array, $type)
 		{
-			if(empty($array) || empty($type)){
+			if (empty($array) || empty($type)) {
 				return false;
 			}
-			return $this->securityUtil->isPartEncryptData($array,$type);
+			return $this->securityUtil->isPartEncryptData($array, $type);
 		}
 
 		/**
 		* 获取秘钥，使用缓存
 		*/
-		function callSecretApiWithCache($session,$secretVersion)
+		function callSecretApiWithCache($session, $secretVersion)
 		{
-			if($this->cacheClient)
+			if ($this->cacheClient)
 			{
 				$time = time();
-				$cacheKey = $this->buildCacheKey($session,$secretVersion);
+				$cacheKey = $this->buildCacheKey($session, $secretVersion);
 				$secretContext = $this->cacheClient->getCache($cacheKey);
 
-				if($secretContext)
+				if ($secretContext)
 				{
-					if($this->canUpload($secretContext)){
-						if($this->report($secretContext)){
+					if ($this->canUpload($secretContext)) {
+						if ($this->report($secretContext)) {
 							$this->clearReport($secretContext);
 						}
 					}
 				}
 
-				if($secretContext && $secretContext->invalidTime > $time)
+				if ($secretContext && $secretContext->invalidTime > $time)
 				{
 					return $secretContext;
 				}
 			}
 
-			$secretContext = $this->callSecretApi($session,$secretVersion);
+			$secretContext = $this->callSecretApi($session, $secretVersion);
 
-			if($this->cacheClient)
+			if ($this->cacheClient)
 			{
 				$secretContext->cacheKey = $cacheKey;
-				$this->cacheClient->setCache($cacheKey,$secretContext);
+				$this->cacheClient->setCache($cacheKey, $secretContext);
 			}
 
 			return $secretContext;
 		}
 
-		function incrCounter($op,$type,$secretContext,$flush)
+		function incrCounter($op, $type, $secretContext, $flush)
 		{
-			if($op == 1){
+			if ($op == 1) {
 				switch ($type) {
 					case 'nick':
-					$secretContext->encryptNickNum ++ ;
+					$secretContext->encryptNickNum++;
 						break;
 					case 'simple':
-						$secretContext->encryptSimpleNum ++ ;
+						$secretContext->encryptSimpleNum++;
 						break;
 					case 'receiver_name':
-						$secretContext->encryptReceiverNameNum ++ ;
+						$secretContext->encryptReceiverNameNum++;
 						break;
 					case 'phone':
-						$secretContext->encryptPhoneNum ++ ;
+						$secretContext->encryptPhoneNum++;
 						break;
 					default:
 						break;
 				}
-			}else if($op == 2){
+			}else if ($op == 2) {
 				switch ($type) {
 					case 'nick':
-					$secretContext->decryptNickNum ++ ;
+					$secretContext->decryptNickNum++;
 						break;
 					case 'simple':
-						$secretContext->decryptSimpleNum ++ ;
+						$secretContext->decryptSimpleNum++;
 						break;
 					case 'receiver_name':
-						$secretContext->decryptReceiverNameNum ++ ;
+						$secretContext->decryptReceiverNameNum++;
 						break;
 					case 'phone':
-						$secretContext->decryptPhoneNum ++ ;
+						$secretContext->decryptPhoneNum++;
 						break;
 					default:
 						break;
 				}
-			}else{
+			}else {
 				switch ($type) {
 					case 'nick':
-					$secretContext->searchNickNum ++ ;
+					$secretContext->searchNickNum++;
 						break;
 					case 'simple':
-						$secretContext->searchSimpleNum ++ ;
+						$secretContext->searchSimpleNum++;
 						break;
 					case 'receiver_name':
-						$secretContext->searchReceiverNameNum ++ ;
+						$secretContext->searchReceiverNameNum++;
 						break;
 					case 'phone':
-						$secretContext->searchPhoneNum ++ ;
+						$secretContext->searchPhoneNum++;
 						break;
 					default:
 						break;
 				}
 			}
 
-			if($flush && $this->cacheClient){
-				$this->cacheClient->setCache($secretContext->cacheKey,$secretContext);
+			if ($flush && $this->cacheClient) {
+				$this->cacheClient->setCache($secretContext->cacheKey, $secretContext);
 			}
 		}
 
 		function flushCounter($secretContext)
 		{
-			if($this->cacheClient){
-				$this->cacheClient->setCache($secretContext->cacheKey,$secretContext);
+			if ($this->cacheClient) {
+				$this->cacheClient->setCache($secretContext->cacheKey, $secretContext);
 			}			
 		}
 
@@ -462,7 +462,7 @@ 
 		function canUpload($secretContext)
 		{
 			$current = time();
-			if($current - $secretContext->lastUploadTime > 300){
+			if ($current-$secretContext->lastUploadTime > 300) {
 				return true;
 			}
 			return false;
@@ -476,14 +476,14 @@ 
 			$request = new TopSdkFeedbackUploadRequest;
 			$request->setContent($secretContext->toLogString());
 
-			if(empty($secretContext->session)){
+			if (empty($secretContext->session)) {
 				$request->setType(APP_SECRET_TYPE);
-			}else{
+			}else {
 				$request->setType(APP_USER_SECRET_TYPE);				
 			}
 
-			$response = $this->topClient->execute($request,$secretContext->session);
-			if($response->code == 0){
+			$response = $this->topClient->execute($request, $secretContext->session);
+			if ($response->code == 0) {
 				return true;
 			}
 			return false;
@@ -492,49 +492,49 @@ 
 		/**
 		* 获取秘钥，不使用缓存
 		*/
-		function callSecretApi($session,$secretVersion)
+		function callSecretApi($session, $secretVersion)
 		{
 			$request = new TopSecretGetRequest;
 			$request->setRandomNum($this->randomNum);
-			if($secretVersion)
+			if ($secretVersion)
 			{
-				if(intval($secretVersion) < 0 || $session == null){
+				if (intval($secretVersion) < 0 || $session == null) {
 					$session = null;
-					$secretVersion = -1 * intval($secretVersion < 0);
+					$secretVersion = -1*intval($secretVersion < 0);
 				}
 				$request->setSecretVersion($secretVersion);
 			}
 			
 			$topSession = $session;
-			if($session != null && $session[0] == '_')
+			if ($session != null && $session[0] == '_')
 			{
-				$request->setCustomerUserId(substr($session,1));
+				$request->setCustomerUserId(substr($session, 1));
 				$topSession = null;
 			}
 
-			$response = $this->topClient->execute($request,$topSession);
-			if($response->code != 0){
+			$response = $this->topClient->execute($request, $topSession);
+			if ($response->code != 0) {
 				throw new Exception($response->msg);
 			}
 
 			$time = time();
 			$secretContext = new SecretContext();
-			$secretContext->maxInvalidTime = $time + intval($response->max_interval);
-			$secretContext->invalidTime = $time + intval($response->interval);
+			$secretContext->maxInvalidTime = $time+intval($response->max_interval);
+			$secretContext->invalidTime = $time+intval($response->interval);
 			$secretContext->secret = strval($response->secret);
 			$secretContext->session = $session;
-			if(!empty($response->app_config)){
+			if (!empty($response->app_config)) {
 				$tmpJson = json_decode($response->app_config);
 				$appConfig = array();
-				foreach ($tmpJson as $key => $value){
+				foreach ($tmpJson as $key => $value) {
 					$appConfig[$key] = $value;
 				}
 				$secretContext->appConfig = $appConfig;
 			}
 
-			if(empty($session)){
-				$secretContext->secretVersion = -1 * intval($response->secret_version);
-			}else{
+			if (empty($session)) {
+				$secretContext->secretVersion = -1*intval($response->secret_version);
+			}else {
 				$secretContext->secretVersion = intval($response->secret_version);
 			}
 			return $secretContext;

Braces +5 added lines, -5 removed lines

@@ -135,7 +135,7 @@ 
 
 				if(empty($secretData)){
 					$result[$value] = $value;
-				}else{
+				} else{
 					$result[$value] = $this->securityUtil->decrypt($value,$type,$secretContext);
 					$this->incrCounter(2,$type,$secretContext,true);
 				}
@@ -391,7 +391,7 @@ 
 					default:
 						break;
 				}
-			}else if($op == 2){
+			} else if($op == 2){
 				switch ($type) {
 					case 'nick':
 					$secretContext->decryptNickNum ++ ;
@@ -408,7 +408,7 @@ 
 					default:
 						break;
 				}
-			}else{
+			} else{
 				switch ($type) {
 					case 'nick':
 					$secretContext->searchNickNum ++ ;
@@ -478,7 +478,7 @@ 
 
 			if(empty($secretContext->session)){
 				$request->setType(APP_SECRET_TYPE);
-			}else{
+			} else{
 				$request->setType(APP_USER_SECRET_TYPE);				
 			}
 
@@ -534,7 +534,7 @@ 
 
 			if(empty($session)){
 				$secretContext->secretVersion = -1 * intval($response->secret_version);
-			}else{
+			} else{
 				$secretContext->secretVersion = intval($response->secret_version);
 			}
 			return $secretContext;

src/service/taobao/bin/top/security/SecretContext.php

Indentation +58 added lines, -58 removed lines

@@ -1,61 +1,61 @@
 <?php
 
-	class SecretContext
-	{
-		var $secret;
-		var $secretVersion;
-		var $invalidTime;
-		var $maxInvalidTime;
-		var $appConfig;
-
-		var $cacheKey = '';
-		var $session = '';
-		var $encryptPhoneNum = 0;
-		var $encryptNickNum = 0;
-		var $encryptReceiverNameNum = 0;
-		var $encryptSimpleNum = 0;
-		var $encryptSearchNum = 0;
-
-		var $decryptPhoneNum = 0;
-		var $decryptNickNum = 0;
-		var $decryptReceiverNameNum = 0;
-		var $decryptSimpleNum = 0;
-		var $decryptSearchNum = 0;
-
-		var $searchPhoneNum = 0;
-		var $searchNickNum = 0;
-		var $searchReceiverNameNum = 0;
-		var $searchSimpleNum = 0;
-		var $searchSearchNum = 0;
-
-		var $lastUploadTime;
-
-		function toLogString()
-		{
-			return $this->session.','.$this->encryptPhoneNum.','.$this->encryptNickNum.','
-				  .$this->encryptReceiverNameNum.','.$this->encryptSimpleNum.','.$this->encryptSearchNum.','
-				  .$this->decryptPhoneNum.','.$this->decryptNickNum.','.$this->decryptReceiverNameNum.','
-				  .$this->decryptSimpleNum.','.$this->decryptSearchNum.','.$this->searchPhoneNum.','
-				  .$this->searchNickNum.','.$this->searchReceiverNameNum.','.$this->searchSimpleNum.','
-				  .$this->searchSearchNum ;
-		}
-
-		function __construct()
-	 	{
-	 		$this->lastUploadTime = time();
-	 	}
-	}
-
-	class SecretData
-	{
-		var $originalValue;
-		var $originalBase64Value;
-		var $secretVersion;
-		var $search;
-
-		function __construct()
-	 	{
-
-	 	}
-	}
+    class SecretContext
+    {
+        var $secret;
+        var $secretVersion;
+        var $invalidTime;
+        var $maxInvalidTime;
+        var $appConfig;
+
+        var $cacheKey = '';
+        var $session = '';
+        var $encryptPhoneNum = 0;
+        var $encryptNickNum = 0;
+        var $encryptReceiverNameNum = 0;
+        var $encryptSimpleNum = 0;
+        var $encryptSearchNum = 0;
+
+        var $decryptPhoneNum = 0;
+        var $decryptNickNum = 0;
+        var $decryptReceiverNameNum = 0;
+        var $decryptSimpleNum = 0;
+        var $decryptSearchNum = 0;
+
+        var $searchPhoneNum = 0;
+        var $searchNickNum = 0;
+        var $searchReceiverNameNum = 0;
+        var $searchSimpleNum = 0;
+        var $searchSearchNum = 0;
+
+        var $lastUploadTime;
+
+        function toLogString()
+        {
+            return $this->session.','.$this->encryptPhoneNum.','.$this->encryptNickNum.','
+                    .$this->encryptReceiverNameNum.','.$this->encryptSimpleNum.','.$this->encryptSearchNum.','
+                    .$this->decryptPhoneNum.','.$this->decryptNickNum.','.$this->decryptReceiverNameNum.','
+                    .$this->decryptSimpleNum.','.$this->decryptSearchNum.','.$this->searchPhoneNum.','
+                    .$this->searchNickNum.','.$this->searchReceiverNameNum.','.$this->searchSimpleNum.','
+                    .$this->searchSearchNum ;
+        }
+
+        function __construct()
+            {
+                $this->lastUploadTime = time();
+            }
+    }
+
+    class SecretData
+    {
+        var $originalValue;
+        var $originalBase64Value;
+        var $secretVersion;
+        var $search;
+
+        function __construct()
+            {
+
+            }
+    }
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 				  .$this->decryptPhoneNum.','.$this->decryptNickNum.','.$this->decryptReceiverNameNum.','
 				  .$this->decryptSimpleNum.','.$this->decryptSearchNum.','.$this->searchPhoneNum.','
 				  .$this->searchNickNum.','.$this->searchReceiverNameNum.','.$this->searchSimpleNum.','
-				  .$this->searchSearchNum ;
+				  .$this->searchSearchNum;
 		}
 
 		function __construct()

src/service/taobao/bin/top/security/SecretGetRequest.php

Indentation +23 added lines, -23 removed lines

@@ -2,34 +2,34 @@
 
 class TopSecretGetRequest
 {
-	private $apiParas = array();
+    private $apiParas = array();
 	
-	public function getApiMethodName()
-	{
-		return "taobao.top.secret.get";
-	}
+    public function getApiMethodName()
+    {
+        return "taobao.top.secret.get";
+    }
 	
-	public function getApiParas()
-	{
-		return $this->apiParas;
-	}
+    public function getApiParas()
+    {
+        return $this->apiParas;
+    }
 
-	public function setRandomNum($random){
-		$this->apiParas['random_num'] = $random;
-	}
+    public function setRandomNum($random){
+        $this->apiParas['random_num'] = $random;
+    }
 
-	public function setCustomerUserId($customId){
-		$this->apiParas['customer_user_id'] = $customId;
-	}
+    public function setCustomerUserId($customId){
+        $this->apiParas['customer_user_id'] = $customId;
+    }
 
-	public function setSecretVersion($version){
-		$this->apiParas['secret_version'] = $version;
-	}
+    public function setSecretVersion($version){
+        $this->apiParas['secret_version'] = $version;
+    }
 	
-	public function check(){}
+    public function check(){}
 	
-	public function putOtherTextParam($key, $value) {
-		$this->apiParas[$key] = $value;
-		$this->$key = $value;
-	}
+    public function putOtherTextParam($key, $value) {
+        $this->apiParas[$key] = $value;
+        $this->$key = $value;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -14,19 +14,19 @@
 		return $this->apiParas;
 	}
 
-	public function setRandomNum($random){
+	public function setRandomNum($random) {
 		$this->apiParas['random_num'] = $random;
 	}
 
-	public function setCustomerUserId($customId){
+	public function setCustomerUserId($customId) {
 		$this->apiParas['customer_user_id'] = $customId;
 	}
 
-	public function setSecretVersion($version){
+	public function setSecretVersion($version) {
 		$this->apiParas['secret_version'] = $version;
 	}
 	
-	public function check(){}
+	public function check() {}
 	
 	public function putOtherTextParam($key, $value) {
 		$this->apiParas[$key] = $value;

src/service/taobao/bin/top/security/SecurityTest.php

Indentation +19 added lines, -19 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-	include './SecurityClient.php';
-	include './YacCache.php';
+    include './SecurityClient.php';
+    include './YacCache.php';
 
 
-	$c = new TopClient;
+    $c = new TopClient;
     $c->appkey = '576216';
     $c->secretKey = 'd1e44cec2f6c8a2c73342595b711decc';
     $c->gatewayUrl = 'https://10.218.128.111/router/rest';
@@ -25,8 +25,8 @@ 
 
     if($client->isEncryptData($encryptValue,$type))
     {
-    	$originalValue = $client->decrypt($encryptValue,$type,$session);
-    	echo "解密后:".$originalValue.PHP_EOL;
+        $originalValue = $client->decrypt($encryptValue,$type,$session);
+        echo "解密后:".$originalValue.PHP_EOL;
     }
 
     $originalValue = $client->decrypt('~YjW+T6rCmKcc0tGqzWIDaQ==~-113~','nick',$session);
@@ -37,23 +37,23 @@ 
     $client->decryptBatch($secArray,'nick',$session);
 
 
-	$typeArray = array('normal','nick','receiver_name');
+    $typeArray = array('normal','nick','receiver_name');
 
-	$val2 = '啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊看哦【啊啊啊的';
+    $val2 = '啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊看哦【啊啊啊的';
 
-	foreach ($typeArray as $type2) {
-		echo "==============================TOP================================".PHP_EOL;
-		$encty2 = $client->encrypt($val2,$type2,$session);
-		echo $type2."|明文：".$val2." ---->密文：".$encty2.PHP_EOL;
-		if($client->isEncryptData($encty2,$type2))
-		{
-			$originalValue = $client->decrypt($encty2,$type2,$session);
-    		echo "解密后:".$originalValue.PHP_EOL;
+    foreach ($typeArray as $type2) {
+        echo "==============================TOP================================".PHP_EOL;
+        $encty2 = $client->encrypt($val2,$type2,$session);
+        echo $type2."|明文：".$val2." ---->密文：".$encty2.PHP_EOL;
+        if($client->isEncryptData($encty2,$type2))
+        {
+            $originalValue = $client->decrypt($encty2,$type2,$session);
+            echo "解密后:".$originalValue.PHP_EOL;
             echo "search明文：".$originalValue." -->".$client->search($originalValue,$type2,$session).PHP_EOL;
-		}else{
-			echo "不是加密数据".PHP_EOL;
-		}
-	}
+        }else{
+            echo "不是加密数据".PHP_EOL;
+        }
+    }
 
     $encryptNick = $client->encrypt("xxxuxxxuxxxu","nick");
     echo "加密后:".$encryptNick.PHP_EOL;

Spacing +18 added lines, -18 removed lines

@@ -11,7 +11,7 @@ 
 
     $session = '6101701a21788e0e44743d5f1032ccd5276f00ea6a2d9092050695162';
 
-    $client = new SecurityClient($c,'S7/xdg4AD7WooWY7+g11qoBpaVsEkonULDJPEiMcXPE=');
+    $client = new SecurityClient($c, 'S7/xdg4AD7WooWY7+g11qoBpaVsEkonULDJPEiMcXPE=');
     $yac = new YacCache;
     $client->setCacheClient($yac);
 
@@ -19,50 +19,50 @@ 
     $val = '13834566786';
 
     echo "原文：13834566786".PHP_EOL;
-    $encryptValue = $client->encrypt($val,$type,$session);
+    $encryptValue = $client->encrypt($val, $type, $session);
     echo "加密后:".$encryptValue.PHP_EOL;
-    echo "search明文：".$val." -->".$client->search("6786",$type,$session).PHP_EOL;
+    echo "search明文：".$val." -->".$client->search("6786", $type, $session).PHP_EOL;
 
-    if($client->isEncryptData($encryptValue,$type))
+    if ($client->isEncryptData($encryptValue, $type))
     {
-    	$originalValue = $client->decrypt($encryptValue,$type,$session);
+    	$originalValue = $client->decrypt($encryptValue, $type, $session);
     	echo "解密后:".$originalValue.PHP_EOL;
     }
 
-    $originalValue = $client->decrypt('~YjW+T6rCmKcc0tGqzWIDaQ==~-113~','nick',$session);
+    $originalValue = $client->decrypt('~YjW+T6rCmKcc0tGqzWIDaQ==~-113~', 'nick', $session);
     echo "公钥解密后:".$originalValue.PHP_EOL;    
 
 
     $secArray = array('~YjW+T6rCmKcc0tGqzWIDaQ==~-113~');
-    $client->decryptBatch($secArray,'nick',$session);
+    $client->decryptBatch($secArray, 'nick', $session);
 
 
-	$typeArray = array('normal','nick','receiver_name');
+	$typeArray = array('normal', 'nick', 'receiver_name');
 
 	$val2 = '啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊看哦【啊啊啊的';
 
 	foreach ($typeArray as $type2) {
 		echo "==============================TOP================================".PHP_EOL;
-		$encty2 = $client->encrypt($val2,$type2,$session);
+		$encty2 = $client->encrypt($val2, $type2, $session);
 		echo $type2."|明文：".$val2." ---->密文：".$encty2.PHP_EOL;
-		if($client->isEncryptData($encty2,$type2))
+		if ($client->isEncryptData($encty2, $type2))
 		{
-			$originalValue = $client->decrypt($encty2,$type2,$session);
+			$originalValue = $client->decrypt($encty2, $type2, $session);
     		echo "解密后:".$originalValue.PHP_EOL;
-            echo "search明文：".$originalValue." -->".$client->search($originalValue,$type2,$session).PHP_EOL;
-		}else{
+            echo "search明文：".$originalValue." -->".$client->search($originalValue, $type2, $session).PHP_EOL;
+		}else {
 			echo "不是加密数据".PHP_EOL;
 		}
 	}
 
-    $encryptNick = $client->encrypt("xxxuxxxuxxxu","nick");
+    $encryptNick = $client->encrypt("xxxuxxxuxxxu", "nick");
     echo "加密后:".$encryptNick.PHP_EOL;
-    echo "search明文：xxxuxxxuxxxu -->".$client->search("xxxu","nick").PHP_EOL;
-    if($client->isEncryptData($encryptNick,"nick"))
+    echo "search明文：xxxuxxxuxxxu -->".$client->search("xxxu", "nick").PHP_EOL;
+    if ($client->isEncryptData($encryptNick, "nick"))
     {
-        $originalNick = $client->decryptPublic($encryptNick,"nick");
+        $originalNick = $client->decryptPublic($encryptNick, "nick");
         echo "解密后:".$originalNick.PHP_EOL;
-    }else{
+    }else {
         echo "不是加密数据 ".$encryptNick.PHP_EOL;
     }
 ?>
\ No newline at end of file

Braces +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
 			$originalValue = $client->decrypt($encty2,$type2,$session);
     		echo "解密后:".$originalValue.PHP_EOL;
             echo "search明文：".$originalValue." -->".$client->search($originalValue,$type2,$session).PHP_EOL;
-		}else{
+		} else{
 			echo "不是加密数据".PHP_EOL;
 		}
 	}
@@ -62,7 +62,7 @@ 
     {
         $originalNick = $client->decryptPublic($encryptNick,"nick");
         echo "解密后:".$originalNick.PHP_EOL;
-    }else{
+    } else{
         echo "不是加密数据 ".$encryptNick.PHP_EOL;
     }
 ?>
\ No newline at end of file

src/service/taobao/bin/top/security/SecretCounterUtil.php

Indentation +78 added lines, -78 removed lines

@@ -1,97 +1,97 @@
 <?php
 
-	include './SecretContext.php';
-	include './iCache.php';
-	include '../../TopSdk.php';
+    include './SecretContext.php';
+    include './iCache.php';
+    include '../../TopSdk.php';
 
-	class SecretCounterUtil
-	{
-		private $topClient ;
-		private $cacheClient = null;
+    class SecretCounterUtil
+    {
+        private $topClient ;
+        private $cacheClient = null;
 
-		private $counterMap;
+        private $counterMap;
 
-		function __construct($client)
-		{
-			$this->topClient = $client;
+        function __construct($client)
+        {
+            $this->topClient = $client;
 
-			$counterMap = array();
-		}
+            $counterMap = array();
+        }
 
-		/*
+        /*
 		* 如果不走缓存模式，析构即调用API回传统计信息
 		*/
-		function __destruct()
-		{
-			if($this->cacheClient == null){
+        function __destruct()
+        {
+            if($this->cacheClient == null){
 
-			}
-		}
+            }
+        }
 
-		function report($session)
-		{
-			$request = new TopSdkFeedbackUploadRequest;
-		}
+        function report($session)
+        {
+            $request = new TopSdkFeedbackUploadRequest;
+        }
 
-		function setCacheClient($cache)
-		{
-			$this->cacheClient = $cache;
-		}
+        function setCacheClient($cache)
+        {
+            $this->cacheClient = $cache;
+        }
 
-		function incrDecrypt($delt,$session,$type)
-		{
-			$item = getItem($session);
-			if($item == null){
-				$item = new SecretCounter();
-				putItem($session,$item);
-			}
+        function incrDecrypt($delt,$session,$type)
+        {
+            $item = getItem($session);
+            if($item == null){
+                $item = new SecretCounter();
+                putItem($session,$item);
+            }
 
-			if($type == "nick"){
-				$item->$decryptNickNum += $delt;
-			}else if($type == "receiver_name"){
-				$item->$decryptReceiverNameNum += $delt ;	
-			}else if($type == "phone"){
-				$item->$decryptPhoneNum += $delt ;	
-			}else if($type == "simple"){
-				$item->$decryptSimpleNum += $delt ;	
-			}
-		}
+            if($type == "nick"){
+                $item->$decryptNickNum += $delt;
+            }else if($type == "receiver_name"){
+                $item->$decryptReceiverNameNum += $delt ;	
+            }else if($type == "phone"){
+                $item->$decryptPhoneNum += $delt ;	
+            }else if($type == "simple"){
+                $item->$decryptSimpleNum += $delt ;	
+            }
+        }
 
-		function incrEncrypt($delt,$session,$type)
-		{
-			$item = getItem($session);
-			if($item == null){
-				$item = new SecretCounter();
-				putItem($session,$item);
-			}
+        function incrEncrypt($delt,$session,$type)
+        {
+            $item = getItem($session);
+            if($item == null){
+                $item = new SecretCounter();
+                putItem($session,$item);
+            }
 
-			if($type == "nick"){
-				$item->$encryptNickNum += $delt ;
-			}else if($type == "receiver_name"){
-				$item->$encryptReceiverNameNum += $delt ;	
-			}else if($type == "phone"){
-				$item->$encryptPhoneNum += $delt ;	
-			}else if($type == "simple"){
-				$item->$encryptSimpleNum += $delt ;	
-			}
-		}
+            if($type == "nick"){
+                $item->$encryptNickNum += $delt ;
+            }else if($type == "receiver_name"){
+                $item->$encryptReceiverNameNum += $delt ;	
+            }else if($type == "phone"){
+                $item->$encryptPhoneNum += $delt ;	
+            }else if($type == "simple"){
+                $item->$encryptSimpleNum += $delt ;	
+            }
+        }
 
-		function getItem($session)
-		{
-			if($this->cacheClient == null){
-				return $counterMap[$session];
-			}else{
-				return $this->cacheClient->getCache('s_'.$session);
-			}
-		}
+        function getItem($session)
+        {
+            if($this->cacheClient == null){
+                return $counterMap[$session];
+            }else{
+                return $this->cacheClient->getCache('s_'.$session);
+            }
+        }
 
-		function putItem($session,$item)
-		{
-			if($this->cacheClient == null){
-				$counterMap[$session] = $item;
-			}else{
-				$this->cacheClient->setCache('s_'.$session,$item);
-			}
-		}
-	}
+        function putItem($session,$item)
+        {
+            if($this->cacheClient == null){
+                $counterMap[$session] = $item;
+            }else{
+                $this->cacheClient->setCache('s_'.$session,$item);
+            }
+        }
+    }
 ?>
\ No newline at end of file

Spacing +29 added lines, -29 removed lines

@@ -6,7 +6,7 @@ 
 
 	class SecretCounterUtil
 	{
-		private $topClient ;
+		private $topClient;
 		private $cacheClient = null;
 
 		private $counterMap;
@@ -23,7 +23,7 @@ 
 		*/
 		function __destruct()
 		{
-			if($this->cacheClient == null){
+			if ($this->cacheClient == null) {
 
 			}
 		}
@@ -38,59 +38,59 @@ 
 			$this->cacheClient = $cache;
 		}
 
-		function incrDecrypt($delt,$session,$type)
+		function incrDecrypt($delt, $session, $type)
 		{
 			$item = getItem($session);
-			if($item == null){
+			if ($item == null) {
 				$item = new SecretCounter();
-				putItem($session,$item);
+				putItem($session, $item);
 			}
 
-			if($type == "nick"){
+			if ($type == "nick") {
 				$item->$decryptNickNum += $delt;
-			}else if($type == "receiver_name"){
-				$item->$decryptReceiverNameNum += $delt ;	
-			}else if($type == "phone"){
-				$item->$decryptPhoneNum += $delt ;	
-			}else if($type == "simple"){
-				$item->$decryptSimpleNum += $delt ;	
+			}else if ($type == "receiver_name") {
+				$item->$decryptReceiverNameNum += $delt;	
+			}else if ($type == "phone") {
+				$item->$decryptPhoneNum += $delt;	
+			}else if ($type == "simple") {
+				$item->$decryptSimpleNum += $delt;	
 			}
 		}
 
-		function incrEncrypt($delt,$session,$type)
+		function incrEncrypt($delt, $session, $type)
 		{
 			$item = getItem($session);
-			if($item == null){
+			if ($item == null) {
 				$item = new SecretCounter();
-				putItem($session,$item);
+				putItem($session, $item);
 			}
 
-			if($type == "nick"){
-				$item->$encryptNickNum += $delt ;
-			}else if($type == "receiver_name"){
-				$item->$encryptReceiverNameNum += $delt ;	
-			}else if($type == "phone"){
-				$item->$encryptPhoneNum += $delt ;	
-			}else if($type == "simple"){
-				$item->$encryptSimpleNum += $delt ;	
+			if ($type == "nick") {
+				$item->$encryptNickNum += $delt;
+			}else if ($type == "receiver_name") {
+				$item->$encryptReceiverNameNum += $delt;	
+			}else if ($type == "phone") {
+				$item->$encryptPhoneNum += $delt;	
+			}else if ($type == "simple") {
+				$item->$encryptSimpleNum += $delt;	
 			}
 		}
 
 		function getItem($session)
 		{
-			if($this->cacheClient == null){
+			if ($this->cacheClient == null) {
 				return $counterMap[$session];
-			}else{
+			}else {
 				return $this->cacheClient->getCache('s_'.$session);
 			}
 		}
 
-		function putItem($session,$item)
+		function putItem($session, $item)
 		{
-			if($this->cacheClient == null){
+			if ($this->cacheClient == null) {
 				$counterMap[$session] = $item;
-			}else{
-				$this->cacheClient->setCache('s_'.$session,$item);
+			}else {
+				$this->cacheClient->setCache('s_'.$session, $item);
 			}
 		}
 	}

Braces +8 added lines, -8 removed lines

@@ -48,11 +48,11 @@ 
 
 			if($type == "nick"){
 				$item->$decryptNickNum += $delt;
-			}else if($type == "receiver_name"){
+			} else if($type == "receiver_name"){
 				$item->$decryptReceiverNameNum += $delt ;	
-			}else if($type == "phone"){
+			} else if($type == "phone"){
 				$item->$decryptPhoneNum += $delt ;	
-			}else if($type == "simple"){
+			} else if($type == "simple"){
 				$item->$decryptSimpleNum += $delt ;	
 			}
 		}
@@ -67,11 +67,11 @@ 
 
 			if($type == "nick"){
 				$item->$encryptNickNum += $delt ;
-			}else if($type == "receiver_name"){
+			} else if($type == "receiver_name"){
 				$item->$encryptReceiverNameNum += $delt ;	
-			}else if($type == "phone"){
+			} else if($type == "phone"){
 				$item->$encryptPhoneNum += $delt ;	
-			}else if($type == "simple"){
+			} else if($type == "simple"){
 				$item->$encryptSimpleNum += $delt ;	
 			}
 		}
@@ -80,7 +80,7 @@ 
 		{
 			if($this->cacheClient == null){
 				return $counterMap[$session];
-			}else{
+			} else{
 				return $this->cacheClient->getCache('s_'.$session);
 			}
 		}
@@ -89,7 +89,7 @@ 
 		{
 			if($this->cacheClient == null){
 				$counterMap[$session] = $item;
-			}else{
+			} else{
 				$this->cacheClient->setCache('s_'.$session,$item);
 			}
 		}