Fix: Add RegexDefaults class and update all Regex timeouts

Introduced a new static class `RegexDefaults` in `Constants.cs` to define default values for regular expressions, including a default timeout of 200 milliseconds. Updated various `Regex` instances across multiple files (`DateTimeSerializer.cs`, `RecurrencePatternSerializer.cs`, `RequestStatusSerializer.cs`, `StringSerializer.cs`, `TimeSpanSerializer.cs`, `UtcOffsetSerializer.cs`, `WeekDaySerializer.cs`, `SimpleDeserializer.cs`, `TextUtil.cs`) to use the new `RegexDefaults.Timeout` for specifying the timeout parameter.
ical-org · Oct 13, 2024 · ae4bd4f · ae4bd4f
1 parent 5067c3c
commit ae4bd4f
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 21 deletions.
diff --git a/Ical.Net/Constants.cs b/Ical.Net/Constants.cs
@@ -353,4 +353,19 @@ public static class CalendarMethods
         /// </summary>
         public const string DeclineCounter = "DECLINECOUNTER";
     }
+
+    /// <summary>
+    /// The defaults used for regular expressions.
+    /// </summary>
+    public static class RegexDefaults
+    {
+        /// <summary>
+        /// The default timeout for regular expressions in milliseconds.
+        /// </summary>
+        public const int TimeoutMilliseconds = 200;
+        /// <summary>
+        /// The default timeout for regular expressions.
+        /// </summary>
+        public static readonly TimeSpan Timeout = TimeSpan.FromMilliseconds(TimeoutMilliseconds);
+    }
 }
diff --git a/Ical.Net/Serialization/DataTypes/DateTimeSerializer.cs b/Ical.Net/Serialization/DataTypes/DateTimeSerializer.cs
@@ -93,8 +93,8 @@ public override string SerializeToString(object obj)
         }
 
         private const RegexOptions _ciCompiled = RegexOptions.Compiled | RegexOptions.IgnoreCase;
-        internal static readonly Regex DateOnlyMatch = new Regex(@"^((\d{4})(\d{2})(\d{2}))?$", _ciCompiled);
-        internal static readonly Regex FullDateTimePatternMatch = new Regex(@"^((\d{4})(\d{2})(\d{2}))T((\d{2})(\d{2})(\d{2})(Z)?)$", _ciCompiled);
+        internal static readonly Regex DateOnlyMatch = new Regex(@"^((\d{4})(\d{2})(\d{2}))?$", _ciCompiled, RegexDefaults.Timeout);
+        internal static readonly Regex FullDateTimePatternMatch = new Regex(@"^((\d{4})(\d{2})(\d{2}))T((\d{2})(\d{2})(\d{2})(Z)?)$", _ciCompiled, RegexDefaults.Timeout);
 
         public override object Deserialize(TextReader tr)
         {

diff --git a/Ical.Net/Serialization/DataTypes/RecurrencePatternSerializer.cs b/Ical.Net/Serialization/DataTypes/RecurrencePatternSerializer.cs
@@ -190,25 +190,25 @@ public override string SerializeToString(object obj)
         private const RegexOptions _ciCompiled = RegexOptions.IgnoreCase | RegexOptions.Compiled;
 
         internal static readonly Regex OtherInterval =
-            new Regex(@"every\s+(?<Interval>other|\d+)?\w{0,2}\s*(?<Freq>second|minute|hour|day|week|month|year)s?,?\s*(?<More>.+)", _ciCompiled);
+            new Regex(@"every\s+(?<Interval>other|\d+)?\w{0,2}\s*(?<Freq>second|minute|hour|day|week|month|year)s?,?\s*(?<More>.+)", _ciCompiled, RegexDefaults.Timeout);
 
-        internal static readonly Regex AdverbFrequencies = new Regex(@"FREQ=(SECONDLY|MINUTELY|HOURLY|DAILY|WEEKLY|MONTHLY|YEARLY);?(.*)", _ciCompiled);
+        internal static readonly Regex AdverbFrequencies = new Regex(@"FREQ=(SECONDLY|MINUTELY|HOURLY|DAILY|WEEKLY|MONTHLY|YEARLY);?(.*)", _ciCompiled, RegexDefaults.Timeout);
 
-        internal static readonly Regex NumericTemporalUnits = new Regex(@"(?<Num>\d+)\w\w\s+(?<Type>second|minute|hour|day|week|month)", _ciCompiled);
+        internal static readonly Regex NumericTemporalUnits = new Regex(@"(?<Num>\d+)\w\w\s+(?<Type>second|minute|hour|day|week|month)", _ciCompiled, RegexDefaults.Timeout);
 
-        internal static readonly Regex TemporalUnitType = new Regex(@"(?<Type>second|minute|hour|day|week|month)\s+(?<Num>\d+)", _ciCompiled);
+        internal static readonly Regex TemporalUnitType = new Regex(@"(?<Type>second|minute|hour|day|week|month)\s+(?<Num>\d+)", _ciCompiled, RegexDefaults.Timeout);
 
         internal static readonly Regex RelativeDaysOfWeek =
             new Regex(
                 @"(?<Num>\d+\w{0,2})?(\w|\s)+?(?<First>first)?(?<Last>last)?\s*((?<Day>sunday|monday|tuesday|wednesday|thursday|friday|saturday)\s*(and|or)?\s*)+",
-                _ciCompiled);
+                _ciCompiled, RegexDefaults.Timeout);
 
         internal static readonly Regex Time = new Regex(@"at\s+(?<Hour>\d{1,2})(:(?<Minute>\d{2})((:|\.)(?<Second>\d{2}))?)?\s*(?<Meridian>(a|p)m?)?",
-            _ciCompiled);
+            _ciCompiled, RegexDefaults.Timeout);
 
