huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adds .Value to logger calls to avoid calling .ToUriComponents on a bad header. (#1169) 

* Add .Value to request properties in HostingRequestStartLog
This commit is contained in:
Justin Kotalik 2017-08-18 09:43:04 -07:00 committed by GitHub
parent 456957bf57
commit c74d0e7458
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNetCore.Hosting/Internal/HostingRequestStartingLog.cs
View File

@ -64,10 +64,10 @@ namespace Microsoft.AspNetCore.Hosting.Internal
_request.Protocol,
_request.Method,
_request.Scheme,
_request.Host,
_request.PathBase,
_request.Path,
_request.QueryString,
_request.Host.Value,
_request.PathBase.Value,
_request.Path.Value,
_request.QueryString.Value,
_request.ContentType,
_request.ContentLength);
}

35
test/Microsoft.AspNetCore.Hosting.Tests/Internal/HostingRequestStartLogTests.cs Normal file
View File

@ -0,0 +1,35 @@
using System;
using System.Collections.Generic;
using System.Text;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Hosting.Internal;
using Moq;
using Xunit;
namespace Microsoft.AspNetCore.Hosting.Tests.Internal
{
public class HostingRequestStartLogTests
{
[Theory]
[InlineData(",XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "Request starting GET 1.1 http://,XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX//?query test 0")]
[InlineData(" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "Request starting GET 1.1 http:// XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX//?query test 0")]
public void InvalidHttpContext_DoesNotThrowOnAccessingProperties(string input, string expected)
{
var mockRequest = new Mock<HttpRequest>();
mockRequest.Setup(request => request.Protocol).Returns("GET");
mockRequest.Setup(request => request.Method).Returns("1.1");
mockRequest.Setup(request => request.Scheme).Returns("http");
mockRequest.Setup(request => request.Host).Returns(new HostString(input));
mockRequest.Setup(request => request.PathBase).Returns(new PathString("/"));
mockRequest.Setup(request => request.Path).Returns(new PathString("/"));
mockRequest.Setup(request => request.QueryString).Returns(new QueryString("?query"));
mockRequest.Setup(request => request.ContentType).Returns("test");
mockRequest.Setup(request => request.ContentLength).Returns(0);
var mockContext = new Mock<HttpContext>();
mockContext.Setup(context => context.Request).Returns(mockRequest.Object);
var logger = new HostingRequestStartingLog(mockContext.Object);
Assert.Equal(expected, logger.ToString());
}
}
}