|
|
@@ -11,62 +11,60 @@ namespace Masuit.Tools.AspNetCore.Extensions;
|
|
|
[ServiceInject(ServiceLifetime.Scoped)]
|
|
|
public class MultipartRequestService : IMultipartRequestService
|
|
|
{
|
|
|
- public async Task<(Dictionary<string, StringValues>, byte[])> GetDataFromMultiPart(MultipartReader reader, CancellationToken cancellationToken)
|
|
|
- {
|
|
|
- var formAccumulator = new KeyValueAccumulator();
|
|
|
- var file = Array.Empty<byte>();
|
|
|
+ public async Task<(Dictionary<string, StringValues>, byte[])> GetDataFromMultiPart(MultipartReader reader, CancellationToken cancellationToken)
|
|
|
+ {
|
|
|
+ var formAccumulator = new KeyValueAccumulator();
|
|
|
+ var file = Array.Empty<byte>();
|
|
|
|
|
|
- while (await reader.ReadNextSectionAsync(cancellationToken) is { } section)
|
|
|
- {
|
|
|
- if (!ContentDispositionHeaderValue.TryParse(section.ContentDisposition, out var contentDisposition))
|
|
|
- {
|
|
|
- continue;
|
|
|
- }
|
|
|
+ while (await reader.ReadNextSectionAsync(cancellationToken) is { } section)
|
|
|
+ {
|
|
|
+ if (!ContentDispositionHeaderValue.TryParse(section.ContentDisposition, out var contentDisposition))
|
|
|
+ {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
|
|
|
- if (contentDisposition.IsFormDisposition())
|
|
|
- {
|
|
|
- formAccumulator = await AccumulateForm(formAccumulator, section, contentDisposition);
|
|
|
- }
|
|
|
- else if (contentDisposition.IsFileDisposition())
|
|
|
- {
|
|
|
- await using var memoryStream = new PooledMemoryStream();
|
|
|
- await section.Body.CopyToAsync(memoryStream, cancellationToken);
|
|
|
- file = memoryStream.ToArray();
|
|
|
- }
|
|
|
- }
|
|
|
+ if (contentDisposition.IsFormDisposition())
|
|
|
+ {
|
|
|
+ formAccumulator = await AccumulateForm(formAccumulator, section, contentDisposition);
|
|
|
+ }
|
|
|
+ else if (contentDisposition.IsFileDisposition())
|
|
|
+ {
|
|
|
+ await using var memoryStream = new PooledMemoryStream();
|
|
|
+ await section.Body.CopyToAsync(memoryStream, cancellationToken);
|
|
|
+ file = memoryStream.ToArray();
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- return (formAccumulator.GetResults(), file);
|
|
|
- }
|
|
|
+ return (formAccumulator.GetResults(), file);
|
|
|
+ }
|
|
|
|
|
|
- private Encoding GetEncoding(MultipartSection section)
|
|
|
- {
|
|
|
- var hasMediaTypeHeader = MediaTypeHeaderValue.TryParse(section.ContentType, out var mediaType);
|
|
|
- if (!hasMediaTypeHeader || Encoding.UTF7.Equals(mediaType.Encoding))
|
|
|
- {
|
|
|
- return Encoding.UTF8;
|
|
|
- }
|
|
|
+ private Encoding GetEncoding(MultipartSection section)
|
|
|
+ {
|
|
|
+ var hasMediaTypeHeader = MediaTypeHeaderValue.TryParse(section.ContentType, out var mediaType);
|
|
|
+ if (!hasMediaTypeHeader || Encoding.UTF7.Equals(mediaType.Encoding))
|
|
|
+ {
|
|
|
+ return Encoding.UTF8;
|
|
|
+ }
|
|
|
|
|
|
- return mediaType.Encoding;
|
|
|
- }
|
|
|
+ return mediaType.Encoding;
|
|
|
+ }
|
|
|
|
|
|
- private async Task<KeyValueAccumulator> AccumulateForm(KeyValueAccumulator formAccumulator, MultipartSection section, ContentDispositionHeaderValue contentDisposition)
|
|
|
- {
|
|
|
- var key = HeaderUtilities.RemoveQuotes(contentDisposition.Name).Value;
|
|
|
- using var streamReader = new StreamReader(section.Body, GetEncoding(section), true, 1024, true);
|
|
|
- {
|
|
|
- var value = await streamReader.ReadToEndAsync();
|
|
|
- if (string.Equals(value, "undefined", StringComparison.OrdinalIgnoreCase))
|
|
|
- {
|
|
|
- value = string.Empty;
|
|
|
- }
|
|
|
- formAccumulator.Append(key, value);
|
|
|
+ private async Task<KeyValueAccumulator> AccumulateForm(KeyValueAccumulator formAccumulator, MultipartSection section, ContentDispositionHeaderValue contentDisposition)
|
|
|
+ {
|
|
|
+ var key = HeaderUtilities.RemoveQuotes(contentDisposition.Name).Value;
|
|
|
+ using var streamReader = new StreamReader(section.Body, GetEncoding(section), true, 1024, true);
|
|
|
+ var value = await streamReader.ReadToEndAsync();
|
|
|
+ if (string.Equals(value, "undefined", StringComparison.OrdinalIgnoreCase))
|
|
|
+ {
|
|
|
+ value = string.Empty;
|
|
|
+ }
|
|
|
|
|
|
- if (formAccumulator.ValueCount > FormReader.DefaultValueCountLimit)
|
|
|
- {
|
|
|
- throw new InvalidDataException($"Form key count limit {FormReader.DefaultValueCountLimit} exceeded.");
|
|
|
- }
|
|
|
- }
|
|
|
+ formAccumulator.Append(key, value);
|
|
|
+ if (formAccumulator.ValueCount > FormReader.DefaultValueCountLimit)
|
|
|
+ {
|
|
|
+ throw new InvalidDataException($"Form key count limit {FormReader.DefaultValueCountLimit} exceeded.");
|
|
|
+ }
|
|
|
|
|
|
- return formAccumulator;
|
|
|
- }
|
|
|
-}
|
|
|
+ return formAccumulator;
|
|
|
+ }
|
|
|
+}
|
懒得勤快