-        internal static readonly Regex RecurUntil = new Regex(@"^\s*until\s+(?<DateTime>.+)$", _ciCompiled);
+        internal static readonly Regex RecurUntil = new Regex(@"^\s*until\s+(?<DateTime>.+)$", _ciCompiled, RegexDefaults.Timeout);
 
-        internal static readonly Regex SpecificRecurrenceCount = new Regex(@"^\s*for\s+(?<Count>\d+)\s+occurrences\s*$", _ciCompiled);
+        internal static readonly Regex SpecificRecurrenceCount = new Regex(@"^\s*for\s+(?<Count>\d+)\s+occurrences\s*$", _ciCompiled, RegexDefaults.Timeout);
 
         public override object Deserialize(TextReader tr)
         {

diff --git a/Ical.Net/Serialization/DataTypes/RequestStatusSerializer.cs b/Ical.Net/Serialization/DataTypes/RequestStatusSerializer.cs
@@ -59,8 +59,8 @@ public override string SerializeToString(object obj)
             }
         }
 
-        internal static readonly Regex NarrowRequestMatch = new Regex(@"(.*?[^\\]);(.*?[^\\]);(.+)", RegexOptions.Compiled);
-        internal static readonly Regex BroadRequestMatch = new Regex(@"(.*?[^\\]);(.+)", RegexOptions.Compiled);
+        internal static readonly Regex NarrowRequestMatch = new Regex(@"(.*?[^\\]);(.*?[^\\]);(.+)", RegexOptions.Compiled, RegexDefaults.Timeout);
+        internal static readonly Regex BroadRequestMatch = new Regex(@"(.*?[^\\]);(.+)", RegexOptions.Compiled, RegexDefaults.Timeout);
 
         public override object Deserialize(TextReader tr)
         {

diff --git a/Ical.Net/Serialization/DataTypes/StatusCodeSerializer.cs b/Ical.Net/Serialization/DataTypes/StatusCodeSerializer.cs
@@ -29,7 +29,7 @@ public override string SerializeToString(object obj)
             return Encode(sc, Escape(string.Join(".", vals)));
         }
 
