update

Author: wandercn

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "alipay_sdk_rust"
 license = "MIT"
-version = "1.0.13"
+version = "1.0.14"
 edition = "2018"
 authors = ["wandercn<[email protected]>"]
 description = "AliPay Sdk for Rust"
@@ -14,12 +14,12 @@ categories = ["api-bindings", "accessibility", "development-tools", "compilers"]
 jsonmap = "0.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-gostd = "0.4.1"
+gostd = "0.4"
 sha2 = "0.10.2"
 base64 = "0.22.1"
 rsa = "0.6.1"
 uuid = { version = "1.0.0", features = ["v4", "fast-rng", "macro-diagnostics"] }
-serde_with = "1.14.0"
+serde_with = "3.12.0"
 log = "0.4"
 x509-parser = "0.17.0"
 md5 = "0.7.0"

src/cert.rs

@@ -8,6 +8,8 @@ use x509_parser::prelude::*;
 
 use log::debug;
 
+use crate::util::base64_encode;
+
 ///    get_cert_sn 获取证书序列号SN
 ///    cert_path：X.509证书文件路径(appCertPublicKey.crt、alipayCertPublicKey_RSA2.crt)
 ///    返回 sn：证书序列号(app_cert_sn、alipay_cert_sn)
@@ -100,7 +102,7 @@ pub fn get_public_key_with_path<'a>(alipay_cert_path: impl AsRef<str>) -> Result
     let cert_data = &fs::read(alipay_cert_path.as_ref())?;
     let cert = load_certificate(cert_data)?;
     match cert.parse_x509() {
-        Ok(certificate) => Ok(base64::encode(certificate.public_key().raw)),
+        Ok(certificate) => Ok(base64_encode(certificate.public_key().raw)),
         Err(err) => Err(Error::new(ErrorKind::Other, err.to_string())),
     }
 }

src/pay.rs

@@ -481,7 +481,7 @@ impl PayClient {
             parameters.insert(k, v[0].to_string());
         }
 
-        let form = build_form(&self.api_url(), &mut parameters)
+        let form = build_form(&self.api_url(), &mut parameters)?
             .as_bytes()
             .to_vec();
         Ok(form)

src/sign.rs

