nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-06 05:28:15 -05:00
Code

[AC-1783] PayPal IPN Changes (#3404)

Browse Source 
* Reverted changes to the domain for the PayPal IPN client, and added more logging

* Removing User-Agent as it wasn't in the IPN client previously
This commit is contained in:
Conner Turnbull 2023-11-02 10:22:54 -04:00 committed by GitHub
parent a3e440209a
commit abc7b35a3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Billing/Utilities/PayPalIpnClient.cs
View File

@ -15,9 +15,9 @@ public class PayPalIpnClient
public PayPalIpnClient(IOptions<BillingSettings> billingSettings, ILogger<PayPalIpnClient> logger) public PayPalIpnClient(IOptions<BillingSettings> billingSettings, ILogger<PayPalIpnClient> logger)
{ {
var bSettings = billingSettings?.Value; var bSettings = billingSettings?.Value;
_ipnUri = new Uri(bSettings.PayPal.Production ? "https://ipnpb.paypal.com/cgi-bin/webscr" :
"https://ipnpb.sandbox.paypal.com/cgi-bin/webscr");
_logger = logger; _logger = logger;
_ipnUri = new Uri(bSettings.PayPal.Production ? "https://www.paypal.com/cgi-bin/webscr" :
"https://www.sandbox.paypal.com/cgi-bin/webscr");
} }
public async Task<bool> VerifyIpnAsync(string ipnBody) public async Task<bool> VerifyIpnAsync(string ipnBody)
@ -29,19 +29,16 @@ public class PayPalIpnClient
throw new ArgumentException("No IPN body."); throw new ArgumentException("No IPN body.");
} }
var request = new HttpRequestMessage var request = new HttpRequestMessage { Method = HttpMethod.Post, RequestUri = _ipnUri };
{
Method = HttpMethod.Post,
RequestUri = _ipnUri
};
_httpClient.DefaultRequestHeaders.Add("User-Agent", "CSharp-IPN-VerificationScript");
var cmdIpnBody = string.Concat("cmd=_notify-validate&", ipnBody); var cmdIpnBody = string.Concat("cmd=_notify-validate&", ipnBody);
request.Content = new StringContent(cmdIpnBody, Encoding.UTF8, "application/x-www-form-urlencoded"); request.Content = new StringContent(cmdIpnBody, Encoding.UTF8, "application/x-www-form-urlencoded");
var response = await _httpClient.SendAsync(request); var response = await _httpClient.SendAsync(request);
if (!response.IsSuccessStatusCode) if (!response.IsSuccessStatusCode)
{ {
_logger.LogError("Failed to receive a successful response from PayPal IPN verification service. Response: {Response}", response);
throw new Exception("Failed to verify IPN, status: " + response.StatusCode); throw new Exception("Failed to verify IPN, status: " + response.StatusCode);
} }
var responseContent = await response.Content.ReadAsStringAsync(); var responseContent = await response.Content.ReadAsStringAsync();
if (responseContent.Equals("VERIFIED")) if (responseContent.Equals("VERIFIED"))
{ {
@ -53,6 +50,7 @@ public class PayPalIpnClient
_logger.LogWarning("Received an INVALID response from PayPal: {ResponseContent}", responseContent); _logger.LogWarning("Received an INVALID response from PayPal: {ResponseContent}", responseContent);
return false; return false;
} }
_logger.LogError("Failed to verify IPN: {ResponseContent}", responseContent); _logger.LogError("Failed to verify IPN: {ResponseContent}", responseContent);
throw new Exception("Failed to verify IPN."); throw new Exception("Failed to verify IPN.");
} }