From 262b7eb0e233826dd47e2f6a479a8c6564fe936e Mon Sep 17 00:00:00 2001 From: huemng Date: Tue, 31 Jan 2023 16:26:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=8APrpcrypt=E6=96=87=E4=BB=B6=E6=8B=86?= =?UTF-8?q?=E4=B8=BA=E4=B8=89=E4=B8=AAClass=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WeChat/Contracts/BasicPushEvent.php | 11 +-- WeChat/Prpcrypt/ErrorCode.php | 53 +++++++++++ WeChat/Prpcrypt/PKCS7Encoder.php | 46 ++++++++++ WeChat/{Contracts => Prpcrypt}/Prpcrypt.php | 99 +-------------------- 4 files changed, 106 insertions(+), 103 deletions(-) create mode 100644 WeChat/Prpcrypt/ErrorCode.php create mode 100644 WeChat/Prpcrypt/PKCS7Encoder.php rename WeChat/{Contracts => Prpcrypt}/Prpcrypt.php (53%) diff --git a/WeChat/Contracts/BasicPushEvent.php b/WeChat/Contracts/BasicPushEvent.php index 76e6f91..9af5c57 100644 --- a/WeChat/Contracts/BasicPushEvent.php +++ b/WeChat/Contracts/BasicPushEvent.php @@ -17,6 +17,7 @@ namespace WeChat\Contracts; use WeChat\Exceptions\InvalidArgumentException; use WeChat\Exceptions\InvalidDecryptException; use WeChat\Exceptions\InvalidResponseException; +use WeChat\Prpcrypt\Prpcrypt; /** * 微信通知处理基本类 @@ -95,10 +96,7 @@ class BasicPushEvent if (empty($options['encodingaeskey'])) { throw new InvalidArgumentException("Missing Config -- [encodingaeskey]"); } - if (!class_exists('Prpcrypt', false)) { - require __DIR__ . '/Prpcrypt.php'; - } - $prpcrypt = new \Prpcrypt($this->config->get('encodingaeskey')); + $prpcrypt = new Prpcrypt($this->config->get('encodingaeskey')); $result = Tools::xml2arr($this->postxml); $array = $prpcrypt->decrypt($result['Encrypt']); if (intval($array[0]) > 0) { @@ -136,10 +134,7 @@ class BasicPushEvent { $xml = Tools::arr2xml(empty($data) ? $this->message : $data); if ($this->isEncrypt() || $isEncrypt) { - if (!class_exists('Prpcrypt', false)) { - require __DIR__ . '/Prpcrypt.php'; - } - $prpcrypt = new \Prpcrypt($this->config->get('encodingaeskey')); + $prpcrypt = new Prpcrypt($this->config->get('encodingaeskey')); // 如果是第三方平台，加密得使用 component_appid $component_appid = $this->config->get('component_appid'); $appid = empty($component_appid) ? $this->appid : $component_appid; diff --git a/WeChat/Prpcrypt/ErrorCode.php b/WeChat/Prpcrypt/ErrorCode.php new file mode 100644 index 0000000..d11e4eb --- /dev/null +++ b/WeChat/Prpcrypt/ErrorCode.php @@ -0,0 +1,53 @@ + '处理成功', + '40001' => '校验签名失败', + '40002' => '解析xml失败', + '40003' => '计算签名失败', + '40004' => '不合法的AESKey', + '40005' => '校验AppID失败', + '40006' => 'AES加密失败', + '40007' => 'AES解密失败', + '40008' => '公众平台发送的xml不合法', + '40009' => 'Base64编码失败', + '40010' => 'Base64解码失败', + '40011' => '公众帐号生成回包xml失败', + ]; + + /** + * 获取错误消息内容 + * @param string $code 错误代码 + * @return bool + */ + public static function getErrText($code) + { + if (isset(self::$errCode[$code])) { + return self::$errCode[$code]; + } + return false; + } + +} \ No newline at end of file diff --git a/WeChat/Prpcrypt/PKCS7Encoder.php b/WeChat/Prpcrypt/PKCS7Encoder.php new file mode 100644 index 0000000..bac5ab0 --- /dev/null +++ b/WeChat/Prpcrypt/PKCS7Encoder.php @@ -0,0 +1,46 @@ + PKCS7Encoder::$blockSize) { + $pad = 0; + } + return substr($text, 0, strlen($text) - $pad); + } + +} \ No newline at end of file diff --git a/WeChat/Contracts/Prpcrypt.php b/WeChat/Prpcrypt/Prpcrypt.php similarity index 53% rename from WeChat/Contracts/Prpcrypt.php rename to WeChat/Prpcrypt/Prpcrypt.php index 62afcfd..cec9af7 100644 --- a/WeChat/Contracts/Prpcrypt.php +++ b/WeChat/Prpcrypt/Prpcrypt.php @@ -12,48 +12,7 @@ // | github开源项目：https://github.com/zoujingli/WeChatDeveloper // +---------------------------------------------------------------------- -/** - * PKCS7算法 - 加解密 - * Class PKCS7Encoder - */ -class PKCS7Encoder -{ - - public static $blockSize = 32; - - /** - * 对需要加密的明文进行填充补位 - * @param string $text 需要进行填充补位操作的明文 - * @return string 补齐明文字符串 - */ - function encode($text) - { - $amount_to_pad = PKCS7Encoder::$blockSize - (strlen($text) % PKCS7Encoder::$blockSize); - if ($amount_to_pad == 0) { - $amount_to_pad = PKCS7Encoder::$blockSize; - } - list($pad_chr, $tmp) = [chr($amount_to_pad), '']; - for ($index = 0; $index < $amount_to_pad; $index++) { - $tmp .= $pad_chr; - } - return $text . $tmp; - } - - /** - * 对解密后的明文进行补位删除 - * @param string $text 解密后的明文 - * @return string 删除填充补位后的明文 - */ - function decode($text) - { - $pad = ord(substr($text, -1)); - if ($pad < 1 || $pad > PKCS7Encoder::$blockSize) { - $pad = 0; - } - return substr($text, 0, strlen($text) - $pad); - } - -} +namespace WeChat\Prpcrypt; /** * 公众号消息 - 加解密 @@ -88,7 +47,7 @@ class Prpcrypt $text = $pkcEncoder->encode($random . pack("N", strlen($text)) . $text . $appid); $encrypted = openssl_encrypt($text, 'AES-256-CBC', substr($this->key, 0, 32), OPENSSL_ZERO_PADDING, $iv); return [ErrorCode::$OK, $encrypted]; - } catch (Exception $e) { + } catch (\Exception $e) { return [ErrorCode::$EncryptAESError, null]; } } @@ -103,7 +62,7 @@ class Prpcrypt try { $iv = substr($this->key, 0, 16); $decrypted = openssl_decrypt($encrypted, 'AES-256-CBC', substr($this->key, 0, 32), OPENSSL_ZERO_PADDING, $iv); - } catch (Exception $e) { + } catch (\Exception $e) { return [ErrorCode::$DecryptAESError, null]; } try { @@ -116,7 +75,7 @@ class Prpcrypt $len_list = unpack("N", substr($content, 0, 4)); $xml_len = $len_list[1]; return [0, substr($content, 4, $xml_len), substr($content, $xml_len + 4)]; - } catch (Exception $e) { + } catch (\Exception $e) { return [ErrorCode::$IllegalBuffer, null]; } } @@ -137,53 +96,3 @@ class Prpcrypt } } - -/** - * 仅用作类内部使用 - * 不用于官方API接口的errCode码 - * Class ErrorCode - */ -class ErrorCode -{ - - public static $OK = 0; - public static $ParseXmlError = 40002; - public static $IllegalAesKey = 40004; - public static $IllegalBuffer = 40008; - public static $EncryptAESError = 40006; - public static $DecryptAESError = 40007; - public static $EncodeBase64Error = 40009; - public static $DecodeBase64Error = 40010; - public static $GenReturnXmlError = 40011; - public static $ValidateAppidError = 40005; - public static $ComputeSignatureError = 40003; - public static $ValidateSignatureError = 40001; - public static $errCode = [ - '0' => '处理成功', - '40001' => '校验签名失败', - '40002' => '解析xml失败', - '40003' => '计算签名失败', - '40004' => '不合法的AESKey', - '40005' => '校验AppID失败', - '40006' => 'AES加密失败', - '40007' => 'AES解密失败', - '40008' => '公众平台发送的xml不合法', - '40009' => 'Base64编码失败', - '40010' => 'Base64解码失败', - '40011' => '公众帐号生成回包xml失败', - ]; - - /** - * 获取错误消息内容 - * @param string $code 错误代码 - * @return bool - */ - public static function getErrText($code) - { - if (isset(self::$errCode[$code])) { - return self::$errCode[$code]; - } - return false; - } - -}