lsm/DotNetCore.SKIT.FlurlHttpClient.Wechat
1
0
Fork 0
mirror of https://gitee.com/fudiwei/DotNetCore.SKIT.FlurlHttpClient.Wechat.git synced 2025-07-15 23:13:32 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

feat(tenpayv3): 验签时不再抛出异常

Browse Source
This commit is contained in:
Fu Diwei 2021-08-02 22:06:22 +08:00
parent 9e6bd2e824
commit 23b6b94335
3 changed files with 12 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Exceptions/WechatTenpayResponseVerificationException.cs
View File

@ -1,24 +0,0 @@
using System;
namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Exceptions
{
public class WechatTenpayResponseVerificationException : WechatTenpayException
{
/// <inheritdoc/>
internal WechatTenpayResponseVerificationException()
{
}
/// <inheritdoc/>
internal WechatTenpayResponseVerificationException(string message)
: base(message)
{
}
/// <inheritdoc/>
internal WechatTenpayResponseVerificationException(string message, Exception innerException)
: base(message, innerException)
{
}
}
}

28
src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientEventVerificationExtensions.cs
View File

@ -35,39 +35,23 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
if (callbackSignature == null) throw new ArgumentNullException(nameof(callbackSignature)); if (callbackSignature == null) throw new ArgumentNullException(nameof(callbackSignature));
if (callbackSerialNumber == null) throw new ArgumentNullException(nameof(callbackSerialNumber)); if (callbackSerialNumber == null) throw new ArgumentNullException(nameof(callbackSerialNumber));
if (client.CertificateManager == null) if (client.CertificateManager != null)
{ {
throw new Exceptions.WechatTenpayResponseVerificationException($"You must set an instance of `{nameof(Settings.CertificateManager)}` at first.");
}
else
{
string? certificate = client.CertificateManager.GetCertificate(callbackSerialNumber);
if (certificate == null)
throw new Exceptions.WechatTenpayResponseVerificationException("Cannot get certificate by the serial number, may not be stored.");
string? publicKey = null;
try try
{ {
publicKey = Utilities.RSAUtility.ExportPublicKey(certificate); string certificate = client.CertificateManager.GetCertificate(callbackSerialNumber)!;
} string publicKey = Utilities.RSAUtility.ExportPublicKey(certificate);
catch (Exception ex)
{
throw new Exceptions.WechatTenpayResponseVerificationException("Cannot get public key of the certificate, may not be a valid certificate data.", ex);
}
try
{
return Utilities.RSAUtility.VerifyWithSHA256( return Utilities.RSAUtility.VerifyWithSHA256(
publicKey: publicKey, publicKey: publicKey,
plainText: GetPlainTextForSignature(timestamp: callbackTimestamp, nonce: callbackNonce, body: callbackBody), plainText: GetPlainTextForSignature(timestamp: callbackTimestamp, nonce: callbackNonce, body: callbackBody),
signature: callbackSignature signature: callbackSignature
); );
} }
catch (Exception ex) catch { }
{
throw new Exceptions.WechatTenpayResponseVerificationException("Verify event signature failed. Please see the `InnerException` for more details.", ex);
}
} }
return false;
} }
private static string GetPlainTextForSignature(string timestamp, string nonce, string body) private static string GetPlainTextForSignature(string timestamp, string nonce, string body)

31
src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientResponseVerificationExtensions.cs
View File

@ -23,42 +23,23 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
if (client == null) throw new ArgumentNullException(nameof(client)); if (client == null) throw new ArgumentNullException(nameof(client));
if (response == null) throw new ArgumentNullException(nameof(response)); if (response == null) throw new ArgumentNullException(nameof(response));
if (client.CertificateManager == null) if (client.CertificateManager != null)
{ {
throw new Exceptions.WechatTenpayResponseVerificationException($"You must set an instance of `{nameof(Settings.CertificateManager)}` at first.");
}
else
{
if (response.WechatpayCertSerialNumber == null)
throw new Exceptions.WechatTenpayResponseVerificationException("Cannot read the serial number in headers of this response.");
string? certificate = client.CertificateManager.GetCertificate(response.WechatpayCertSerialNumber);
if (certificate == null)
throw new Exceptions.WechatTenpayResponseVerificationException("Cannot get certificate by the serial number, may not be stored.");
string? publicKey = null;
try try
{ {
publicKey = Utilities.RSAUtility.ExportPublicKey(certificate); string certificate = client.CertificateManager.GetCertificate(response.WechatpayCertSerialNumber)!;
} string publicKey = Utilities.RSAUtility.ExportPublicKey(certificate);
catch (Exception ex)
{
throw new Exceptions.WechatTenpayResponseVerificationException("Cannot get public key of the certificate, may not be a valid certificate data.", ex);
}
try
{
return Utilities.RSAUtility.VerifyWithSHA256( return Utilities.RSAUtility.VerifyWithSHA256(
publicKey: publicKey, publicKey: publicKey,
plainText: GetPlainTextForSignature(response), plainText: GetPlainTextForSignature(response),
signature: response.WechatpaySignature signature: response.WechatpaySignature
); );
} }
catch (Exception ex) catch { }
{
throw new Exceptions.WechatTenpayResponseVerificationException("Verify response signature failed.", ex);
}
} }
return false;
} }
private static string GetPlainTextForSignature(WechatTenpayResponse response) private static string GetPlainTextForSignature(WechatTenpayResponse response)