@@ -16,8 +16,11 @@ use std::{
 
 use sha2::{Digest, Sha256};
 
-use crate::error::AliPaySDKError::AliPayError;
-use crate::error::{AliPayResult, AliPaySDKError};
+use crate::{error::AliPaySDKError::AliPayError, util::base64_encode};
+use crate::{
+    error::{AliPayResult, AliPaySDKError},
+    util::base64_decode,
+};
 /// 签名接口
 pub trait Signer {
     fn set_private_key(&mut self, private_key_str: &str) -> AliPayResult<()>;
@@ -79,7 +82,7 @@ impl Signer for SignSHA256WithRSA {
             PaddingScheme::new_pkcs1v15_sign(Some(Hash::SHA2_256)),
             digest.as_slice(),
         ) {
-            Ok(base64::encode(signature_byte))
+            Ok(base64_encode(signature_byte))
         } else {
             Err(AliPayError("pkcs1v15_sign failed".to_string()))
         }
@@ -88,7 +91,7 @@ impl Signer for SignSHA256WithRSA {
     fn verify(&self, source: &str, signature: &str) -> AliPayResult<bool> {
         let mut hashed = Sha256::new();
         hashed.update(source.as_bytes());
-        if let Ok(decode_signature) = base64::decode(signature) {
+        if let Ok(decode_signature) = base64_decode(signature) {
             match self.public_key.as_ref().unwrap().verify(
                 PaddingScheme::new_pkcs1v15_sign(Some(Hash::SHA2_256)),
                 &hashed.finalize(),

src/tests/sign_test.rs

@@ -1,7 +1,7 @@
 use gostd::strings;
 
 use crate::sign::{builder, Signer};
-use anyhow::{Context, Result};
+use anyhow::Result;
 const PRIVATE_KEY_FILE: &str = "src/tests/ffactory.org_私钥.txt"; // 沙箱环境自定义测试密钥
 const PUBILC_KEY_FILE: &str = "src/tests/ffactory.org_公钥.txt"; // 沙箱环境自定义测试密钥
 const SOURCE_URL: &str = r#"alipay_root_cert_sn=687b59193f3f462dd5336e5abf83c5d8_02941eef3187dddf3d3b83462e1dfcf6&app_cert_sn=1aca24501cc5cd3ac19089ff49d99d63&app_id=2021000117650139&biz_content={"buyer_id":"2088102175953034","out_trade_no":"1620630871769533001","subject":"iPhone","timestamp":"2021-05-08 17:09:04","total_amount":"88.88"}&charset=utf-8&format=JSON&method=alipay.trade.create&sign_type=RSA2&timestamp=2021-05-12 17:18:09&version=1.0"#;

src/tests/trade_create_test.rs

@@ -1,4 +1,4 @@
-use anyhow::{Context, Result};
+use anyhow::Result;
 
 use crate::{
     biz::{self, BizContenter},

src/util.rs

@@ -2,6 +2,7 @@
 // #![allow(unused)]
 
 use super::biz::BizContenter;
+use crate::error::AliPayResult;
 use gostd::builtin::len;
 use gostd::io::StringWriter;
 use gostd::strings;
@@ -30,43 +31,46 @@ pub fn get_out_trade_no() -> String {
     Uuid::new_v4().to_string()
 }
 
-pub fn build_form(base_url: &str, parameters: &mut HashMap<String, String>) -> String {
+pub fn build_form(
+    base_url: &str,
+    parameters: &mut HashMap<String, String>,
+) -> AliPayResult<String> {
     let mut buf = strings::Builder::new();
-    buf.WriteString("<form name=\"alipaysubmit\" method=\"post\" action=\"");
-    buf.WriteString(base_url);
-    buf.WriteString("?charset=utf-8");
-    buf.WriteString("\">\n");
-    buf.WriteString(&build_hidden_fields(parameters));
-    buf.WriteString("<input type=\"submit\" value=\"立即支付\" style=\"display:none\" >\n");
-    buf.WriteString("</form>\n");
-    buf.WriteString("<script>document.forms['alipaysubmit'].submit();</script>");
-    buf.String()
+    buf.WriteString("<form name=\"alipaysubmit\" method=\"post\" action=\"")?;
+    buf.WriteString(base_url)?;
+    buf.WriteString("?charset=utf-8")?;
+    buf.WriteString("\">\n")?;
+    buf.WriteString(&build_hidden_fields(parameters)?)?;
+    buf.WriteString("<input type=\"submit\" value=\"立即支付\" style=\"display:none\" >\n")?;
+    buf.WriteString("</form>\n")?;
+    buf.WriteString("<script>document.forms['alipaysubmit'].submit();</script>")?;
+    Ok(buf.String())
 }
 
-fn build_hidden_fields(parameters: &mut HashMap<String, String>) -> String {
+fn build_hidden_fields(parameters: &mut HashMap<String, String>) -> AliPayResult<String> {
     if parameters.is_empty() {
-        return "".to_string();
+        return Ok("".to_string());
     }
     let mut buf = strings::Builder::new();
     for (key, value) in parameters {
         if value.is_empty() {
             continue;
         }
-        buf.WriteString(&build_hidden_field(key, value));
+        buf.WriteString(&build_hidden_field(key, value)?)?;
     }
-    buf.String()
+    Ok(buf.String())
 }
 
-fn build_hidden_field(key: &str, value: &str) -> String {
+fn build_hidden_field(key: &str, value: &str) -> AliPayResult<String> {
     let mut buf = strings::Builder::new();
-    buf.WriteString("<input type=\"hidden\" name=\"");
-    buf.WriteString(key);
-    buf.WriteString("\" value=\"");
+    buf.WriteString("<input type=\"hidden\" name=\"")?;
+    buf.WriteString(key)?;
+    buf.WriteString("\" value=\"")?;
     // 转义双引号
     let a = strings::ReplaceAll(value, "\"", "&quot;");
-    buf.WriteString(&a);
-    buf.WriteString("\">\n");
-    buf.String()
+    buf.WriteString(&a)?;
+    buf.WriteString("\">\n")?;
+    Ok(buf.String())
 }
 
 // 只支持value是{}或[]或""包裹的key，不支持数字
@@ -91,7 +95,7 @@ pub fn json_get(result: &str, key: &str) -> String {
             if current == b'{' || current == b'[' {
                 left_brackets += 1;
             }
-            
+
             if (current == b']' || current == b'}') && left_brackets == 0 {
                 break;
             }
@@ -118,14 +122,13 @@ pub fn json_get(result: &str, key: &str) -> String {
 }
 
 use gostd::net::url;
-use std::io::Result;
 
 // 获取支付宝CallBack异步消息的待签名字符串和签名
 // 自行实现签名文档 https://opendocs.alipay.com/common/02mse7?pathHash=096e611e
 // 返回值 source - 签名字符串 , sign - 签名 , sign_type - 签名类型
-pub fn get_async_callback_msg_source(raw_body: &[u8]) -> Result<(String, String, String)> {
+pub fn get_async_callback_msg_source(raw_body: &[u8]) -> AliPayResult<(String, String, String)> {
     // 解析 URL 查询字符串
-    let raw_str = String::from_utf8_lossy(raw_body);
+    let raw_str = std::str::from_utf8(raw_body)?;
     let values = url::ParseQuery(&raw_str)?;
 
     let sign_type = values.Get("sign_type");
@@ -153,3 +156,19 @@ pub fn get_async_callback_msg_source(raw_body: &[u8]) -> Result<(String, String,
 
     Ok((source, sign, sign_type))
 }
+
+use base64::{engine::general_purpose, DecodeError, Engine as _};
+
+pub fn base64_encode<T>(input: T) -> String
+where
+    T: AsRef<[u8]>,
+{
+    general_purpose::STANDARD.encode(input)
+}
+
+pub fn base64_decode<T>(input: T) -> Result<Vec<u8>, DecodeError>
+where
+    T: AsRef<[u8]>,
+{
+    general_purpose::STANDARD.decode(input)
+}