limits

oskogstad · oskogstad · commit aa193e2964ba · 2024-11-07T13:12:43.000+01:00
diff --git a/src/Digdir.Domain.Dialogporten.WebApi/Common/Authentication/ServiceOwnerOnBehalfOfPersonMiddleware.cs b/src/Digdir.Domain.Dialogporten.WebApi/Common/Authentication/ServiceOwnerOnBehalfOfPersonMiddleware.cs
@@ -37,7 +37,7 @@ public Task InvokeAsync(HttpContext context)
         if (!NorwegianPersonIdentifier.TryParse(endUserIdQuery.First(), out var endUserId))
         {
             context.Response.StatusCode = StatusCodes.Status400BadRequest;
-            context.Response.WriteAsJsonAsync(context.ResponseBuilder(
+            context.Response.WriteAsJsonAsync(context.GetResponseOrDefault(
                 context.Response.StatusCode,
                 [
                     new("EndUserId",
diff --git a/src/Digdir.Domain.Dialogporten.WebApi/Common/Authentication/UserTypeValidationMiddleware.cs b/src/Digdir.Domain.Dialogporten.WebApi/Common/Authentication/UserTypeValidationMiddleware.cs
@@ -21,7 +21,7 @@ public async Task InvokeAsync(HttpContext context)
             if (userType == UserIdType.Unknown)
             {
                 context.Response.StatusCode = StatusCodes.Status403Forbidden;
-                await context.Response.WriteAsJsonAsync(context.ResponseBuilder(
+                await context.Response.WriteAsJsonAsync(context.GetResponseOrDefault(
                     context.Response.StatusCode,
                     [
                         new("Type",
diff --git a/src/Digdir.Domain.Dialogporten.WebApi/Common/Constants.cs b/src/Digdir.Domain.Dialogporten.WebApi/Common/Constants.cs
@@ -5,6 +5,7 @@ internal static class Constants
     internal const string IfMatch = "If-Match";
     internal const string Authorization = "Authorization";
     internal const string CurrentTokenIssuer = "CurrentIssuer";
+    internal const int MaxRequestBodySize = 100_000;
 
     internal static class SwaggerSummary
     {
diff --git a/src/Digdir.Domain.Dialogporten.WebApi/Common/Extensions/ErrorResponseBuilderExtensions.cs b/src/Digdir.Domain.Dialogporten.WebApi/Common/Extensions/ErrorResponseBuilderExtensions.cs
@@ -6,16 +6,41 @@ namespace Digdir.Domain.Dialogporten.WebApi.Common.Extensions;
 
 internal static class ErrorResponseBuilderExtensions
 {
-    public static object ResponseBuilder(this HttpContext ctx, int statusCode, List<ValidationFailure>? failures = null) =>
-        ResponseBuilder(failures ?? [], ctx, statusCode);
+    public static ProblemDetails DefaultResponse(this HttpContext ctx, int? statusCode = null) => new()
+    {
+        Title = "An error occurred while processing the request.",
+        Detail = "Something went wrong during the request.",
+        Type = "https://datatracker.ietf.org/doc/html/rfc7231#section-6.6.1",
+        Status = statusCode ?? ctx.Response.StatusCode,
+        Instance = ctx.Request.Path,
+        Extensions = { { "traceId", Activity.Current?.Id ?? ctx.TraceIdentifier } }
+    };
+
+    public static ProblemDetails GetResponseOrDefault(this HttpContext ctx, int statusCode,
+        List<ValidationFailure>? failures = null) =>
+        ctx.ResponseBuilder(failures, statusCode) ?? ctx.DefaultResponse(statusCode);
 
     public static object ResponseBuilder(List<ValidationFailure> failures, HttpContext ctx, int statusCode)
+        => ctx.ResponseBuilder(failures, statusCode) ?? ctx.DefaultResponse(statusCode);
+
+    public static ProblemDetails? ResponseBuilder(this HttpContext ctx, List<ValidationFailure>? failures = null, int? statusCode = null)
     {
-        var errors = failures
+        var errors = failures?
             .GroupBy(f => f.PropertyName)
-            .ToDictionary(x => x.Key, x => x.Select(m => m.ErrorMessage).ToArray());
+            .ToDictionary(x => x.Key, x => x.Select(m => m.ErrorMessage).ToArray())
+            ?? [];
+
+        statusCode ??= ctx.Response.StatusCode;
         return statusCode switch
         {
+            StatusCodes.Status413PayloadTooLarge => new ProblemDetails
+            {
+                Title = $"Payload too large. The maximum allowed size is {Constants.MaxRequestBodySize} bytes.",
+                Type = "https://datatracker.ietf.org/doc/html/rfc7231#section-6.5.11",
+                Status = statusCode,
+                Instance = ctx.Request.Path,
+                Extensions = { { "traceId", Activity.Current?.Id ?? ctx.TraceIdentifier } }
+            },
             StatusCodes.Status400BadRequest => new ValidationProblemDetails(errors)
             {
                 Title = "One or more validation errors occurred.",
@@ -73,15 +98,7 @@ public static object ResponseBuilder(List<ValidationFailure> failures, HttpConte
                 Instance = ctx.Request.Path,
                 Extensions = { { "traceId", Activity.Current?.Id ?? ctx.TraceIdentifier } }
             },
-            _ => new ProblemDetails
-            {
-                Title = "An error occurred while processing the request.",
-                Detail = "Something went wrong during the request.",
-                Type = "https://datatracker.ietf.org/doc/html/rfc7231#section-6.6.1",
-                Status = ctx.Response.StatusCode,
-                Instance = ctx.Request.Path,
-                Extensions = { { "traceId", Activity.Current?.Id ?? ctx.TraceIdentifier } }
-            }
+            _ => null
         };
     }
 }
diff --git a/src/Digdir.Domain.Dialogporten.WebApi/Common/Extensions/GlobalExceptionHandler.cs b/src/Digdir.Domain.Dialogporten.WebApi/Common/Extensions/GlobalExceptionHandler.cs
@@ -9,16 +9,26 @@ internal sealed class GlobalExceptionHandler : IExceptionHandler
     public async ValueTask<bool> TryHandleAsync(HttpContext ctx, Exception exception,
         CancellationToken cancellationToken)
     {
-        var http = $"{ctx.Request.Scheme}: {ctx.Request.Method} {ctx.Request.Path}";
-        var type = exception.GetType().Name;
-        var error = exception.Message;
-        var logger = ctx.Resolve<ILogger<GlobalExceptionHandler>>();
-        logger.LogError(exception, "{@Http}{@Type}{@Reason}", http, type, error);
-        ctx.Response.StatusCode = exception is IUpstreamServiceError
-            ? StatusCodes.Status502BadGateway
-            : StatusCodes.Status500InternalServerError;
+        ctx.Response.StatusCode = exception switch
+        {
+            BadHttpRequestException badHttpRequestException => badHttpRequestException.StatusCode,
+            IUpstreamServiceError => StatusCodes.Status502BadGateway,
+            _ => StatusCodes.Status500InternalServerError
+        };
+
         ctx.Response.ContentType = "application/problem+json";
-        await ctx.Response.WriteAsJsonAsync(ctx.ResponseBuilder(ctx.Response.StatusCode), cancellationToken);
+        var response = ctx.ResponseBuilder();
+
+        if (ctx.Response.StatusCode >= 500 || response is null)
+        {
+            var http = $"{ctx.Request.Scheme}: {ctx.Request.Method} {ctx.Request.Path}";
+            var type = exception.GetType().Name;
+            var error = exception.Message;
+            var logger = ctx.Resolve<ILogger<GlobalExceptionHandler>>();
+            logger.LogError(exception, "{@Http}{@Type}{@Reason}", http, type, error);
+        }
+
+        await ctx.Response.WriteAsJsonAsync(response ?? ctx.DefaultResponse(), cancellationToken);
         return true;
     }
 }
diff --git a/src/Digdir.Domain.Dialogporten.WebApi/Endpoints/V1/ServiceOwner/Dialogs/Patch/PatchDialogsController.cs b/src/Digdir.Domain.Dialogporten.WebApi/Endpoints/V1/ServiceOwner/Dialogs/Patch/PatchDialogsController.cs
@@ -70,10 +70,10 @@ public async Task<IActionResult> Patch(
         if (!dialogQueryResult.TryPickT0(out var dialog, out var errors))
         {
             return errors.Match<IActionResult>(
-                notFound => NotFound(HttpContext.ResponseBuilder(StatusCodes.Status404NotFound,
+                notFound => NotFound(HttpContext.GetResponseOrDefault(StatusCodes.Status404NotFound,
                     notFound.ToValidationResults())),
                 validationFailed =>
-                    BadRequest(HttpContext.ResponseBuilder(StatusCodes.Status400BadRequest,
+                    BadRequest(HttpContext.GetResponseOrDefault(StatusCodes.Status400BadRequest,
                         validationFailed.Errors.ToList())));
         }
 
@@ -88,12 +88,12 @@ public async Task<IActionResult> Patch(
         var result = await _sender.Send(command, ct);
         return result.Match(
             success => (IActionResult)NoContent(),
-            notFound => NotFound(HttpContext.ResponseBuilder(StatusCodes.Status404NotFound, notFound.ToValidationResults())),
-            badRequest => BadRequest(HttpContext.ResponseBuilder(StatusCodes.Status400BadRequest, badRequest.ToValidationResults())),
-            validationFailed => BadRequest(HttpContext.ResponseBuilder(StatusCodes.Status400BadRequest, validationFailed.Errors.ToList())),
-            forbidden => new ObjectResult(HttpContext.ResponseBuilder(StatusCodes.Status403Forbidden, forbidden.ToValidationResults())),
-            domainError => UnprocessableEntity(HttpContext.ResponseBuilder(StatusCodes.Status422UnprocessableEntity, domainError.ToValidationResults())),
-            concurrencyError => new ObjectResult(HttpContext.ResponseBuilder(StatusCodes.Status412PreconditionFailed)) { StatusCode = StatusCodes.Status412PreconditionFailed }
+            notFound => NotFound(HttpContext.GetResponseOrDefault(StatusCodes.Status404NotFound, notFound.ToValidationResults())),
+            badRequest => BadRequest(HttpContext.GetResponseOrDefault(StatusCodes.Status400BadRequest, badRequest.ToValidationResults())),
+            validationFailed => BadRequest(HttpContext.GetResponseOrDefault(StatusCodes.Status400BadRequest, validationFailed.Errors.ToList())),
+            forbidden => new ObjectResult(HttpContext.GetResponseOrDefault(StatusCodes.Status403Forbidden, forbidden.ToValidationResults())),
+            domainError => UnprocessableEntity(HttpContext.GetResponseOrDefault(StatusCodes.Status422UnprocessableEntity, domainError.ToValidationResults())),
+            concurrencyError => new ObjectResult(HttpContext.GetResponseOrDefault(StatusCodes.Status412PreconditionFailed)) { StatusCode = StatusCodes.Status412PreconditionFailed }
         );
     }
 }
diff --git a/src/Digdir.Domain.Dialogporten.WebApi/Program.cs b/src/Digdir.Domain.Dialogporten.WebApi/Program.cs
@@ -52,6 +52,11 @@ static void BuildAndRun(string[] args, TelemetryConfiguration telemetryConfigura
 {
     var builder = WebApplication.CreateBuilder(args);
 
+    builder.WebHost.ConfigureKestrel(kestrelOptions =>
+    {
+        kestrelOptions.Limits.MaxRequestBodySize = Constants.MaxRequestBodySize;
+    });
+
     builder.Host.UseSerilog((context, services, configuration) => configuration
         .MinimumLevel.Warning()
         .ReadFrom.Configuration(context.Configuration)

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public Task InvokeAsync(HttpContext context)`
`37`	`37`	`if (!NorwegianPersonIdentifier.TryParse(endUserIdQuery.First(), out var endUserId))`
`38`	`38`	`{`
`39`	`39`	`context.Response.StatusCode = StatusCodes.Status400BadRequest;`
`40`		`- context.Response.WriteAsJsonAsync(context.ResponseBuilder(`
	`40`	`+ context.Response.WriteAsJsonAsync(context.GetResponseOrDefault(`
`41`	`41`	`context.Response.StatusCode,`
`42`	`42`	`[`
`43`	`43`	`new("EndUserId",`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public async Task InvokeAsync(HttpContext context)`
`21`	`21`	`if (userType == UserIdType.Unknown)`
`22`	`22`	`{`
`23`	`23`	`context.Response.StatusCode = StatusCodes.Status403Forbidden;`
`24`		`- await context.Response.WriteAsJsonAsync(context.ResponseBuilder(`
	`24`	`+ await context.Response.WriteAsJsonAsync(context.GetResponseOrDefault(`
`25`	`25`	`context.Response.StatusCode,`
`26`	`26`	`[`
`27`	`27`	`new("Type",`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ internal static class Constants`
`5`	`5`	`internal const string IfMatch = "If-Match";`
`6`	`6`	`internal const string Authorization = "Authorization";`
`7`	`7`	`internal const string CurrentTokenIssuer = "CurrentIssuer";`
	`8`	`+ internal const int MaxRequestBodySize = 100_000;`
`8`	`9`
`9`	`10`	`internal static class SwaggerSummary`
`10`	`11`	`{`