Compare commits
7
Commits
1.21
...
01d3aa90ea
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
01d3aa90ea | ||
|
|
c3981fd859 | ||
|
|
8cc4425dfb | ||
|
|
60579c6230 | ||
|
|
f3478270fb | ||
|
|
1039f6f2d5 | ||
|
|
765eee2060 |
@@ -16,7 +16,8 @@ public sealed class PayfastConfirmationEndpoint : IEndpoint
|
|||||||
public void Map(IEndpointRouteBuilder builder)
|
public void Map(IEndpointRouteBuilder builder)
|
||||||
{
|
{
|
||||||
builder.MapPost("payments/payfast/confirm", async (HttpRequest request, PayfastService payfastService,
|
builder.MapPost("payments/payfast/confirm", async (HttpRequest request, PayfastService payfastService,
|
||||||
IJobOrchestrator jobOrchestrator, IConfiguration configuration, IHostEnvironment hostEnvironment, CancellationToken cancellationToken) =>
|
IJobOrchestrator jobOrchestrator, IConfiguration configuration, IHostEnvironment hostEnvironment,
|
||||||
|
ILogger<PayfastConfirmationEndpoint> logger, CancellationToken cancellationToken) =>
|
||||||
{
|
{
|
||||||
using Activity? activity = PaymentActivitySource.StartActivity("ReceivePayfastWebhook", ActivityKind.Server);
|
using Activity? activity = PaymentActivitySource.StartActivity("ReceivePayfastWebhook", ActivityKind.Server);
|
||||||
|
|
||||||
@@ -25,10 +26,6 @@ public sealed class PayfastConfirmationEndpoint : IEndpoint
|
|||||||
|
|
||||||
string? remoteIp = request.HttpContext.Connection.RemoteIpAddress?.ToString();
|
string? remoteIp = request.HttpContext.Connection.RemoteIpAddress?.ToString();
|
||||||
|
|
||||||
var ipValidation = await payfastService.ValidateReferrerIpAsync(remoteIp!, !hostEnvironment.IsProduction(), cancellationToken);
|
|
||||||
|
|
||||||
if (ipValidation.IsFailed || !ipValidation.Value) return Results.Unauthorized();
|
|
||||||
|
|
||||||
var formCollection = await request.ReadFormAsync(cancellationToken);
|
var formCollection = await request.ReadFormAsync(cancellationToken);
|
||||||
|
|
||||||
if (!formCollection.TryGetValue("signature", out var signatureValues) || string.IsNullOrWhiteSpace(signatureValues.ToString()))
|
if (!formCollection.TryGetValue("signature", out var signatureValues) || string.IsNullOrWhiteSpace(signatureValues.ToString()))
|
||||||
@@ -43,7 +40,11 @@ public sealed class PayfastConfirmationEndpoint : IEndpoint
|
|||||||
var signatureCheck = PayfastService.GenerateSignature(paramDictionary, passphrase);
|
var signatureCheck = PayfastService.GenerateSignature(paramDictionary, passphrase);
|
||||||
|
|
||||||
if (signatureCheck.IsFailed || !string.Equals(signatureCheck.Value, incomingSignature, StringComparison.OrdinalIgnoreCase))
|
if (signatureCheck.IsFailed || !string.Equals(signatureCheck.Value, incomingSignature, StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
logger.LogCritical($"Incoming sugnature failed validation: {incomingSignature}, {signatureCheck.Errors.Select(e => e.Message).ToList()}");
|
||||||
|
|
||||||
return Results.Unauthorized();
|
return Results.Unauthorized();
|
||||||
|
}
|
||||||
|
|
||||||
var formPairs = formCollection.Select(kvp => $"{kvp.Key}={HttpUtility.UrlEncode(kvp.Value.ToString())}");
|
var formPairs = formCollection.Select(kvp => $"{kvp.Key}={HttpUtility.UrlEncode(kvp.Value.ToString())}");
|
||||||
|
|
||||||
@@ -54,7 +55,11 @@ public sealed class PayfastConfirmationEndpoint : IEndpoint
|
|||||||
var serverConfirmation = await payfastService.ValidateServerConfirmationAsync(rawQueryParamString, isSandbox, cancellationToken);
|
var serverConfirmation = await payfastService.ValidateServerConfirmationAsync(rawQueryParamString, isSandbox, cancellationToken);
|
||||||
|
|
||||||
if (serverConfirmation.IsFailed || !serverConfirmation.Value)
|
if (serverConfirmation.IsFailed || !serverConfirmation.Value)
|
||||||
|
{
|
||||||
|
logger.LogCritical($"Server confirmation failed: {rawQueryParamString}, {serverConfirmation.Errors.Select(e => e.Message).ToList()}");
|
||||||
|
|
||||||
return Results.Unauthorized();
|
return Results.Unauthorized();
|
||||||
|
}
|
||||||
|
|
||||||
var notification = PayfastPaymentConfirmationReceivedEvent.Create(payload, payload.MerchantPaymentId!,
|
var notification = PayfastPaymentConfirmationReceivedEvent.Create(payload, payload.MerchantPaymentId!,
|
||||||
allowLoopback: !hostEnvironment.IsProduction(), performBackgroundChecks: false);
|
allowLoopback: !hostEnvironment.IsProduction(), performBackgroundChecks: false);
|
||||||
|
|||||||
@@ -161,8 +161,8 @@ spec:
|
|||||||
httpGet:
|
httpGet:
|
||||||
path: /health
|
path: /health
|
||||||
port: 8080
|
port: 8080
|
||||||
initialDelaySeconds: 5
|
initialDelaySeconds: 10
|
||||||
periodSeconds: 10
|
periodSeconds: 15
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /health
|
path: /health
|
||||||
|
|||||||
Reference in New Issue
Block a user