aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-01-17 13:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switching to compiled regex and further optimizing method

Browse Source
This commit is contained in:
rockstardev
2025-06-04 23:43:11 +02:00
parent d7662e789c
commit 1602069734
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
BTCPayServer/HostedServices/Webhooks/WebhookSender.cs
View File

@@ -6,6 +6,7 @@ using System.Net.Http;
using System.Net.Http.Headers;
using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using BTCPayServer.Client.Models;
@@ -285,11 +286,14 @@ public class WebhookSender(
return Task.FromResult(req)!;
}
// Regex pattern to validate JSONPath: alphanumeric, underscore, dot, hyphen, square brackets, asterisk, single/double quotes
private static readonly Regex _jsonPathRegex = new(@"^[a-zA-Z0-9_\.\-\[\]\*'""]*$", RegexOptions.Compiled);
protected static string InterpolateJsonField(string str, string fieldName, JObject obj)
{
if (string.IsNullOrEmpty(str) || string.IsNullOrEmpty(fieldName) || obj == null)
return str;
fieldName += ".";
// Regex pattern to validate JSONPath: alphanumeric, underscore, dot, hyphen, square brackets, asterisk, single/double quotes
const string jsonPathPattern = @"^[a-zA-Z0-9_\.\-\[\]\*'""]*$";
//find all instance of {fieldName*} in str, then run obj.SelectToken(*) on it
while (true)
@@ -312,7 +316,7 @@ public class WebhookSender(
{
result = obj.ToString();
}
else if (System.Text.RegularExpressions.Regex.IsMatch(jsonpath, jsonPathPattern))
else if (_jsonPathRegex.IsMatch(jsonpath))
{
// Only process if JSONPath is valid
result = obj.SelectToken(jsonpath)?.ToString() ?? string.Empty;