add ApiSecurityHelper.GetUnwrapCertKey()

michaeljxf · Aug 23, 2021 · c872e3c · c872e3c
1 parent 8abb876
commit c872e3c
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 1 deletion.
diff --git a/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3.Test/Apis/BasePay/BasePayApisTests.cs b/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3.Test/Apis/BasePay/BasePayApisTests.cs
@@ -63,7 +63,7 @@ public void CertificatesTest()
             var pubKey = ApiSecurityHelper.AesGcmDecryptCiphertext(tenpayV3Setting.TenPayV3_APIv3Key, cert.encrypt_certificate.nonce,
                      cert.encrypt_certificate.associated_data, cert.encrypt_certificate.ciphertext);
             Console.WriteLine(pubKey);
-            Assert.IsNull(pubKey);
+            Assert.IsNotNull(pubKey);
         }
     }
 }
diff --git a/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3.Test/Helpers/ApiSecurityHelperTests.cs b/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3.Test/Helpers/ApiSecurityHelperTests.cs
@@ -0,0 +1,31 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Senparc.Weixin.TenPayV3.Helpers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Senparc.Weixin.TenPayV3.Test.net6.Helpers
+{
+    [TestClass]
+  public  class ApiSecurityHelperTests
+    {
+        [TestMethod]
+        public void GetUnwrapCertKeyTest()
+        {
+            var originalPublicKey = @"-----BEGIN PUBLIC KEY-----
+    MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4zej1cqugGQtVSY2Ah8R
+    MCKcr2UpZ8Npo+5Ja9xpFPYkWHaF1Gjrn3d5kcwAFuHHcfdc3yxDYx6+9grvJnCA
+    2zQzWjzVRa3BJ5LTMj6yqvhEmtvjO9D1xbFTA2m3kyjxlaIar/RYHZSslT4VmjIa
+    tW9KJCDKkwpM6x/RIWL8wwfFwgz2q3Zcrff1y72nB8p8P12ndH7GSLoY6d2Tv0OB
+    2+We2Kyy2+QzfGXOmLp7UK/pFQjJjzhSf9jxaWJXYKIBxpGlddbRZj9PqvFPTiep
+    8rvfKGNZF9Q6QaMYTpTp/uKQ3YvpDlyeQlYe4rRFauH3mOE6j56QlYQWivknDX9V
+    rwIDAQAB
+-----END PUBLIC KEY-----";
+
+            var unwrapKey = ApiSecurityHelper.GetUnwrapCertKey(originalPublicKey);
+            Assert.AreEqual(@"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4zej1cqugGQtVSY2Ah8RMCKcr2UpZ8Npo+5Ja9xpFPYkWHaF1Gjrn3d5kcwAFuHHcfdc3yxDYx6+9grvJnCA2zQzWjzVRa3BJ5LTMj6yqvhEmtvjO9D1xbFTA2m3kyjxlaIar/RYHZSslT4VmjIatW9KJCDKkwpM6x/RIWL8wwfFwgz2q3Zcrff1y72nB8p8P12ndH7GSLoY6d2Tv0OB2+We2Kyy2+QzfGXOmLp7UK/pFQjJjzhSf9jxaWJXYKIBxpGlddbRZj9PqvFPTiep8rvfKGNZF9Q6QaMYTpTp/uKQ3YvpDlyeQlYe4rRFauH3mOE6j56QlYQWivknDX9VrwIDAQAB", unwrapKey);
+        }
+    }
+}
diff --git a/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Helpers/ApiSecurityHelper.cs b/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/Helpers/ApiSecurityHelper.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace Senparc.Weixin.TenPayV3.Helpers
@@ -34,5 +35,16 @@ public static string AesGcmDecryptCiphertext(string aes_key, string nonce, strin
 
             return decrypted_string;
         }
+
+        /// <summary>   
+        /// 获得纯净的证书内容
+        /// </summary>
+        /// <param name="orignalPublicKey">原始证书秘钥字符串</param>
+        /// <returns></returns>
+        public static string GetUnwrapCertKey(string originalPublicKey)
+        {
+            var unwrapKey = Regex.Replace(originalPublicKey, @"(\s|([\-]+[^\-]+[\-]+))+", "");
+            return unwrapKey;
+        }
     }
 }