Merge pull request 'Updated nuget packages' (#26) from payments into master

Reviewed-on: #26

MidrandBooksApi/MidrandBooksApi.csproj

@@ -54,13 +54,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="LiteCharms.Features" Version="1.115.0" />
+    <PackageReference Include="LiteCharms.Features" Version="1.121.0" />
   </ItemGroup>
 
   <!-- UI -->
   <ItemGroup>
     <PackageReference Include="ANM.Blazored.Toast" Version="0.1.1" />
-    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.115.0" />
+    <PackageReference Include="LiteCharms.Features.MidrandBooks" Version="1.121.0" />
 
     <!-- Global Usings -->
     <Using Include="Blazored.Toast.Services" />

MidrandBooksApi/Payments/Payfast/PayfastConfirmationEndpoint.cs

@@ -16,19 +16,14 @@ public sealed class PayfastConfirmationEndpoint : IEndpoint
     public void Map(IEndpointRouteBuilder builder)
     {
         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);
 
             activity?.SetTag("messaging.system", "payfast");
             activity?.SetTag("messaging.destination.name", "payments/payfast/confirm");
 
-            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);
 
             if (!formCollection.TryGetValue("signature", out var signatureValues) || string.IsNullOrWhiteSpace(signatureValues.ToString()))
@@ -37,24 +32,30 @@ public sealed class PayfastConfirmationEndpoint : IEndpoint
             string incomingSignature = signatureValues.ToString().Trim();
             var payload = ParseForm(formCollection, incomingSignature);
 
-            var paramDictionary = payload.ToParamDictionary();
+            string? passphrase = configuration["PayfastSettings:Passphrase"];
-            string? passphrase = configuration["HasherSettings:PayfastPassphrase"];
 
-            var signatureCheck = PayfastService.GenerateSignature(paramDictionary, passphrase);
+            if (!PayfastService.VerifyIncomingSignatureFromForm(formCollection, passphrase!))
-
+            {
-            if (signatureCheck.IsFailed || !string.Equals(signatureCheck.Value, incomingSignature, StringComparison.OrdinalIgnoreCase))
+                logger.LogCritical($"Incoming signature failed validation: {incomingSignature}");
                 return Results.Unauthorized();
+            }
 
-            var formPairs = formCollection.Select(kvp => $"{kvp.Key}={HttpUtility.UrlEncode(kvp.Value.ToString())}");
+            var sortedPairs = formCollection
+                .Where(kvp => !kvp.Key.Equals("signature", StringComparison.OrdinalIgnoreCase))
+                .OrderBy(kvp => kvp.Key, StringComparer.Ordinal)
+                .Select(kvp => $"{kvp.Key}={HttpUtility.UrlEncode(kvp.Value.ToString().Trim())}");
 
-            string rawQueryParamString = string.Join("&", formPairs);
+            string rawQueryParamString = string.Join("&", sortedPairs);
 
             bool isSandbox = !hostEnvironment.IsProduction();
-
             var serverConfirmation = await payfastService.ValidateServerConfirmationAsync(rawQueryParamString, isSandbox, cancellationToken);
 
             if (serverConfirmation.IsFailed || !serverConfirmation.Value)
+            {
+                logger.LogCritical($"Payfast server validation ping rejected the request data: {rawQueryParamString}");
+
                 return Results.Unauthorized();
+            }
 
             var notification = PayfastPaymentConfirmationReceivedEvent.Create(payload, payload.MerchantPaymentId!,
                 allowLoopback: !hostEnvironment.IsProduction(), performBackgroundChecks: false);
@@ -62,7 +63,6 @@ public sealed class PayfastConfirmationEndpoint : IEndpoint
             await jobOrchestrator.SendAsync(notification, cancellationToken);
 
             activity?.SetStatus(ActivityStatusCode.Ok);
-
             return Results.Ok();
         })
         .WithDescription("Securely confirm and process an incoming Payfast merchant payment callback.")

midrandbooksapi-uat.yml

@@ -22,11 +22,9 @@ data:
   PayfastSettings__CheckoutUrl: "https://sandbox.payfast.co.za/eng/process"
   PayfastSettings__ValidHosts__0: "www.payfast.co.za"
   PayfastSettings__ValidHosts__1: "sandbox.payfast.co.za"
-  PayfastSettings__ValidHosts__2: "w1w.payfast.co.za"
+  PayfastSettings__ValidHosts__2: "ips.payfast.co.za"
-  PayfastSettings__ValidHosts__3: "w2w.payfast.co.za"
+  PayfastSettings__ValidHosts__3: "api.payfast.co.za"
-  PayfastSettings__ValidHosts__4: "ips.payfast.co.za"
+  PayfastSettings__ValidHosts__4: "payment.payfast.io"
-  PayfastSettings__ValidHosts__5: "api.payfast.co.za"
-  PayfastSettings__ValidHosts__6: "payment.payfast.io"
   LiteCharmsSettings__Authority: "https://sts.security.khongisa.co.za"
   LiteCharmsSettings__Audience: "midrandbooks-api"
 ---
@@ -128,17 +126,17 @@ spec:
             - name: PayfastSettings__Passphrase
               valueFrom:
                 secretKeyRef:
-                  name: scheduler-secrets
+                  name: midrandbooksapi-secrets
                   key: payfast-passphrase
             - name: PayfastSettings__MerchantId
               valueFrom:
                 secretKeyRef:
-                  name: scheduler-secrets
+                  name: midrandbooksapi-secrets
                   key: payfast-merchantid
             - name: PayfastSettings__MerchantKey
               valueFrom:
                 secretKeyRef:
-                  name: scheduler-secrets
+                  name: midrandbooksapi-secrets
                   key: payfast-merchantkey
             - name: ConnectionStrings__PostgresScheduler
               valueFrom:
@@ -163,8 +161,8 @@ spec:
             httpGet:
               path: /health
               port: 8080
-            initialDelaySeconds: 5
+            initialDelaySeconds: 10
-            periodSeconds: 10
+            periodSeconds: 15
           readinessProbe:
             httpGet:
               path: /health