mirror of
https://github.com/2dust/v2rayN.git
synced 2026-11-08 21:45:01 +03:00
fix(security): guard subscription/message regex filters against ReDoS (#10185)
Filter patterns (subscription subFilter, policy-group Filter, message MsgFilter) accept arbitrary user input while the tested text (remarks from subscriptions, log lines) is attacker-influenced. Regex.IsMatch without timeout hangs on evil patterns like (a+)+$ - a malicious subscription can freeze the UI/log pipeline on every update. Add Utils.IsRegexMatch with a 2s timeout; fail open (match) with a log so no node or message is silently dropped. Apply to all four call sites. Co-authored-by: sdhfsl <sdhfsl@users.noreply.github.com>
This commit is contained in:
@@ -726,6 +726,40 @@ public class Utils
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Regex match with a timeout guard. Filter patterns can come from user
|
||||
/// input or subscription content while the tested text (remarks, log
|
||||
/// messages) is attacker-influenced, so an evil pattern like (a+)+$
|
||||
/// would otherwise hang the caller (ReDoS). On timeout or invalid
|
||||
/// pattern, fail open (return true) so no node/message is silently
|
||||
/// dropped; the incident is logged.
|
||||
/// </summary>
|
||||
public static bool IsRegexMatch(string? input, string? pattern, int timeoutSeconds = 2)
|
||||
{
|
||||
if (pattern.IsNullOrEmpty())
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if (input.IsNullOrEmpty())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
try
|
||||
{
|
||||
return Regex.IsMatch(input, pattern, RegexOptions.None, TimeSpan.FromSeconds(timeoutSeconds));
|
||||
}
|
||||
catch (RegexMatchTimeoutException ex)
|
||||
{
|
||||
Logging.SaveLog("IsRegexMatch timeout", ex);
|
||||
return true;
|
||||
}
|
||||
catch (ArgumentException ex)
|
||||
{
|
||||
Logging.SaveLog("IsRegexMatch invalid pattern", ex);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion Data Checks
|
||||
|
||||
#region Speed Test
|
||||
|
||||
Reference in New Issue
Block a user