Merge pull request #49 from PandaTechAM/development

Enhance logging to handle non-JSON requests and responses gracefully

Author: HaikAsatryan

src/SharedKernel/Logging/ReductionHelper.cs

@@ -71,8 +71,7 @@ public static object ParseAndRedactJson(string body)
       }
       catch (JsonException)
       {
-         // If invalid JSON, do naive string-based redaction
-         return RedactSensitiveString(body);
+         return (Headers: "{}", Body: "[SKIPPED_NON_JSON]");
       }
    }
 
@@ -135,7 +134,9 @@ private static Dictionary<string, object> RedactObject(JsonElement element)
    private static string RedactSensitiveString(string? value)
    {
       if (string.IsNullOrWhiteSpace(value))
+      {
          return string.Empty;
+      }
 
       return SensitiveKeywords.Any(k => value.Contains(k, StringComparison.OrdinalIgnoreCase))
          ? "[REDACTED]"

src/SharedKernel/Logging/RequestLoggingMiddleware.cs

@@ -15,6 +15,12 @@ internal sealed class RequestLoggingMiddleware(
       "/above-board"
    ];
 
+   private static readonly HashSet<string> JsonMediaTypes = new(StringComparer.OrdinalIgnoreCase)
+   {
+      "application/json",
+      "text/json"
+   };
+
    public async Task InvokeAsync(HttpContext context)
    {
       if (HttpMethods.IsOptions(context.Request.Method))
@@ -30,7 +36,12 @@ public async Task InvokeAsync(HttpContext context)
          return;
       }
 
-      var requestLog = await CaptureRequestAsync(context.Request);
+      var isJsonRequest = IsJson(context.Request.ContentType);
+      
+      var requestLog    = isJsonRequest
+         ? await CaptureRequestAsync(context.Request)
+         : (Headers: "{}", Body: "[SKIPPED_NON_JSON]");
+      
       var originalBodyStream = context.Response.Body;
 
       await using var responseBody = new MemoryStream();
@@ -46,7 +57,12 @@ public async Task InvokeAsync(HttpContext context)
       {
          var elapsedMs = Stopwatch.GetElapsedTime(stopwatch)
                                   .TotalMilliseconds;
-         var responseLog = await CaptureResponseAsync(context.Response);
+
+         var isJsonReply = IsJson(context.Response.ContentType);
+
+         var responseLog = isJsonReply
+            ? await CaptureResponseAsync(context.Response)
+            : (Headers: "{}", Body: "[SKIPPED_NON_JSON]");
 
          logger.LogInformation(
             "[Incoming Request] HTTP {Method} {Query} responded with {StatusCode} in {ElapsedMilliseconds}ms. " +
@@ -95,4 +111,9 @@ public async Task InvokeAsync(HttpContext context)
          JsonSerializer.Serialize(redactedBody)
       );
    }
+
+   private static bool IsJson(string? contentType) =>
+      !string.IsNullOrWhiteSpace(contentType) &&
+      (JsonMediaTypes.Any(contentType.StartsWith) ||
+       contentType.Contains("+json", StringComparison.OrdinalIgnoreCase));
 }

src/SharedKernel/SharedKernel.csproj

@@ -8,13 +8,13 @@
         <PackageReadmeFile>Readme.md</PackageReadmeFile>
         <Authors>Pandatech</Authors>
         <Copyright>MIT</Copyright>
-        <Version>1.3.6</Version>
+        <Version>1.3.7</Version>
         <PackageId>Pandatech.SharedKernel</PackageId>
         <Title>Pandatech Shared Kernel Library</Title>
         <PackageTags>Pandatech, shared kernel, library, OpenAPI, Swagger, utilities, scalar</PackageTags>
         <Description>Pandatech.SharedKernel provides centralized configurations, utilities, and extensions for ASP.NET Core projects. For more information refere to readme.md document.</Description>
         <RepositoryUrl>https://github.com/PandaTechAM/be-lib-sharedkernel</RepositoryUrl>
-        <PackageReleaseNotes>Package updates</PackageReleaseNotes>
+        <PackageReleaseNotes>Logging changed to work only with json requests and responses</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>