Merge pull request #891 from Project-MONAI/FixRegex

neildsouth · web-flow · commit 66bddafa0499 · 2023-10-16T10:15:29.000+01:00
add timeout to regex
diff --git a/src/WorkflowManager/ConditionsResolver/Resovler/Conditional.cs b/src/WorkflowManager/ConditionsResolver/Resovler/Conditional.cs
@@ -92,7 +92,7 @@ public int Parse(ReadOnlySpan<char> input, int currentIndex = 0)
             {
                 var pattern = @"(?i:\bnull\b|''|""""|\bundefined\b)";
                 var replace = NULL;
-                input = Regex.Replace(input.ToString(), pattern, replace, RegexOptions.IgnoreCase);
+                input = Regex.Replace(input.ToString(), pattern, replace, RegexOptions.IgnoreCase, TimeSpan.FromSeconds(1));
             }
 
             if (input.IsEmpty || input.IsWhiteSpace())
@@ -211,7 +211,7 @@ private int ParseChars(ReadOnlySpan<char> input, int currentIndex, char currentC
 
         private int ParseExtendedOperators(ReadOnlySpan<char> input, int currentIndex)
         {
-            var currentWord = Regex.Match(input.ToString(), @"\'\w+\'|^\w+").Value;
+            var currentWord = Regex.Match(input.ToString(), @"\'\w+\'|^\w+", new RegexOptions(), TimeSpan.FromSeconds(1)).Value;
 
             if (currentWord.ToUpper() == CONTAINS && currentIndex != 0)
             {

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public int Parse(ReadOnlySpan<char> input, int currentIndex = 0)`
`92`	`92`	`{`
`93`	`93`	`var pattern = @"(?i:\bnull\b\|''\|""""\|\bundefined\b)";`
`94`	`94`	`var replace = NULL;`
`95`		`- input = Regex.Replace(input.ToString(), pattern, replace, RegexOptions.IgnoreCase);`
	`95`	`+ input = Regex.Replace(input.ToString(), pattern, replace, RegexOptions.IgnoreCase, TimeSpan.FromSeconds(1));`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`if (input.IsEmpty \|\| input.IsWhiteSpace())`
`@@ -211,7 +211,7 @@ private int ParseChars(ReadOnlySpan<char> input, int currentIndex, char currentC`
`211`	`211`
`212`	`212`	`private int ParseExtendedOperators(ReadOnlySpan<char> input, int currentIndex)`
`213`	`213`	`{`
`214`		`- var currentWord = Regex.Match(input.ToString(), @"\'\w+\'\|^\w+").Value;`
	`214`	`+ var currentWord = Regex.Match(input.ToString(), @"\'\w+\'\|^\w+", new RegexOptions(), TimeSpan.FromSeconds(1)).Value;`
`215`	`215`
`216`	`216`	`if (currentWord.ToUpper() == CONTAINS && currentIndex != 0)`
`217`	`217`	`{`