nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 15:42:48 -05:00
Code Activity

update libs, aspnet core 20, & id server 2.0

Browse Source
This commit is contained in:
Kyle Spearrin
2017-10-06 11:38:47 -04:00
parent 5db8649b44
commit f2183246d2
12 changed files with 72 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Api/Utilities/MultipartFormDataHelper.cs
View File

@ -5,6 +5,7 @@ using Microsoft.Net.Http.Headers;
using System;
using System.IO;
using System.Threading.Tasks;
using Microsoft.Extensions.Primitives;
namespace Bit.Api.Utilities
{
@ -30,7 +31,7 @@ namespace Bit.Api.Utilities
if(ContentDispositionHeaderValue.TryParse(section.ContentDisposition, out var content) &&
HasFileContentDisposition(content))
{
var fileName = HeaderUtilities.RemoveQuotes(content.FileName) ?? string.Empty;
var fileName = HeaderUtilities.RemoveQuotes(content.FileName).ToString();
using(section.Body)
{
await callback(section.Body, fileName);
@ -52,7 +53,7 @@ namespace Bit.Api.Utilities
private static string GetBoundary(MediaTypeHeaderValue contentType, int lengthLimit)
{
var boundary = HeaderUtilities.RemoveQuotes(contentType.Boundary);
if(string.IsNullOrWhiteSpace(boundary))
if(StringSegment.IsNullOrEmpty(boundary))
{
throw new InvalidDataException("Missing content-type boundary.");
}
@ -62,14 +63,14 @@ namespace Bit.Api.Utilities
throw new InvalidDataException($"Multipart boundary length limit {lengthLimit} exceeded.");
}
return boundary;
return boundary.ToString();
}
private static bool HasFileContentDisposition(ContentDispositionHeaderValue content)
{
// Content-Disposition: form-data; name="myfile1"; filename="Misc 002.jpg"
return content != null && content.DispositionType.Equals("form-data") &&
(!string.IsNullOrEmpty(content.FileName) || !string.IsNullOrEmpty(content.FileNameStar));
(!StringSegment.IsNullOrEmpty(content.FileName) || !StringSegment.IsNullOrEmpty(content.FileNameStar));
}
}
}