-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
eead33f
commit 9cb9bc6
Showing
93 changed files
with
7,265 additions
and
446 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
159 changes: 79 additions & 80 deletions
159
src/Altinn.App.Api/Helpers/RequestHandling/RequestPartValidator.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,115 +1,114 @@ | ||
| using Altinn.Platform.Storage.Interface.Models; | ||
|
|
||
| namespace Altinn.App.Api.Helpers.RequestHandling | ||
| namespace Altinn.App.Api.Helpers.RequestHandling; | ||
|
|
||
| /// <summary> | ||
| /// Represents a validator of a single <see cref="RequestPart"/> with the help of app metadata | ||
| /// </summary> | ||
| public class RequestPartValidator | ||
| { | ||
| private readonly Application _appInfo; | ||
|
|
||
| /// <summary> | ||
| /// Represents a validator of a single <see cref="RequestPart"/> with the help of app metadata | ||
| /// Initialises a new instance of the <see cref="RequestPartValidator"/> class with the given application info. | ||
| /// </summary> | ||
| public class RequestPartValidator | ||
| /// <param name="appInfo">The application metadata to use when validating a <see cref="RequestPart"/>.</param> | ||
| public RequestPartValidator(Application appInfo) | ||
| { | ||
| private readonly Application _appInfo; | ||
| _appInfo = appInfo; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Initialises a new instance of the <see cref="RequestPartValidator"/> class with the given application info. | ||
| /// </summary> | ||
| /// <param name="appInfo">The application metadata to use when validating a <see cref="RequestPart"/>.</param> | ||
| public RequestPartValidator(Application appInfo) | ||
| /// <summary> | ||
| /// Operation that can validate a <see cref="RequestPart"/> using the internal <see cref="Application"/>. | ||
| /// </summary> | ||
| /// <param name="part">The request part to be validated.</param> | ||
| /// <returns>null if no errors where found. Otherwise an error message.</returns> | ||
| public string? ValidatePart(RequestPart part) | ||
| { | ||
| if (part.Name == "instance") | ||
| { | ||
| _appInfo = appInfo; | ||
| } | ||
| if (!part.ContentType.StartsWith("application/json", StringComparison.Ordinal)) | ||
| { | ||
| return $"Unexpected Content-Type '{part.ContentType}' of embedded instance template. Expecting 'application/json'"; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Operation that can validate a <see cref="RequestPart"/> using the internal <see cref="Application"/>. | ||
| /// </summary> | ||
| /// <param name="part">The request part to be validated.</param> | ||
| /// <returns>null if no errors where found. Otherwise an error message.</returns> | ||
| public string? ValidatePart(RequestPart part) | ||
| //// TODO: Validate that the element can be read as an instance? | ||
| } | ||
| else | ||
| { | ||
| if (part.Name == "instance") | ||
| DataType? dataType = _appInfo.DataTypes.Find(e => e.Id == part.Name); | ||
| if (dataType == null) | ||
| { | ||
| if (!part.ContentType.StartsWith("application/json", StringComparison.Ordinal)) | ||
| { | ||
| return $"Unexpected Content-Type '{part.ContentType}' of embedded instance template. Expecting 'application/json'"; | ||
| } | ||
| return $"Multipart section named, '{part.Name}' does not correspond to an element type in application metadata"; | ||
| } | ||
|
|
||
| //// TODO: Validate that the element can be read as an instance? | ||
| if (part.ContentType == null) | ||
| { | ||
| return $"The multipart section named {part.Name} is missing Content-Type."; | ||
| } | ||
| else | ||
| { | ||
| DataType? dataType = _appInfo.DataTypes.Find(e => e.Id == part.Name); | ||
| if (dataType == null) | ||
| { | ||
| return $"Multipart section named, '{part.Name}' does not correspond to an element type in application metadata"; | ||
| } | ||
|
|
||
| if (part.ContentType == null) | ||
| { | ||
| return $"The multipart section named {part.Name} is missing Content-Type."; | ||
| } | ||
| else | ||
| { | ||
| string contentTypeWithoutEncoding = part.ContentType.Split(";")[0]; | ||
|
|
||
| // restrict content type if allowedContentTypes is specified | ||
| if ( | ||
| dataType.AllowedContentTypes != null | ||
| && dataType.AllowedContentTypes.Count > 0 | ||
| && !dataType.AllowedContentTypes.Contains(contentTypeWithoutEncoding) | ||
| ) | ||
| { | ||
| return $"The multipart section named {part.Name} has a Content-Type '{part.ContentType}' which is invalid for element type '{dataType.Id}'"; | ||
| } | ||
| } | ||
|
|
||
| long contentSize = part.FileSize != 0 ? part.FileSize : part.Bytes.Length; | ||
|
|
||
| if (contentSize == 0) | ||
| { | ||
| return $"The multipart section named {part.Name} has no data. Cannot process empty part."; | ||
| } | ||
| string contentTypeWithoutEncoding = part.ContentType.Split(";")[0]; | ||
|
|
||
| // restrict content type if allowedContentTypes is specified | ||
| if ( | ||
| dataType.MaxSize.HasValue | ||
| && dataType.MaxSize > 0 | ||
| && contentSize > (long)dataType.MaxSize.Value * 1024 * 1024 | ||
| dataType.AllowedContentTypes != null | ||
| && dataType.AllowedContentTypes.Count > 0 | ||
| && !dataType.AllowedContentTypes.Contains(contentTypeWithoutEncoding) | ||
| ) | ||
| { | ||
| return $"The multipart section named {part.Name} exceeds the size limit of element type '{dataType.Id}'"; | ||
| return $"The multipart section named {part.Name} has a Content-Type '{part.ContentType}' which is invalid for element type '{dataType.Id}'"; | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| long contentSize = part.FileSize != 0 ? part.FileSize : part.Bytes.Length; | ||
|
|
||
| if (contentSize == 0) | ||
| { | ||
| return $"The multipart section named {part.Name} has no data. Cannot process empty part."; | ||
| } | ||
|
|
||
| if ( | ||
| dataType.MaxSize.HasValue | ||
| && dataType.MaxSize > 0 | ||
| && contentSize > (long)dataType.MaxSize.Value * 1024 * 1024 | ||
| ) | ||
| { | ||
| return $"The multipart section named {part.Name} exceeds the size limit of element type '{dataType.Id}'"; | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Operation that can validate a list of <see cref="RequestPart"/> elements using the internal <see cref="Application"/>. | ||
| /// </summary> | ||
| /// <param name="parts">The list of request parts to be validated.</param> | ||
| /// <returns>null if no errors where found. Otherwise an error message.</returns> | ||
| public string? ValidateParts(List<RequestPart> parts) | ||
| return null; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Operation that can validate a list of <see cref="RequestPart"/> elements using the internal <see cref="Application"/>. | ||
| /// </summary> | ||
| /// <param name="parts">The list of request parts to be validated.</param> | ||
| /// <returns>null if no errors where found. Otherwise an error message.</returns> | ||
| public string? ValidateParts(List<RequestPart> parts) | ||
| { | ||
| foreach (RequestPart part in parts) | ||
| { | ||
| foreach (RequestPart part in parts) | ||
| string? partError = ValidatePart(part); | ||
| if (partError != null) | ||
| { | ||
| string? partError = ValidatePart(part); | ||
| if (partError != null) | ||
| { | ||
| return partError; | ||
| } | ||
| return partError; | ||
| } | ||
| } | ||
|
|
||
| foreach (DataType dataType in _appInfo.DataTypes) | ||
| foreach (DataType dataType in _appInfo.DataTypes) | ||
| { | ||
| if (dataType.MaxCount > 0) | ||
| { | ||
| if (dataType.MaxCount > 0) | ||
| int partCount = parts.Count(p => p.Name == dataType.Id); | ||
| if (dataType.MaxCount < partCount) | ||
| { | ||
| int partCount = parts.Count(p => p.Name == dataType.Id); | ||
| if (dataType.MaxCount < partCount) | ||
| { | ||
| return $"The list of parts contains more elements of type '{dataType.Id}' than the element type allows."; | ||
| } | ||
| return $"The list of parts contains more elements of type '{dataType.Id}' than the element type allows."; | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.