From eb2db62fe2be80399d67418a228bf00eb550c629 Mon Sep 17 00:00:00 2001 From: Damian Hickey Date: Thu, 26 Feb 2026 11:07:24 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20string=20literals=20corrupted=20by=20CT?= =?UTF-8?q?=E2=86=92Ct=20global=20rename=20(DOCTYPE,=20REDACTED,=20SELECT,?= =?UTF-8?q?=20CONNECTION=5FSTRING,=20REDIRECTS)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bff/hosts/Hosts.ServiceDefaults/Extensions.cs | 2 +- .../src/Documentation.Mcp/Sources/Blog/BlogSearchTool.cs | 4 ++-- .../src/Documentation.Mcp/Sources/Docs/DocsSearchTool.cs | 4 ++-- .../Documentation.Mcp/Sources/Samples/SamplesSearchTool.cs | 6 +++--- identity-server/aspire/ServiceDefaults/Extensions.cs | 2 +- .../IdentityServer/Endpoints/Results/CheckSessionResult.cs | 2 +- .../Endpoints/Results/EndSessionCallbackResult.cs | 2 +- .../Extensions/NameValueCollectionExtensions.cs | 2 +- .../Logging/Models/TokenRequestValidationLog.cs | 2 +- .../IdentityServer/Pages/Admin/Clients/ClientRepository.cs | 2 +- .../ConformanceReport/ConformanceReportIntegrationTests.cs | 2 +- .../Endpoints/Authorize/PushedAuthorizationTests.cs | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bff/hosts/Hosts.ServiceDefaults/Extensions.cs b/bff/hosts/Hosts.ServiceDefaults/Extensions.cs index 482baecd2..4ca3dcf60 100644 --- a/bff/hosts/Hosts.ServiceDefaults/Extensions.cs +++ b/bff/hosts/Hosts.ServiceDefaults/Extensions.cs @@ -85,7 +85,7 @@ public static class Extensions } // Uncomment the following lines to enable the Azure Monitor exporter (requires the Azure.Monitor.OpenTelemetry.AspNetCore package) - //if (!string.IsNullOrEmpty(builder.Configuration["APPLICATIONINSIGHTS_CONNECtION_STRING"])) + //if (!string.IsNullOrEmpty(builder.Configuration["APPLICATIONINSIGHTS_CONNECTION_STRING"])) //{ // builder.Services.AddOpenTelemetry() // .UseAzureMonitor(); diff --git a/docs-mcp/src/Documentation.Mcp/Sources/Blog/BlogSearchTool.cs b/docs-mcp/src/Documentation.Mcp/Sources/Blog/BlogSearchTool.cs index cc15bbf9a..e4da5a338 100644 --- a/docs-mcp/src/Documentation.Mcp/Sources/Blog/BlogSearchTool.cs +++ b/docs-mcp/src/Documentation.Mcp/Sources/Blog/BlogSearchTool.cs @@ -19,7 +19,7 @@ internal sealed class BlogSearchTool(McpDb db) [Description("The search query. Keep it concise and specific to increase the likelihood of a match.")] string query) { var results = await db.FTSBlogArticle - .FromSqlRaw("SELECt * FROM FTSBlogArticle WHERE Title MATCH {0} OR Content MATCH {0} ORDER BY rank", McpDb.EscapeFtsQueryString(query)) + .FromSqlRaw("SELECT * FROM FTSBlogArticle WHERE Title MATCH {0} OR Content MATCH {0} ORDER BY rank", McpDb.EscapeFtsQueryString(query)) .AsNoTracking() .Take(6) .ToListAsync(); @@ -48,7 +48,7 @@ internal sealed class BlogSearchTool(McpDb db) public async Task Fetch([Description("The document id.")] string id) { var result = await db.FTSBlogArticle - .FromSqlRaw("SELECt * FROM FTSBlogArticle WHERE Id = {0} ORDER BY rank", id) + .FromSqlRaw("SELECT * FROM FTSBlogArticle WHERE Id = {0} ORDER BY rank", id) .AsNoTracking() .FirstOrDefaultAsync(); diff --git a/docs-mcp/src/Documentation.Mcp/Sources/Docs/DocsSearchTool.cs b/docs-mcp/src/Documentation.Mcp/Sources/Docs/DocsSearchTool.cs index cd2d31291..6a7d03bf3 100644 --- a/docs-mcp/src/Documentation.Mcp/Sources/Docs/DocsSearchTool.cs +++ b/docs-mcp/src/Documentation.Mcp/Sources/Docs/DocsSearchTool.cs @@ -19,7 +19,7 @@ internal sealed class DocsSearchTool(McpDb db) [Description("The search query. Keep it concise and specific to increase the likelihood of a match.")] string query) { var results = await db.FTSDocsArticle - .FromSqlRaw("SELECt * FROM FTSDocsArticle WHERE Title MATCH {0} OR Content MATCH {0} OR Product MATCH {0} ORDER BY rank", McpDb.EscapeFtsQueryString(query)) + .FromSqlRaw("SELECT * FROM FTSDocsArticle WHERE Title MATCH {0} OR Content MATCH {0} OR Product MATCH {0} ORDER BY rank", McpDb.EscapeFtsQueryString(query)) .AsNoTracking() .Take(6) .ToListAsync(); @@ -49,7 +49,7 @@ internal sealed class DocsSearchTool(McpDb db) [Description("The document id.")] string id) { var result = await db.FTSDocsArticle - .FromSqlRaw("SELECt * FROM FTSDocsArticle WHERE Id = {0} ORDER BY rank", id) + .FromSqlRaw("SELECT * FROM FTSDocsArticle WHERE Id = {0} ORDER BY rank", id) .AsNoTracking() .FirstOrDefaultAsync(); diff --git a/docs-mcp/src/Documentation.Mcp/Sources/Samples/SamplesSearchTool.cs b/docs-mcp/src/Documentation.Mcp/Sources/Samples/SamplesSearchTool.cs index 39362aa7c..01b583b81 100644 --- a/docs-mcp/src/Documentation.Mcp/Sources/Samples/SamplesSearchTool.cs +++ b/docs-mcp/src/Documentation.Mcp/Sources/Samples/SamplesSearchTool.cs @@ -19,7 +19,7 @@ internal sealed class SamplesSearchTool(McpDb db) [Description("The search query. Keep it concise and specific to increase the likelihood of a match.")] string query) { var results = await db.FTSSampleProject - .FromSqlRaw("SELECt * FROM FTSSampleProject WHERE Title MATCH {0} OR Description MATCH {0} OR Product MATCH {0} ORDER BY rank", McpDb.EscapeFtsQueryString(query, "OR")) + .FromSqlRaw("SELECT * FROM FTSSampleProject WHERE Title MATCH {0} OR Description MATCH {0} OR Product MATCH {0} ORDER BY rank", McpDb.EscapeFtsQueryString(query, "OR")) .AsNoTracking() .Take(6) .ToListAsync(); @@ -49,7 +49,7 @@ internal sealed class SamplesSearchTool(McpDb db) [Description("The document id.")] string id) { var result = await db.FTSSampleProject - .FromSqlRaw("SELECt * FROM FTSSampleProject WHERE Id = {0} ORDER BY rank", id) + .FromSqlRaw("SELECT * FROM FTSSampleProject WHERE Id = {0} ORDER BY rank", id) .AsNoTracking() .FirstOrDefaultAsync(); @@ -72,7 +72,7 @@ internal sealed class SamplesSearchTool(McpDb db) filename = filename.Replace("wwwroot", "~", StringComparison.Ordinal); var result = await db.FTSSampleProject - .FromSqlRaw("SELECt * FROM FTSSampleProject WHERE Id = {0} ORDER BY rank", id) + .FromSqlRaw("SELECT * FROM FTSSampleProject WHERE Id = {0} ORDER BY rank", id) .AsNoTracking() .FirstOrDefaultAsync(); diff --git a/identity-server/aspire/ServiceDefaults/Extensions.cs b/identity-server/aspire/ServiceDefaults/Extensions.cs index b0b3730bf..5c5d31796 100644 --- a/identity-server/aspire/ServiceDefaults/Extensions.cs +++ b/identity-server/aspire/ServiceDefaults/Extensions.cs @@ -82,7 +82,7 @@ public static class Extensions } // Uncomment the following lines to enable the Azure Monitor exporter (requires the Azure.Monitor.OpenTelemetry.AspNetCore package) - //if (!string.IsNullOrEmpty(builder.Configuration["APPLICATIONINSIGHTS_CONNECtION_STRING"])) + //if (!string.IsNullOrEmpty(builder.Configuration["APPLICATIONINSIGHTS_CONNECTION_STRING"])) //{ // builder.Services.AddOpenTelemetry() // .UseAzureMonitor(); diff --git a/identity-server/src/IdentityServer/Endpoints/Results/CheckSessionResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/CheckSessionResult.cs index aecf38185..fb153e485 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/CheckSessionResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/CheckSessionResult.cs @@ -68,7 +68,7 @@ internal class CheckSessionHttpWriter : IHttpResponseWriter } private const string Html = @" - + diff --git a/identity-server/src/IdentityServer/Endpoints/Results/EndSessionCallbackResult.cs b/identity-server/src/IdentityServer/Endpoints/Results/EndSessionCallbackResult.cs index a14605ad7..18ab5395b 100644 --- a/identity-server/src/IdentityServer/Endpoints/Results/EndSessionCallbackResult.cs +++ b/identity-server/src/IdentityServer/Endpoints/Results/EndSessionCallbackResult.cs @@ -80,7 +80,7 @@ internal class EndSessionCallbackHttpWriter : IHttpResponseWriter"); + sb.Append(""); if (result.Result.FrontChannelLogoutUrls != null) { diff --git a/identity-server/src/IdentityServer/Extensions/NameValueCollectionExtensions.cs b/identity-server/src/IdentityServer/Extensions/NameValueCollectionExtensions.cs index b08723303..870e22472 100644 --- a/identity-server/src/IdentityServer/Extensions/NameValueCollectionExtensions.cs +++ b/identity-server/src/IdentityServer/Extensions/NameValueCollectionExtensions.cs @@ -111,7 +111,7 @@ internal static class NameValueCollectionExtensions { if (nameFilter.Contains(name, StringComparer.OrdinalIgnoreCase)) { - value = "***REDACtED***"; + value = "***REDACTED***"; } dict.Add(name, value); } diff --git a/identity-server/src/IdentityServer/Logging/Models/TokenRequestValidationLog.cs b/identity-server/src/IdentityServer/Logging/Models/TokenRequestValidationLog.cs index 1f5ec3767..c571b1681 100644 --- a/identity-server/src/IdentityServer/Logging/Models/TokenRequestValidationLog.cs +++ b/identity-server/src/IdentityServer/Logging/Models/TokenRequestValidationLog.cs @@ -50,7 +50,7 @@ internal class TokenRequestValidationLog } else if (request.UserName.IsPresent()) { - UserName = "***REDACtED***"; + UserName = "***REDACTED***"; } } diff --git a/identity-server/templates/src/IdentityServer/Pages/Admin/Clients/ClientRepository.cs b/identity-server/templates/src/IdentityServer/Pages/Admin/Clients/ClientRepository.cs index 7f660241a..9281ee5e0 100644 --- a/identity-server/templates/src/IdentityServer/Pages/Admin/Clients/ClientRepository.cs +++ b/identity-server/templates/src/IdentityServer/Pages/Admin/Clients/ClientRepository.cs @@ -274,7 +274,7 @@ public class ClientRepository(ConfigurationDbContext context) client.AllowedScopes.AddRange(toAdd.Select(s => new ClientScope { Scope = s })); } - // REDIRECtS & LOGOUT URIs (unchanged)... + // REDIRECTS & LOGOUT URIs (unchanged)... var flow = client.AllowedGrantTypes.Select(x => x.GrantType).Single() == GrantType.ClientCredentials ? Flow.ClientCredentials : Flow.CodeFlowWithPkce; diff --git a/identity-server/test/IdentityServer.IntegrationTests/ConformanceReport/ConformanceReportIntegrationTests.cs b/identity-server/test/IdentityServer.IntegrationTests/ConformanceReport/ConformanceReportIntegrationTests.cs index 73de7f713..45ca50fc6 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/ConformanceReport/ConformanceReportIntegrationTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/ConformanceReport/ConformanceReportIntegrationTests.cs @@ -80,7 +80,7 @@ public class ConformanceReportIntegrationTests : IAsyncLifetime var html = await response.Content.ReadAsStringAsync(); html.ShouldNotBeEmpty(); - html.ShouldContain(""); + html.ShouldContain(""); html.ShouldContain("OAuth 2.1"); html.ShouldContain("FAPI 2.0"); } diff --git a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/PushedAuthorizationTests.cs b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/PushedAuthorizationTests.cs index 1431161e1..89daefc03 100644 --- a/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/PushedAuthorizationTests.cs +++ b/identity-server/test/IdentityServer.IntegrationTests/Endpoints/Authorize/PushedAuthorizationTests.cs @@ -116,7 +116,7 @@ public class PushedAuthorizationTests state: expectedState ); - _mockPipeline.MockLogger.LogMessages.ShouldContain(msg => msg.Contains("\"client_secret\": \"***REDACtED***\"")); + _mockPipeline.MockLogger.LogMessages.ShouldContain(msg => msg.Contains("\"client_secret\": \"***REDACTED***\"")); _mockPipeline.MockLogger.LogMessages.ShouldNotContain(msg => msg.Contains(clientSecret)); }