Refactoring

src/WorkflowManager/ConditionsResolver/Parser/ConditionalParameterParser.cs

@@ -51,7 +51,7 @@
         private readonly IPayloadService _payloadService;
         private readonly IWorkflowService _workflowService;
 
-        private readonly Regex _squigglyBracketsRegex = new Regex(@"\{{(.*?)\}}");
+        private readonly Regex _squigglyBracketsRegex = new(@"\{{(.*?)\}}", RegexOptions.None, matchTimeout: TimeSpan.FromSeconds(2));
 
         private WorkflowInstance? _workflowInstance = null;
         private string? _workflowInstanceId = null;
@@ -282,7 +282,7 @@
             var subValues = subValue.Split('.');
             var id = subValues[1].Trim('\'');
 
             var task = WorkflowInstance?.Tasks.FirstOrDefault(t => t.TaskId == id);
 
             if (task is null)
             {

src/WorkflowManager/ConditionsResolver/Resovler/ConditionalGroup.cs

@@ -38,13 +38,13 @@
 
         public int GroupedLogical { get; set; } = 1;
 
-        public Regex FindAnds { get; } = new Regex(@"([\s]and[\s]|[\s]AND[\s]|[\s]And[\s])");
+        public Regex FindAnds { get; } = new(@"([\s]and[\s]|[\s]AND[\s]|[\s]And[\s])", RegexOptions.None, matchTimeout: TimeSpan.FromSeconds(2));
 
-        public Regex FindOrs { get; } = new Regex(@"([\s]or[\s]|[\s]OR[\s]|[\s]Or[\s])");
+        public Regex FindOrs { get; } = new(@"([\s]or[\s]|[\s]OR[\s]|[\s]Or[\s])", RegexOptions.None, matchTimeout: TimeSpan.FromSeconds(2));
 
-        public Regex FindBrackets { get; } = new Regex(@"((?<!\[)\()");
+        public Regex FindBrackets { get; } = new(@"((?<!\[)\()", RegexOptions.None, matchTimeout: TimeSpan.FromSeconds(2));
 
-        public Regex FindCloseBrackets { get; } = new Regex(@"((?<!\[)\))");
+        public Regex FindCloseBrackets { get; } = new(@"((?<!\[)\))", RegexOptions.None, matchTimeout: TimeSpan.FromSeconds(2));
 
         private string[] ParseOrs(string input) => FindOrs.SplitOnce(input);
 
@@ -96,7 +96,7 @@
 
             if (foundOpenBrackets.Count >= 1)
             {
                 var firstOpenBracketIndex = foundOpenBrackets.First().Index;
                 if (firstOpenBracketIndex == 0)
                 {
                     GroupedLogical = groupedLogicalParent + 1;
@@ -141,15 +141,15 @@
             }
             var startingBracketHasBeenTrimmed = indexOfClosingBracket < foundBrackets.Index;
             // if first index of any ANDs or ORs are before the first bracket then left hand evaluation should be processed
             if (!startingBracketHasBeenTrimmed && (foundAnds.Any() && foundAnds.First().Index < foundBrackets.Index) || (foundOrs.Any() && foundOrs.First().Index < foundBrackets.Index))
             {
                 if (!foundOrs.Any() || foundAnds.Any() && foundAnds.First().Index < foundOrs.First().Index)
                 {
                     var splitByAnds = ParseAnds(input);
                     var rightAnd = splitByAnds[1].TrimStartExt("AND");
                     Set(splitByAnds[0], rightAnd, Keyword.And);
                 }
                 else if (!foundAnds.Any() && foundOrs.Any() || foundOrs.First().Index < foundAnds.First().Index)
                 {
                     var splitByOrs = ParseOrs(input);
                     var rightOrs = splitByOrs[1].TrimStartExt("OR");
@@ -321,8 +321,8 @@
 
                 if (foundOpenBrackets.Count == 1)
                 {
                     var foundBracketsAreAtStartAndEnd = foundOpenBrackets.First().Index == 0
                         && foundClosingBrackets.First().Index == input.Length - 1;
                     if (foundBracketsAreAtStartAndEnd)
                     {
                         input = input.Trim('(');

src/WorkflowManager/WorkflowManager/Validators/WorkflowValidator.cs

@@ -270,7 +270,7 @@ private async Task ValidateWorkflowSpec(Workflow workflow)
             }
 
             var taskIds = workflow.Tasks.Select(t => t.Id);
-            var pattern = new Regex(@"^[a-zA-Z0-9-_]+$");
+            var pattern = new Regex(@"^[a-zA-Z0-9-_]+$", RegexOptions.None, matchTimeout: TimeSpan.FromSeconds(2));
             foreach (var taskId in taskIds)
             {
                 if (pattern.IsMatch(taskId) is false)

tests/UnitTests/ConditionsResolver.Tests/Resolver/RegexExtensionsTests.cs

@@ -30,7 +30,7 @@ public class RegexExtensionsTests
         [InlineData(new string[] { "test ", "( test( test" }, "test ( test( test")]
         public void Regex_WhenSplitOnce_ShouldOnlyHaveArrayOfTwo(string[] expected, string stringToSplit)
         {
-            var regexFindBrackets = new Regex(@"((?<!\[)\()");
+            var regexFindBrackets = new Regex(@"((?<!\[)\()", RegexOptions.None, matchTimeout: TimeSpan.FromSeconds(2));
             var result = regexFindBrackets.SplitOnce(stringToSplit);
             Assert.Equal(expected, result);
             Assert.Equal(2, result.Length);
@@ -40,7 +40,7 @@ public void Regex_WhenSplitOnce_ShouldOnlyHaveArrayOfTwo(string[] expected, stri
         public void Regex_WhenSplitOnceProvidedNullInput_ShouldThrowException()
         {
             var expectedErrorMessage = "Value cannot be null. (Parameter 'input')";
-            var regexFindBrackets = new Regex(@"((?<!\[)\()");
+            var regexFindBrackets = new Regex(@"((?<!\[)\()", RegexOptions.None, matchTimeout: TimeSpan.FromSeconds(2));
 #pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type.
             var exception = Assert.Throws<ArgumentNullException>(() => regexFindBrackets.SplitOnce(null));
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.