-        internal static readonly Regex StatusCode = new Regex(@"\d(\.\d+)*", RegexOptions.Compiled | RegexOptions.CultureInvariant);
+        internal static readonly Regex StatusCode = new Regex(@"\d(\.\d+)*", RegexOptions.Compiled | RegexOptions.CultureInvariant, RegexDefaults.Timeout);
 
         public override object Deserialize(TextReader tr)
         {

diff --git a/Ical.Net/Serialization/DataTypes/StringSerializer.cs b/Ical.Net/Serialization/DataTypes/StringSerializer.cs
@@ -14,7 +14,7 @@ public StringSerializer() { }
 
         public StringSerializer(SerializationContext ctx) : base(ctx) { }
 
-        internal static readonly Regex SingleBackslashMatch = new Regex(@"(?<!\\)\\(?!\\)", RegexOptions.Compiled);
+        internal static readonly Regex SingleBackslashMatch = new Regex(@"(?<!\\)\\(?!\\)", RegexOptions.Compiled, RegexDefaults.Timeout);
 
         protected virtual string Unescape(string value)
         {
@@ -98,7 +98,7 @@ public override string SerializeToString(object obj)
             return string.Join(",", values);
         }
 
-        internal static readonly Regex UnescapedCommas = new Regex(@"(?<!\\),", RegexOptions.Compiled);
+        internal static readonly Regex UnescapedCommas = new Regex(@"(?<!\\),", RegexOptions.Compiled, RegexDefaults.Timeout);
         public override object Deserialize(TextReader tr)
         {
             if (tr == null)

diff --git a/Ical.Net/Serialization/DataTypes/TimeSpanSerializer.cs b/Ical.Net/Serialization/DataTypes/TimeSpanSerializer.cs
@@ -68,7 +68,7 @@ public override string SerializeToString(object obj)
 
         internal static readonly Regex TimespanMatch =
             new Regex(@"^(?<sign>\+|-)?P(((?<week>\d+)W)|(?<main>((?<day>\d+)D)?(?<time>T((?<hour>\d+)H)?((?<minute>\d+)M)?((?<second>\d+)S)?)?))$",
-                RegexOptions.Compiled | RegexOptions.IgnoreCase);
+                RegexOptions.Compiled | RegexOptions.IgnoreCase, RegexDefaults.Timeout);
 
         public override object Deserialize(TextReader tr)
         {

diff --git a/Ical.Net/Serialization/DataTypes/UtcOffsetSerializer.cs b/Ical.Net/Serialization/DataTypes/UtcOffsetSerializer.cs
@@ -28,7 +28,7 @@ public override string SerializeToString(object obj)
             return null;
         }
 
-        internal static readonly Regex DecodeOffset = new Regex(@"(\+|-)(\d{2})(\d{2})(\d{2})?", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        internal static readonly Regex DecodeOffset = new Regex(@"(\+|-)(\d{2})(\d{2})(\d{2})?", RegexOptions.Compiled | RegexOptions.IgnoreCase, RegexDefaults.Timeout);
 
         public override object Deserialize(TextReader tr)
         {

diff --git a/Ical.Net/Serialization/DataTypes/WeekDaySerializer.cs b/Ical.Net/Serialization/DataTypes/WeekDaySerializer.cs
@@ -30,7 +30,7 @@ public override string SerializeToString(object obj)
             return Encode(ds, value);
         }
 
-        private static readonly Regex _dayOfWeek = new Regex(@"(\+|-)?(\d{1,2})?(\w{2})", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex _dayOfWeek = new Regex(@"(\+|-)?(\d{1,2})?(\w{2})", RegexOptions.Compiled | RegexOptions.IgnoreCase, RegexDefaults.Timeout);
 
         public override object Deserialize(TextReader tr)
         {

diff --git a/Ical.Net/Serialization/SimpleDeserializer.cs b/Ical.Net/Serialization/SimpleDeserializer.cs
@@ -30,7 +30,7 @@ internal SimpleDeserializer(
         private const string _paramNameGroup = "paramName";
         private const string _paramValueGroup = "paramValue";
 
-        private static readonly Regex _contentLineRegex = new Regex(BuildContentLineRegex(), RegexOptions.Compiled);
+        private static readonly Regex _contentLineRegex = new Regex(BuildContentLineRegex(), RegexOptions.Compiled, RegexDefaults.Timeout);
 
         private readonly DataTypeMapper _dataTypeMapper;
         private readonly ISerializerFactory _serializerFactory;

diff --git a/Ical.Net/Utility/TextUtil.cs b/Ical.Net/Utility/TextUtil.cs
@@ -47,7 +47,7 @@ public static string RemoveEmptyLines(string s)
             return s;
         }
 
-        internal static readonly Regex NormalizeToCrLf = new Regex(@"((\r(?=[^\n]))|((?<=[^\r])\n))", RegexOptions.Compiled);
+        internal static readonly Regex NormalizeToCrLf = new Regex(@"((\r(?=[^\n]))|((?<=[^\r])\n))", RegexOptions.Compiled, RegexDefaults.Timeout);
 
         /// <summary>
         /// Normalizes line endings, converting "\r" into "\r\n" and "\n" into "\r\n".
@@ -62,7 +62,7 @@ public static TextReader Normalize(string s, SerializationContext ctx)
             return new StringReader(s);
         }
 
-        internal static readonly Regex NewLineMatch = new Regex(@"(\r\n[ \t])", RegexOptions.Compiled);
+        internal static readonly Regex NewLineMatch = new Regex(@"(\r\n[ \t])", RegexOptions.Compiled, RegexDefaults.Timeout);
 
         /// <summary> Unwraps lines from the RFC 5545 "line folding" technique. </summary>
         public static string UnwrapLines(string s) => NewLineMatch.Replace(s, string.Empty);