tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-11-04 21:10:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

#490 use byte content not stream (#498)

Browse Source
This commit is contained in:
Tom Pallister
2018-07-25 08:34:58 +01:00
committed by GitHub
parent 69ca874239
commit d186f0e1b6
5 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ocelot/Request/Mapper/IRequestMapper.cs
View File

@@ -7,6 +7,6 @@
public interface IRequestMapper
{
Response<HttpRequestMessage> Map(HttpRequest request);
Task<Response<HttpRequestMessage>> Map(HttpRequest request);
}
}

21
src/Ocelot/Request/Mapper/RequestMapper.cs
View File

@@ -15,13 +15,13 @@
{
private readonly string[] _unsupportedHeaders = { "host" };
public Response<HttpRequestMessage> Map(HttpRequest request)
public async Task<Response<HttpRequestMessage>> Map(HttpRequest request)
{
try
{
var requestMessage = new HttpRequestMessage()
{
Content = MapContent(request),
Content = await MapContent(request),
Method = MapMethod(request),
RequestUri = MapUri(request)
};
@@ -36,14 +36,15 @@
}
}
private HttpContent MapContent(HttpRequest request)
private async Task<HttpContent> MapContent(HttpRequest request)
{
if (request.Body == null || (request.Body.CanSeek && request.Body.Length <= 0))
{
return null;
}
var content = new StreamContent(request.Body);
// Never change this to StreamContent again, I forgot it doesnt work in #464.
var content = new ByteArrayContent(await ToByteArray(request.Body));
if(!string.IsNullOrEmpty(request.ContentType))
{
@@ -95,5 +96,17 @@
{
return !_unsupportedHeaders.Contains(header.Key.ToLower());
}
private async Task<byte[]> ToByteArray(Stream stream)
{
using(stream)
{
using (var memStream = new MemoryStream())
{
await stream.CopyToAsync(memStream);
return memStream.ToArray();
}
}
}
}
}

2
src/Ocelot/Request/Middleware/DownstreamRequestInitialiserMiddleware.cs
View File

@@ -27,7 +27,7 @@ namespace Ocelot.Request.Middleware
public async Task Invoke(DownstreamContext context)
{
var downstreamRequest = _requestMapper.Map(context.HttpContext.Request);
var downstreamRequest = await _requestMapper.Map(context.HttpContext.Request);
if (downstreamRequest.IsError)
{

4
test/Ocelot.UnitTests/Request/DownstreamRequestInitialiserMiddlewareTests.cs
View File

@@ -95,7 +95,7 @@ namespace Ocelot.UnitTests.Request
_requestMapper
.Setup(rm => rm.Map(It.IsAny<HttpRequest>()))
.Returns(_mappedRequest);
.ReturnsAsync(_mappedRequest);
}
private void GivenTheMapperWillReturnAnError()
@@ -104,7 +104,7 @@ namespace Ocelot.UnitTests.Request
_requestMapper
.Setup(rm => rm.Map(It.IsAny<HttpRequest>()))
.Returns(_mappedRequest);
.ReturnsAsync(_mappedRequest);
}
private void WhenTheMiddlewareIsInvoked()

5
test/Ocelot.UnitTests/Request/Mapper/RequestMapperTests.cs
View File

@@ -16,6 +16,7 @@
using System.IO;
using System.Text;
using System.Security.Cryptography;
using System.Threading.Tasks;
public class RequestMapperTests
{
@@ -378,9 +379,9 @@
_inputRequest.Body = null;
}
private void WhenMapped()
private async Task WhenMapped()
{
_mappedRequest = _requestMapper.Map(_inputRequest);
_mappedRequest = await _requestMapper.Map(_inputRequest);
}
private void ThenNoErrorIsReturned()