Compare commits
65
Commits
0a95df4c39
..
1.68.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
29f6d66c44 | ||
|
|
fd6057d691 | ||
|
|
bcfc9ef962 | ||
|
|
7961d934ba | ||
|
|
b4e967acc9 | ||
|
|
205bbb9f3f | ||
|
|
73ef4b04a9 | ||
|
|
780415b6d4 | ||
|
|
879094073a | ||
|
|
b369dad452 | ||
|
|
c938bfec09 | ||
|
|
adc14038db | ||
|
|
61cb6c2228 | ||
|
|
e7a798b5e9 | ||
|
|
41b6b71b31 | ||
|
|
ee6beef603 | ||
|
|
1c3f3eaf0d | ||
|
|
2e77666d9e | ||
|
|
1977b6b301 | ||
|
|
0ab14d8b63 | ||
|
|
466458e230 | ||
|
|
141d32f591 | ||
|
|
d9e7f225ae | ||
|
|
6ae63e2ad1 | ||
|
|
f5efdde37c | ||
|
|
1592d5dc8f | ||
|
|
50a8a59d92 | ||
|
|
b70d9559b0 | ||
|
|
81d5e8f07c | ||
|
|
20a53942b5 | ||
|
|
9edb2aa4aa | ||
|
|
6ed023f2cf | ||
|
|
2c9f5a846c | ||
|
|
41f7c05be3 | ||
|
|
1a03355e84 | ||
|
|
7743c3178e | ||
|
|
ab3d8e6e9a | ||
|
|
db4c348288 | ||
|
|
6683234642 | ||
|
|
6ddbb9479a | ||
|
|
6c7349a0f8 | ||
|
|
e97fd6cd3f | ||
|
|
184c7c252a | ||
|
|
bfe8c458d6 | ||
|
|
e6e0475db1 | ||
|
|
5090c60797 | ||
|
|
9432252e15 | ||
|
|
47111a1a3a | ||
|
|
6eb3d50375 | ||
|
|
4deb732804 | ||
|
|
20d9387d0b | ||
|
|
9f6d0ccaa0 | ||
|
|
1acbc4d213 | ||
|
|
8c99668fac | ||
|
|
ad44f46204 | ||
|
|
49d999c1e3 | ||
|
|
9ed4777a18 | ||
|
|
0cf44f68cc | ||
|
|
41ed5a4288 | ||
|
|
bbcba5e06c | ||
|
|
502cc326dd | ||
|
|
4675d4c5fc | ||
|
|
f80bb2fff9 | ||
|
|
6767906b0d | ||
|
|
a344af4498 |
@@ -37,7 +37,7 @@ public sealed class PayfastServiceFeatureTests(Fixture fixture) : IClassFixture<
|
|||||||
|
|
||||||
string liveTargetIp = addresses.First().ToString();
|
string liveTargetIp = addresses.First().ToString();
|
||||||
|
|
||||||
var result = await payfastService.ValidateReferrerIpAsync(liveTargetIp, fixture.CancellationToken);
|
var result = await payfastService.ValidateReferrerIpAsync(liveTargetIp, true, fixture.CancellationToken);
|
||||||
|
|
||||||
Assert.True(result.IsSuccess);
|
Assert.True(result.IsSuccess);
|
||||||
Assert.True(result.Value);
|
Assert.True(result.Value);
|
||||||
@@ -48,7 +48,7 @@ public sealed class PayfastServiceFeatureTests(Fixture fixture) : IClassFixture<
|
|||||||
{
|
{
|
||||||
string rogueIp = "8.8.8.8";
|
string rogueIp = "8.8.8.8";
|
||||||
|
|
||||||
var result = await payfastService.ValidateReferrerIpAsync(rogueIp, fixture.CancellationToken);
|
var result = await payfastService.ValidateReferrerIpAsync(rogueIp, true, fixture.CancellationToken);
|
||||||
|
|
||||||
Assert.True(result.IsSuccess);
|
Assert.True(result.IsSuccess);
|
||||||
Assert.False(result.Value);
|
Assert.False(result.Value);
|
||||||
|
|||||||
+1
-1
@@ -61,7 +61,7 @@ public sealed class PayfastPaymentConfirmationReceivedEventHandler(IServiceProvi
|
|||||||
|
|
||||||
if (notification.PerformBackgroundChecks)
|
if (notification.PerformBackgroundChecks)
|
||||||
{
|
{
|
||||||
var isHostValid = await payfastService.ValidateReferrerIpAsync(notification.RemoteIpAddress!, cancellationToken);
|
var isHostValid = await payfastService.ValidateReferrerIpAsync(notification.RemoteIpAddress!, notification.AllowLoopback, cancellationToken);
|
||||||
|
|
||||||
if (isHostValid.IsFailed)
|
if (isHostValid.IsFailed)
|
||||||
throw new Exception("Security validation exception: Webhook packet source address failed cluster validation checks.");
|
throw new Exception("Security validation exception: Webhook packet source address failed cluster validation checks.");
|
||||||
|
|||||||
+6
-3
@@ -13,15 +13,18 @@ public sealed class PayfastPaymentConfirmationReceivedEvent : EventBase, IEvent
|
|||||||
|
|
||||||
public bool PerformBackgroundChecks { get; set; }
|
public bool PerformBackgroundChecks { get; set; }
|
||||||
|
|
||||||
|
public bool AllowLoopback { get; set; }
|
||||||
|
|
||||||
public PayfastPaymentConfirmationReceivedEvent() { }
|
public PayfastPaymentConfirmationReceivedEvent() { }
|
||||||
|
|
||||||
private PayfastPaymentConfirmationReceivedEvent(PayfastWebhookPayload? payload, string paymentId, bool performBackgroundChecks = true)
|
private PayfastPaymentConfirmationReceivedEvent(PayfastWebhookPayload? payload, string paymentId, bool performBackgroundChecks = true, bool allowLoopback = false)
|
||||||
{
|
{
|
||||||
Payload = payload;
|
Payload = payload;
|
||||||
CorrelationId = paymentId;
|
CorrelationId = paymentId;
|
||||||
PerformBackgroundChecks = performBackgroundChecks;
|
PerformBackgroundChecks = performBackgroundChecks;
|
||||||
|
AllowLoopback = allowLoopback;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static PayfastPaymentConfirmationReceivedEvent Create(PayfastWebhookPayload? payload, string paymentId, bool performBackgroundChecks = true) =>
|
public static PayfastPaymentConfirmationReceivedEvent Create(PayfastWebhookPayload? payload, string paymentId, bool performBackgroundChecks = true, bool allowLoopback = false) =>
|
||||||
new(payload, paymentId, performBackgroundChecks);
|
new(payload, paymentId, performBackgroundChecks, allowLoopback);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ public sealed partial class PayfastService(IDbContextFactory<MidrandBooksDbConte
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async ValueTask<Result<bool>> ValidateReferrerIpAsync(string remoteIpAddress, CancellationToken cancellationToken = default)
|
public async ValueTask<Result<bool>> ValidateReferrerIpAsync(string remoteIpAddress, bool allowLoopback = false, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(remoteIpAddress))
|
if (string.IsNullOrWhiteSpace(remoteIpAddress))
|
||||||
return Result.Fail<bool>("Remote IP address is null or whitespace.");
|
return Result.Fail<bool>("Remote IP address is null or whitespace.");
|
||||||
@@ -74,6 +74,12 @@ public sealed partial class PayfastService(IDbContextFactory<MidrandBooksDbConte
|
|||||||
|
|
||||||
if (IPAddress.TryParse(remoteIpAddress, out var incomingIp))
|
if (IPAddress.TryParse(remoteIpAddress, out var incomingIp))
|
||||||
{
|
{
|
||||||
|
if (allowLoopback && IPAddress.IsLoopback(incomingIp))
|
||||||
|
{
|
||||||
|
logger.LogInformation("Local development loopback IP '{RemoteIp}' allowed bypassing DNS verification.", remoteIpAddress);
|
||||||
|
return Result.Ok(true);
|
||||||
|
}
|
||||||
|
|
||||||
bool isValid = validIps.Contains(incomingIp);
|
bool isValid = validIps.Contains(incomingIp);
|
||||||
|
|
||||||
if (!isValid)
|
if (!isValid)
|
||||||
|
|||||||
Reference in New Issue
Block a user