Rework HeaderUtilities.Contains

Author: JunTaoLuo

src/Microsoft.Net.Http.Headers/HeaderUtilities.cs

@@ -220,7 +220,7 @@ internal static int GetNextNonEmptyOrWhitespaceIndex(
         /// <code>false</code>.
         /// </returns>
         // e.g. { "headerValue=10, targetHeaderValue=30" }
-        public static bool TryParseTimeSpan(StringValues headerValues, string targetValue, out TimeSpan? value)
+        public static bool TryParseSeconds(StringValues headerValues, string targetValue, out TimeSpan? value)
         {
             for (var i = 0; i < headerValues.Count; i++)
             {
@@ -258,12 +258,49 @@ public static bool TryParseTimeSpan(StringValues headerValues, string targetValu
         /// </returns>
         public static bool Contains(StringValues headerValues, string targetValue)
         {
+            if (StringValues.IsNullOrEmpty(headerValues) || string.IsNullOrEmpty(targetValue))
+            {
+                return false;
+            }
+
+
             for (var i = 0; i < headerValues.Count; i++)
             {
-                var index = headerValues[i].IndexOf(targetValue, StringComparison.OrdinalIgnoreCase);
-                if (index != -1)
+                var current = 0;
+
+                // Trim leading white space
+                current += HttpRuleParser.GetWhitespaceLength(headerValues[i], current);
+
+                while (current < headerValues[i].Length)
                 {
-                    return true;
+                    var tokenLength = HttpRuleParser.GetTokenLength(headerValues[i], current);
+                    if (tokenLength == targetValue.Length
+                        && string.Compare(headerValues[i], current, targetValue, 0, tokenLength, StringComparison.OrdinalIgnoreCase) == 0)
+                    {
+                        // Token matches target value
+                        return true;
+                    }
+                    else
+                    {
+                        // Skip until the next potential name
+                        current += tokenLength;
+                        current += HttpRuleParser.GetWhitespaceLength(headerValues[i], current);
+
+                        // Skip the value if present
+                        if (current < headerValues[i].Length && headerValues[i][current] == '=')
+                        {
+                            current++; // skip '='
+                            current += NameValueHeaderValue.GetValueLength(headerValues[i], current);
+                            current += HttpRuleParser.GetWhitespaceLength(headerValues[i], current);
+                        }
+
+                        // Skip the delimiter
+                        if (current < headerValues[i].Length && headerValues[i][current] == ',')
+                        {
+                            current++; // skip ','
+                            current += HttpRuleParser.GetWhitespaceLength(headerValues[i], current);
+                        }
+                    }
                 }
             }
 

test/Microsoft.Net.Http.Headers.Tests/HeaderUtilitiesTest.cs

@@ -52,10 +52,10 @@ public static TheoryData<DateTimeOffset, bool> TestValues
         [InlineData("header1   =45, header2=80", "header1", 45)]
         [InlineData("header1=   89   , header2=22", "header1", 89)]
         [InlineData("header1=   89   , header2= 42", "header2", 42)]
-        public void TryParseTimeSpan_Succeeds(string headerValues, string targetValue, int expectedValue)
+        public void TryParseSeconds_Succeeds(string headerValues, string targetValue, int expectedValue)
         {
             TimeSpan? value;
-            Assert.True(HeaderUtilities.TryParseTimeSpan(new StringValues(headerValues), targetValue, out value));
+            Assert.True(HeaderUtilities.TryParseSeconds(new StringValues(headerValues), targetValue, out value));
             Assert.Equal(TimeSpan.FromSeconds(expectedValue), value);
         }
 
@@ -66,10 +66,44 @@ public void TryParseTimeSpan_Succeeds(string headerValues, string targetValue, i
         [InlineData("h=10", "header")]
         [InlineData("", "")]
         [InlineData(null, null)]
-        public void TryParseTimeSpan_Fails(string headerValues, string targetValue)
+        public void TryParseSeconds_Fails(string headerValues, string targetValue)
         {
             TimeSpan? value;
-            Assert.False(HeaderUtilities.TryParseTimeSpan(new StringValues(headerValues), targetValue, out value));
+            Assert.False(HeaderUtilities.TryParseSeconds(new StringValues(headerValues), targetValue, out value));
+        }
+
+        [Theory]
+        [InlineData("h", "h", true)]
+        [InlineData("h=", "h", true)]
+        [InlineData("h=1", "h", true)]
+        [InlineData("H", "h", true)]
+        [InlineData("H=", "h", true)]
+        [InlineData("H=1", "h", true)]
+        [InlineData("h", "H", true)]
+        [InlineData("h=", "H", true)]
+        [InlineData("h=1", "H", true)]
+        [InlineData("header1, header=10", "header1", true)]
+        [InlineData("header1=, header=10", "header1", true)]
+        [InlineData("header1=3, header=10", "header1", true)]
+        [InlineData("header1   , header=80", "header1", true)]
+        [InlineData("header1   =45, header=80", "header1", true)]
+        [InlineData("header1=   89   , header=22", "header1", true)]
+        [InlineData("header1=3, header", "header", true)]
+        [InlineData("header1=3, header=", "header", true)]
+        [InlineData("header1=3, header=10", "header", true)]
+        [InlineData("header1=   89   , header= 42", "header", true)]
+        [InlineData("header1=   89   , header = 42", "header", true)]
+        [InlineData(null, null, false)]
+        [InlineData(null, "", false)]
+        [InlineData("", null, false)]
+        [InlineData("", "", false)]
+        [InlineData("h=10", "header", false)]
+        [InlineData("header1", "header", false)]
+        [InlineData("h=header", "header", false)]
+        [InlineData("header1, header2=80", "header", false)]
+        public void Contains_MatchesExactValue(string headerValues, string targetValue, bool contains)
+        {
+            Assert.Equal(contains, HeaderUtilities.Contains(new StringValues(headerValues), targetValue));
         }
 
         [Theory]