[Infrastructure] Use GeneratedRegex property (#58710)

WeihanLi · web-flow · commit 8cdcb63a58cf · 2025-01-28T13:13:04.000+01:00
* Use GeneratedRegex property
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs b/src/Components/test/E2ETest/ServerExecutionTests/WebSocketCompressionTests.cs
@@ -104,11 +104,11 @@ public void EmbeddingServerAppInsideIframe_WithCompressionEnabled_Fails()
 
         Assert.True(logs.Count > 0);
 
-        Assert.Matches(ParseErrorMessage(), logs[0].Message);
+        Assert.Matches(ParseErrorMessageRegex, logs[0].Message);
     }
 
     [GeneratedRegex(@"security - Refused to frame 'http://\d+\.\d+\.\d+\.\d+:\d+/' because an ancestor violates the following Content Security Policy directive: ""frame-ancestors 'none'"".")]
-    private static partial Regex ParseErrorMessage();
+    private static partial Regex ParseErrorMessageRegex { get; }
 }
 
 public partial class DefaultConfigurationWebSocketCompressionTests : AllowedWebSocketCompressionTests
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/ResourceCollectionTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/ResourceCollectionTest.cs
@@ -32,11 +32,11 @@ public void StaticRendering_CanUseFingerprintedResources()
         var url = $"{ServerPathBase}/resource-collection";
         Navigate(url);
 
-        Browser.True(() => AppStylesRegex().IsMatch(Browser.Exists(By.Id("basic-app-styles")).Text));
+        Browser.True(() => AppStylesRegex.IsMatch(Browser.Exists(By.Id("basic-app-styles")).Text));
 
         Browser.Exists(By.Id("import-module")).Click();
 
-        Browser.True(() => JsModuleRegex().IsMatch(Browser.Exists(By.Id("js-module")).Text));
+        Browser.True(() => JsModuleRegex.IsMatch(Browser.Exists(By.Id("js-module")).Text));
     }
 
     [Theory]
@@ -49,15 +49,15 @@ public void StaticRendering_CanUseFingerprintedResources_InteractiveModes(string
 
         Browser.Equal(renderMode, () => Browser.Exists(By.Id("platform-name")).Text);
 
-        Browser.True(() => AppStylesRegex().IsMatch(Browser.Exists(By.Id("basic-app-styles")).Text));
+        Browser.True(() => AppStylesRegex.IsMatch(Browser.Exists(By.Id("basic-app-styles")).Text));
 
         Browser.Exists(By.Id("import-module")).Click();
 
-        Browser.True(() => JsModuleRegex().IsMatch(Browser.Exists(By.Id("js-module")).Text));
+        Browser.True(() => JsModuleRegex.IsMatch(Browser.Exists(By.Id("js-module")).Text));
     }
 
     [GeneratedRegex("""BasicTestApp\.[a-zA-Z0-9]{10}\.styles\.css""")]
-    private static partial Regex AppStylesRegex();
+    private static partial Regex AppStylesRegex { get; }
     [GeneratedRegex(""".*Index\.[a-zA-Z0-9]{10}\.mjs""")]
-    private static partial Regex JsModuleRegex();
+    private static partial Regex JsModuleRegex { get; }
 }
diff --git a/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs b/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs
@@ -117,16 +117,16 @@ public async Task IncrementallyUpdatesCache()
     }
 
     [GeneratedRegex("/Microsoft\\.AspNetCore\\.Components\\.\\w*\\.wasm")]
-    private static partial Regex GetFingerprintedComponentsEntryRegex();
+    private static partial Regex GetFingerprintedComponentsEntryRegex { get; }
 
     [GeneratedRegex("/dotnet\\.native\\.\\w*\\.wasm")]
-    private static partial Regex GetFingerprintedDotNetWasmEntryRegex();
+    private static partial Regex GetFingerprintedDotNetWasmEntryRegex { get; }
 
     private static bool IsFingerprintedComponentsEntry(string url)
-        => GetFingerprintedComponentsEntryRegex().IsMatch(url);
+        => GetFingerprintedComponentsEntryRegex.IsMatch(url);
 
     private static bool IsFingerprintedDotNetWasmEntry(string url)
