Check that regex succeeded and value is an integer. (#2958)

Co-authored-by: id4s <user@contoso.com>
AzureAD · Aug 1, 2024 · a596983 · a596983
1 parent 0fdfc96
commit a596983
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Microsoft.Identity.Web/CookiePolicyOptionsExtensions.cs b/src/Microsoft.Identity.Web/CookiePolicyOptionsExtensions.cs
@@ -152,8 +152,13 @@ bool IsChromiumVersionAtLeast(int major)
 
                 // Extract digits from first capturing group.
                 Match match = Regex.Match(userAgent, regex);
-                int version = Convert.ToInt32(match.Groups[1].Value, CultureInfo.CurrentCulture);
-                return version >= major;
+                if (!match.Success)
+                    return false;
+
+                if (int.TryParse(match.Groups[1].Value, out int version))
+                    return version >= major;
+
+                return false;
             }
 
             bool IsUcBrowser()

diff --git a/tests/Microsoft.Identity.Web.Test/CookiePolicyOptionsExtensionsTests.cs b/tests/Microsoft.Identity.Web.Test/CookiePolicyOptionsExtensionsTests.cs
@@ -90,6 +90,7 @@ public void HandleSameSiteCookieCompatibility_CustomFilter_ExecutesSuccessfully(
         }
 
         [Theory]
+        [InlineData(false, "Dalvik / 2.1.0(Linux; U; Android 12; Chromecast Build / STTE.230319.008.H1)")]
         [InlineData(true, "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148")]
         [InlineData(true, "Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1 Mobile/15E148 Safari/604.1")]
         [InlineData(true, "Mozilla/5.0 (iPad; CPU OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148")]