-        => GetFingerprintedDotNetWasmEntryRegex().IsMatch(url);
+        => GetFingerprintedDotNetWasmEntryRegex.IsMatch(url);
 
     private IReadOnlyCollection<string> GetCacheEntryUrls()
     {
diff --git a/src/Http/Routing/src/Constraints/AlphaRouteConstraint.cs b/src/Http/Routing/src/Constraints/AlphaRouteConstraint.cs
@@ -20,10 +20,10 @@ internal partial class AlphaRouteConstraint : RegexRouteConstraint
     /// <summary>
     /// Initializes a new instance of the <see cref="AlphaRouteConstraint" /> class.
     /// </summary>
-    public AlphaRouteConstraint() : base(GetAlphaRouteRegex())
+    public AlphaRouteConstraint() : base(AlphaRouteRegex)
     {
     }
 
     [GeneratedRegex(@"^[A-Za-z]*$")]
-    private static partial Regex GetAlphaRouteRegex();
+    private static partial Regex AlphaRouteRegex { get; }
 }
diff --git a/src/Security/Authentication/Negotiate/src/Internal/LdapAdapter.cs b/src/Security/Authentication/Negotiate/src/Internal/LdapAdapter.cs
@@ -15,8 +15,8 @@ namespace Microsoft.AspNetCore.Authentication.Negotiate;
 internal static partial class LdapAdapter
 {
     [GeneratedRegex(@"(?<![^\\]\\),")]
-    internal static partial Regex DistinguishedNameSeparator();
-    
+    internal static partial Regex DistinguishedNameSeparatorRegex { get; }
+
     public static async Task RetrieveClaimsAsync(LdapSettings settings, ClaimsIdentity identity, ILogger logger)
     {
         var user = identity.Name!;
@@ -66,7 +66,7 @@ public static async Task RetrieveClaimsAsync(LdapSettings settings, ClaimsIdenti
             {
                 // Example distinguished name: CN=TestGroup,DC=KERB,DC=local
                 var groupDN = $"{Encoding.UTF8.GetString((byte[])group)}";
-                var groupCN = DistinguishedNameSeparator().Split(groupDN)[0].Substring("CN=".Length);
+                var groupCN = DistinguishedNameSeparatorRegex.Split(groupDN)[0].Substring("CN=".Length);
 
                 if (!settings.IgnoreNestedGroups)
                 {
@@ -124,7 +124,7 @@ private static void GetNestedGroups(LdapConnection connection, ClaimsIdentity pr
                 foreach (var member in memberof)
                 {
                     var nestedGroupDN = $"{Encoding.UTF8.GetString((byte[])member)}";
-                    var nestedGroupCN = DistinguishedNameSeparator().Split(nestedGroupDN)[0].Substring("CN=".Length);
+                    var nestedGroupCN = DistinguishedNameSeparatorRegex.Split(nestedGroupDN)[0].Substring("CN=".Length);
 
                     if (processedGroups.Contains(nestedGroupDN))
                     {
diff --git a/src/Security/Authentication/Negotiate/test/Negotiate.Test/LdapAdapterTests.cs b/src/Security/Authentication/Negotiate/test/Negotiate.Test/LdapAdapterTests.cs
@@ -8,31 +8,31 @@ public class LdapAdapterTests
     [Fact]
     public void DistinguishedNameWithoutCommasSuccess()
     {
-        var parts = LdapAdapter.DistinguishedNameSeparator().Split("Testing group - City");
+        var parts = LdapAdapter.DistinguishedNameSeparatorRegex.Split("Testing group - City");
 
         Assert.Equal(new[] { "Testing group - City" }, parts);
     }
 
     [Fact]
     public void DistinguishedNameWithEscapedCommaSuccess()
     {
-        var parts = LdapAdapter.DistinguishedNameSeparator().Split(@"Testing group\,City");
+        var parts = LdapAdapter.DistinguishedNameSeparatorRegex.Split(@"Testing group\,City");
 
         Assert.Equal(new[] { @"Testing group\,City" }, parts);
     }
 
     [Fact]
     public void DistinguishedNameWithNotEscapedCommaSuccess()
     {
-        var parts = LdapAdapter.DistinguishedNameSeparator().Split("Testing group,City");
+        var parts = LdapAdapter.DistinguishedNameSeparatorRegex.Split("Testing group,City");
 
         Assert.Equal(new[] { "Testing group", "City" }, parts);
     }
 
     [Fact]
     public void DistinguishedNameWithEscapedBackslashAndNotEscapedCommaSuccess()
     {
-        var parts = LdapAdapter.DistinguishedNameSeparator().Split(@"Testing group\\,City");
+        var parts = LdapAdapter.DistinguishedNameSeparatorRegex.Split(@"Testing group\\,City");
 
         Assert.Equal(new[] { @"Testing group\\", "City" }, parts);
     }
diff --git a/src/Shared/CertificateGeneration/UnixCertificateManager.cs b/src/Shared/CertificateGeneration/UnixCertificateManager.cs
@@ -776,7 +776,7 @@ private static List<NssDb> GetNssDbs(string homeDirectory)
     }
 
     [GeneratedRegex("OPENSSLDIR:\\s*\"([^\"]+)\"")]
-    private static partial Regex OpenSslVersionRegex();
+    private static partial Regex OpenSslVersionRegex { get; }
 
     /// <remarks>
     /// It is the caller's responsibility to ensure that <see cref="OpenSslCommand"/> is available.
@@ -803,7 +803,7 @@ private static bool TryGetOpenSslDirectory([NotNullWhen(true)] out string? openS
                 return false;
             }
 
-            var match = OpenSslVersionRegex().Match(stdout);
+            var match = OpenSslVersionRegex.Match(stdout);
             if (!match.Success)
             {
                 Log.UnixOpenSslVersionParsingFailed();
@@ -858,14 +858,14 @@ private static bool TryGetOpenSslHash(string certificatePath, [NotNullWhen(true)
     }
 
     [GeneratedRegex("^[0-9a-f]+\\.[0-9]+$")]
-    private static partial Regex OpenSslHashFilenameRegex();
+    private static partial Regex OpenSslHashFilenameRegex { get; }
 
     /// <remarks>
     /// We only ever use .pem, but someone will eventually put their own cert in this directory,
     /// so we should handle the same extensions as c_rehash (other than .crl).
     /// </remarks>
     [GeneratedRegex("\\.(pem|crt|cer)$")]
-    private static partial Regex OpenSslCertificateExtensionRegex();
+    private static partial Regex OpenSslCertificateExtensionRegex { get; }
 
     /// <remarks>
     /// This is a simplified version of c_rehash from OpenSSL.  Using the real one would require
@@ -876,21 +876,17 @@ private static bool TryRehashOpenSslCertificates(string certificateDirectory)
         try
         {
             // First, delete all the existing symlinks, so we don't have to worry about fragmentation or leaks.
-
-            var hashRegex = OpenSslHashFilenameRegex();
-            var extensionRegex = OpenSslCertificateExtensionRegex();
-
             var certs = new List<FileInfo>();
 
             var dirInfo = new DirectoryInfo(certificateDirectory);
             foreach (var file in dirInfo.EnumerateFiles())
             {
                 var isSymlink = (file.Attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint;
-                if (isSymlink && hashRegex.IsMatch(file.Name))
+                if (isSymlink && OpenSslHashFilenameRegex.IsMatch(file.Name))
                 {
                     file.Delete();
                 }
-                else if (extensionRegex.IsMatch(file.Name))
+                else if (OpenSslCertificateExtensionRegex.IsMatch(file.Name))
                 {
                     certs.Add(file);
                 }

Original file line number	Diff line number	Diff line change
`@@ -104,11 +104,11 @@ public void EmbeddingServerAppInsideIframe_WithCompressionEnabled_Fails()`
`104`	`104`
`105`	`105`	`Assert.True(logs.Count > 0);`
`106`	`106`
`107`		`- Assert.Matches(ParseErrorMessage(), logs[0].Message);`
	`107`	`+ Assert.Matches(ParseErrorMessageRegex, logs[0].Message);`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`[GeneratedRegex(@"security - Refused to frame 'http://\d+\.\d+\.\d+\.\d+:\d+/' because an ancestor violates the following Content Security Policy directive: ""frame-ancestors 'none'"".")]`
`111`		`- private static partial Regex ParseErrorMessage();`
	`111`	`+ private static partial Regex ParseErrorMessageRegex { get; }`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`public partial class DefaultConfigurationWebSocketCompressionTests : AllowedWebSocketCompressionTests`
Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,10 @@ internal partial class AlphaRouteConstraint : RegexRouteConstraint`
`20`	`20`	`/// <summary>`
`21`	`21`	`/// Initializes a new instance of the <see cref="AlphaRouteConstraint" /> class.`
`22`	`22`	`/// </summary>`
`23`		`- public AlphaRouteConstraint() : base(GetAlphaRouteRegex())`
	`23`	`+ public AlphaRouteConstraint() : base(AlphaRouteRegex)`
`24`	`24`	`{`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`[GeneratedRegex(@"^[A-Za-z]*$")]`
`28`		`- private static partial Regex GetAlphaRouteRegex();`
	`28`	`+ private static partial Regex AlphaRouteRegex { get; }`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ namespace Microsoft.AspNetCore.Authentication.Negotiate;`
`15`	`15`	`internal static partial class LdapAdapter`
`16`	`16`	`{`
`17`	`17`	`[GeneratedRegex(@"(?<![^\\]\\),")]`
`18`		`- internal static partial Regex DistinguishedNameSeparator();`
`19`		`-`
	`18`	`+ internal static partial Regex DistinguishedNameSeparatorRegex { get; }`
	`19`	`+`
`20`	`20`	`public static async Task RetrieveClaimsAsync(LdapSettings settings, ClaimsIdentity identity, ILogger logger)`
`21`	`21`	`{`
`22`	`22`	`var user = identity.Name!;`
`@@ -66,7 +66,7 @@ public static async Task RetrieveClaimsAsync(LdapSettings settings, ClaimsIdenti`
`66`	`66`	`{`
`67`	`67`	`// Example distinguished name: CN=TestGroup,DC=KERB,DC=local`
`68`	`68`	`var groupDN = $"{Encoding.UTF8.GetString((byte[])group)}";`
`69`		`- var groupCN = DistinguishedNameSeparator().Split(groupDN)[0].Substring("CN=".Length);`
	`69`	`+ var groupCN = DistinguishedNameSeparatorRegex.Split(groupDN)[0].Substring("CN=".Length);`
`70`	`70`
`71`	`71`	`if (!settings.IgnoreNestedGroups)`
`72`	`72`	`{`
`@@ -124,7 +124,7 @@ private static void GetNestedGroups(LdapConnection connection, ClaimsIdentity pr`
`124`	`124`	`foreach (var member in memberof)`
`125`	`125`	`{`
`126`	`126`	`var nestedGroupDN = $"{Encoding.UTF8.GetString((byte[])member)}";`
`127`		`- var nestedGroupCN = DistinguishedNameSeparator().Split(nestedGroupDN)[0].Substring("CN=".Length);`
	`127`	`+ var nestedGroupCN = DistinguishedNameSeparatorRegex.Split(nestedGroupDN)[0].Substring("CN=".Length);`
`128`	`128`
`129`	`129`	`if (processedGroups.Contains(nestedGroupDN))`
`130`	`130`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,31 +8,31 @@ public class LdapAdapterTests`
`8`	`8`	`[Fact]`
`9`	`9`	`public void DistinguishedNameWithoutCommasSuccess()`
`10`	`10`	`{`
`11`		`- var parts = LdapAdapter.DistinguishedNameSeparator().Split("Testing group - City");`
	`11`	`+ var parts = LdapAdapter.DistinguishedNameSeparatorRegex.Split("Testing group - City");`
`12`	`12`
`13`	`13`	`Assert.Equal(new[] { "Testing group - City" }, parts);`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`[Fact]`
`17`	`17`	`public void DistinguishedNameWithEscapedCommaSuccess()`
`18`	`18`	`{`
`19`		`- var parts = LdapAdapter.DistinguishedNameSeparator().Split(@"Testing group\,City");`
	`19`	`+ var parts = LdapAdapter.DistinguishedNameSeparatorRegex.Split(@"Testing group\,City");`
`20`	`20`
`21`	`21`	`Assert.Equal(new[] { @"Testing group\,City" }, parts);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`[Fact]`
`25`	`25`	`public void DistinguishedNameWithNotEscapedCommaSuccess()`
`26`	`26`	`{`
`27`		`- var parts = LdapAdapter.DistinguishedNameSeparator().Split("Testing group,City");`
	`27`	`+ var parts = LdapAdapter.DistinguishedNameSeparatorRegex.Split("Testing group,City");`
`28`	`28`
`29`	`29`	`Assert.Equal(new[] { "Testing group", "City" }, parts);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`[Fact]`
`33`	`33`	`public void DistinguishedNameWithEscapedBackslashAndNotEscapedCommaSuccess()`
`34`	`34`	`{`
`35`		`- var parts = LdapAdapter.DistinguishedNameSeparator().Split(@"Testing group\\,City");`
	`35`	`+ var parts = LdapAdapter.DistinguishedNameSeparatorRegex.Split(@"Testing group\\,City");`
`36`	`36`
`37`	`37`	`Assert.Equal(new[] { @"Testing group\\", "City" }, parts);`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -776,7 +776,7 @@ private static List<NssDb> GetNssDbs(string homeDirectory)`
`776`	`776`	`}`
`777`	`777`
`778`	`778`	`[GeneratedRegex("OPENSSLDIR:\\s*\"([^\"]+)\"")]`
`779`		`- private static partial Regex OpenSslVersionRegex();`
	`779`	`+ private static partial Regex OpenSslVersionRegex { get; }`
`780`	`780`
`781`	`781`	`/// <remarks>`
`782`	`782`	`/// It is the caller's responsibility to ensure that <see cref="OpenSslCommand"/> is available.`
`@@ -803,7 +803,7 @@ private static bool TryGetOpenSslDirectory([NotNullWhen(true)] out string? openS`
`803`	`803`	`return false;`
`804`	`804`	`}`
`805`	`805`
`806`		`- var match = OpenSslVersionRegex().Match(stdout);`
	`806`	`+ var match = OpenSslVersionRegex.Match(stdout);`
`807`	`807`	`if (!match.Success)`
`808`	`808`	`{`
`809`	`809`	`Log.UnixOpenSslVersionParsingFailed();`
`@@ -858,14 +858,14 @@ private static bool TryGetOpenSslHash(string certificatePath, [NotNullWhen(true)`
`858`	`858`	`}`
`859`	`859`
`860`	`860`	`[GeneratedRegex("^[0-9a-f]+\\.[0-9]+$")]`
`861`		`- private static partial Regex OpenSslHashFilenameRegex();`
	`861`	`+ private static partial Regex OpenSslHashFilenameRegex { get; }`
`862`	`862`
`863`	`863`	`/// <remarks>`
`864`	`864`	`/// We only ever use .pem, but someone will eventually put their own cert in this directory,`
`865`	`865`	`/// so we should handle the same extensions as c_rehash (other than .crl).`
`866`	`866`	`/// </remarks>`
`867`	`867`	`[GeneratedRegex("\\.(pem\|crt\|cer)$")]`
`868`		`- private static partial Regex OpenSslCertificateExtensionRegex();`
	`868`	`+ private static partial Regex OpenSslCertificateExtensionRegex { get; }`
`869`	`869`
`870`	`870`	`/// <remarks>`
`871`	`871`	`/// This is a simplified version of c_rehash from OpenSSL. Using the real one would require`
`@@ -876,21 +876,17 @@ private static bool TryRehashOpenSslCertificates(string certificateDirectory)`
`876`	`876`	`try`
`877`	`877`	`{`
`878`	`878`	`// First, delete all the existing symlinks, so we don't have to worry about fragmentation or leaks.`
`879`		`-`
`880`		`- var hashRegex = OpenSslHashFilenameRegex();`
`881`		`- var extensionRegex = OpenSslCertificateExtensionRegex();`
`882`		`-`
`883`	`879`	`var certs = new List<FileInfo>();`
`884`	`880`
`885`	`881`	`var dirInfo = new DirectoryInfo(certificateDirectory);`
`886`	`882`	`foreach (var file in dirInfo.EnumerateFiles())`
`887`	`883`	`{`
`888`	`884`	`var isSymlink = (file.Attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint;`
`889`		`- if (isSymlink && hashRegex.IsMatch(file.Name))`
	`885`	`+ if (isSymlink && OpenSslHashFilenameRegex.IsMatch(file.Name))`
`890`	`886`	`{`
`891`	`887`	`file.Delete();`
`892`	`888`	`}`
`893`		`- else if (extensionRegex.IsMatch(file.Name))`
	`889`	`+ else if (OpenSslCertificateExtensionRegex.IsMatch(file.Name))`
`894`	`890`	`{`
`895`	`891`	`certs.Add(file);`
`896`	`892`	`}`